From a419b4a36c39938c50be370cfaa3a31c553f2574 Mon Sep 17 00:00:00 2001
From: cryptoAtwill <willes.lau@protocol.ai>
Date: Thu, 23 Jan 2025 10:38:03 +0800
Subject: [PATCH] update crates

---
 Cargo.lock                    | 218 +++++++++-------------------------
 ext/libp2p-bitswap/Cargo.toml |  30 ++---
 2 files changed, 70 insertions(+), 178 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 868f2354b..88734f2b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1213,16 +1213,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "cached"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af4dfac631a8e77b2f327f7852bb6172771f5279c4512efe79fad6067b37be3d"
-dependencies = [
- "hashbrown 0.11.2",
- "once_cell",
-]
-
 [[package]]
 name = "camino"
 version = "1.1.9"
@@ -1357,19 +1347,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e4de3bc4ea267985becf712dc6d9eed8b04c953b3fcfb339ebc87acd9804901"
 
-[[package]]
-name = "cid"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ed9c8b2d17acb8110c46f1da5bf4a696d745e1474a16db0cd2b49cd0249bf2"
-dependencies = [
- "core2",
- "multibase",
- "multihash 0.16.3",
- "serde",
- "unsigned-varint 0.7.2",
-]
-
 [[package]]
 name = "cid"
 version = "0.10.1"
@@ -2448,19 +2425,6 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "env_logger"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
-dependencies = [
- "atty",
- "humantime 2.1.0",
- "log",
- "regex",
- "termcolor",
-]
-
 [[package]]
 name = "env_logger"
 version = "0.10.2"
@@ -2970,7 +2934,7 @@ name = "fendermint_actor_activity_tracker"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "cid 0.10.1",
+ "cid",
  "fil_actors_evm_shared",
  "fil_actors_runtime",
  "frc42_dispatch",
@@ -2991,7 +2955,7 @@ name = "fendermint_actor_chainmetadata"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "cid 0.10.1",
+ "cid",
  "fil_actors_runtime",
  "frc42_dispatch",
  "fvm_ipld_amt",
@@ -3009,7 +2973,7 @@ name = "fendermint_actor_eam"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "cid 0.10.1",
+ "cid",
  "fil_actor_eam",
  "fil_actors_evm_shared",
  "fil_actors_runtime",
@@ -3030,7 +2994,7 @@ name = "fendermint_actor_gas_market_eip1559"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "cid 0.10.1",
+ "cid",
  "fendermint_actors_api",
  "fil_actors_evm_shared",
  "fil_actors_runtime",
@@ -3051,7 +3015,7 @@ name = "fendermint_actors"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "cid 0.10.1",
+ "cid",
  "fendermint_actor_activity_tracker",
  "fendermint_actor_chainmetadata",
  "fendermint_actor_eam",
@@ -3069,7 +3033,7 @@ name = "fendermint_actors_api"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "cid 0.10.1",
+ "cid",
  "fil_actors_evm_shared",
  "fil_actors_runtime",
  "frc42_dispatch",
