From b7e80ff25d224ee0e0a0ccef6ccbef3ac36c7a18 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Thu, 7 Nov 2024 18:00:29 +0700 Subject: [PATCH] chore: update multihash & cid --- Cargo.lock | 1763 ++++++++++------- Cargo.toml | 58 +- actors/evm/Cargo.toml | 2 +- .../src/interpreter/instructions/context.rs | 7 +- actors/evm/src/interpreter/system.rs | 2 +- actors/evm/src/lib.rs | 4 +- actors/market/Cargo.toml | 4 +- actors/market/src/deal.rs | 2 +- actors/market/src/lib.rs | 5 +- actors/market/src/testing.rs | 2 +- actors/market/tests/harness.rs | 3 +- actors/market/tests/sector_content_changed.rs | 3 +- actors/miner/Cargo.toml | 2 + actors/miner/src/deadline_state.rs | 2 +- actors/miner/src/lib.rs | 2 +- actors/miner/src/state.rs | 2 +- actors/miner/tests/state_harness.rs | 2 +- actors/miner/tests/util.rs | 9 +- actors/system/Cargo.toml | 1 + actors/system/src/lib.rs | 4 +- integration_tests/Cargo.toml | 2 +- integration_tests/src/util/mod.rs | 2 +- runtime/Cargo.toml | 7 +- runtime/src/runtime/actor_blockstore.rs | 2 +- runtime/src/runtime/empty.rs | 2 +- runtime/src/runtime/fvm.rs | 2 +- runtime/src/runtime/mod.rs | 2 +- runtime/src/test_blockstores.rs | 2 +- runtime/src/test_utils.rs | 14 +- test_vm/Cargo.toml | 2 +- test_vm/src/lib.rs | 2 +- test_vm/src/messaging.rs | 2 +- vm_api/Cargo.toml | 6 +- vm_api/src/util/mod.rs | 2 +- 34 files changed, 1093 insertions(+), 835 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b12431ddf..7c6cca6a4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,24 +14,24 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.21.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -40,36 +40,36 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56" [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "async-channel" @@ -78,31 +78,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.6.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" +checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" dependencies = [ - "async-lock", "async-task", "concurrent-queue", - "fastrand 2.0.1", + "fastrand", "futures-lite", "slab", ] [[package]] name = "async-global-executor" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel", + "async-channel 2.3.1", "async-executor", "async-io", "async-lock", @@ -113,40 +124,41 @@ dependencies = [ [[package]] name = "async-io" -version = "1.13.0" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ "async-lock", - "autocfg", "cfg-if", "concurrent-queue", + "futures-io", "futures-lite", - "log", "parking", "polling", - "rustix 0.37.26", + "rustix", "slab", - "socket2 0.4.10", - "waker-fn", + "tracing", + "windows-sys 0.59.0", ] [[package]] name = "async-lock" -version = "2.8.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener", + "event-listener 5.3.1", + "event-listener-strategy", + "pin-project-lite", ] [[package]] name = "async-std" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615" dependencies = [ - "async-channel", + "async-channel 1.9.0", "async-global-executor", "async-io", "async-lock", @@ -155,7 +167,7 @@ dependencies = [ "futures-core", "futures-io", "futures-lite", - "gloo-timers", + "gloo-timers 0.3.0", "kv-log-macro", "log", "memchr", @@ -168,19 +180,19 @@ dependencies = [ [[package]] name = "async-task" -version = "4.5.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.85", ] [[package]] @@ -213,35 +225,34 @@ dependencies = [ [[package]] name = "auto_impl" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" +checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.85", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -264,9 +275,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -294,9 +305,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -324,6 +335,30 @@ dependencies = [ "constant_time_eq", ] +[[package]] +name = "blake2s_simd" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" +dependencies = [ + "arrayref", + "arrayvec", + "constant_time_eq", +] + +[[package]] +name = "blake3" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", +] + [[package]] name = "block-buffer" version = "0.9.0" @@ -344,25 +379,22 @@ dependencies = [ [[package]] name = "blocking" -version = "1.4.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ - "async-channel", - "async-lock", + "async-channel 2.3.1", "async-task", - "fastrand 2.0.1", "futures-io", "futures-lite", "piper", - "tracing", ] [[package]] name = "bs58" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" dependencies = [ "sha2 0.10.8", "tinyvec", @@ -370,9 +402,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byte-slice-cast" @@ -388,36 +420,36 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" dependencies = [ "serde", ] [[package]] name = "camino" -version = "1.1.6" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ "serde", ] [[package]] name = "cargo-platform" -version = "0.1.4" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" dependencies = [ "serde", ] [[package]] name = "cargo_metadata" -version = "0.17.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7daec1a2a2129eeba1644b220b4647ec537b0b5d4bfd6876fcc5a540056b592" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", @@ -429,9 +461,9 @@ dependencies = [ [[package]] name = "castaway" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc" +checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" dependencies = [ "rustversion", ] @@ -447,11 +479,11 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ - "libc", + "shlex", ] [[package]] @@ -462,39 +494,39 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "num-traits", ] [[package]] name = "cid" -version = "0.8.6" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ed9c8b2d17acb8110c46f1da5bf4a696d745e1474a16db0cd2b49cd0249bf2" +checksum = "fd94671561e36e4e7de75f753f577edafb0e7c05d6e4547229fdf7938fbcd2c3" dependencies = [ "core2", "multibase", - "multihash 0.16.3", + "multihash 0.18.1", "serde", "serde_bytes", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] name = "cid" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd94671561e36e4e7de75f753f577edafb0e7c05d6e4547229fdf7938fbcd2c3" +checksum = "3147d8272e8fa0ccd29ce51194dd98f79ddfb8191ba9e3409884e751798acf3a" dependencies = [ "core2", "multibase", - "multihash 0.18.1", + "multihash 0.19.2", "serde", "serde_bytes", - "unsigned-varint", + "unsigned-varint 0.8.0", ] [[package]] @@ -509,9 +541,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.7" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -519,9 +551,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstyle", "clap_lex", @@ -529,21 +561,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.85", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "coins-bip32" @@ -583,7 +615,7 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5286a0843c21f8367f7be734f89df9b822e0321d8bcce8d6e735aadff7d74979" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bech32", "bs58", "digest 0.10.7", @@ -599,18 +631,18 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] [[package]] name = "const-hex" -version = "1.11.3" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ba00838774b4ab0233e355d26710fbfc8327a05c017f6dc4873f876d1f79f78" +checksum = "0121754e84117e65f9d90648ee6aa4882a6e63110307ab73967a4c5e7e69e586" dependencies = [ "cfg-if", "cpufeatures", @@ -621,21 +653,21 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -643,9 +675,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core2" @@ -658,21 +690,18 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.10" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -682,9 +711,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", "rand_core", @@ -713,12 +742,12 @@ dependencies = [ [[package]] name = "ctor" -version = "0.2.5" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e366bff8cd32dd8754b0991fb66b279dc48f598c3a18914852a6673deef583" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.38", + "syn 2.0.85", ] [[package]] @@ -767,15 +796,15 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "data-encoding-macro" -version = "0.1.13" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c904b33cc60130e1aeea4956ab803d08a3f4a0ca82d64ed757afac3891f2bb99" +checksum = "f1559b6cba622276d6d63706db152618eeb15b89b3e4041446b05876e352e639" dependencies = [ "data-encoding", "data-encoding-macro-internal", @@ -783,9 +812,9 @@ dependencies = [ [[package]] name = "data-encoding-macro-internal" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fdf3fce3ce863539ec1d7fd1b6dcc3c645663376b43ed376bbf887733e4f772" +checksum = "332d754c0af53bc87c108fed664d121ecf59207ec4196041f04d6ab9002ad33f" dependencies = [ "data-encoding", "syn 1.0.109", @@ -793,9 +822,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "zeroize", @@ -803,9 +832,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] @@ -843,13 +872,22 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.17" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.85", ] [[package]] @@ -881,15 +919,15 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "dunce" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "ecdsa" -version = "0.16.8" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ "der", "digest 0.10.7", @@ -913,15 +951,15 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elliptic-curve" -version = "0.13.6" +version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct", "crypto-bigint", @@ -938,20 +976,20 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] [[package]] name = "enr" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe81b5c06ecfdbc71dd845216f225f53b62a10cb8a16c946836a3467f701d05b" +checksum = "2a3d8dc56e02f954cac8eb489772c552c473346fc34f67412bb6244fd647f7e4" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "hex", "k256", @@ -973,7 +1011,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.85", ] [[package]] @@ -997,12 +1035,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1077,14 +1115,13 @@ dependencies = [ [[package]] name = "ethers" -version = "2.0.10" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad13497f6e0a24292fc7b408e30d22fe9dc262da1f40d7b542c3a44e7fc0476" +checksum = "816841ea989f0c69e459af1cf23a6b0033b19a55424a1ea3a30099becdb8dec0" dependencies = [ "ethers-addressbook", "ethers-contract", "ethers-core", - "ethers-etherscan", "ethers-middleware", "ethers-providers", "ethers-signers", @@ -1092,9 +1129,9 @@ dependencies = [ [[package]] name = "ethers-addressbook" -version = "2.0.10" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6e9e8acd0ed348403cc73a670c24daba3226c40b98dc1a41903766b3ab6240a" +checksum = "5495afd16b4faa556c3bba1f21b98b4983e53c1755022377051a975c3b021759" dependencies = [ "ethers-core", "once_cell", @@ -1104,9 +1141,9 @@ dependencies = [ [[package]] name = "ethers-contract" -version = "2.0.10" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d79269278125006bb0552349c03593ffa9702112ca88bc7046cc669f148fb47c" +checksum = "6fceafa3578c836eeb874af87abacfb041f92b4da0a78a5edd042564b8ecdaaa" dependencies = [ "const-hex", "ethers-contract-abigen", @@ -1123,9 +1160,9 @@ dependencies = [ [[package]] name = "ethers-contract-abigen" -version = "2.0.10" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce95a43c939b2e4e2f3191c5ad4a1f279780b8a39139c9905b43a7433531e2ab" +checksum = "04ba01fbc2331a38c429eb95d4a570166781f14290ef9fdb144278a90b5a739b" dependencies = [ "Inflector", "const-hex", @@ -1138,16 +1175,16 @@ dependencies = [ "regex", "serde", "serde_json", - "syn 2.0.38", - "toml 0.7.8", + "syn 2.0.85", + "toml 0.8.19", "walkdir", ] [[package]] name = "ethers-contract-derive" -version = "2.0.10" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9ce44906fc871b3ee8c69a695ca7ec7f70e50cb379c9b9cb5e532269e492f6" +checksum = "87689dcabc0051cde10caaade298f9e9093d65f6125c14575db3fd8c669a168f" dependencies = [ "Inflector", "const-hex", @@ -1156,14 +1193,14 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.38", + "syn 2.0.85", ] [[package]] name = "ethers-core" -version = "2.0.10" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0a17f0708692024db9956b31d7a20163607d2745953f5ae8125ab368ba280ad" +checksum = "82d80cc6ad30b14a48ab786523af33b37f28a8623fc06afd55324816ef18fb1f" dependencies = [ "arrayvec", "bytes", @@ -1182,39 +1219,23 @@ dependencies = [ "serde", "serde_json", "strum", - "syn 2.0.38", + "syn 2.0.85", "tempfile", "thiserror", "tiny-keccak", "unicode-xid", ] -[[package]] -name = "ethers-etherscan" -version = "2.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e53451ea4a8128fbce33966da71132cf9e1040dcfd2a2084fd7733ada7b2045" -dependencies = [ - "ethers-core", - "reqwest", - "semver", - "serde", - "serde_json", - "thiserror", - "tracing", -] - [[package]] name = "ethers-middleware" -version = "2.0.10" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "473f1ccd0c793871bbc248729fa8df7e6d2981d6226e4343e3bbaa9281074d5d" +checksum = "48f9fdf09aec667c099909d91908d5eaf9be1bd0e2500ba4172c1d28bfaa43de" dependencies = [ "async-trait", "auto_impl", "ethers-contract", "ethers-core", - "ethers-etherscan", "ethers-providers", "ethers-signers", "futures-channel", @@ -1233,13 +1254,13 @@ dependencies = [ [[package]] name = "ethers-providers" -version = "2.0.10" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6838fa110e57d572336178b7c79e94ff88ef976306852d8cb87d9e5b1fc7c0b5" +checksum = "6434c9a33891f1effc9c75472e12666db2fa5a0fec4b29af6221680a6fe83ab2" dependencies = [ "async-trait", "auto_impl", - "base64 0.21.5", + "base64 0.21.7", "bytes", "const-hex", "enr", @@ -1269,9 +1290,9 @@ dependencies = [ [[package]] name = "ethers-signers" -version = "2.0.10" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea44bec930f12292866166f9ddbea6aa76304850e4d8dcd66dc492b43d00ff1" +checksum = "228875491c782ad851773b652dd8ecac62cda8571d3bc32a5853644dd26766c2" dependencies = [ "async-trait", "coins-bip32", @@ -1322,20 +1343,41 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", + "pin-project-lite", +] + [[package]] name = "export_macro" version = "1.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.85", ] [[package]] name = "eyre" -version = "0.6.8" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" dependencies = [ "indenter", "once_cell", @@ -1343,18 +1385,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "ff" @@ -1374,8 +1407,8 @@ dependencies = [ "fil_actors_runtime", "frc42_dispatch", "fvm_actor_utils", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", "fvm_shared", "num-derive 0.3.3", "num-traits", @@ -1393,11 +1426,11 @@ dependencies = [ "cid 0.10.1", "clap", "futures", - "fvm_ipld_blockstore", + "fvm_ipld_blockstore 0.2.1", "fvm_ipld_car", - "fvm_ipld_encoding", + "fvm_ipld_encoding 0.4.0", "serde", - "serde_ipld_dagcbor", + "serde_ipld_dagcbor 0.4.2", "serde_json", ] @@ -1406,8 +1439,8 @@ name = "fil_actor_cron" version = "15.0.0-rc1" dependencies = [ "fil_actors_runtime", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", "fvm_shared", "log", "num-derive 0.3.3", @@ -1419,13 +1452,13 @@ dependencies = [ name = "fil_actor_datacap" version = "15.0.0-rc1" dependencies = [ - "cid 0.10.1", + "cid 0.11.1", "fil_actors_runtime", "frc42_dispatch", "frc46_token", "fvm_actor_utils", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", "fvm_ipld_hamt", "fvm_shared", "lazy_static", @@ -1440,16 +1473,16 @@ name = "fil_actor_eam" version = "15.0.0-rc1" dependencies = [ "anyhow", - "cid 0.10.1", + "cid 0.11.1", "fil_actor_evm", "fil_actors_evm_shared", "fil_actors_runtime", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", "fvm_shared", "hex-literal", "log", - "multihash 0.18.1", + "multihash 0.19.2", "num-derive 0.3.3", "num-traits", "rlp", @@ -1463,7 +1496,7 @@ dependencies = [ "fil_actors_runtime", "frc42_dispatch", "fvm_actor_utils", - "fvm_ipld_encoding", + "fvm_ipld_encoding 0.5.1", "fvm_shared", "hex-literal", "num-derive 0.3.3", @@ -1476,21 +1509,21 @@ name = "fil_actor_evm" version = "15.0.0-rc1" dependencies = [ "anyhow", - "cid 0.10.1", + "cid 0.11.1", "ethers", "etk-asm", "fil_actors_evm_shared", "fil_actors_runtime", "frc42_dispatch", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", "fvm_ipld_kamt", "fvm_shared", "hex", "hex-literal", "lazy_static", "log", - "multihash 0.18.1", + "multihash-codetable", "num-derive 0.3.3", "num-traits", "once_cell", @@ -1505,11 +1538,11 @@ name = "fil_actor_init" version = "15.0.0-rc1" dependencies = [ "anyhow", - "cid 0.10.1", + "cid 0.11.1", "fil_actors_runtime", "frc42_dispatch", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", "fvm_ipld_hamt", "fvm_shared", "log", @@ -1523,7 +1556,7 @@ name = "fil_actor_market" version = "15.0.0-rc1" dependencies = [ "anyhow", - "cid 0.10.1", + "cid 0.11.1", "fil_actor_power", "fil_actor_reward", "fil_actor_verifreg", @@ -1532,16 +1565,16 @@ dependencies = [ "frc46_token", "fvm_ipld_amt", "fvm_ipld_bitfield", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", "fvm_ipld_hamt", "fvm_shared", "integer-encoding 3.0.4", + "ipld-core", "itertools 0.10.5", "lazy_static", - "libipld-core 0.13.1", "log", - "multihash 0.18.1", + "multihash-codetable", "num-derive 0.3.3", "num-traits", "regex", @@ -1553,9 +1586,9 @@ name = "fil_actor_miner" version = "15.0.0-rc1" dependencies = [ "anyhow", - "bitflags 2.4.1", + "bitflags 2.6.0", "byteorder", - "cid 0.10.1", + "cid 0.11.1", "const-hex", "fil_actor_account", "fil_actor_market", @@ -1565,14 +1598,16 @@ dependencies = [ "frc42_dispatch", "fvm_ipld_amt", "fvm_ipld_bitfield", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", "fvm_ipld_hamt", "fvm_shared", "itertools 0.10.5", "lazy_static", "log", - "multihash 0.18.1", + "multihash 0.19.2", + "multihash-codetable", + "multihash-derive 0.9.1", "num-derive 0.3.3", "num-traits", "rand", @@ -1585,12 +1620,12 @@ name = "fil_actor_multisig" version = "15.0.0-rc1" dependencies = [ "anyhow", - "cid 0.10.1", + "cid 0.11.1", "fil_actors_runtime", "frc42_dispatch", "fvm_actor_utils", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", "fvm_ipld_hamt", "fvm_shared", "indexmap 1.9.3", @@ -1606,13 +1641,13 @@ name = "fil_actor_paych" version = "15.0.0-rc1" dependencies = [ "anyhow", - "cid 0.10.1", + "cid 0.11.1", "derive_builder", "fil_actors_runtime", "frc42_dispatch", "fvm_ipld_amt", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", "fvm_shared", "lazy_static", "num-derive 0.3.3", @@ -1629,13 +1664,13 @@ name = "fil_actor_power" version = "15.0.0-rc1" dependencies = [ "anyhow", - "cid 0.10.1", + "cid 0.11.1", "const-hex", "fil_actor_reward", "fil_actors_runtime", "frc42_dispatch", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", "fvm_ipld_hamt", "fvm_shared", "indexmap 1.9.3", @@ -1652,8 +1687,8 @@ name = "fil_actor_reward" version = "15.0.0-rc1" dependencies = [ "fil_actors_runtime", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", "fvm_shared", "lazy_static", "log", @@ -1668,11 +1703,12 @@ name = "fil_actor_system" version = "15.0.0-rc1" dependencies = [ "anyhow", - "cid 0.10.1", + "cid 0.11.1", "fil_actors_runtime", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", "fvm_shared", + "multihash-codetable", "num-derive 0.3.3", "num-traits", "serde", @@ -1683,14 +1719,14 @@ name = "fil_actor_verifreg" version = "15.0.0-rc1" dependencies = [ "anyhow", - "cid 0.10.1", + "cid 0.11.1", "const-hex", "fil_actors_runtime", "frc42_dispatch", "frc46_token", "fvm_actor_utils", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", "fvm_ipld_hamt", "fvm_shared", "lazy_static", @@ -1705,7 +1741,7 @@ name = "fil_actors_evm_shared" version = "15.0.0-rc1" dependencies = [ "fil_actors_runtime", - "fvm_ipld_encoding", + "fvm_ipld_encoding 0.5.1", "fvm_shared", "hex", "serde", @@ -1719,7 +1755,7 @@ dependencies = [ "anyhow", "bimap", "blake2b_simd", - "cid 0.10.1", + "cid 0.11.1", "ctor", "ethers", "export_macro", @@ -1745,8 +1781,8 @@ dependencies = [ "frc46_token", "fvm_actor_utils", "fvm_ipld_bitfield", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", "fvm_ipld_hamt", "fvm_shared", "hex", @@ -1756,7 +1792,7 @@ dependencies = [ "lazy_static", "libsecp256k1", "log", - "multihash 0.18.1", + "multihash-codetable", "num-derive 0.3.3", "num-traits", "rand", @@ -1773,18 +1809,18 @@ name = "fil_actors_runtime" version = "15.0.0-rc1" dependencies = [ "anyhow", - "base64 0.21.5", + "base64 0.21.7", "blake2b_simd", "byteorder", "castaway", - "cid 0.10.1", + "cid 0.11.1", "const-hex", "derive_builder", "fil_actors_runtime", "fvm_ipld_amt", "fvm_ipld_bitfield", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", "fvm_ipld_hamt", "fvm_sdk", "fvm_shared", @@ -1794,7 +1830,8 @@ dependencies = [ "lazy_static", "libsecp256k1", "log", - "multihash 0.18.1", + "multihash-codetable", + "multihash-derive 0.9.1", "num", "num-derive 0.3.3", "num-traits", @@ -1806,7 +1843,7 @@ dependencies = [ "serde_repr", "sha2 0.10.8", "thiserror", - "unsigned-varint", + "unsigned-varint 0.7.2", "vm_api", ] @@ -1814,7 +1851,7 @@ dependencies = [ name = "fil_builtin_actors_bundle" version = "15.0.0-rc1" dependencies = [ - "cid 0.10.1", + "cid 0.11.1", "clap", "fil_actor_account", "fil_actor_bundler", @@ -1843,7 +1880,7 @@ version = "15.0.0-rc1" dependencies = [ "anyhow", "bimap", - "cid 0.10.1", + "cid 0.11.1", "fil_actor_account", "fil_actor_cron", "fil_actor_datacap", @@ -1858,8 +1895,8 @@ dependencies = [ "fil_actor_verifreg", "fil_actors_runtime", "frc46_token", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", "fvm_shared", "num-derive 0.3.3", "num-traits", @@ -1897,9 +1934,9 @@ dependencies = [ [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -1907,12 +1944,11 @@ dependencies = [ [[package]] name = "frc42_dispatch" version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9567f7b38af6f277072c9ea230f7c5be12237905ef19348f4b490f563f3fef" +source = "git+https://github.com/filecoin-project/actors-utils?branch=steb/update-multihash#1c48e2b627335b7affcf272a6cd1f4d86a53f6ca" dependencies = [ "frc42_hasher", "frc42_macros", - "fvm_ipld_encoding", + "fvm_ipld_encoding 0.5.1", "fvm_sdk", "fvm_shared", "thiserror", @@ -1921,8 +1957,7 @@ dependencies = [ [[package]] name = "frc42_hasher" version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238a28ff638f138c4b4c75f4d35cd28cedcb45858cfcaa4df36dc25b0b3298db" +source = "git+https://github.com/filecoin-project/actors-utils?branch=steb/update-multihash#1c48e2b627335b7affcf272a6cd1f4d86a53f6ca" dependencies = [ "fvm_sdk", "fvm_shared", @@ -1932,8 +1967,7 @@ dependencies = [ [[package]] name = "frc42_macros" version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07758f10c4a85a14b59c1c2d63d6200122f144b42e495dabdc997bf1c917e62" +source = "git+https://github.com/filecoin-project/actors-utils?branch=steb/update-multihash#1c48e2b627335b7affcf272a6cd1f4d86a53f6ca" dependencies = [ "blake2b_simd", "frc42_hasher", @@ -1945,18 +1979,18 @@ dependencies = [ [[package]] name = "frc46_token" version = "11.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af558bacb4e00ac1aa47115464f2bfa3d8dbd2a3b032dc325d20eaaaa22522e7" +source = "git+https://github.com/filecoin-project/actors-utils?branch=steb/update-multihash#1c48e2b627335b7affcf272a6cd1f4d86a53f6ca" dependencies = [ - "cid 0.10.1", + "cid 0.11.1", "frc42_dispatch", "fvm_actor_utils", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", "fvm_ipld_hamt", "fvm_sdk", "fvm_shared", - "integer-encoding 4.0.0", + "integer-encoding 4.0.2", + "multihash-codetable", "num-traits", "serde", "serde_tuple", @@ -1971,9 +2005,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1986,9 +2020,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1996,15 +2030,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -2013,23 +2047,21 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" -version = "1.13.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 1.9.0", + "fastrand", "futures-core", "futures-io", - "memchr", "parking", "pin-project-lite", - "waker-fn", ] [[package]] @@ -2044,42 +2076,42 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.85", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" dependencies = [ - "gloo-timers", + "gloo-timers 0.2.6", "send_wrapper 0.4.0", ] [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -2096,16 +2128,16 @@ dependencies = [ [[package]] name = "fvm_actor_utils" version = "11.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe8cad6375c09395099f25313600a53b1012a29595f9666a48c00eba7a8adaf9" +source = "git+https://github.com/filecoin-project/actors-utils?branch=steb/update-multihash#1c48e2b627335b7affcf272a6cd1f4d86a53f6ca" dependencies = [ "anyhow", - "cid 0.10.1", + "cid 0.11.1", "frc42_dispatch", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", "fvm_sdk", "fvm_shared", + "multihash-codetable", "num-traits", "serde", "serde_tuple", @@ -2114,15 +2146,16 @@ dependencies = [ [[package]] name = "fvm_ipld_amt" -version = "0.6.2" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fea333475130094f27ce67809aae3f69eb5247541d835950b7c5da733dbbb34" +checksum = "c5b2fafc1ba970b5ab128556df7b921233a946fdb37f622391faac6677e8912e" dependencies = [ "anyhow", - "cid 0.10.1", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", - "itertools 0.11.0", + "cid 0.11.1", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", + "itertools 0.13.0", + "multihash-codetable", "once_cell", "serde", "thiserror", @@ -2130,27 +2163,38 @@ dependencies = [ [[package]] name = "fvm_ipld_bitfield" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da94287cafa663c2e295fe45c4c9dbf5ab7b52f648568f9ae3823deaf9873a89" +checksum = "6814996a6fd838ee8845255d7c4f550564ef5ee739b8c0f4e670fed02b232801" dependencies = [ - "fvm_ipld_encoding", + "fvm_ipld_encoding 0.5.1", "serde", "thiserror", - "unsigned-varint", + "unsigned-varint 0.8.0", ] [[package]] name = "fvm_ipld_blockstore" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "417f52f6915b9f9a68de8462e1cf46f14a2c16420f484b8d2066873de2ffe420" +checksum = "d064b957420f5ecc137a153baaa6c32e2eb19b674135317200b6f2537eabdbfd" dependencies = [ "anyhow", "cid 0.10.1", "multihash 0.18.1", ] +[[package]] +name = "fvm_ipld_blockstore" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b8b31e022f71b73440054f7e5171231a1ebc745adf075014d5aa8ea78ea283" +dependencies = [ + "anyhow", + "cid 0.11.1", + "multihash-codetable", +] + [[package]] name = "fvm_ipld_car" version = "0.7.1" @@ -2159,11 +2203,11 @@ checksum = "6190f03442b67b21a3d4e115c4d4dd3468aed24e27ebb074218822c1b3df41ba" dependencies = [ "cid 0.10.1", "futures", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.2.1", + "fvm_ipld_encoding 0.4.0", "serde", "thiserror", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -2174,10 +2218,27 @@ checksum = "90608092e31d9a06236268c58f7c36668ab4b2a48afafe3a97e08f094ad7ae50" dependencies = [ "anyhow", "cid 0.10.1", - "fvm_ipld_blockstore", + "fvm_ipld_blockstore 0.2.1", "multihash 0.18.1", "serde", - "serde_ipld_dagcbor", + "serde_ipld_dagcbor 0.4.2", + "serde_repr", + "serde_tuple", + "thiserror", +] + +[[package]] +name = "fvm_ipld_encoding" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "723294d1574e0126a9e16069ef6581a2ee3c06eb7d6edc33eb2a976057747bfb" +dependencies = [ + "anyhow", + "cid 0.11.1", + "fvm_ipld_blockstore 0.3.1", + "multihash-codetable", + "serde", + "serde_ipld_dagcbor 0.6.1", "serde_repr", "serde_tuple", "thiserror", @@ -2185,18 +2246,18 @@ dependencies = [ [[package]] name = "fvm_ipld_hamt" -version = "0.9.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c900736087ff87cc51f669eee2f8e000c80717472242eb3f712aaa059ac3b3" +checksum = "8512ddaa098c324e0c6b0d8cccacdcbc08834509db11f52d5f5cd7f1f10a39f8" dependencies = [ "anyhow", "byteorder", - "cid 0.10.1", + "cid 0.11.1", "forest_hash_utils", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", - "libipld-core 0.16.0", - "multihash 0.18.1", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", + "ipld-core", + "multihash-codetable", "once_cell", "serde", "sha2 0.10.8", @@ -2205,17 +2266,17 @@ dependencies = [ [[package]] name = "fvm_ipld_kamt" -version = "0.3.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed361b9a0c2fb2b3b3252a7668d1656e83f696787c14ab1a695c0535bf5f8d64" +checksum = "02250be2140aa2e805e18b9427dc93fa1ad9753c8169d0807389f31739683450" dependencies = [ "anyhow", "byteorder", - "cid 0.10.1", + "cid 0.11.1", "forest_hash_utils", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", - "multihash 0.18.1", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", + "multihash-codetable", "once_cell", "serde", "thiserror", @@ -2223,12 +2284,12 @@ dependencies = [ [[package]] name = "fvm_sdk" -version = "4.3.0" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4943c9b564d8417b7723a7b4a6925e54e7d29a0b870917fcdf6426f46430a09" +checksum = "4f046d9a70141cdfb28369b08be49c202db76f05626058fef656e7dbf76cdab1" dependencies = [ - "cid 0.10.1", - "fvm_ipld_encoding", + "cid 0.11.1", + "fvm_ipld_encoding 0.5.1", "fvm_shared", "lazy_static", "log", @@ -2238,27 +2299,26 @@ dependencies = [ [[package]] name = "fvm_shared" -version = "4.3.0" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31841282c98f3acd78c741f1e38ecebc97e72243c4ecb73a658f6529246a35a5" +checksum = "d7914b3d590df23156d9cac0dbbdd8b1ee5b2fb1115dc136bf04e6e7cdebc0fb" dependencies = [ "anyhow", - "bitflags 2.4.1", + "bitflags 2.6.0", "blake2b_simd", - "cid 0.10.1", + "cid 0.11.1", "data-encoding", "data-encoding-macro", - "fvm_ipld_encoding", + "fvm_ipld_encoding 0.5.1", "lazy_static", - "multihash 0.18.1", "num-bigint", - "num-derive 0.4.1", + "num-derive 0.4.2", "num-integer", "num-traits", "serde", "serde_tuple", "thiserror", - "unsigned-varint", + "unsigned-varint 0.8.0", ] [[package]] @@ -2283,9 +2343,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -2294,9 +2354,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "gloo-timers" @@ -2310,6 +2370,18 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + [[package]] name = "group" version = "0.13.0" @@ -2323,9 +2395,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -2333,7 +2405,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -2348,9 +2420,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" [[package]] name = "hashers" @@ -2367,6 +2439,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -2378,9 +2456,15 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "hex" @@ -2408,9 +2492,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -2419,9 +2503,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -2430,9 +2514,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -2451,9 +2535,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" dependencies = [ "bytes", "futures-channel", @@ -2466,7 +2550,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2", "tokio", "tower-service", "tracing", @@ -2481,9 +2565,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -2546,12 +2630,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.15.0", ] [[package]] @@ -2565,9 +2649,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] @@ -2580,26 +2664,26 @@ checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" [[package]] name = "integer-encoding" -version = "4.0.0" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "924df4f0e24e2e7f9cdd90babb0b96f93b20f3ecfa949ea9e6613756b8c8e1bf" +checksum = "0d762194228a2f1c11063e46e32e5acb96e66e906382b9eb5441f2e0504bbd5a" [[package]] -name = "io-lifetimes" -version = "1.0.11" +name = "ipld-core" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +checksum = "b4ede82a79e134f179f4b29b5fdb1eb92bd1b38c4dfea394c539051150a21b9b" dependencies = [ - "hermit-abi 0.3.3", - "libc", - "windows-sys", + "cid 0.11.1", + "serde", + "serde_bytes", ] [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "itertools" @@ -2612,24 +2696,24 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -2640,7 +2724,7 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "pem", "ring", "serde", @@ -2650,9 +2734,9 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.1" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" +checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" dependencies = [ "cfg-if", "ecdsa", @@ -2664,9 +2748,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] @@ -2682,54 +2766,24 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin", + "spin 0.9.8", ] [[package]] name = "libc" -version = "0.2.149" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" - -[[package]] -name = "libipld-core" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdd758764f9680a818af33c31db733eb7c45224715d8816b9dcf0548c75f7c5" -dependencies = [ - "anyhow", - "cid 0.8.6", - "core2", - "multibase", - "multihash 0.16.3", - "serde", - "thiserror", -] - -[[package]] -name = "libipld-core" -version = "0.16.0" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5acd707e8d8b092e967b2af978ed84709eaded82b75effe6cb6f6cc797ef8158" -dependencies = [ - "anyhow", - "cid 0.10.1", - "core2", - "multibase", - "multihash 0.18.1", - "serde", - "thiserror", -] +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libsecp256k1" @@ -2779,30 +2833,24 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" dependencies = [ "value-bag", ] [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "mime" @@ -2812,22 +2860,23 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] name = "mio" -version = "0.8.9" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -2843,33 +2892,46 @@ dependencies = [ [[package]] name = "multihash" -version = "0.16.3" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c346cf9999c631f002d8f977c4eaeaa0e6386f16007202308d0b3757522c2cc" +checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815" dependencies = [ + "blake2b_simd", "core2", - "multihash-derive", + "multihash-derive 0.8.1", "serde", "serde-big-array", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] name = "multihash" -version = "0.18.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815" +checksum = "cc41f430805af9d1cf4adae4ed2149c759b877b01d909a1f40256188d09345d2" +dependencies = [ + "core2", + "serde", + "unsigned-varint 0.8.0", +] + +[[package]] +name = "multihash-codetable" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67996849749d25f1da9f238e8ace2ece8f9d6bdf3f9750aaf2ae7de3a5cad8ea" dependencies = [ "blake2b_simd", + "blake2s_simd", + "blake3", "core2", "digest 0.10.7", - "multihash-derive", + "multihash-derive 0.9.1", "ripemd", - "serde", - "serde-big-array", + "sha1", "sha2 0.10.8", "sha3", - "unsigned-varint", + "strobe-rs", ] [[package]] @@ -2878,19 +2940,43 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d6d4752e6230d8ef7adf7bd5d8c4b1f6561c1014c5ba9a37445ccefe18aa1db" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro-error", "proc-macro2", "quote", "syn 1.0.109", - "synstructure", + "synstructure 0.12.6", +] + +[[package]] +name = "multihash-derive" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f1b7edab35d920890b88643a765fc9bd295cf0201f4154dda231bef9b8404eb" +dependencies = [ + "core2", + "multihash 0.19.2", + "multihash-derive-impl", +] + +[[package]] +name = "multihash-derive-impl" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3dc7141bd06405929948754f0628d247f5ca1865be745099205e5086da957cb" +dependencies = [ + "proc-macro-crate 3.2.0", + "proc-macro2", + "quote", + "syn 2.0.85", + "synstructure 0.13.1", ] [[package]] name = "num" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", @@ -2902,11 +2988,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", "serde", @@ -2914,14 +2999,20 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", "serde", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.3.3" @@ -2935,30 +3026,29 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.85", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -2967,11 +3057,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -2980,9 +3069,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -2990,45 +3079,45 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.85", ] [[package]] name = "object" -version = "0.32.1" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "open-fastrlp" @@ -3057,9 +3146,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.5" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb" +checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ "arrayvec", "bitvec", @@ -3071,11 +3160,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.5" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" +checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", "syn 1.0.109", @@ -3083,15 +3172,15 @@ dependencies = [ [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -3123,15 +3212,15 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.5" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", "thiserror", @@ -3140,9 +3229,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.5" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" +checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd" dependencies = [ "pest", "pest_generator", @@ -3150,22 +3239,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.5" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" +checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.85", ] [[package]] name = "pest_meta" -version = "2.7.5" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" +checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d" dependencies = [ "once_cell", "pest", @@ -3184,29 +3273,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.85", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -3216,12 +3305,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand", "futures-io", ] @@ -3237,18 +3326,17 @@ dependencies = [ [[package]] name = "polling" -version = "2.8.0" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ - "autocfg", - "bitflags 1.3.2", "cfg-if", "concurrent-queue", - "libc", - "log", + "hermit-abi 0.4.0", "pin-project-lite", - "windows-sys", + "rustix", + "tracing", + "windows-sys 0.59.0", ] [[package]] @@ -3259,9 +3347,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "pretty_env_logger" @@ -3275,12 +3366,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.15" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.38", + "syn 2.0.85", ] [[package]] @@ -3307,6 +3398,15 @@ dependencies = [ "toml 0.5.11", ] +[[package]] +name = "proc-macro-crate" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +dependencies = [ + "toml_edit", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -3333,20 +3433,20 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] [[package]] name = "proptest" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "lazy_static", "num-traits", "rand", @@ -3364,9 +3464,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.33" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3416,20 +3516,11 @@ dependencies = [ "rand_core", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "regex" -version = "1.10.2" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -3439,9 +3530,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -3450,17 +3541,17 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -3479,6 +3570,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tower-service", @@ -3508,7 +3600,7 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", + "spin 0.5.2", "untrusted", "web-sys", "winapi", @@ -3547,9 +3639,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hex" @@ -3559,51 +3651,37 @@ checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.37.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys", -] - -[[package]] -name = "rustix" -version = "0.38.20" +version = "0.38.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" +checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.10", - "windows-sys", + "linux-raw-sys", + "windows-sys 0.52.0", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "salsa20" @@ -3625,9 +3703,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.10.0" +version = "2.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60" +checksum = "1aa7ffc1c0ef49b0452c6e2986abf2b07743320641ffd5fc63d552458e3b779b" dependencies = [ "cfg-if", "derive_more", @@ -3637,14 +3715,14 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.10.0" +version = "2.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19" +checksum = "46385cc24172cf615450267463f937c10072516359b3ff1cb24228a4a08bf951" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.85", ] [[package]] @@ -3681,9 +3759,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] @@ -3702,9 +3780,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.189" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" dependencies = [ "serde_derive", ] @@ -3720,22 +3798,22 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.12" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.189" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.85", ] [[package]] @@ -3750,33 +3828,46 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_ipld_dagcbor" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded35fbe4ab8fdec1f1d14b4daff2206b1eada4d6e708cb451d464d2d965f493" +dependencies = [ + "cbor4ii", + "ipld-core", + "scopeguard", + "serde", +] + [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.85", ] [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -3814,6 +3905,17 @@ dependencies = [ "serde", ] +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] + [[package]] name = "sha2" version = "0.9.9" @@ -3848,11 +3950,17 @@ dependencies = [ "keccak", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signature" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", "rand_core", @@ -3895,7 +4003,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 1.0.109", @@ -3903,35 +4011,31 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.10" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "winapi", + "windows-sys 0.52.0", ] [[package]] -name = "socket2" -version = "0.5.5" +name = "spin" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys", -] +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spin" -version = "0.5.2" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "spki" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der", @@ -3943,6 +4047,19 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "strobe-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98fe17535ea31344936cc58d29fec9b500b0452ddc4cc24c429c8a921a0e84e5" +dependencies = [ + "bitflags 1.3.2", + "byteorder", + "keccak", + "subtle", + "zeroize", +] + [[package]] name = "strsim" version = "0.10.0" @@ -3951,24 +4068,24 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.25.0" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", - "syn 2.0.38", + "syn 2.0.85", ] [[package]] @@ -3986,9 +4103,9 @@ dependencies = [ [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -4003,15 +4120,21 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "synstructure" version = "0.12.6" @@ -4024,6 +4147,17 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", +] + [[package]] name = "system-configuration" version = "0.5.1" @@ -4053,22 +4187,22 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "redox_syscall", - "rustix 0.38.20", - "windows-sys", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", ] [[package]] name = "termcolor" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -4101,7 +4235,7 @@ version = "15.0.0-rc1" dependencies = [ "anyhow", "blake2b_simd", - "cid 0.10.1", + "cid 0.11.1", "fil_actor_account", "fil_actor_cron", "fil_actor_datacap", @@ -4121,12 +4255,12 @@ dependencies = [ "fil_actors_integration_tests", "fil_actors_runtime", "fil_builtin_actors_state", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", "fvm_ipld_hamt", "fvm_shared", "integer-encoding 3.0.4", - "multihash 0.18.1", + "multihash-codetable", "num-traits", "serde", "test-case", @@ -4135,32 +4269,33 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.85", ] [[package]] name = "time" -version = "0.3.30" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -4175,10 +4310,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -4193,9 +4329,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -4208,31 +4344,30 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" dependencies = [ "backtrace", "bytes", "libc", "mio", "pin-project-lite", - "socket2 0.5.5", - "windows-sys", + "socket2", + "windows-sys 0.52.0", ] [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -4246,9 +4381,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", @@ -4258,20 +4393,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", @@ -4280,9 +4415,9 @@ dependencies = [ [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -4303,7 +4438,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.85", ] [[package]] @@ -4327,9 +4462,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" @@ -4339,9 +4474,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "uint" @@ -4363,30 +4498,30 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "unsigned-varint" @@ -4398,6 +4533,12 @@ dependencies = [ "futures-util", ] +[[package]] +name = "unsigned-varint" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" + [[package]] name = "untrusted" version = "0.7.1" @@ -4406,9 +4547,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.4.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -4427,26 +4568,28 @@ dependencies = [ [[package]] name = "value-bag" -version = "1.4.2" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" +checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vm_api" version = "1.0.0" dependencies = [ "anyhow", - "cid 0.10.1", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "cid 0.11.1", + "fvm_ipld_blockstore 0.3.1", + "fvm_ipld_encoding 0.5.1", "fvm_ipld_hamt", "fvm_shared", + "multihash-codetable", + "multihash-derive 0.9.1", "num-derive 0.3.3", "num-traits", "rand", @@ -4454,17 +4597,11 @@ dependencies = [ "serde", ] -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -4487,34 +4624,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.85", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -4524,9 +4662,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4534,28 +4672,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.85", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -4579,11 +4717,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -4598,7 +4736,25 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -4607,13 +4763,29 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -4622,47 +4794,95 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + [[package]] name = "winnow" -version = "0.5.17" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -4674,7 +4894,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -4705,8 +4925,43 @@ dependencies = [ "tap", ] +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", +] + [[package]] name = "zeroize" -version = "1.6.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", +] diff --git a/Cargo.toml b/Cargo.toml index 925a7d249..6c277fdf4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -116,14 +116,14 @@ rlp = { version = "0.5.1", default-features = false } substrate-bn = { version = "0.6.0", default-features = false } # IPLD/Encoding -cid = { version = "0.10.1", default-features = false, features = [ - "serde-codec", +cid = { version = "0.11.1", default-features = false, features = [ + "serde", "std", ] } -multihash = { version = "0.18.1", default-features = false, features = [ - "multihash-impl", -] } -libipld-core = { version = "0.13.1", features = ["serde-codec"] } +multihash = { version = "0.19.1", default-features = false } +multihash-codetable = { version = "0.1.4", default-features = false } +multihash-derive = { version = "0.9.1", default-features = false } +ipld-core = { version = "0.4.1", features = ["serde"] } integer-encoding = { version = "3.0.3", default-features = false } # helix-onchain @@ -132,14 +132,14 @@ frc42_dispatch = "7.0.0" frc46_token = "11.0.0" # FVM -fvm_sdk = "4.3.0" -fvm_shared = "4.3.0" -fvm_ipld_encoding = "0.4.0" -fvm_ipld_blockstore = "0.2.0" -fvm_ipld_hamt = "0.9.0" -fvm_ipld_kamt = "0.3.0" -fvm_ipld_amt = { version = "0.6.2" } -fvm_ipld_bitfield = "0.6.0" +fvm_sdk = "4.5.0" +fvm_shared = "4.5.0" +fvm_ipld_encoding = "0.5.0" +fvm_ipld_blockstore = "0.3.0" +fvm_ipld_hamt = "0.10.2" +fvm_ipld_kamt = "0.4.2" +fvm_ipld_amt = { version = "0.7.2" } +fvm_ipld_bitfield = "0.7.0" # workspace fil_actor_account = { path = "actors/account" } @@ -173,9 +173,9 @@ test_vm = { path = "test_vm" } #fvm_ipld_bitfield = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" } #fvm_ipld_encoding = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" } #fvm_ipld_blockstore = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" } -#fvm_actor_utils = { git = "https://github.com/helix-onchain/filecoin", branch = "main" } -#frc42_dispatch = { git = "https://github.com/helix-onchain/filecoin", branch = "main" } -#frc46_token = { git = "https://github.com/helix-onchain/filecoin", branch = "main" } +fvm_actor_utils = { git = "https://github.com/filecoin-project/actors-utils", branch = "steb/update-multihash" } +frc42_dispatch = { git = "https://github.com/filecoin-project/actors-utils", branch = "steb/update-multihash" } +frc46_token = { git = "https://github.com/filecoin-project/actors-utils", branch = "steb/update-multihash" } ## Uncomment when working locally on ref-fvm and this repo simultaneously. ## Assumes the ref-fvm checkout is in a sibling directory with the same name. @@ -192,17 +192,19 @@ test_vm = { path = "test_vm" } ## Uncomment entries below when working locally on ref-fvm and this repo simultaneously. ## Assumes the ref-fvm checkout is in a sibling directory with the same name. ## (Valid once FVM modules are published to crates.io) -# [patch.crates-io] -# fvm_shared = { path = "../ref-fvm/shared" } -# fvm_sdk = { path = "../ref-fvm/sdk" } -# fvm_ipld_hamt = { path = "../ref-fvm/ipld/hamt" } -# fvm_ipld_amt = { path = "../ref-fvm/ipld/amt" } -# fvm_ipld_bitfield = { path = "../ref-fvm/ipld/bitfield"} -# fvm_ipld_encoding = { path = "../ref-fvm/ipld/encoding"} -# fvm_ipld_blockstore = { path = "../ref-fvm/ipld/blockstore"} -#fvm_actor_utils = { path = "../../filecoin/fvm_actor_utils"} -#frc42_dispatch = { path = "../../filecoin/frc42_dispatch"} -#frc46_token = { path = "../../filecoin/frc46_token"} +#[patch.crates-io] +#fvm_shared = { path = "../ref-fvm/shared" } +#fvm_sdk = { path = "../ref-fvm/sdk" } +#fvm_ipld_car = { path = "../ref-fvm/ipld/car" } +#fvm_ipld_hamt = { path = "../ref-fvm/ipld/hamt" } +#fvm_ipld_amt = { path = "../ref-fvm/ipld/amt" } +#fvm_ipld_bitfield = { path = "../ref-fvm/ipld/bitfield"} +#fvm_ipld_encoding = { path = "../ref-fvm/ipld/encoding"} +#fvm_ipld_blockstore = { path = "../ref-fvm/ipld/blockstore"} +#fvm_actor_utils = { path = "../actors-utils/fvm_actor_utils"} +#fil_actor_bundler = { path = "../builtin-actors-bundler"} +#frc42_dispatch = { path = "../actors-utils/frc42_dispatch"} +#frc46_token = { path = "../actors-utils/frc46_token"} [profile.wasm] inherits = "release" diff --git a/actors/evm/Cargo.toml b/actors/evm/Cargo.toml index 7515908da..8149e9ede 100644 --- a/actors/evm/Cargo.toml +++ b/actors/evm/Cargo.toml @@ -26,7 +26,7 @@ anyhow = { workspace = true } log = { workspace = true } fvm_ipld_blockstore = { workspace = true } fvm_ipld_encoding = { workspace = true } -multihash = { workspace = true } +multihash-codetable = { workspace = true } frc42_dispatch = { workspace = true } fil_actors_evm_shared = { workspace = true } hex = { workspace = true } diff --git a/actors/evm/src/interpreter/instructions/context.rs b/actors/evm/src/interpreter/instructions/context.rs index 3d86a25d5..5f201ee9f 100644 --- a/actors/evm/src/interpreter/instructions/context.rs +++ b/actors/evm/src/interpreter/instructions/context.rs @@ -150,6 +150,7 @@ pub fn base_fee( #[cfg(test)] mod tests { use crate::evm_unit_test; + use cid::multihash::Multihash; use cid::Cid; use fil_actors_evm_shared::uints::U256; use fil_actors_runtime::EAM_ACTOR_ID; @@ -160,12 +161,10 @@ mod tests { fn test_blockhash() { // truncate to 32 bytes let counting_byte_hash: Vec = (0..40u8).collect(); - let long_unknown = - Cid::new_v1(IPLD_RAW, multihash::Multihash::wrap(0, &counting_byte_hash).unwrap()); + let long_unknown = Cid::new_v1(IPLD_RAW, Multihash::wrap(0, &counting_byte_hash).unwrap()); let long_expect = counting_byte_hash[..32].try_into().unwrap(); // multihash code ignored - let cbor_odd_hash = - Cid::new_v1(DAG_CBOR, multihash::Multihash::wrap(123, &[0xfe; 32]).unwrap()); + let cbor_odd_hash = Cid::new_v1(DAG_CBOR, Multihash::wrap(123, &[0xfe; 32]).unwrap()); let cbor_odd_expect = [0xfe; 32]; let nothing = [0; 32]; diff --git a/actors/evm/src/interpreter/system.rs b/actors/evm/src/interpreter/system.rs index ceb247496..96f1141e1 100644 --- a/actors/evm/src/interpreter/system.rs +++ b/actors/evm/src/interpreter/system.rs @@ -1,6 +1,5 @@ use std::borrow::Cow; -use cid::multihash::Code; use fil_actors_evm_shared::{address::EthAddress, uints::U256}; use fil_actors_runtime::{ actor_error, extract_send_result, runtime::EMPTY_ARR_CID, AsActorError, EAM_ACTOR_ID, @@ -15,6 +14,7 @@ use fvm_shared::econ::TokenAmount; use fvm_shared::error::{ErrorNumber, ExitCode}; use fvm_shared::sys::SendFlags; use fvm_shared::{MethodNum, Response, IPLD_RAW, METHOD_SEND}; +use multihash_codetable::Code; use crate::state::{State, Tombstone}; use crate::BytecodeHash; diff --git a/actors/evm/src/lib.rs b/actors/evm/src/lib.rs index 778e54526..ad42fff70 100644 --- a/actors/evm/src/lib.rs +++ b/actors/evm/src/lib.rs @@ -50,8 +50,8 @@ const EVM_WORD_SIZE: usize = 32; #[test] fn test_method_selector() { // We could just _generate_ this method selector with a proc macro, but this is easier. - use cid::multihash::MultihashDigest; - let hash = cid::multihash::Code::Keccak256.digest(NATIVE_METHOD_SIGNATURE.as_bytes()); + use multihash_codetable::MultihashDigest; + let hash = multihash_codetable::Code::Keccak256.digest(NATIVE_METHOD_SIGNATURE.as_bytes()); let computed_selector = &hash.digest()[..4]; assert_eq!(computed_selector, NATIVE_METHOD_SELECTOR); } diff --git a/actors/market/Cargo.toml b/actors/market/Cargo.toml index 9de92154f..5b01da15f 100644 --- a/actors/market/Cargo.toml +++ b/actors/market/Cargo.toml @@ -26,12 +26,13 @@ fvm_ipld_encoding = { workspace = true } fvm_ipld_hamt = { workspace = true } fvm_shared = { workspace = true } integer-encoding = { workspace = true } -libipld-core = { workspace = true } +ipld-core = { workspace = true } log = { workspace = true } num-derive = { workspace = true } num-traits = { workspace = true } serde = { workspace = true } lazy_static = { workspace = true } +multihash-codetable = { workspace = true } [dev-dependencies] fil_actors_runtime = { workspace = true, features = ["test_utils", "sector-default"] } @@ -39,7 +40,6 @@ fil_actor_power = { workspace = true } fil_actor_reward = { workspace = true } fil_actor_verifreg = { workspace = true } fvm_ipld_amt = { workspace = true } -multihash = { workspace = true } regex = { workspace = true } itertools = { workspace = true } diff --git a/actors/market/src/deal.rs b/actors/market/src/deal.rs index 9339a833b..976c4a1d2 100644 --- a/actors/market/src/deal.rs +++ b/actors/market/src/deal.rs @@ -11,7 +11,7 @@ use fvm_shared::crypto::signature::Signature; use fvm_shared::econ::TokenAmount; use fvm_shared::piece::PaddedPieceSize; use fvm_shared::sector::SectorNumber; -use libipld_core::ipld::Ipld; +use ipld_core::ipld::Ipld; use serde::{de, Deserialize, Deserializer, Serialize, Serializer}; use std::convert::{TryFrom, TryInto}; diff --git a/actors/market/src/lib.rs b/actors/market/src/lib.rs index c63fbeb42..6a1a9c1b3 100644 --- a/actors/market/src/lib.rs +++ b/actors/market/src/lib.rs @@ -4,7 +4,7 @@ use std::cmp::min; use std::collections::{BTreeMap, BTreeSet, HashSet}; -use cid::multihash::{Code, MultihashGeneric}; +use cid::multihash::Multihash; use cid::Cid; use fil_actors_runtime::reward::ThisEpochRewardReturn; use frc46_token::token::types::{BalanceReturn, TransferFromParams, TransferFromReturn}; @@ -16,6 +16,7 @@ use fvm_ipld_hamt::BytesKey; use fvm_shared::address::Address; use fvm_shared::bigint::BigInt; use fvm_shared::clock::{ChainEpoch, EPOCH_UNDEFINED}; +use fvm_shared::crypto::hash::SupportedHashes; use fvm_shared::deal::DealID; use fvm_shared::econ::TokenAmount; use fvm_shared::error::ExitCode; @@ -1723,7 +1724,7 @@ pub fn deal_cid(rt: &impl Runtime, proposal: &DealProposal) -> Result Result { const DIGEST_SIZE: u32 = 32; - let hash = MultihashGeneric::wrap(Code::Blake2b256.into(), &rt.hash_blake2b(data)) + let hash = Multihash::wrap(SupportedHashes::Blake2b256.into(), &rt.hash_blake2b(data)) .map_err(|e| actor_error!(illegal_argument; "failed to take cid of proposal {}", e))?; debug_assert_eq!(u32::from(hash.size()), DIGEST_SIZE, "expected 32byte digest"); Ok(Cid::new_v1(DAG_CBOR, hash)) diff --git a/actors/market/src/testing.rs b/actors/market/src/testing.rs index 05b1d42de..aaf874d9f 100644 --- a/actors/market/src/testing.rs +++ b/actors/market/src/testing.rs @@ -4,7 +4,6 @@ use std::{ convert::TryFrom, }; -use cid::multihash::{Code, MultihashDigest}; use cid::Cid; use fvm_ipld_blockstore::Blockstore; use fvm_ipld_encoding::DAG_CBOR; @@ -18,6 +17,7 @@ use fvm_shared::{ ActorID, }; use integer_encoding::VarInt; +use multihash_codetable::{Code, MultihashDigest}; use num_traits::Zero; use fil_actors_runtime::builtin::HAMT_BIT_WIDTH; diff --git a/actors/market/tests/harness.rs b/actors/market/tests/harness.rs index b4ad54603..f30313168 100644 --- a/actors/market/tests/harness.rs +++ b/actors/market/tests/harness.rs @@ -1207,8 +1207,7 @@ pub fn assert_deal_deleted( sector_number: SectorNumber, empty_sector_deals: bool, ) { - use cid::multihash::Code; - use cid::multihash::MultihashDigest; + use multihash_codetable::{Code, MultihashDigest}; let st: State = rt.get_state(); diff --git a/actors/market/tests/sector_content_changed.rs b/actors/market/tests/sector_content_changed.rs index 16decb21b..4667c4dab 100644 --- a/actors/market/tests/sector_content_changed.rs +++ b/actors/market/tests/sector_content_changed.rs @@ -5,8 +5,7 @@ use fvm_shared::deal::DealID; use fvm_shared::econ::TokenAmount; use fvm_shared::error::ExitCode; use fvm_shared::piece::PaddedPieceSize; -use multihash::Code::Sha2_256; -use multihash::MultihashDigest; +use multihash_codetable::{Code::Sha2_256, MultihashDigest}; use num_traits::Zero; use fil_actor_market::ext::miner::{ diff --git a/actors/miner/Cargo.toml b/actors/miner/Cargo.toml index bc03e1ae9..e78023c2e 100644 --- a/actors/miner/Cargo.toml +++ b/actors/miner/Cargo.toml @@ -33,6 +33,7 @@ lazy_static = { workspace = true } log = { workspace = true } byteorder = { workspace = true } itertools = { workspace = true } +multihash-codetable = { workspace = true } [dev-dependencies] fil_actors_runtime = { workspace = true, features = ["test_utils", "sector-default"] } @@ -43,6 +44,7 @@ fil_actor_market = { workspace = true } rand = { workspace = true } test-case = { workspace = true } const-hex = { workspace = true } +multihash-derive = { workspace = true } [features] fil-actor = ["fil_actors_runtime/fil-actor"] diff --git a/actors/miner/src/deadline_state.rs b/actors/miner/src/deadline_state.rs index fb2752285..bf9160dca 100644 --- a/actors/miner/src/deadline_state.rs +++ b/actors/miner/src/deadline_state.rs @@ -5,7 +5,6 @@ use std::cmp; use std::collections::BTreeSet; use anyhow::anyhow; -use cid::multihash::Code; use cid::Cid; use fvm_ipld_bitfield::BitField; use fvm_ipld_blockstore::Blockstore; @@ -15,6 +14,7 @@ use fvm_shared::clock::ChainEpoch; use fvm_shared::econ::TokenAmount; use fvm_shared::error::ExitCode; use fvm_shared::sector::{PoStProof, SectorSize}; +use multihash_codetable::Code; use num_traits::{Signed, Zero}; use fil_actors_runtime::runtime::Policy; diff --git a/actors/miner/src/lib.rs b/actors/miner/src/lib.rs index 01b9b5f85..c8f047b3d 100644 --- a/actors/miner/src/lib.rs +++ b/actors/miner/src/lib.rs @@ -9,7 +9,6 @@ use std::ops::Neg; use anyhow::{anyhow, Error}; use byteorder::{BigEndian, ByteOrder, WriteBytesExt}; -use cid::multihash::Code::Blake2b256; use cid::Cid; use fvm_ipld_bitfield::{BitField, Validate}; use fvm_ipld_blockstore::Blockstore; @@ -32,6 +31,7 @@ use fvm_shared::sector::{ use fvm_shared::{ActorID, MethodNum, METHOD_CONSTRUCTOR, METHOD_SEND}; use itertools::Itertools; use log::{error, info, warn}; +use multihash_codetable::Code::Blake2b256; use num_derive::FromPrimitive; use num_traits::{Signed, Zero}; diff --git a/actors/miner/src/state.rs b/actors/miner/src/state.rs index c2c96f0e9..0ba88729a 100644 --- a/actors/miner/src/state.rs +++ b/actors/miner/src/state.rs @@ -6,7 +6,6 @@ use std::cmp; use std::ops::Neg; use anyhow::{anyhow, Error}; -use cid::multihash::Code; use cid::Cid; use fvm_ipld_amt::Error as AmtError; use fvm_ipld_bitfield::BitField; @@ -20,6 +19,7 @@ use fvm_shared::error::ExitCode; use fvm_shared::sector::{RegisteredPoStProof, SectorNumber, SectorSize}; use fvm_shared::{ActorID, HAMT_BIT_WIDTH}; use itertools::Itertools; +use multihash_codetable::Code; use num_traits::Zero; use fil_actors_runtime::runtime::policy_constants::MAX_SECTOR_NUMBER; diff --git a/actors/miner/tests/state_harness.rs b/actors/miner/tests/state_harness.rs index 0ea6490f0..dc9cb1f05 100644 --- a/actors/miner/tests/state_harness.rs +++ b/actors/miner/tests/state_harness.rs @@ -1,5 +1,4 @@ #![allow(dead_code)] -use cid::multihash::Code::Blake2b256; use fil_actor_miner::{ BitFieldQueue, CollisionPolicy, MinerInfo, QuantSpec, SectorOnChainInfo, SectorPreCommitOnChainInfo, State, VestSpec, VestingFunds, @@ -12,6 +11,7 @@ use fvm_ipld_encoding::CborStore; use fvm_shared::econ::TokenAmount; use fvm_shared::sector::{SectorNumber, SectorSize}; use fvm_shared::{clock::ChainEpoch, sector::RegisteredPoStProof}; +use multihash_codetable::Code::Blake2b256; use fil_actors_runtime::test_utils::*; diff --git a/actors/miner/tests/util.rs b/actors/miner/tests/util.rs index 93381e4af..fdbceb349 100644 --- a/actors/miner/tests/util.rs +++ b/actors/miner/tests/util.rs @@ -6,7 +6,6 @@ use std::iter; use std::ops::Neg; use anyhow::anyhow; -use cid::multihash::MultihashDigest; use cid::Cid; use fil_actors_runtime::reward::FilterEstimate; use fvm_ipld_amt::Amt; @@ -38,7 +37,7 @@ use fvm_shared::sector::{ use fvm_shared::{ActorID, HAMT_BIT_WIDTH, METHOD_SEND}; use itertools::Itertools; use lazy_static::lazy_static; -use multihash::derive::Multihash; +use multihash_codetable::MultihashDigest; use num_traits::Signed; use fil_actor_account::Method as AccountMethod; @@ -3297,12 +3296,12 @@ pub fn make_prove_commit_aggregate(sector_nos: &BitField) -> ProveCommitAggregat } // multihash library doesn't support poseidon hashing, so we fake it -#[derive(Clone, Copy, Debug, Eq, Multihash, PartialEq)] +#[derive(Clone, Copy, Debug, Eq, MultihashDigest, PartialEq)] #[mh(alloc_size = 64)] enum MhCode { - #[mh(code = 0xb401, hasher = multihash::Sha2_256)] + #[mh(code = 0xb401, hasher = multihash_codetable::Sha2_256)] PoseidonFake, - #[mh(code = 0x1012, hasher = multihash::Sha2_256)] + #[mh(code = 0x1012, hasher = multihash_codetable::Sha2_256)] Sha256TruncPaddedFake, } diff --git a/actors/system/Cargo.toml b/actors/system/Cargo.toml index 8a7b11b08..6d14065f9 100644 --- a/actors/system/Cargo.toml +++ b/actors/system/Cargo.toml @@ -17,6 +17,7 @@ crate-type = ["cdylib", "lib"] fil_actors_runtime = { workspace = true } fvm_shared = { workspace = true } fvm_ipld_encoding = { workspace = true } +multihash-codetable = { workspace = true } fvm_ipld_blockstore = { workspace = true } num-traits = { workspace = true } anyhow = { workspace = true } diff --git a/actors/system/src/lib.rs b/actors/system/src/lib.rs index 8d6cc487a..8ebc7820e 100644 --- a/actors/system/src/lib.rs +++ b/actors/system/src/lib.rs @@ -1,6 +1,6 @@ // Copyright 2019-2022 ChainSafe Systems // SPDX-License-Identifier: Apache-2.0, MIT -use cid::{multihash, Cid}; +use cid::Cid; use fvm_ipld_blockstore::Blockstore; use fvm_ipld_encoding::tuple::*; use fvm_ipld_encoding::CborStore; @@ -33,7 +33,7 @@ pub struct State { impl State { pub fn new(store: &BS) -> Result { let c = store - .put_cbor(&Vec::<(String, Cid)>::new(), multihash::Code::Blake2b256) + .put_cbor(&Vec::<(String, Cid)>::new(), multihash_codetable::Code::Blake2b256) .context_code(ExitCode::USR_ILLEGAL_STATE, "failed to store system state")?; Ok(Self { builtin_actors: c }) } diff --git a/integration_tests/Cargo.toml b/integration_tests/Cargo.toml index 166f3c602..e04f4d1c7 100644 --- a/integration_tests/Cargo.toml +++ b/integration_tests/Cargo.toml @@ -60,8 +60,8 @@ thiserror = { workspace = true } libsecp256k1 = { workspace = true } export_macro = { path = "./macro" } ctor = "0.2.5" +multihash-codetable = { workspace = true } [dev-dependencies] -multihash = { workspace = true } test-case = { workspace = true } hex-literal = { workspace = true } diff --git a/integration_tests/src/util/mod.rs b/integration_tests/src/util/mod.rs index 87a53837d..440eb0ffc 100644 --- a/integration_tests/src/util/mod.rs +++ b/integration_tests/src/util/mod.rs @@ -1,4 +1,3 @@ -use cid::multihash::{Code, MultihashDigest}; use cid::Cid; use fil_actor_market::{load_provider_sector_deals, DealProposal, DealState, State as MarketState}; use fil_actor_miner::ext::verifreg::AllocationID; @@ -27,6 +26,7 @@ use fvm_shared::piece::PieceInfo; use fvm_shared::sector::{RegisteredSealProof, SectorNumber}; use fvm_shared::{ActorID, METHOD_SEND}; use integer_encoding::VarInt; +use multihash_codetable::{Code, MultihashDigest}; use num_traits::Zero; use regex::Regex; use std::collections::HashMap; diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 3379ac93b..265aa940c 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -23,7 +23,7 @@ integer-encoding = { workspace = true } itertools = { workspace = true } lazy_static = { workspace = true } log = { workspace = true } -multihash = { workspace = true } +multihash-codetable = { workspace = true } num = { workspace = true } num-derive = { workspace = true } num-traits = { workspace = true } @@ -44,7 +44,7 @@ blake2b_simd = { workspace = true, optional = true } hex = { workspace = true, optional = true } pretty_env_logger = { workspace = true, optional = true } rand = { workspace = true, optional = true } -base64 = "0.21.2" +multihash-derive = { workspace = true, optional = true } [dependencies.libsecp256k1] workspace = true @@ -52,6 +52,7 @@ features = ["static-context", "std"] optional = true [dev-dependencies] +base64 = "0.21.2" derive_builder = { workspace = true } hex = { workspace = true } rand = { workspace = true } @@ -93,4 +94,4 @@ no-provider-deal-collateral = [] fake-proofs = [] -test_utils = ["hex", "multihash/sha2", "multihash/sha3", "multihash/ripemd", "libsecp256k1", "blake2b_simd", "rand", "rand/std_rng", "pretty_env_logger"] +test_utils = ["hex", "multihash-derive", "multihash-codetable/sha2", "multihash-codetable/sha3", "multihash-codetable/ripemd", "libsecp256k1", "blake2b_simd", "rand", "rand/std_rng", "pretty_env_logger"] diff --git a/runtime/src/runtime/actor_blockstore.rs b/runtime/src/runtime/actor_blockstore.rs index 497efd0bd..343284dfb 100644 --- a/runtime/src/runtime/actor_blockstore.rs +++ b/runtime/src/runtime/actor_blockstore.rs @@ -1,10 +1,10 @@ use std::convert::TryFrom; use anyhow::Result; -use cid::multihash::Code; use cid::Cid; use fvm_ipld_blockstore::Block; use fvm_sdk as fvm; +use multihash_codetable::Code; use crate::actor_error; diff --git a/runtime/src/runtime/empty.rs b/runtime/src/runtime/empty.rs index 4885a09f8..a718e9227 100644 --- a/runtime/src/runtime/empty.rs +++ b/runtime/src/runtime/empty.rs @@ -28,8 +28,8 @@ pub const EMPTY_ARR_CID: Cid = Cid::new_v1( #[test] fn test_empty_arr_cid() { - use cid::multihash::{Code, MultihashDigest}; use fvm_ipld_encoding::to_vec; + use multihash_codetable::{Code, MultihashDigest}; let empty = to_vec::<[(); 0]>(&[]).unwrap(); let expected = Cid::new_v1(DAG_CBOR, Code::Blake2b256.digest(&empty)); diff --git a/runtime/src/runtime/fvm.rs b/runtime/src/runtime/fvm.rs index 810196b6c..d4bc5562e 100644 --- a/runtime/src/runtime/fvm.rs +++ b/runtime/src/runtime/fvm.rs @@ -1,5 +1,4 @@ use anyhow::{anyhow, Error}; -use cid::multihash::Code; use cid::Cid; use fvm_ipld_blockstore::Blockstore; use fvm_ipld_encoding::ipld_block::IpldBlock; @@ -28,6 +27,7 @@ use fvm_shared::sector::{ use fvm_shared::sys::SendFlags; use fvm_shared::version::NetworkVersion; use fvm_shared::{ActorID, MethodNum, Response}; +use multihash_codetable::Code; use num_traits::FromPrimitive; use serde::de::DeserializeOwned; use serde::Serialize; diff --git a/runtime/src/runtime/mod.rs b/runtime/src/runtime/mod.rs index 5ce9d1424..34bc5f2e5 100644 --- a/runtime/src/runtime/mod.rs +++ b/runtime/src/runtime/mod.rs @@ -33,12 +33,12 @@ pub(crate) mod hash_algorithm; pub(crate) mod empty; -use cid::multihash::Code; pub use empty::EMPTY_ARR_CID; use fvm_ipld_encoding::ipld_block::IpldBlock; use fvm_shared::chainid::ChainID; use fvm_shared::event::ActorEvent; use fvm_shared::sys::SendFlags; +use multihash_codetable::Code; pub use vm_api::Primitives; /// Runtime is the VM's internal runtime object. diff --git a/runtime/src/test_blockstores.rs b/runtime/src/test_blockstores.rs index 562aeab0e..7ca5b5e16 100644 --- a/runtime/src/test_blockstores.rs +++ b/runtime/src/test_blockstores.rs @@ -68,7 +68,7 @@ impl Blockstore for MemoryBlockstore { mod tests { use super::*; use fvm_ipld_blockstore::Block; - use multihash::Code; + use multihash_codetable::Code; #[test] fn basic_tracking_store() { diff --git a/runtime/src/test_utils.rs b/runtime/src/test_utils.rs index 643b245a4..2ee344101 100644 --- a/runtime/src/test_utils.rs +++ b/runtime/src/test_utils.rs @@ -8,7 +8,6 @@ use std::rc::Rc; use anyhow::anyhow; use anyhow::{Error, Result}; -use cid::multihash::{Code, Multihash as OtherMultihash}; use cid::Cid; use fvm_ipld_encoding::de::DeserializeOwned; use fvm_ipld_encoding::CborStore; @@ -31,9 +30,8 @@ use fvm_shared::sector::{ }; use fvm_shared::version::NetworkVersion; use fvm_shared::{ActorID, MethodNum, Response}; - -use cid::multihash::MultihashDigest; -use multihash::derive::Multihash; +use multihash_codetable::Code; +use multihash_derive::MultihashDigest; use crate::runtime::builtins::Type; use crate::runtime::{ @@ -128,7 +126,7 @@ const IPLD_RAW: u64 = 0x55; /// Returns an identity CID for bz. pub fn make_identity_cid(bz: &[u8]) -> Cid { - Cid::new_v1(IPLD_RAW, OtherMultihash::wrap(0, bz).expect("name too long")) + Cid::new_v1(IPLD_RAW, Multihash::wrap(0, bz).expect("name too long")) } /// Enable logging to enviornment. Returns error if already init. @@ -1612,12 +1610,12 @@ pub fn recover_secp_public_key( } // multihash library doesn't support poseidon hashing, so we fake it -#[derive(Clone, Copy, Debug, PartialEq, Eq, Multihash)] +#[derive(Clone, Copy, Debug, PartialEq, Eq, MultihashDigest)] #[mh(alloc_size = 64)] enum MhCode { - #[mh(code = 0xb401, hasher = multihash::Sha2_256)] + #[mh(code = 0xb401, hasher = multihash_codetable::Sha2_256)] PoseidonFake, - #[mh(code = 0x1012, hasher = multihash::Sha2_256)] + #[mh(code = 0x1012, hasher = multihash_codetable::Sha2_256)] Sha256TruncPaddedFake, } diff --git a/test_vm/Cargo.toml b/test_vm/Cargo.toml index 258112805..f8eeb0067 100644 --- a/test_vm/Cargo.toml +++ b/test_vm/Cargo.toml @@ -41,8 +41,8 @@ integer-encoding = { workspace = true } num-traits = { workspace = true } serde = { workspace = true } vm_api = { workspace = true } +multihash-codetable = { workspace = true } [dev-dependencies] -multihash = { workspace = true } test-case = { workspace = true } fil_actors_integration_tests = { workspace = true } diff --git a/test_vm/src/lib.rs b/test_vm/src/lib.rs index 9e13ac5d5..907b99c3b 100644 --- a/test_vm/src/lib.rs +++ b/test_vm/src/lib.rs @@ -1,4 +1,3 @@ -use cid::multihash::Code; use cid::Cid; use fil_actor_account::State as AccountState; use fil_actor_cron::{Entry as CronEntry, State as CronState}; @@ -32,6 +31,7 @@ use fvm_shared::error::ExitCode; use fvm_shared::sector::StoragePower; use fvm_shared::version::NetworkVersion; use fvm_shared::{MethodNum, METHOD_SEND}; +use multihash_codetable::Code; use serde::ser; use std::cell::{RefCell, RefMut}; use std::collections::{BTreeMap, HashMap}; diff --git a/test_vm/src/messaging.rs b/test_vm/src/messaging.rs index 2257bad83..c05a4a9e9 100644 --- a/test_vm/src/messaging.rs +++ b/test_vm/src/messaging.rs @@ -1,5 +1,4 @@ use anyhow::anyhow; -use cid::multihash::Code; use cid::Cid; use fil_actor_account::Actor as AccountActor; use fil_actor_cron::Actor as CronActor; @@ -16,6 +15,7 @@ use fil_actor_power::Actor as PowerActor; use fil_actor_reward::Actor as RewardActor; use fil_actor_system::Actor as SystemActor; use fil_actor_verifreg::Actor as VerifregActor; +use multihash_codetable::Code; use fil_actors_runtime::runtime::builtins::Type; use fil_actors_runtime::runtime::{ diff --git a/vm_api/Cargo.toml b/vm_api/Cargo.toml index ccd36b110..29cadc0bb 100644 --- a/vm_api/Cargo.toml +++ b/vm_api/Cargo.toml @@ -23,6 +23,8 @@ rand = { workspace = true } rand_chacha = { workspace = true } serde = { workspace = true } -[features] -testing = [] +multihash-codetable = { workspace = true } +multihash-derive = { workspace = true, optional = true } +[features] +testing = ["multihash-derive"] diff --git a/vm_api/src/util/mod.rs b/vm_api/src/util/mod.rs index 463abe624..eed336c03 100644 --- a/vm_api/src/util/mod.rs +++ b/vm_api/src/util/mod.rs @@ -1,10 +1,10 @@ -use cid::multihash::Code; use fvm_ipld_encoding::ipld_block::IpldBlock; use fvm_ipld_encoding::{CborStore, RawBytes}; use fvm_shared::address::{Address, BLS_PUB_LEN}; use fvm_shared::econ::TokenAmount; use fvm_shared::error::ExitCode; use fvm_shared::MethodNum; +use multihash_codetable::Code; use rand::prelude::*; use rand_chacha::ChaCha8Rng; use serde::Serialize;