From a02c55cd650534f6069672cf41ce3a077ec5404e Mon Sep 17 00:00:00 2001 From: Hubert Date: Fri, 14 Apr 2023 09:25:12 +0200 Subject: [PATCH] Revert "chore: upgrade libp2p to 0.52.2 (#2732)" (#2759) * Revert "chore: upgrade libp2p to 0.52.2 (#2732)" This reverts commit f61e3de3e88117e3b81fc19ced093cd720c33973. * update lockfile * lock to 0.51.1 * fix/suppress warnings * deprecate more --- Cargo.lock | 438 +++++++++--------- Cargo.toml | 2 +- .../examples/bitswap-in-browser/src/main.rs | 11 +- node/forest_libp2p/bitswap/tests/go_compat.rs | 11 +- .../bitswap/tests/request_manager.rs | 12 +- node/forest_libp2p/src/behaviour.rs | 13 +- node/forest_libp2p/src/discovery.rs | 4 +- node/forest_libp2p/src/service.rs | 21 +- 8 files changed, 249 insertions(+), 263 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 242764267137..df09c2fe9c6e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -143,7 +143,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", "once_cell", "version_check", ] @@ -155,7 +155,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if 1.0.0", - "getrandom 0.2.8", + "getrandom 0.2.9", "once_cell", "version_check", ] @@ -395,9 +395,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" +checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" dependencies = [ "async-lock", "async-task", @@ -448,7 +448,7 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.7", + "rustix 0.37.11", "slab", "socket2", "waker-fn", @@ -471,7 +471,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -502,9 +502,9 @@ dependencies = [ [[package]] name = "async-stream" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad445822218ce64be7a341abfb0b1ea43b5c23aa83902542a4542e78309d8e5e" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" dependencies = [ "async-stream-impl", "futures-core", @@ -513,13 +513,13 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4655ae1a7b0cdf149156f780c5bf3f1352bc53cbd9e0a361a7ef7b22947e965" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.14", ] [[package]] @@ -536,7 +536,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -554,9 +554,9 @@ dependencies = [ [[package]] name = "atomic-waker" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" [[package]] name = "attohttpc" @@ -610,18 +610,18 @@ dependencies = [ [[package]] name = "aws-region" -version = "0.25.1" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92a8af5850d0ea0916ca3e015ab86951ded0bf4b70fd27896e81ae1dfb0af37" +checksum = "056557a61427d0e5ba29dd931031c8ffed4ee7a550e7cd55692a9d8deb0a9dba" dependencies = [ "thiserror", ] [[package]] name = "axum" -version = "0.6.12" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f8ccfd9221ee7d1f3d4b33e1f8319b3a81ed8f61f2ea40b37b859794b4491" +checksum = "3b32c5ea3aabaf4deb5f5ced2d688ec0844c881c9e6c696a8b769a05fc691e62" dependencies = [ "async-trait", "axum-core", @@ -654,9 +654,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2f958c80c248b34b9a877a643811be8dbca03ca5ba827f2b63baf3a81e5fc4e" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" dependencies = [ "async-trait", "bytes 1.4.0", @@ -676,7 +676,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ "futures-core", - "getrandom 0.2.8", + "getrandom 0.2.9", "instant", "pin-project-lite 0.2.9", "rand 0.8.5", @@ -941,9 +941,9 @@ dependencies = [ [[package]] name = "blocking" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" dependencies = [ "async-channel", "async-lock", @@ -951,6 +951,7 @@ dependencies = [ "atomic-waker", "fastrand", "futures-lite", + "log", ] [[package]] @@ -1403,7 +1404,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -1461,9 +1462,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" dependencies = [ "crossbeam-utils", ] @@ -1766,9 +1767,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -1954,7 +1955,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -1971,7 +1972,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -2184,9 +2185,9 @@ dependencies = [ [[package]] name = "dialoguer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af3c796f3b0b408d9fd581611b47fa850821fcb84aa640b83a3c1a5be2d691f2" +checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" dependencies = [ "console", "shell-words", @@ -2467,13 +2468,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -2504,9 +2505,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "execute" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "313431b1c5e3a6ec9b864333defee57d2ddb50de77abab419e4baedb6cdff292" +checksum = "16d9a9ea4c04632c16bc5c71a2fcc63d308481f7fc67eb1a1ce6315c44a426ae" dependencies = [ "execute-command-macro", "execute-command-tokens", @@ -2577,13 +2578,13 @@ dependencies = [ [[package]] name = "fd-lock" -version = "3.0.11" +version = "3.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9799aefb4a2e4a01cc47610b1dd47c18ab13d991f27bbcaed9296f5a53d5cbad" +checksum = "39ae6b3d9530211fb3b12a95374b8b0823be812f53d09e18c5675c0146b09642" dependencies = [ "cfg-if 1.0.0", - "rustix 0.37.7", - "windows-sys 0.45.0", + "rustix 0.37.11", + "windows-sys 0.48.0", ] [[package]] @@ -2615,7 +2616,7 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "fil_actor_account_v10" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "frc42_dispatch", "fvm_ipld_encoding 0.3.3", @@ -2628,7 +2629,7 @@ dependencies = [ [[package]] name = "fil_actor_account_v8" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "fvm_ipld_encoding 0.3.3", "fvm_shared 2.3.0", @@ -2640,7 +2641,7 @@ dependencies = [ [[package]] name = "fil_actor_account_v9" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "frc42_dispatch", "fvm_ipld_encoding 0.3.3", @@ -2653,7 +2654,7 @@ dependencies = [ [[package]] name = "fil_actor_cron_v10" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "fvm_ipld_encoding 0.3.3", "fvm_shared 3.1.0", @@ -2665,7 +2666,7 @@ dependencies = [ [[package]] name = "fil_actor_cron_v8" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "fvm_ipld_encoding 0.3.3", "fvm_shared 2.3.0", @@ -2677,7 +2678,7 @@ dependencies = [ [[package]] name = "fil_actor_cron_v9" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "fvm_ipld_encoding 0.3.3", "fvm_shared 2.3.0", @@ -2689,7 +2690,7 @@ dependencies = [ [[package]] name = "fil_actor_datacap_v10" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "fil_actors_runtime_v10", "frc42_dispatch", @@ -2702,13 +2703,26 @@ dependencies = [ "serde", ] +[[package]] +name = "fil_actor_evm_shared_v10" +version = "1.0.0" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" +dependencies = [ + "fil_actors_runtime_v10", + "fvm_ipld_encoding 0.3.3", + "fvm_shared 3.1.0", + "hex", + "serde", + "uint", +] + [[package]] name = "fil_actor_evm_v10" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "cid", - "fil_actors_evm_shared_v10", + "fil_actor_evm_shared_v10", "frc42_dispatch", "fvm_ipld_encoding 0.3.3", "fvm_shared 3.1.0", @@ -2721,7 +2735,7 @@ dependencies = [ [[package]] name = "fil_actor_init_v10" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "cid", "fil_actors_runtime_v10", @@ -2737,7 +2751,7 @@ dependencies = [ [[package]] name = "fil_actor_init_v8" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "anyhow", "cid", @@ -2754,7 +2768,7 @@ dependencies = [ [[package]] name = "fil_actor_init_v9" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "cid", "fil_actors_runtime_v9", @@ -2769,7 +2783,7 @@ dependencies = [ [[package]] name = "fil_actor_interface" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "ahash 0.8.3", "anyhow", @@ -2822,7 +2836,7 @@ dependencies = [ [[package]] name = "fil_actor_market_v10" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "cid", "fil_actors_runtime_v10", @@ -2840,7 +2854,7 @@ dependencies = [ [[package]] name = "fil_actor_market_v8" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "anyhow", "cid", @@ -2858,7 +2872,7 @@ dependencies = [ [[package]] name = "fil_actor_market_v9" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "anyhow", "cid", @@ -2876,7 +2890,7 @@ dependencies = [ [[package]] name = "fil_actor_miner_v10" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "anyhow", "cid", @@ -2899,7 +2913,7 @@ dependencies = [ [[package]] name = "fil_actor_miner_v8" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "anyhow", "cid", @@ -2920,7 +2934,7 @@ dependencies = [ [[package]] name = "fil_actor_miner_v9" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "anyhow", "cid", @@ -2942,7 +2956,7 @@ dependencies = [ [[package]] name = "fil_actor_multisig_v10" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "cid", "fil_actors_runtime_v10", @@ -2961,7 +2975,7 @@ dependencies = [ [[package]] name = "fil_actor_multisig_v8" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "anyhow", "cid", @@ -2980,7 +2994,7 @@ dependencies = [ [[package]] name = "fil_actor_multisig_v9" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "cid", "fil_actors_runtime_v9", @@ -2999,7 +3013,7 @@ dependencies = [ [[package]] name = "fil_actor_power_v10" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "anyhow", "cid", @@ -3019,7 +3033,7 @@ dependencies = [ [[package]] name = "fil_actor_power_v8" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "anyhow", "cid", @@ -3038,7 +3052,7 @@ dependencies = [ [[package]] name = "fil_actor_power_v9" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "anyhow", "cid", @@ -3057,7 +3071,7 @@ dependencies = [ [[package]] name = "fil_actor_reward_v10" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "fvm_ipld_encoding 0.3.3", "fvm_shared 3.1.0", @@ -3070,7 +3084,7 @@ dependencies = [ [[package]] name = "fil_actor_reward_v8" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "fvm_ipld_encoding 0.3.3", "fvm_shared 2.3.0", @@ -3083,7 +3097,7 @@ dependencies = [ [[package]] name = "fil_actor_reward_v9" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "fvm_ipld_encoding 0.3.3", "fvm_shared 2.3.0", @@ -3096,7 +3110,7 @@ dependencies = [ [[package]] name = "fil_actor_system_v10" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "cid", "fvm_ipld_encoding 0.3.3", @@ -3109,7 +3123,7 @@ dependencies = [ [[package]] name = "fil_actor_system_v8" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "cid", "fvm_ipld_encoding 0.3.3", @@ -3122,7 +3136,7 @@ dependencies = [ [[package]] name = "fil_actor_system_v9" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "cid", "fvm_ipld_encoding 0.3.3", @@ -3132,23 +3146,10 @@ dependencies = [ "serde", ] -[[package]] -name = "fil_actors_evm_shared_v10" -version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" -dependencies = [ - "fil_actors_runtime_v10", - "fvm_ipld_encoding 0.3.3", - "fvm_shared 3.1.0", - "hex", - "serde", - "uint", -] - [[package]] name = "fil_actors_runtime_v10" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "anyhow", "cid", @@ -3172,7 +3173,7 @@ dependencies = [ [[package]] name = "fil_actors_runtime_v8" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "anyhow", "cid", @@ -3194,7 +3195,7 @@ dependencies = [ [[package]] name = "fil_actors_runtime_v9" version = "1.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states#22a8c956a7f2d08904ad60d8d14e99bcb0a6df74" +source = "git+https://github.com/ChainSafe/fil-actor-states#3968a759e799e29376b2d85aec68351cbaca6317" dependencies = [ "anyhow", "cid", @@ -4131,7 +4132,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "syn 2.0.13", + "syn 2.0.14", "tokio", ] @@ -4344,34 +4345,34 @@ dependencies = [ [[package]] name = "frc42_dispatch" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4dc594c941eba1d5a9474f595c6d0f9d752fa333b672755bbe7c23d30f64282" +checksum = "c6fda233581861602b8c1c0922a44d79977cb0f56cfe1c3b71eafb589d1da749" dependencies = [ "frc42_hasher", "frc42_macros", "fvm_ipld_encoding 0.3.3", - "fvm_sdk 3.0.0", - "fvm_shared 3.1.0", + "fvm_sdk 3.2.0", + "fvm_shared 3.2.0", "thiserror", ] [[package]] name = "frc42_hasher" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6caf7fa3028536d11b1ff94a63bd1d60926ff7366b25b2a94d07bd23190f459" +checksum = "ad1cf7cebdc57c39906ba8b1148cde4a633cd76614131b983eb4c07f35c735d0" dependencies = [ - "fvm_sdk 3.0.0", - "fvm_shared 3.1.0", + "fvm_sdk 3.2.0", + "fvm_shared 3.2.0", "thiserror", ] [[package]] name = "frc42_macros" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c57201a8c3c26b41c4234a0f68b123ec2c33c958d31d09a3a780c345256e7928" +checksum = "9479347c6b83b53f1c041045e9954e3213bb6d1cfc9d2f2927340765a1aabd58" dependencies = [ "blake2b_simd", "frc42_hasher", @@ -4476,9 +4477,9 @@ checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ "fastrand", "futures-core", @@ -4497,7 +4498,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -4832,13 +4833,13 @@ dependencies = [ [[package]] name = "fvm_sdk" -version = "3.0.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fef17308967cceb1d22f05003d60adb0d5b9ba53e34ace4ae04701eb7e6af02" +checksum = "db8ac1214ca6c31bcbb4e2e7461cd17af18e0496b9053547d465f15c8d8429a7" dependencies = [ "cid", "fvm_ipld_encoding 0.3.3", - "fvm_shared 3.1.0", + "fvm_shared 3.2.0", "lazy_static", "log", "num-traits", @@ -4911,6 +4912,31 @@ dependencies = [ "unsigned-varint", ] +[[package]] +name = "fvm_shared" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674e86afc2ce02808d24f578296f105b13c23300e60e0eac331c4c1575beabb5" +dependencies = [ + "anyhow", + "bitflags", + "blake2b_simd", + "cid", + "data-encoding", + "data-encoding-macro", + "fvm_ipld_encoding 0.3.3", + "lazy_static", + "multihash 0.16.3", + "num-bigint", + "num-derive", + "num-integer", + "num-traits", + "serde", + "serde_tuple", + "thiserror", + "unsigned-varint", +] + [[package]] name = "fxhash" version = "0.2.1" @@ -4953,12 +4979,12 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a329e22866dd78b35d2c639a4a23d7b950aeae300dfd79f4fb19f74055c2404" +checksum = "199523ba70af2b447640715e8c4bd2b5360313a71d2d69361ae4dd1dc31487dd" dependencies = [ "libc", - "windows 0.43.0", + "windows 0.48.0", ] [[package]] @@ -4974,9 +5000,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -5492,13 +5518,13 @@ checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" [[package]] name = "io-lifetimes" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" dependencies = [ "hermit-abi 0.3.1", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -5521,14 +5547,14 @@ checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" [[package]] name = "is-terminal" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", - "io-lifetimes 1.0.9", - "rustix 0.37.7", - "windows-sys 0.45.0", + "io-lifetimes 1.0.10", + "rustix 0.37.11", + "windows-sys 0.48.0", ] [[package]] @@ -5652,9 +5678,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.140" +version = "0.2.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" [[package]] name = "libipld" @@ -5785,17 +5811,15 @@ dependencies = [ [[package]] name = "libp2p" -version = "0.51.2" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab78d6d2201578bb3a33dff33c540af6b8f0bdcd751b4028e798e868c2ca0722" +checksum = "53e068bb83ef4e0bed45de5ca4a4118018ac1f70ea3ecb1f4878742d08a97473" dependencies = [ "bytes 1.4.0", "futures", "futures-timer", - "getrandom 0.2.8", + "getrandom 0.2.9", "instant", - "libp2p-allow-block-list", - "libp2p-connection-limits", "libp2p-core", "libp2p-dns", "libp2p-gossipsub", @@ -5818,30 +5842,6 @@ dependencies = [ "pin-project", ] -[[package]] -name = "libp2p-allow-block-list" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c54073648b20bb47335164544a4e5694434f44530f47a4f6618f5f585f3ff5" -dependencies = [ - "libp2p-core", - "libp2p-identity", - "libp2p-swarm", - "void", -] - -[[package]] -name = "libp2p-connection-limits" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4caa33f1d26ed664c4fe2cca81a08c8e07d4c1c04f2f4ac7655c2dd85467fda0" -dependencies = [ - "libp2p-core", - "libp2p-identity", - "libp2p-swarm", - "void", -] - [[package]] name = "libp2p-core" version = "0.39.1" @@ -5886,9 +5886,9 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.44.2" +version = "0.44.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38c95818acf1d0d917712dd3bf4e73c4839e6fca6329d70ba9968cecc6bbb7e4" +checksum = "eac213adad69bd9866fe87c37fbf241626715e5cd454fb6df9841aa2b02440ee" dependencies = [ "asynchronous-codec", "base64 0.21.0", @@ -5956,9 +5956,9 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.43.1" +version = "0.43.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc57e02d7ad49a63792370f24b829af38f34982ff56556e59e4cb325a4dbf6b" +checksum = "9647c76e63c4d0e9a10369cef9b929a2e5e8f03008b2097ab365fc4cb4e5318f" dependencies = [ "arrayvec 0.7.2", "asynchronous-codec", @@ -6108,7 +6108,7 @@ dependencies = [ "fnv", "futures", "futures-timer", - "getrandom 0.2.8", + "getrandom 0.2.9", "instant", "libp2p-core", "libp2p-identity", @@ -6505,7 +6505,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" dependencies = [ - "rustix 0.37.7", + "rustix 0.37.11", ] [[package]] @@ -6769,7 +6769,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", ] [[package]] @@ -7206,9 +7206,9 @@ checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" [[package]] name = "parking" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" [[package]] name = "parking_lot" @@ -7426,9 +7426,9 @@ checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" [[package]] name = "polling" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" +checksum = "4be1c66a6add46bff50935c313dae30a5030cf8385c5206e8a95e9e9def974aa" dependencies = [ "autocfg", "bitflags", @@ -7437,7 +7437,7 @@ dependencies = [ "libc", "log", "pin-project-lite 0.2.9", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -7656,9 +7656,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48e50df39172a3e7eb17e14642445da64996989bc212b583015435d39a58537" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ "bytes 1.4.0", "prost-derive", @@ -7666,9 +7666,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea9b0f8cbe5e15a8a042d030bd96668db28ecb567ec37d691971ff5731d2b1b" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools 0.10.5", @@ -7679,9 +7679,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379119666929a1afd7a043aa6cf96fa67a6dce9af60c88095a4686dbce4c9c88" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ "prost", ] @@ -7935,7 +7935,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", ] [[package]] @@ -8056,7 +8056,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", "redox_syscall 0.2.16", "thiserror", ] @@ -8421,8 +8421,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0af200a3324fa5bcd922e84e9b55a298ea9f431a489f01961acdebc6e908f25" dependencies = [ "bitflags", - "errno 0.3.0", - "io-lifetimes 1.0.9", + "errno 0.3.1", + "io-lifetimes 1.0.10", "libc", "linux-raw-sys 0.1.4", "windows-sys 0.45.0", @@ -8430,16 +8430,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.7" +version = "0.37.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d" +checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" dependencies = [ "bitflags", - "errno 0.3.0", - "io-lifetimes 1.0.9", + "errno 0.3.1", + "io-lifetimes 1.0.10", "libc", "linux-raw-sys 0.3.1", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -8696,9 +8696,9 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" [[package]] name = "serde" -version = "1.0.159" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" dependencies = [ "serde_derive", ] @@ -8735,13 +8735,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -8758,9 +8758,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", @@ -8784,7 +8784,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -8831,9 +8831,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85456ffac572dc8826334164f2fb6fb40a7c766aebe195a2a21ee69ee2885ecf" +checksum = "331bb8c3bf9b92457ab7abecf07078c13f7d270ba490103e84e8b014490cd0b0" dependencies = [ "base64 0.13.1", "chrono", @@ -8847,9 +8847,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cbcd6104f8a4ab6af7f6be2a0da6be86b9de3c401f6e86bb856ab2af739232f" +checksum = "859011bddcc11f289f07f467cc1fe01c7a941daa4d8f6c40d4d1c92eb6d9319c" dependencies = [ "darling", "proc-macro2", @@ -8859,9 +8859,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.19" +version = "0.9.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82e6c8c047aa50a7328632d067bcae6ef38772a79e28daf32f735e0e4f3dd10" +checksum = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c" dependencies = [ "indexmap", "itoa", @@ -8962,9 +8962,9 @@ dependencies = [ [[package]] name = "sha3" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" +checksum = "54c2bb1a323307527314a36bfb73f24febb08ce2b8a554bf4ffd6f51ad15198c" dependencies = [ "digest 0.10.6", "keccak", @@ -9395,9 +9395,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.13" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +checksum = "fcf316d5356ed6847742d036f8a39c3b8435cac10bd528a4bd461928a6ab34d5" dependencies = [ "proc-macro2", "quote", @@ -9464,7 +9464,7 @@ dependencies = [ "cfg-if 1.0.0", "fastrand", "redox_syscall 0.3.5", - "rustix 0.37.7", + "rustix 0.37.11", "windows-sys 0.45.0", ] @@ -9500,7 +9500,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -9649,7 +9649,7 @@ checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -10144,9 +10144,9 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad2024452afd3874bf539695e04af6732ba06517424dbf958fdb16a01f3bef6c" +checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" [[package]] name = "unsigned-varint" @@ -10198,11 +10198,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", ] [[package]] @@ -10919,21 +10919,6 @@ dependencies = [ "windows_x86_64_msvc 0.34.0", ] -[[package]] -name = "windows" -version = "0.43.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows" version = "0.48.0" @@ -10980,6 +10965,15 @@ dependencies = [ "windows-targets 0.42.2", ] +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -11281,9 +11275,9 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "yasna" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ "time 0.3.20", ] @@ -11315,7 +11309,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -11339,9 +11333,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.7+zstd.1.5.4" +version = "2.0.8+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index e369d928210c..976d00788983 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -97,7 +97,7 @@ lazy_static = "1.4" libipld = { version = "0.14", default-features = false, features = ["dag-cbor", "dag-json", "derive"] } libipld-core = "0.14" libipld-macro = "0.14" -libp2p = { version = "0.51.2", default-features = false } +libp2p = { version = "=0.51.1", default-features = false } libsecp256k1 = "0.7" log = "0.4" lru = "0.9" diff --git a/node/forest_libp2p/bitswap/examples/bitswap-in-browser/src/main.rs b/node/forest_libp2p/bitswap/examples/bitswap-in-browser/src/main.rs index f19a6076b1bb..353ed65a9a4c 100644 --- a/node/forest_libp2p/bitswap/examples/bitswap-in-browser/src/main.rs +++ b/node/forest_libp2p/bitswap/examples/bitswap-in-browser/src/main.rs @@ -11,12 +11,7 @@ use cid::{ }; use forest_libp2p_bitswap::{BitswapStoreRead, BitswapStoreReadWrite}; use libipld::Block; -use libp2p::{ - futures::StreamExt, - multiaddr::Protocol, - swarm::{SwarmBuilder, SwarmEvent}, - Swarm, -}; +use libp2p::{futures::StreamExt, multiaddr::Protocol, swarm::SwarmEvent, Swarm}; use parking_lot::RwLock; use rand::{rngs::OsRng, Rng}; use tokio::select; @@ -28,7 +23,9 @@ async fn main() -> anyhow::Result<()> { let (transport, _, local_peer_id) = TransportBuilder::new().build()?; let behaviour = DemoBehaviour::default(); let bitswap_request_manager = behaviour.bitswap.request_manager(); - let mut swarm = SwarmBuilder::with_tokio_executor(transport, behaviour, local_peer_id).build(); + // https://github.com/ChainSafe/forest/issues/2762 + #[allow(deprecated)] + let mut swarm = Swarm::with_tokio_executor(transport, behaviour, local_peer_id); swarm.listen_on("/ip4/127.0.0.1/tcp/0/ws".parse()?)?; let local_peer_addr = loop { let event = swarm.select_next_some().await; diff --git a/node/forest_libp2p/bitswap/tests/go_compat.rs b/node/forest_libp2p/bitswap/tests/go_compat.rs index e26786972f9c..16edfaeab672 100644 --- a/node/forest_libp2p/bitswap/tests/go_compat.rs +++ b/node/forest_libp2p/bitswap/tests/go_compat.rs @@ -14,11 +14,8 @@ mod tests { Cid, }; use libp2p::{ - core, - futures::StreamExt, - identity, noise, request_response, - swarm::{SwarmBuilder, SwarmEvent}, - tcp, yamux, PeerId, Transport, + core, futures::StreamExt, identity, noise, request_response, swarm::SwarmEvent, tcp, yamux, + PeerId, Swarm, Transport, }; const TIMEOUT: Duration = Duration::from_secs(60); @@ -40,7 +37,9 @@ mod tests { .timeout(TIMEOUT) .boxed(); let behaviour = BitswapBehaviour::new(&[b"/test/ipfs/bitswap/1.2.0"], Default::default()); - let mut swarm = SwarmBuilder::with_tokio_executor(transport, behaviour, peer_id).build(); + // TODO https://github.com/ChainSafe/forest/issues/2762 + #[allow(deprecated)] + let mut swarm = Swarm::with_tokio_executor(transport, behaviour, peer_id); swarm.listen_on(LISTEN_ADDR.parse()?)?; let expected_inbound_request_cid_str = "bitswap_request_from_go"; let expected_inbound_request_cid = Cid::new_v0( diff --git a/node/forest_libp2p/bitswap/tests/request_manager.rs b/node/forest_libp2p/bitswap/tests/request_manager.rs index dd22589b4fc6..b9de3ffcb576 100644 --- a/node/forest_libp2p/bitswap/tests/request_manager.rs +++ b/node/forest_libp2p/bitswap/tests/request_manager.rs @@ -14,12 +14,8 @@ mod tests { Block, Cid, }; use libp2p::{ - core, - identity::Keypair, - multiaddr::Protocol, - noise, - swarm::{SwarmBuilder, SwarmEvent}, - tcp, yamux, Multiaddr, PeerId, Swarm, Transport, + core, identity::Keypair, multiaddr::Protocol, noise, swarm::SwarmEvent, tcp, yamux, + Multiaddr, PeerId, Swarm, Transport, }; use parking_lot::RwLock; use rand::{rngs::OsRng, Rng}; @@ -113,7 +109,9 @@ mod tests { .timeout(TIMEOUT) .boxed(); let behaviour = BitswapBehaviour::new(&[b"/test/ipfs/bitswap/1.0.0"], Default::default()); - let mut swarm = SwarmBuilder::with_tokio_executor(transport, behaviour, peer_id).build(); + // https://github.com/ChainSafe/forest/issues/2762 + #[allow(deprecated)] + let mut swarm = Swarm::with_tokio_executor(transport, behaviour, peer_id); swarm.listen_on(LISTEN_ADDR.parse()?)?; let peer_addr = loop { let event = swarm.select_next_some().await; diff --git a/node/forest_libp2p/src/behaviour.rs b/node/forest_libp2p/src/behaviour.rs index 63d358cf7f15..3757624d9446 100644 --- a/node/forest_libp2p/src/behaviour.rs +++ b/node/forest_libp2p/src/behaviour.rs @@ -5,8 +5,6 @@ use ahash::{HashMap, HashSet}; use forest_libp2p_bitswap::BitswapBehaviour; use forest_utils::encoding::blake2b_256; use libp2p::{ - allow_block_list::{self, BlockedPeers}, - connection_limits::{self, ConnectionLimits}, core::identity::Keypair, gossipsub::{ self, IdentTopic as Topic, MessageAuthenticity, MessageId, PublishError, SubscriptionError, @@ -38,8 +36,6 @@ pub(crate) struct ForestBehaviour { discovery: DiscoveryBehaviour, ping: ping::Behaviour, identify: identify::Behaviour, - connection_limits: connection_limits::Behaviour, - pub(super) blocked_peers: allow_block_list::Behaviour, pub(super) hello: HelloBehaviour, pub(super) chain_exchange: ChainExchangeBehaviour, pub(super) bitswap: BitswapBehaviour, @@ -57,12 +53,7 @@ impl Recorder for Metrics { } impl ForestBehaviour { - pub fn new( - local_key: &Keypair, - config: &Libp2pConfig, - network_name: &str, - connection_limits: ConnectionLimits, - ) -> Self { + pub fn new(local_key: &Keypair, config: &Libp2pConfig, network_name: &str) -> Self { let mut gs_config_builder = gossipsub::ConfigBuilder::default(); gs_config_builder.max_transmit_size(1 << 20); gs_config_builder.validation_mode(ValidationMode::Strict); @@ -113,8 +104,6 @@ impl ForestBehaviour { "ipfs/0.1.0".into(), local_key.public(), )), - connection_limits: connection_limits::Behaviour::new(connection_limits), - blocked_peers: Default::default(), bitswap, hello: HelloBehaviour::default(), chain_exchange: ChainExchangeBehaviour::default(), diff --git a/node/forest_libp2p/src/discovery.rs b/node/forest_libp2p/src/discovery.rs index e38a1a4b5cf8..bbaf9534d049 100644 --- a/node/forest_libp2p/src/discovery.rs +++ b/node/forest_libp2p/src/discovery.rs @@ -16,7 +16,9 @@ use libp2p::{ kad::{record::store::MemoryStore, Kademlia, KademliaConfig, KademliaEvent, QueryId}, mdns::{tokio::Behaviour as Mdns, Event as MdnsEvent}, multiaddr::Protocol, - swarm::{behaviour::toggle::Toggle, derive_prelude::*, NetworkBehaviour, PollParameters}, + swarm::{ + behaviour::toggle::Toggle, derive_prelude::*, NetworkBehaviour, PollParameters, ToSwarm, + }, }; use log::{debug, error, trace, warn}; use tokio::time::Interval; diff --git a/node/forest_libp2p/src/service.rs b/node/forest_libp2p/src/service.rs index afcbd536f28c..ec4cc963dce7 100644 --- a/node/forest_libp2p/src/service.rs +++ b/node/forest_libp2p/src/service.rs @@ -23,8 +23,10 @@ use futures_util::stream::StreamExt; use fvm_ipld_blockstore::Blockstore; use fvm_shared::clock::ChainEpoch; pub use libp2p::gossipsub::{IdentTopic, Topic}; +// https://github.com/ChainSafe/forest/issues/2762 +#[allow(deprecated)] +use libp2p::swarm::ConnectionLimits; use libp2p::{ - connection_limits::ConnectionLimits, core::{self, identity::Keypair, muxing::StreamMuxerBox, transport::Boxed, Multiaddr}, gossipsub, metrics::{Metrics, Recorder}, @@ -208,7 +210,9 @@ where let transport = build_transport(net_keypair.clone()).expect("Failed to build libp2p transport"); - let connection_limits = ConnectionLimits::default() + // https://github.com/ChainSafe/forest/issues/2762 + #[allow(deprecated)] + let limits = ConnectionLimits::default() .with_max_pending_incoming(Some(10)) .with_max_pending_outgoing(Some(30)) .with_max_established_incoming(Some(config.target_peer_count)) @@ -217,9 +221,10 @@ where let mut swarm = SwarmBuilder::with_tokio_executor( transport, - ForestBehaviour::new(&net_keypair, &config, network_name, connection_limits), + ForestBehaviour::new(&net_keypair, &config, network_name), peer_id, ) + .connection_limits(limits) .notify_handler_buffer_size(std::num::NonZeroUsize::new(20).expect("Not zero")) .per_connection_event_buffer_size(64) .build(); @@ -358,11 +363,15 @@ fn handle_peer_ops(swarm: &mut Swarm, peer_ops: PeerOperation) match peer_ops { Ban(peer_id, reason) => { warn!("Banning {peer_id}, reason: {reason}"); - swarm.behaviour_mut().blocked_peers.block_peer(peer_id); + // https://github.com/ChainSafe/forest/issues/2762 + #[allow(deprecated)] + swarm.ban_peer_id(peer_id); } Unban(peer_id) => { info!("Unbanning {peer_id}"); - swarm.behaviour_mut().blocked_peers.unblock_peer(peer_id); + // https://github.com/ChainSafe/forest/issues/2762 + #[allow(deprecated)] + swarm.unban_peer_id(peer_id); } } } @@ -799,8 +808,6 @@ async fn handle_forest_behaviour_event( ) .await } - ForestBehaviourEvent::ConnectionLimits(_) => {} - ForestBehaviourEvent::BlockedPeers(_) => {} } }