@@ -3092,7 +3056,7 @@ dependencies = [
  "async-stm",
  "async-trait",
  "bytes",
- "cid 0.10.1",
+ "cid",
  "fendermint_abci",
  "fendermint_actor_gas_market_eip1559",
  "fendermint_actors_api",
@@ -3127,7 +3091,7 @@ dependencies = [
  "ipc_ipld_resolver",
  "k256 0.11.6",
  "lazy_static",
- "libipld 0.16.0",
+ "libipld",
  "libp2p",
  "libp2p-bitswap",
  "literally",
@@ -3163,7 +3127,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "bytes",
- "cid 0.10.1",
+ "cid",
  "clap 4.5.21",
  "fendermint_materializer",
  "fendermint_vm_actor_interface",
@@ -3218,7 +3182,7 @@ dependencies = [
  "async-trait",
  "byteorder",
  "bytes",
- "cid 0.10.1",
+ "cid",
  "ethers",
  "fendermint_actor_gas_market_eip1559",
  "fendermint_actors_api",
@@ -3262,7 +3226,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "axum",
- "cid 0.10.1",
+ "cid",
  "clap 4.5.21",
  "erased-serde",
  "ethers",
@@ -3364,7 +3328,7 @@ name = "fendermint_rocksdb"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "cid 0.10.1",
+ "cid",
  "fendermint_storage",
  "fvm_ipld_blockstore",
  "fvm_ipld_encoding",
@@ -3384,7 +3348,7 @@ dependencies = [
  "async-trait",
  "base64 0.21.7",
  "bytes",
- "cid 0.10.1",
+ "cid",
  "clap 4.5.21",
  "ethers",
  "fendermint_crypto",
@@ -3432,7 +3396,7 @@ version = "0.1.0"
 dependencies = [
  "arbitrary",
  "arbtest",
- "cid 0.10.1",
+ "cid",
  "ethers",
  "fendermint_testing",
  "fvm_ipld_encoding",
@@ -3461,7 +3425,7 @@ name = "fendermint_vm_actor_interface"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "cid 0.10.1",
+ "cid",
  "ethers",
  "ethers-core",
  "fendermint_crypto",
@@ -3491,7 +3455,7 @@ name = "fendermint_vm_core"
 version = "0.1.0"
 dependencies = [
  "arbitrary",
- "cid 0.10.1",
+ "cid",
  "fnv",
  "fvm_shared",
  "lazy_static",
@@ -3506,7 +3470,7 @@ dependencies = [
 name = "fendermint_vm_encoding"
 version = "0.1.0"
 dependencies = [
- "cid 0.10.1",
+ "cid",
  "fvm_shared",
  "ipc-api",
  "num-traits",
@@ -3527,7 +3491,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "arbitrary",
- "cid 0.10.1",
+ "cid",
  "fendermint_actor_eam",
  "fendermint_crypto",
  "fendermint_testing",
@@ -3559,7 +3523,7 @@ dependencies = [
  "async-stm",
  "async-trait",
  "base64 0.21.7",
- "cid 0.10.1",
+ "cid",
  "ethers",
  "fendermint_actor_activity_tracker",
  "fendermint_actor_chainmetadata",
@@ -3592,7 +3556,7 @@ dependencies = [
  "ipc-api",
  "ipc-observability",
  "ipc_actors_abis",
- "libipld 0.16.0",
+ "libipld",
  "merkle-tree-rs",
  "multihash 0.18.1",
  "num-traits",
@@ -3623,7 +3587,7 @@ dependencies = [
  "anyhow",
  "arbitrary",
  "blake2b_simd",
- "cid 0.10.1",
+ "cid",
  "ethers",
  "ethers-core",
  "fendermint_crypto",
@@ -3651,7 +3615,7 @@ name = "fendermint_vm_resolver"
 version = "0.1.0"
 dependencies = [
  "async-stm",
- "cid 0.10.1",
+ "cid",
  "im",
  "ipc-api",
  "ipc_ipld_resolver",
@@ -3667,7 +3631,7 @@ dependencies = [
  "anyhow",
  "arbitrary",
  "async-stm",
- "cid 0.10.1",
+ "cid",
  "dircpy",
  "fendermint_testing",
  "fendermint_vm_core",
@@ -3704,7 +3668,7 @@ dependencies = [
  "async-stm",
  "async-trait",
  "bytes",
- "cid 0.10.1",
+ "cid",
  "clap 4.5.21",
  "ethers",
  "fendermint_crypto",
@@ -3770,7 +3734,7 @@ checksum = "e0b1448c65c9a054c640fc086e03b730919ca4feca697c34ed3bda9f16aa982f"
 dependencies = [
  "anyhow",
  "async-std",
- "cid 0.10.1",
+ "cid",
  "clap 4.5.21",
  "futures",
  "fvm_ipld_blockstore",
@@ -3787,7 +3751,7 @@ version = "15.0.0-rc1"
 source = "git+https://github.com/filecoin-project/builtin-actors?tag=v15.0.0#831bf1b9fe281835409c39a8c454a68dd3200bbc"
 dependencies = [
  "anyhow",
- "cid 0.10.1",
+ "cid",
  "fil_actors_evm_shared",
  "fil_actors_runtime",
  "fvm_ipld_blockstore",
@@ -3825,7 +3789,7 @@ dependencies = [
  "blake2b_simd",
  "byteorder",
  "castaway",
- "cid 0.10.1",
+ "cid",
  "fvm_ipld_amt",
  "fvm_ipld_bitfield",
  "fvm_ipld_blockstore",
@@ -4260,7 +4224,7 @@ dependencies = [
  "ambassador",
  "anyhow",
  "arbitrary",
- "cid 0.10.1",
+ "cid",
  "derive_more",
  "filecoin-proofs-api",
  "fvm-wasm-instrument",
@@ -4306,7 +4270,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5fea333475130094f27ce67809aae3f69eb5247541d835950b7c5da733dbbb34"
 dependencies = [
  "anyhow",
- "cid 0.10.1",
+ "cid",
  "fvm_ipld_blockstore",
  "fvm_ipld_encoding",
  "itertools 0.11.0",
@@ -4334,7 +4298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d064b957420f5ecc137a153baaa6c32e2eb19b674135317200b6f2537eabdbfd"
 dependencies = [
  "anyhow",
- "cid 0.10.1",
+ "cid",
  "multihash 0.18.1",
 ]
 
@@ -4344,7 +4308,7 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6190f03442b67b21a3d4e115c4d4dd3468aed24e27ebb074218822c1b3df41ba"
 dependencies = [
- "cid 0.10.1",
+ "cid",
  "futures",
  "fvm_ipld_blockstore",
  "fvm_ipld_encoding",
@@ -4360,7 +4324,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90608092e31d9a06236268c58f7c36668ab4b2a48afafe3a97e08f094ad7ae50"
 dependencies = [
  "anyhow",
- "cid 0.10.1",
+ "cid",
  "fvm_ipld_blockstore",
  "multihash 0.18.1",
  "serde",
@@ -4378,11 +4342,11 @@ checksum = "48c900736087ff87cc51f669eee2f8e000c80717472242eb3f712aaa059ac3b3"
 dependencies = [
  "anyhow",
  "byteorder",
- "cid 0.10.1",
+ "cid",
  "forest_hash_utils",
  "fvm_ipld_blockstore",
  "fvm_ipld_encoding",
- "libipld-core 0.16.0",
+ "libipld-core",
  "multihash 0.18.1",
  "once_cell",
  "serde",
@@ -4396,7 +4360,7 @@ version = "4.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b2df521d41de41c34ac712720abdd6e29e68e3ed922554db70dbf8bc49a82b7"
 dependencies = [
- "cid 0.10.1",
+ "cid",
  "fvm_ipld_encoding",
  "fvm_shared",
  "lazy_static",
@@ -4416,7 +4380,7 @@ dependencies = [
  "bitflags 2.6.0",
  "blake2b_simd",
  "bls-signatures 0.15.0",
- "cid 0.10.1",
+ "cid",
  "data-encoding",
  "data-encoding-macro",
  "filecoin-proofs-api",
@@ -4590,12 +4554,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -5368,7 +5326,7 @@ name = "ipc-api"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "cid 0.10.1",
+ "cid",
  "ethers",
  "fil_actors_runtime",
  "fnv",
@@ -5402,7 +5360,7 @@ dependencies = [
  "async-trait",
  "base64 0.21.7",
  "bytes",
- "cid 0.10.1",
+ "cid",
  "clap 4.5.21",
  "clap_complete",
  "env_logger 0.10.2",
@@ -5465,7 +5423,7 @@ dependencies = [
  "async-trait",
  "base64 0.21.7",
  "bytes",
- "cid 0.10.1",
+ "cid",
  "dirs",
  "ethers",
  "ethers-contract",
@@ -5510,7 +5468,7 @@ name = "ipc-types"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "cid 0.10.1",
+ "cid",
  "fvm_ipld_amt",
  "fvm_ipld_blockstore",
  "fvm_ipld_encoding",
@@ -5576,7 +5534,7 @@ dependencies = [
  "base64 0.21.7",
  "blake2b_simd",
  "bloom",
- "cid 0.10.1",
+ "cid",
  "env_logger 0.10.2",
  "fvm_ipld_blockstore",
  "fvm_ipld_encoding",
@@ -5587,7 +5545,7 @@ dependencies = [
  "ipc-observability",
  "ipc_ipld_resolver",
  "lazy_static",
- "libipld 0.16.0",
+ "libipld",
  "libp2p",
  "libp2p-bitswap",
  "libp2p-mplex",
@@ -5860,24 +5818,6 @@ version = "0.2.162"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
 
-[[package]]
-name = "libipld"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac9c3aa309c260aa2f174bac968901eddc546e9d85950c28eae6a7bec402f926"
-dependencies = [
- "async-trait",
- "cached",
- "fnv",
- "libipld-cbor 0.14.0",
- "libipld-core 0.14.0",
- "libipld-macro 0.14.0",
- "log",
- "multihash 0.16.3",
- "parking_lot",
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "libipld"
 version = "0.16.0"
@@ -5885,25 +5825,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1ccd6b8ffb3afee7081fcaec00e1b099fd1c7ccf35ba5729d88538fcc3b4599"
 dependencies = [
  "fnv",
- "libipld-cbor 0.16.0",
- "libipld-core 0.16.0",
- "libipld-macro 0.16.0",
+ "libipld-cbor",
+ "libipld-core",
+ "libipld-macro",
  "log",
  "multihash 0.18.1",
  "thiserror 1.0.69",
 ]
 
-[[package]]
-name = "libipld-cbor"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd1ab68c9d26f20c7d0dfea6eecbae8c00359875210001b33ca27d4a02f3d09"
-dependencies = [
- "byteorder",
- "libipld-core 0.14.0",
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "libipld-cbor"
 version = "0.16.0"
@@ -5911,21 +5840,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77d98c9d1747aa5eef1cf099cd648c3fd2d235249f5fed07522aaebc348e423b"
 dependencies = [
  "byteorder",
- "libipld-core 0.16.0",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "libipld-core"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d44790246ec6b7314cba745992c23d479d018073e66d49ae40ae1b64e5dd8eb5"
-dependencies = [
- "anyhow",
- "cid 0.8.6",
- "core2",
- "multibase",
- "multihash 0.16.3",
+ "libipld-core",
  "thiserror 1.0.69",
 ]
 
@@ -5936,7 +5851,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5acd707e8d8b092e967b2af978ed84709eaded82b75effe6cb6f6cc797ef8158"
 dependencies = [
  "anyhow",
- "cid 0.10.1",
+ "cid",
  "core2",
  "multibase",
  "multihash 0.18.1",
@@ -5944,22 +5859,13 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
-[[package]]
-name = "libipld-macro"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852c011562ae5059b67c3a917f9f5945af5a68df8e39ede4444fff33274d25e2"
-dependencies = [
- "libipld-core 0.14.0",
-]
-
 [[package]]
 name = "libipld-macro"
 version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71171c54214f866ae6722f3027f81dff0931e600e5a61e6b1b6a49ca0b5ed4ae"
 dependencies = [
- "libipld-core 0.16.0",
+ "libipld-core",
 ]
 
 [[package]]
@@ -6033,16 +5939,15 @@ version = "0.25.1"
 dependencies = [
  "async-std",
  "async-trait",
- "env_logger 0.9.3",
+ "env_logger 0.10.2",
  "fnv",
  "futures",
  "lazy_static",
- "libipld 0.14.0",
- "libipld 0.16.0",
+ "libipld",
  "libp2p",
- "multihash 0.16.3",
+ "multihash 0.18.1",
  "prometheus",
- "prost 0.9.0",
+ "prost 0.11.9",
  "prost-build",
  "thiserror 1.0.69",
  "tracing",
@@ -6820,20 +6725,6 @@ dependencies = [
  "data-encoding-macro",
 ]
 
-[[package]]
-name = "multihash"
-version = "0.16.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c346cf9999c631f002d8f977c4eaeaa0e6386f16007202308d0b3757522c2cc"
-dependencies = [
- "blake3",
- "core2",
- "digest 0.10.7",
- "multihash-derive",
- "sha2 0.10.8",
- "unsigned-varint 0.7.2",
-]
-
 [[package]]
 name = "multihash"
 version = "0.18.1"
@@ -6842,6 +6733,7 @@ checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815"
 dependencies = [
  "arbitrary",
  "blake2b_simd",
+ "blake3",
  "core2",
  "digest 0.10.7",
  "multihash-derive",
@@ -9028,7 +8920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e880e0b1f9c7a8db874642c1217f7e19b29e325f24ab9f0fcb11818adec7f01"
 dependencies = [
  "cbor4ii",
- "cid 0.10.1",
+ "cid",
  "scopeguard",
  "serde",
 ]
@@ -10790,7 +10682,7 @@ version = "1.0.0"
 source = "git+https://github.com/filecoin-project/builtin-actors?tag=v15.0.0#831bf1b9fe281835409c39a8c454a68dd3200bbc"
 dependencies = [
  "anyhow",
- "cid 0.10.1",
+ "cid",
  "fvm_ipld_blockstore",
  "fvm_ipld_encoding",
  "fvm_ipld_hamt",
diff --git a/ext/libp2p-bitswap/Cargo.toml b/ext/libp2p-bitswap/Cargo.toml
index bfad697c6..f670092ce 100644
--- a/ext/libp2p-bitswap/Cargo.toml
+++ b/ext/libp2p-bitswap/Cargo.toml
@@ -14,22 +14,22 @@ compat = ["prost", "prost-build"]
 prost-build = { version = "0.9.0", optional = true }
 
 [dependencies]
-async-trait = "0.1.52"
-fnv = "1.0.7"
-futures = "0.3.19"
-lazy_static = "1.4.0"
-libipld = { version = "0.16.0", default-features = false }
-libp2p = { version = "0.53", features = ["request-response"] }
-prometheus = "0.13.0"
-prost = { version = "0.9.0", optional = true }
-thiserror = "1.0.30"
-tracing = "0.1.29"
+async-trait = { workspace = true }
+fnv = { workspace = true }
+futures = { workspace = true }
+lazy_static = { workspace = true }
+libipld = { workspace = true, default-features = false }
+libp2p = { workspace = true , features = ["request-response"] }
+prometheus = { workspace = true }
+prost = { workspace = true, optional = true }
+thiserror = { workspace = true }
+tracing = { workspace = true }
 unsigned-varint = { version = "0.7.1", features = ["futures", "std"] }
 
 [dev-dependencies]
 async-std = { version = "1.10.0", features = ["attributes"] }
-env_logger = "0.9.0"
-libipld = { version = "0.14.0", default-features = false, features = ["dag-cbor"] }
-libp2p = { version = "0.53.0", features = ["tcp", "noise", "yamux", "rsa", "async-std"] }
-multihash = { version = "0.16.0", default-features = false, features = ["blake3", "sha2"] }
-tracing-subscriber = { version = "0.3.5", features = ["env-filter", "tracing-log"] }
+env_logger = { workspace = true }
+libipld = { workspace = true, default-features = false, features = ["dag-cbor"] }
+libp2p = { workspace = true , features = ["tcp", "noise", "yamux", "rsa", "async-std"] }
+multihash = { workspace = true , default-features = false, features = ["blake3", "sha2"] }
+tracing-subscriber = { workspace = true, features = ["env-filter", "tracing-log"] }