From e37a38a981fa62fe5c784753e03ec6b90ca7d98a Mon Sep 17 00:00:00 2001 From: LePremierHomme <57456510+LePremierHomme@users.noreply.github.com> Date: Wed, 20 Nov 2024 13:59:46 +0530 Subject: [PATCH 1/6] chore: upgrade `fvm` and `builtin-actors` versions --- Cargo.lock | 665 ++++++++++++++++++++------------------------ Cargo.toml | 16 +- fendermint/Makefile | 2 +- 3 files changed, 316 insertions(+), 367 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5c087cbe0..d22087718 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,15 +12,6 @@ dependencies = [ "regex", ] -[[package]] -name = "addr2line" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" -dependencies = [ - "gimli 0.27.3", -] - [[package]] name = "addr2line" version = "0.24.2" @@ -112,9 +103,9 @@ checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" [[package]] name = "ambassador" -version = "0.3.7" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87ccf220415ad6a81b21e21780134c746463fdb821cc2530a001df2c3d13a36" +checksum = "6b27ba24e4d8a188489d5a03c7fabc167a60809a383cdb4d15feb37479cd2a48" dependencies = [ "itertools 0.10.5", "proc-macro2", @@ -279,7 +270,7 @@ dependencies = [ "nom", "num-traits", "rusticata-macros", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -613,7 +604,7 @@ version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ - "addr2line 0.24.2", + "addr2line", "cfg-if", "libc", "miniz_oxide", @@ -691,7 +682,7 @@ dependencies = [ "byteorder", "ff 0.13.0", "serde", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -720,7 +711,7 @@ dependencies = [ "rustversion", "serde", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -914,7 +905,7 @@ dependencies = [ "pairing 0.22.0", "rand_core", "subtle", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -930,7 +921,7 @@ dependencies = [ "pairing 0.23.0", "rand_core", "subtle", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1000,7 +991,7 @@ dependencies = [ "serde_json", "serde_repr", "serde_urlencoded", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-util 0.7.12", "url", @@ -1105,7 +1096,7 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1137,9 +1128,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.37" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40545c26d092346d8a8dab71ee48e7685a7a9cba76e634790c215b41a4a7b4cf" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "jobserver", "libc", @@ -1266,9 +1257,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" dependencies = [ "clap_builder", "clap_derive", @@ -1276,9 +1267,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" dependencies = [ "anstream", "anstyle", @@ -1288,11 +1279,11 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.37" +version = "4.5.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11611dca53440593f38e6b25ec629de50b14cdfa63adc0fb856115a2c6d97595" +checksum = "d9647a559c112175f17cf724dc72d3645680a883c58481332779192b0d8e7a01" dependencies = [ - "clap 4.5.20", + "clap 4.5.21", ] [[package]] @@ -1309,9 +1300,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "coins-bip32" @@ -1326,7 +1317,7 @@ dependencies = [ "k256 0.13.4", "serde", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1342,7 +1333,7 @@ dependencies = [ "pbkdf2 0.12.2", "rand", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1362,7 +1353,7 @@ dependencies = [ "serde_derive", "sha2 0.10.8", "sha3", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1475,38 +1466,29 @@ dependencies = [ "memchr", ] -[[package]] -name = "cpp_demangle" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" -dependencies = [ - "cfg-if", -] - [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6" dependencies = [ "libc", ] [[package]] name = "cranelift-bforest" -version = "0.99.2" +version = "0.106.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a91a1ccf6fb772808742db2f51e2179f25b1ec559cbe39ea080c72ff61caf8f" +checksum = "3b57d4f3ffc28bbd6ef1ca7b50b20126717232f97487efe027d135d9d87eb29c" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.99.2" +version = "0.106.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "169db1a457791bff4fd1fc585bb5cc515609647e0420a7d5c98d7700c59c2d00" +checksum = "d1f7d0ac7fd53f2c29db3ff9a063f6ff5a8be2abaa8f6942aceb6e1521e70df7" dependencies = [ "bumpalo", "cranelift-bforest", @@ -1515,8 +1497,8 @@ dependencies = [ "cranelift-control", "cranelift-entity", "cranelift-isle", - "gimli 0.27.3", - "hashbrown 0.13.2", + "gimli 0.28.1", + "hashbrown 0.14.5", "log", "regalloc2", "smallvec", @@ -1525,42 +1507,43 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.99.2" +version = "0.106.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3486b93751ef19e6d6eef66d2c0e83ed3d2ba01da1919ed2747f2f7bd8ba3419" +checksum = "b40bf21460a600178956cb7fd900a7408c6587fbb988a8063f7215361801a1da" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.99.2" +version = "0.106.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86a1205ab18e7cd25dc4eca5246e56b506ced3feb8d95a8d776195e48d2cd4ef" +checksum = "d792ecc1243b7ebec4a7f77d9ed428ef27456eeb1f8c780587a6f5c38841be19" [[package]] name = "cranelift-control" -version = "0.99.2" +version = "0.106.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b108cae0f724ddfdec1871a0dc193a607e0c2d960f083cfefaae8ccf655eff2" +checksum = "cea2808043df964b73ad7582e09afbbe06a31f3fb9db834d53e74b4e16facaeb" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.99.2" +version = "0.106.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "720444006240622798665bfc6aa8178e2eed556da342fda62f659c5267c3c659" +checksum = "f1930946836da6f514da87625cd1a0331f3908e0de454628c24a0b97b130c4d4" dependencies = [ "serde", + "serde_derive", ] [[package]] name = "cranelift-frontend" -version = "0.99.2" +version = "0.106.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a94c4c5508b7407e125af9d5320694b7423322e59a4ac0d07919ae254347ca" +checksum = "5482a5fcdf98f2f31b21093643bdcfe9030866b8be6481117022e7f52baa0f2b" dependencies = [ "cranelift-codegen", "log", @@ -1570,15 +1553,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.99.2" +version = "0.106.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef1f888d0845dcd6be4d625b91d9d8308f3d95bed5c5d4072ce38e1917faa505" +checksum = "6f6e1869b6053383bdb356900e42e33555b4c9ebee05699469b7c53cdafc82ea" [[package]] name = "cranelift-native" -version = "0.99.2" +version = "0.106.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ad5966da08f1e96a3ae63be49966a85c9b249fa465f8cf1b66469a82b1004a0" +checksum = "a91446e8045f1c4bc164b7bba68e2419c623904580d4b730877a663c6da38964" dependencies = [ "cranelift-codegen", "libc", @@ -1587,17 +1570,17 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.99.2" +version = "0.106.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8635c88b424f1d232436f683a301143b36953cd98fc6f86f7bac862dfeb6f5" +checksum = "f8b17979b862d3b0d52de6ae3294ffe4d86c36027b56ad0443a7c8c8f921d14f" dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", - "itertools 0.10.5", + "itertools 0.12.1", "log", "smallvec", - "wasmparser 0.110.0", + "wasmparser 0.201.0", "wasmtime-types", ] @@ -1868,15 +1851,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "debugid" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" -dependencies = [ - "uuid 1.11.0", -] - [[package]] name = "der" version = "0.6.1" @@ -2098,7 +2072,7 @@ dependencies = [ "once_cell", "rayon", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", "yastl", ] @@ -2338,8 +2312,8 @@ dependencies = [ "serde_json", "sha2 0.10.8", "sha3", - "thiserror", - "uuid 0.8.2", + "thiserror 1.0.69", + "uuid", ] [[package]] @@ -2355,7 +2329,7 @@ dependencies = [ "serde", "serde_json", "sha3", - "thiserror", + "thiserror 1.0.69", "uint", ] @@ -2434,7 +2408,7 @@ dependencies = [ "pin-project", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2502,7 +2476,7 @@ dependencies = [ "strum", "syn 2.0.87", "tempfile", - "thiserror", + "thiserror 1.0.69", "tiny-keccak", "unicode-xid", ] @@ -2519,7 +2493,7 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -2543,7 +2517,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "tracing-futures", @@ -2576,7 +2550,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-tungstenite 0.20.1", "tracing", @@ -2603,7 +2577,7 @@ dependencies = [ "ethers-core", "rand", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -2631,7 +2605,7 @@ dependencies = [ "serde_json", "solang-parser", "svm-rs", - "thiserror", + "thiserror 1.0.69", "tiny-keccak", "tokio", "tracing", @@ -2730,9 +2704,9 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" [[package]] name = "fallible-iterator" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fastrand" @@ -2942,7 +2916,7 @@ dependencies = [ "anyhow", "bytes", "cid", - "clap 4.5.20", + "clap 4.5.21", "fendermint_materializer", "fendermint_vm_actor_interface", "fendermint_vm_genesis", @@ -3041,7 +3015,7 @@ dependencies = [ "async-trait", "axum", "cid", - "clap 4.5.20", + "clap 4.5.21", "erased-serde", "ethers", "ethers-contract", @@ -3069,7 +3043,7 @@ dependencies = [ "serde_json", "tendermint 0.31.1", "tendermint-rpc", - "thiserror", + "thiserror 1.0.69", "tokio", "tower-http", "tracing", @@ -3151,7 +3125,7 @@ dependencies = [ "rocksdb", "serde", "tempfile", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -3163,7 +3137,7 @@ dependencies = [ "base64 0.21.7", "bytes", "cid", - "clap 4.5.20", + "clap 4.5.21", "ethers", "fendermint_crypto", "fendermint_vm_actor_interface", @@ -3201,7 +3175,7 @@ dependencies = [ "quickcheck", "quickcheck_macros", "serde", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -3247,7 +3221,7 @@ dependencies = [ "fil_actors_evm_shared", "fvm_ipld_blockstore", "fvm_ipld_encoding", - "fvm_ipld_hamt 0.9.0", + "fvm_ipld_hamt", "fvm_shared", "hex", "ipc-api", @@ -3277,7 +3251,7 @@ dependencies = [ "quickcheck_macros", "regex", "serde", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -3384,7 +3358,7 @@ dependencies = [ "tempfile", "tendermint 0.31.1", "tendermint-rpc", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-util 0.7.12", @@ -3418,7 +3392,7 @@ dependencies = [ "serde", "serde_tuple", "serde_with 2.3.3", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -3464,7 +3438,7 @@ dependencies = [ "tempfile", "tendermint 0.31.1", "tendermint-rpc", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-util 0.7.12", "tracing", @@ -3480,7 +3454,7 @@ dependencies = [ "async-trait", "bytes", "cid", - "clap 4.5.20", + "clap 4.5.21", "ethers", "fendermint_crypto", "fendermint_testing", @@ -3503,7 +3477,7 @@ dependencies = [ "serde", "serde_json", "tendermint-rpc", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "tracing-subscriber", @@ -3546,7 +3520,7 @@ dependencies = [ "anyhow", "async-std", "cid", - "clap 4.5.20", + "clap 4.5.21", "futures", "fvm_ipld_blockstore", "fvm_ipld_car", @@ -3558,8 +3532,8 @@ dependencies = [ [[package]] name = "fil_actor_eam" -version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?tag=v12.0.0#b86938e410daebf27f9397fd622370a16b24f58b" +version = "15.0.0-rc1" +source = "git+https://github.com/filecoin-project/builtin-actors?tag=v15.0.0#831bf1b9fe281835409c39a8c454a68dd3200bbc" dependencies = [ "anyhow", "cid", @@ -3579,8 +3553,8 @@ dependencies = [ [[package]] name = "fil_actors_evm_shared" -version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?tag=v12.0.0#b86938e410daebf27f9397fd622370a16b24f58b" +version = "15.0.0-rc1" +source = "git+https://github.com/filecoin-project/builtin-actors?tag=v15.0.0#831bf1b9fe281835409c39a8c454a68dd3200bbc" dependencies = [ "fil_actors_runtime", "fvm_ipld_encoding", @@ -3592,8 +3566,8 @@ dependencies = [ [[package]] name = "fil_actors_runtime" -version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?tag=v12.0.0#b86938e410daebf27f9397fd622370a16b24f58b" +version = "15.0.0-rc1" +source = "git+https://github.com/filecoin-project/builtin-actors?tag=v15.0.0#831bf1b9fe281835409c39a8c454a68dd3200bbc" dependencies = [ "anyhow", "base64 0.21.7", @@ -3605,7 +3579,7 @@ dependencies = [ "fvm_ipld_bitfield", "fvm_ipld_blockstore", "fvm_ipld_encoding", - "fvm_ipld_hamt 0.8.0", + "fvm_ipld_hamt", "fvm_sdk", "fvm_shared", "hex", @@ -3625,16 +3599,16 @@ dependencies = [ "serde", "serde_repr", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", "unsigned-varint 0.7.2", "vm_api", ] [[package]] name = "filecoin-hashers" -version = "11.1.0" +version = "13.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a96fbc8232ba762026e6b4687dedf08ba1b3830148c919a158c21d7720fb62" +checksum = "85413176cea16bfe171caafab023044820c0033b243b535b19116776ffd3f285" dependencies = [ "anyhow", "bellperson", @@ -3652,9 +3626,9 @@ dependencies = [ [[package]] name = "filecoin-proofs" -version = "16.1.0" +version = "18.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a4daf099aade347b0f23c1dd5b644aad340a223d5b65c37840faedda3092f" +checksum = "096b8b483f6ed5823150daf6cd22ee8e32b3dabcb4fd70dab70044e73bcab107" dependencies = [ "anyhow", "bellperson", @@ -3686,15 +3660,13 @@ dependencies = [ [[package]] name = "filecoin-proofs-api" -version = "16.1.0" +version = "18.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cef9a819a3125ab92269da594daf2f742a3f6b1e03a2493c13a0bda4514b03" +checksum = "3aea8140d1e2d2ac18347e6121ee24d0e903f9cfdc2eb2ee507932e352c9e7b8" dependencies = [ "anyhow", - "bellperson", "bincode", "blstrs 0.7.1", - "filecoin-hashers", "filecoin-proofs", "fr32", "lazy_static", @@ -3797,48 +3769,48 @@ dependencies = [ [[package]] name = "fr32" -version = "9.1.0" +version = "11.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca9913cf6179723cdc69827661a36d9ac3fea4c6c8c0ee71536417e5b2cf5d6" +checksum = "627a3f3108ee3287759a45f6d5aafe48b3017509df9b677115f88266d61e0815" dependencies = [ "anyhow", "blstrs 0.7.1", "byte-slice-cast", "byteorder", "ff 0.13.0", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "frc42_dispatch" -version = "6.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a1704e27193af21e58435974ff20f2be25cc59338afb89920abdb540ad3182b" +checksum = "0b9567f7b38af6f277072c9ea230f7c5be12237905ef19348f4b490f563f3fef" dependencies = [ "frc42_hasher", "frc42_macros", "fvm_ipld_encoding", "fvm_sdk", "fvm_shared", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "frc42_hasher" -version = "4.0.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63f58bb50d36d90f5d0fee8391d6e1ed1a2b15ab8da6417dc42d7c78b587479d" +checksum = "238a28ff638f138c4b4c75f4d35cd28cedcb45858cfcaa4df36dc25b0b3298db" dependencies = [ "fvm_sdk", "fvm_shared", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "frc42_macros" -version = "4.0.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9ce38a981bab5e0d3c0835baa86f83066afe9afaf0aec23cee421f6d8c628e" +checksum = "c07758f10c4a85a14b59c1c2d63d6200122f144b42e495dabdc997bf1c917e62" dependencies = [ "blake2b_simd", "frc42_hasher", @@ -4020,15 +3992,13 @@ dependencies = [ [[package]] name = "fvm" -version = "4.1.2" +version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aa28091abfa865076e1afc15f008ef3b26c7cfa11291f5e5742665cc4746969" +checksum = "f1cffe3c513337263e8f07825f1f3e4749a3a16e239af144c12314e912920d63" dependencies = [ "ambassador", "anyhow", "arbitrary", - "blake2b_simd", - "byteorder", "cid", "derive_more 0.99.18", "filecoin-proofs-api", @@ -4036,15 +4006,13 @@ dependencies = [ "fvm_ipld_amt", "fvm_ipld_blockstore", "fvm_ipld_encoding", - "fvm_ipld_hamt 0.9.0", + "fvm_ipld_hamt", "fvm_shared", "lazy_static", "log", "minstant", "multihash 0.18.1", "num-traits", - "num_cpus", - "once_cell", "quickcheck", "rand", "rayon", @@ -4052,7 +4020,7 @@ dependencies = [ "serde", "serde_tuple", "static_assertions", - "thiserror", + "thiserror 1.0.69", "wasmtime", "wasmtime-environ", "wasmtime-runtime", @@ -4084,7 +4052,7 @@ dependencies = [ "itertools 0.11.0", "once_cell", "serde", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4095,7 +4063,7 @@ checksum = "da94287cafa663c2e295fe45c4c9dbf5ab7b52f648568f9ae3823deaf9873a89" dependencies = [ "fvm_ipld_encoding", "serde", - "thiserror", + "thiserror 1.0.69", "unsigned-varint 0.7.2", ] @@ -4121,7 +4089,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding", "serde", - "thiserror", + "thiserror 1.0.69", "unsigned-varint 0.7.2", ] @@ -4139,27 +4107,7 @@ dependencies = [ "serde_ipld_dagcbor", "serde_repr", "serde_tuple", - "thiserror", -] - -[[package]] -name = "fvm_ipld_hamt" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a53e14c789449cec999ca0e93d909490c921b967adb7a9ec8f12286fb809bd" -dependencies = [ - "anyhow", - "byteorder", - "cid", - "forest_hash_utils", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", - "libipld-core", - "multihash 0.18.1", - "once_cell", - "serde", - "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4179,30 +4127,29 @@ dependencies = [ "once_cell", "serde", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "fvm_sdk" -version = "4.1.2" +version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e58331aefe4b5592c59abfd4d94c62b23ea61d1e121202fbc2fb6abd2fcb165" +checksum = "7e53061f4d51562b90fb3fe9be7a3ab9650a9bd8f08cc6b48d25e6bfe052a21b" dependencies = [ - "byteorder", "cid", "fvm_ipld_encoding", "fvm_shared", "lazy_static", "log", "num-traits", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "fvm_shared" -version = "4.1.2" +version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95f9a003148f592d1b24124b27c9a52f00902b23233515b45b65730dbbfc0c03" +checksum = "9d3355d3bd2eb159a734a06d67dbb21b067a99540f5aefaf7d0d26503ccc73e3" dependencies = [ "anyhow", "arbitrary", @@ -4224,7 +4171,7 @@ dependencies = [ "quickcheck", "serde", "serde_tuple", - "thiserror", + "thiserror 1.0.69", "unsigned-varint 0.7.2", ] @@ -4237,19 +4184,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "fxprof-processed-profile" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" -dependencies = [ - "bitflags 2.6.0", - "debugid", - "fxhash", - "serde", - "serde_json", -] - [[package]] name = "gcra" version = "0.4.0" @@ -4257,7 +4191,7 @@ source = "git+https://github.com/consensus-shipyard/gcra-rs.git?branch=main#621a dependencies = [ "dashmap", "rustc-hash 1.1.0", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4305,12 +4239,12 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" dependencies = [ "fallible-iterator", - "indexmap 1.9.3", + "indexmap 2.6.0", "stable_deref_trait", ] @@ -4418,6 +4352,9 @@ name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash 0.8.11", +] [[package]] name = "hashbrown" @@ -4554,7 +4491,7 @@ dependencies = [ "once_cell", "rand", "socket2", - "thiserror", + "thiserror 1.0.69", "tinyvec", "tokio", "tracing", @@ -4577,7 +4514,7 @@ dependencies = [ "rand", "resolv-conf", "smallvec", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -5154,7 +5091,7 @@ dependencies = [ "fnv", "fvm_ipld_blockstore", "fvm_ipld_encoding", - "fvm_ipld_hamt 0.9.0", + "fvm_ipld_hamt", "fvm_shared", "integer-encoding", "ipc-types", @@ -5168,7 +5105,7 @@ dependencies = [ "serde_tuple", "serde_with 2.3.3", "strum", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -5182,7 +5119,7 @@ dependencies = [ "base64 0.21.7", "bytes", "cid", - "clap 4.5.20", + "clap 4.5.21", "clap_complete", "env_logger 0.10.2", "ethers", @@ -5210,7 +5147,7 @@ dependencies = [ "serde_json", "serde_tuple", "strum", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-tungstenite 0.18.0", "toml 0.7.8", @@ -5273,7 +5210,7 @@ dependencies = [ "serde_with 2.3.3", "strum", "tempfile", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-tungstenite 0.18.0", "toml 0.8.19", @@ -5292,7 +5229,7 @@ dependencies = [ "fvm_ipld_amt", "fvm_ipld_blockstore", "fvm_ipld_encoding", - "fvm_ipld_hamt 0.9.0", + "fvm_ipld_hamt", "fvm_shared", "hex", "indexmap 1.9.3", @@ -5302,7 +5239,7 @@ dependencies = [ "num-derive 0.3.3", "num-traits", "serde", - "thiserror", + "thiserror 1.0.69", "uint", ] @@ -5330,7 +5267,7 @@ dependencies = [ "serde_ipld_dagcbor", "serde_json", "tempfile", - "thiserror", + "thiserror 1.0.69", "tokio", "xsalsa20poly1305", "zeroize", @@ -5358,7 +5295,7 @@ dependencies = [ "env_logger 0.10.2", "fvm_ipld_blockstore", "fvm_ipld_encoding", - "fvm_ipld_hamt 0.9.0", + "fvm_ipld_hamt", "fvm_shared", "gcra", "ipc-api", @@ -5378,7 +5315,7 @@ dependencies = [ "rand", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", ] @@ -5453,6 +5390,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -5598,7 +5544,7 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" dependencies = [ - "regex-automata 0.4.8", + "regex-automata 0.4.9", ] [[package]] @@ -5640,7 +5586,7 @@ dependencies = [ "libipld-macro", "log", "multihash 0.18.1", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5651,7 +5597,7 @@ checksum = "77d98c9d1747aa5eef1cf099cd648c3fd2d235249f5fed07522aaebc348e423b" dependencies = [ "byteorder", "libipld-core", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5666,7 +5612,7 @@ dependencies = [ "multibase", "multihash 0.18.1", "serde", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5728,7 +5674,7 @@ dependencies = [ "multiaddr", "pin-project", "rw-stream-sink", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5755,7 +5701,7 @@ dependencies = [ "libipld", "libp2p", "prometheus", - "thiserror", + "thiserror 1.0.69", "tracing", "unsigned-varint 0.7.2", ] @@ -5794,7 +5740,7 @@ dependencies = [ "rw-stream-sink", "serde", "smallvec", - "thiserror", + "thiserror 1.0.69", "tracing", "unsigned-varint 0.8.0", "void", @@ -5867,7 +5813,7 @@ dependencies = [ "quick-protobuf", "quick-protobuf-codec 0.3.1", "smallvec", - "thiserror", + "thiserror 1.0.69", "tracing", "void", ] @@ -5888,7 +5834,7 @@ dependencies = [ "rand", "serde", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", "tracing", "zeroize", ] @@ -5917,7 +5863,7 @@ dependencies = [ "serde", "sha2 0.10.8", "smallvec", - "thiserror", + "thiserror 1.0.69", "tracing", "uint", "void", @@ -6002,7 +5948,7 @@ dependencies = [ "sha2 0.10.8", "snow", "static_assertions", - "thiserror", + "thiserror 1.0.69", "tracing", "x25519-dalek", "zeroize", @@ -6061,7 +6007,7 @@ dependencies = [ "ring 0.17.8", "rustls 0.23.16", "socket2", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -6153,7 +6099,7 @@ dependencies = [ "ring 0.17.8", "rustls 0.23.16", "rustls-webpki 0.101.7", - "thiserror", + "thiserror 1.0.69", "x509-parser", "yasna", ] @@ -6183,7 +6129,7 @@ dependencies = [ "either", "futures", "libp2p-core", - "thiserror", + "thiserror 1.0.69", "tracing", "yamux 0.12.1", "yamux 0.13.3", @@ -6433,7 +6379,7 @@ dependencies = [ "render-tree", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -6658,7 +6604,7 @@ dependencies = [ "anyhow", "byteorder", "paste", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -6672,7 +6618,7 @@ dependencies = [ "log", "netlink-packet-core", "netlink-sys", - "thiserror", + "thiserror 1.0.69", "tokio", ] @@ -6872,13 +6818,13 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "crc32fast", - "hashbrown 0.13.2", - "indexmap 1.9.3", + "hashbrown 0.14.5", + "indexmap 2.6.0", "memchr", ] @@ -7230,7 +7176,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.69", "ucd-trie", ] @@ -7528,7 +7474,7 @@ version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" dependencies = [ - "thiserror", + "thiserror 1.0.69", "toml 0.5.11", ] @@ -7611,7 +7557,7 @@ dependencies = [ "parking_lot", "procfs", "protobuf", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -7647,7 +7593,7 @@ dependencies = [ "lazy_static", "log", "prometheus", - "thiserror", + "thiserror 1.0.69", "tiny_http", ] @@ -7707,9 +7653,9 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] name = "psm" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" +checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810" dependencies = [ "cc", ] @@ -7738,7 +7684,7 @@ dependencies = [ "asynchronous-codec 0.6.2", "bytes", "quick-protobuf", - "thiserror", + "thiserror 1.0.69", "unsigned-varint 0.7.2", ] @@ -7751,7 +7697,7 @@ dependencies = [ "asynchronous-codec 0.7.0", "bytes", "quick-protobuf", - "thiserror", + "thiserror 1.0.69", "unsigned-varint 0.8.0", ] @@ -7789,9 +7735,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" dependencies = [ "bytes", "futures-io", @@ -7801,26 +7747,29 @@ dependencies = [ "rustc-hash 2.0.0", "rustls 0.23.16", "socket2", - "thiserror", + "thiserror 2.0.3", "tokio", "tracing", ] [[package]] name = "quinn-proto" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" dependencies = [ "bytes", + "getrandom", "rand", "ring 0.17.8", "rustc-hash 2.0.0", "rustls 0.23.16", + "rustls-pki-types", "slab", - "thiserror", + "thiserror 2.0.3", "tinyvec", "tracing", + "web-time", ] [[package]] @@ -7949,7 +7898,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -7973,7 +7922,7 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "regex-syntax 0.8.5", ] @@ -7988,9 +7937,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -8194,7 +8143,7 @@ dependencies = [ "netlink-packet-route", "netlink-proto", "nix", - "thiserror", + "thiserror 1.0.69", "tokio", ] @@ -8352,6 +8301,9 @@ name = "rustls-pki-types" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" +dependencies = [ + "web-time", +] [[package]] name = "rustls-webpki" @@ -8575,9 +8527,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] @@ -8602,9 +8554,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", @@ -8828,9 +8780,9 @@ dependencies = [ [[package]] name = "sha2raw" -version = "11.1.0" +version = "13.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05310f1b1ceedfef5da1f80b6690342aec43713a79d1c303fa7b451f4e313de" +checksum = "73744f6a373edfc5624f452ec705a762e1154bb88c6699242bf37c56d99a6ebb" dependencies = [ "byteorder", "cpufeatures", @@ -8903,7 +8855,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint", "num-traits", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -8987,7 +8939,7 @@ dependencies = [ "lalrpop", "lalrpop-util", "phf", - "thiserror", + "thiserror 1.0.69", "unicode-xid", ] @@ -9046,9 +8998,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "storage-proofs-core" -version = "16.1.0" +version = "18.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568106d9e94bd28082551873fe36e0295de24770e67cecdd25f345a1b39664f7" +checksum = "390385ae6787ad5d4312f3b6f0462c9f6615d9a7863376f8636604e6e43f3d28" dependencies = [ "aes", "anyhow", @@ -9076,14 +9028,14 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "storage-proofs-porep" -version = "16.1.0" +version = "18.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4d3d0dd1f03de0f4a3ea54ceed7d79c62e3c7963abe2014db0934e828514b54" +checksum = "6dd8c6bbeb00933edb41152fdabf28d2519d6a1b6ea176a793e3198a07bb9acd" dependencies = [ "anyhow", "bellperson", @@ -9123,20 +9075,17 @@ dependencies = [ [[package]] name = "storage-proofs-post" -version = "16.1.0" +version = "18.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4817014940a69e7e84aa459afa3d7a0b81090a312d9918089f14810e988ac24" +checksum = "779fbfe1455a57d2a7fd655ce1b2e97bf9f238b65c71919e92aa9df8f2ced8b1" dependencies = [ "anyhow", "bellperson", - "blake2b_simd", "blstrs 0.7.1", "byteorder", "ff 0.13.0", "filecoin-hashers", - "fr32", "generic-array 0.14.7", - "hex", "log", "rayon", "serde", @@ -9146,9 +9095,9 @@ dependencies = [ [[package]] name = "storage-proofs-update" -version = "16.1.0" +version = "18.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5374a6a435d62e23700a08e124a8b4756ddd937fd6152289346481bfdbac21f5" +checksum = "ee4b391917dbcffa2297295971a02cc54aa19aa8b5378d539a435e78f8050153" dependencies = [ "anyhow", "bellperson", @@ -9275,7 +9224,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", "url", "zip", ] @@ -9527,12 +9476,12 @@ dependencies = [ "subtle-encoding", "tendermint 0.31.1", "tendermint-config 0.31.1", - "thiserror", + "thiserror 1.0.69", "time", "tokio", "tracing", "url", - "uuid 0.8.2", + "uuid", "walkdir", ] @@ -9571,7 +9520,16 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +dependencies = [ + "thiserror-impl 2.0.3", ] [[package]] @@ -9585,6 +9543,17 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "thiserror-impl" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "thread_local" version = "1.1.8" @@ -9978,7 +9947,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ "crossbeam-channel", - "thiserror", + "thiserror 1.0.69", "time", "tracing-subscriber", ] @@ -10089,7 +10058,7 @@ dependencies = [ "rand", "rustls 0.20.9", "sha1", - "thiserror", + "thiserror 1.0.69", "url", "utf-8", "webpki 0.22.4", @@ -10110,7 +10079,7 @@ dependencies = [ "rand", "rustls 0.21.12", "sha1", - "thiserror", + "thiserror 1.0.69", "url", "utf-8", ] @@ -10276,12 +10245,6 @@ dependencies = [ "serde", ] -[[package]] -name = "uuid" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" - [[package]] name = "valuable" version = "0.1.0" @@ -10315,13 +10278,13 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vm_api" version = "1.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?tag=v12.0.0#b86938e410daebf27f9397fd622370a16b24f58b" +source = "git+https://github.com/filecoin-project/builtin-actors?tag=v15.0.0#831bf1b9fe281835409c39a8c454a68dd3200bbc" dependencies = [ "anyhow", "cid", "fvm_ipld_blockstore", "fvm_ipld_encoding", - "fvm_ipld_hamt 0.8.0", + "fvm_ipld_hamt", "fvm_shared", "num-derive 0.3.3", "num-traits", @@ -10439,9 +10402,9 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.31.1" +version = "0.201.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41763f20eafed1399fff1afb466496d3a959f58241436cfdc17e3f5ca954de16" +checksum = "b9c7d2731df60006819b013f64ccc2019691deccf6e11a1804bc850cd6748f1a" dependencies = [ "leb128", ] @@ -10458,19 +10421,20 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.110.0" +version = "0.121.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dfcdb72d96f01e6c85b6bf20102e7423bdbaad5c337301bab2bbf253d26413c" +checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ + "bitflags 2.6.0", "indexmap 2.6.0", "semver", ] [[package]] name = "wasmparser" -version = "0.121.2" +version = "0.201.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" +checksum = "84e5df6dba6c0d7fafc63a450f1738451ed7a0b52295d83e868218fa286bf708" dependencies = [ "bitflags 2.6.0", "indexmap 2.6.0", @@ -10489,63 +10453,65 @@ dependencies = [ [[package]] name = "wasmtime" -version = "12.0.2" +version = "19.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4e87029cc5760db9a3774aff4708596fe90c20ed2baeef97212e98b812fd0fc" +checksum = "4e300c0e3f19dc9064e3b17ce661088646c70dbdde36aab46470ed68ba58db7d" dependencies = [ "anyhow", "bincode", "bumpalo", "cfg-if", - "fxprof-processed-profile", + "gimli 0.28.1", "indexmap 2.6.0", "libc", "log", - "object 0.31.1", + "object 0.32.2", "once_cell", "paste", - "psm", "rayon", + "rustix", "serde", + "serde_derive", "serde_json", "target-lexicon", - "wasm-encoder 0.31.1", - "wasmparser 0.110.0", + "wasmparser 0.201.0", "wasmtime-cranelift", "wasmtime-environ", - "wasmtime-jit", + "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.48.0", + "wasmtime-slab", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-asm-macros" -version = "12.0.2" +version = "19.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d84f68d831200016e120f2ee79d81b50cf4c4123112914aefb168d036d445d" +checksum = "110aa598e02a136fb095ca70fa96367fc16bab55256a131e66f9b58f16c73daf" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cranelift" -version = "12.0.2" +version = "19.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae8ed7a4845f22be6b1ad80f33f43fa03445b03a02f2d40dca695129769cd1a" +checksum = "e923262451a4b5b39fe02f69f1338d56356db470e289ea1887346b9c7f592738" dependencies = [ "anyhow", + "cfg-if", "cranelift-codegen", "cranelift-control", "cranelift-entity", "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.27.3", + "gimli 0.28.1", "log", - "object 0.31.1", + "object 0.32.2", "target-lexicon", - "thiserror", - "wasmparser 0.110.0", + "thiserror 1.0.69", + "wasmparser 0.201.0", "wasmtime-cranelift-shared", "wasmtime-environ", "wasmtime-versioned-export-macros", @@ -10553,89 +10519,57 @@ dependencies = [ [[package]] name = "wasmtime-cranelift-shared" -version = "12.0.2" +version = "19.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b17099f9320a1c481634d88101258917d5065717cf22b04ed75b1a8ea062b4" +checksum = "508898cbbea0df81a5d29cfc1c7c72431a1bc4c9e89fd9514b4c868474c05c7a" dependencies = [ "anyhow", "cranelift-codegen", "cranelift-control", "cranelift-native", - "gimli 0.27.3", - "object 0.31.1", + "gimli 0.28.1", + "object 0.32.2", "target-lexicon", "wasmtime-environ", ] [[package]] name = "wasmtime-environ" -version = "12.0.2" +version = "19.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b9227b1001229ff125e0f76bf1d5b9dc4895e6bcfd5cc35a56f84685964ec7" +checksum = "d7e3f2aa72dbb64c19708646e1ff97650f34e254598b82bad5578ea9c80edd30" dependencies = [ "anyhow", + "bincode", "cranelift-entity", - "gimli 0.27.3", + "gimli 0.28.1", "indexmap 2.6.0", "log", - "object 0.31.1", + "object 0.32.2", "serde", + "serde_derive", "target-lexicon", - "thiserror", - "wasmparser 0.110.0", + "thiserror 1.0.69", + "wasmparser 0.201.0", "wasmtime-types", ] -[[package]] -name = "wasmtime-jit" -version = "12.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce606b392c321d7272928003543447119ef937a9c3ebfce5c4bb0bf6b0f5bac" -dependencies = [ - "addr2line 0.20.0", - "anyhow", - "bincode", - "cfg-if", - "cpp_demangle", - "gimli 0.27.3", - "log", - "object 0.31.1", - "rustc-demangle", - "rustix", - "serde", - "target-lexicon", - "wasmtime-environ", - "wasmtime-jit-icache-coherence", - "wasmtime-runtime", - "windows-sys 0.48.0", -] - -[[package]] -name = "wasmtime-jit-debug" -version = "12.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aef27ea6c34ef888030d15560037fe7ef27a5609fbbba8e1e3e41dc4245f5bb2" -dependencies = [ - "once_cell", - "wasmtime-versioned-export-macros", -] - [[package]] name = "wasmtime-jit-icache-coherence" -version = "12.0.2" +version = "19.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b59f94b0409221873565419168e20b5aedf18c4bd64de5c38acf8f0634efeee3" +checksum = "c22ca2ef4d87b23d400660373453e274b2251bc2d674e3102497f690135e04b0" dependencies = [ "cfg-if", "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-runtime" -version = "12.0.2" +version = "19.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceb587a88ae5bb6ca248455a391aff29ac63329a404b2cdea36d91267c797db4" +checksum = "1806ee242ca4fd183309b7406e4e83ae7739b7569f395d56700de7c7ef9f5eb8" dependencies = [ "anyhow", "cc", @@ -10647,40 +10581,53 @@ dependencies = [ "memfd", "memoffset", "paste", - "rand", + "psm", "rustix", "sptr", - "wasm-encoder 0.31.1", + "wasm-encoder 0.201.0", "wasmtime-asm-macros", "wasmtime-environ", - "wasmtime-jit-debug", "wasmtime-versioned-export-macros", - "windows-sys 0.48.0", + "wasmtime-wmemcheck", + "windows-sys 0.52.0", ] +[[package]] +name = "wasmtime-slab" +version = "19.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20c58bef9ce877fd06acb58f08d003af17cb05cc51225b455e999fbad8e584c0" + [[package]] name = "wasmtime-types" -version = "12.0.2" +version = "19.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77943729d4b46141538e8d0b6168915dc5f88575ecdfea26753fd3ba8bab244a" +checksum = "cebe297aa063136d9d2e5b347c1528868aa43c2c8d0e1eb0eec144567e38fe0f" dependencies = [ "cranelift-entity", "serde", - "thiserror", - "wasmparser 0.110.0", + "serde_derive", + "thiserror 1.0.69", + "wasmparser 0.201.0", ] [[package]] name = "wasmtime-versioned-export-macros" -version = "12.0.2" +version = "19.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca7af9bb3ee875c4907835e607a275d10b04d15623d3aebe01afe8fbd3f85050" +checksum = "ffaafa5c12355b1a9ee068e9295d50c4ca0a400c721950cdae4f5b54391a2da5" dependencies = [ "proc-macro2", "quote", "syn 2.0.87", ] +[[package]] +name = "wasmtime-wmemcheck" +version = "19.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9a8c62e9df8322b2166d2a6f096fbec195ddb093748fd74170dcf25ef596769" + [[package]] name = "web-sys" version = "0.3.72" @@ -11002,7 +10949,7 @@ dependencies = [ "pharos", "rustc_version", "send_wrapper 0.6.0", - "thiserror", + "thiserror 1.0.69", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -11042,7 +10989,7 @@ dependencies = [ "nom", "oid-registry", "rusticata-macros", - "thiserror", + "thiserror 1.0.69", "time", ] diff --git a/Cargo.toml b/Cargo.toml index 966fd4c44..1ecd69560 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -194,9 +194,10 @@ openssl = { version = "0.10", features = ["vendored"] } # pull in crates as transitive dependencies that do not support Wasm architector. If this # happens, try removing "crypto" feature from fvm_shared dependency in contracts/binding/Cargo.toml # and run `cargo build`. Then add the "crypto" feature back and run `cargo build` again. -fvm = { version = "4.1.0", default-features = false } # no opencl feature or it fails on CI -fvm_shared = { version = "4.1.0" } -fvm_sdk = { version = "4.1.0" } +fvm = { version = "4.3.0", default-features = false } # no opencl feature or it fails on CI +fvm_shared = { version = "4.3.0" } +fvm_sdk = { version = "4.3.0" } + fvm_ipld_blockstore = "0.2.0" fvm_ipld_car = "0.7.1" @@ -216,9 +217,9 @@ fvm_ipld_amt = "0.6.2" # to cut down the time it takes to compile everything. However, some projects have a "shared" part, # and this copy-paste is clunky, so at least for those that have it, we should use it. # Keep the version here in sync with the Makefile! -fil_actors_evm_shared = { git = "https://github.com/filecoin-project/builtin-actors", tag = "v12.0.0" } -fil_actor_eam = { git = "https://github.com/filecoin-project/builtin-actors", tag = "v12.0.0" } -fil_actors_runtime = { git = "https://github.com/filecoin-project/builtin-actors", tag = "v12.0.0" } +fil_actors_evm_shared = { git = "https://github.com/filecoin-project/builtin-actors", tag = "v15.0.0" } +fil_actor_eam = { git = "https://github.com/filecoin-project/builtin-actors", tag = "v15.0.0" } +fil_actors_runtime = { git = "https://github.com/filecoin-project/builtin-actors", tag = "v15.0.0" } fendermint_actor_eam = { path = "./fendermint/actors/eam" } @@ -227,7 +228,7 @@ cid = { version = "0.10.1", default-features = false, features = [ "std", ] } -frc42_dispatch = "6.0.0" +frc42_dispatch = "7.0.0" # Using the same tendermint-rs dependency as tower-abci. From both we are interested in v037 modules. tower-abci = { version = "0.7" } @@ -254,3 +255,4 @@ opt-level = "z" strip = true codegen-units = 1 incremental = false + diff --git a/fendermint/Makefile b/fendermint/Makefile index 92a668994..ef76d32d6 100644 --- a/fendermint/Makefile +++ b/fendermint/Makefile @@ -1,6 +1,6 @@ .PHONY: all build test lint license check-fmt check-clippy actor-bundle -BUILTIN_ACTORS_TAG ?= v12.0.0 +BUILTIN_ACTORS_TAG ?= v15.0.0 BUILTIN_ACTORS_BUNDLE := $(PWD)/builtin-actors/output/bundle.car CUSTOM_ACTORS_BUNDLE := $(PWD)/actors/output/custom_actors_bundle.car From 3c4d902894013f371899bbb1ca51e2ab0ca16b85 Mon Sep 17 00:00:00 2001 From: LePremierHomme <57456510+LePremierHomme@users.noreply.github.com> Date: Wed, 20 Nov 2024 18:44:47 +0530 Subject: [PATCH 2/6] use `frc42_dispatch` latest rev, instead of crates.io publication --- Cargo.lock | 401 ++++++++++++++++++++++++++++++----------------------- Cargo.toml | 8 +- 2 files changed, 229 insertions(+), 180 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d22087718..579680833 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -608,7 +608,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object 0.36.5", + "object", "rustc-demangle", "windows-targets 0.52.6", ] @@ -1304,6 +1304,12 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" +[[package]] +name = "cobs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" + [[package]] name = "coins-bip32" version = "0.8.7" @@ -1437,9 +1443,12 @@ checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "convert_case" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] [[package]] name = "core-foundation" @@ -1477,73 +1486,86 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.106.2" +version = "0.112.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b57d4f3ffc28bbd6ef1ca7b50b20126717232f97487efe027d135d9d87eb29c" +checksum = "69792bd40d21be8059f7c709f44200ded3bbd073df7eb3fa3c282b387c7ffa5b" dependencies = [ "cranelift-entity", ] +[[package]] +name = "cranelift-bitset" +version = "0.112.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38da1eb6f7d8cdfa92f05acfae63c9a1d7a337e49ce7a2d0769c7fa03a2613a5" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "cranelift-codegen" -version = "0.106.2" +version = "0.112.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1f7d0ac7fd53f2c29db3ff9a063f6ff5a8be2abaa8f6942aceb6e1521e70df7" +checksum = "709f5567a2bff9f06edf911a7cb5ebb091e4c81701714dc6ab574d08b4a69a0d" dependencies = [ "bumpalo", "cranelift-bforest", + "cranelift-bitset", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-control", "cranelift-entity", "cranelift-isle", - "gimli 0.28.1", + "gimli 0.29.0", "hashbrown 0.14.5", "log", "regalloc2", + "rustc-hash 2.0.0", "smallvec", "target-lexicon", ] [[package]] name = "cranelift-codegen-meta" -version = "0.106.2" +version = "0.112.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40bf21460a600178956cb7fd900a7408c6587fbb988a8063f7215361801a1da" +checksum = "72d39a6b194c069fd091ca1f17b9d86ff1a4627ccad8806095828f61989a691f" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.106.2" +version = "0.112.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d792ecc1243b7ebec4a7f77d9ed428ef27456eeb1f8c780587a6f5c38841be19" +checksum = "18f81aefad1f80ed4132ae33f40b92779eeb57edeb1e28bb24424a4098c963a2" [[package]] name = "cranelift-control" -version = "0.106.2" +version = "0.112.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea2808043df964b73ad7582e09afbbe06a31f3fb9db834d53e74b4e16facaeb" +checksum = "6adbaac785ad4683c4f199686f9e15c1471f52ae2f4c013a3be039b4719db754" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.106.2" +version = "0.112.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1930946836da6f514da87625cd1a0331f3908e0de454628c24a0b97b130c4d4" +checksum = "70b85ed43567e13782cd1b25baf42a8167ee57169a60dfd3d7307c6ca3839da0" dependencies = [ + "cranelift-bitset", "serde", "serde_derive", ] [[package]] name = "cranelift-frontend" -version = "0.106.2" +version = "0.112.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5482a5fcdf98f2f31b21093643bdcfe9030866b8be6481117022e7f52baa0f2b" +checksum = "8349f71373bb69c6f73992c6c1606236a66c8134e7a60e04e03fbd64b1aa7dcf" dependencies = [ "cranelift-codegen", "log", @@ -1553,15 +1575,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.106.2" +version = "0.112.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f6e1869b6053383bdb356900e42e33555b4c9ebee05699469b7c53cdafc82ea" +checksum = "464a6b958ce05e0c237c8b25508012b6c644e8c37348213a8c786ba29e28cfdb" [[package]] name = "cranelift-native" -version = "0.106.2" +version = "0.112.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91446e8045f1c4bc164b7bba68e2419c623904580d4b730877a663c6da38964" +checksum = "ffc4acaf6894ee323ff4e9ce786bec09f0ebbe49941e8012f1c1052f1d965034" dependencies = [ "cranelift-codegen", "libc", @@ -1570,9 +1592,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.106.2" +version = "0.112.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8b17979b862d3b0d52de6ae3294ffe4d86c36027b56ad0443a7c8c8f921d14f" +checksum = "b878860895cca97454ef8d8b12bfda9d0889dd49efee175dba78d54ff8363ec2" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1580,7 +1602,7 @@ dependencies = [ "itertools 0.12.1", "log", "smallvec", - "wasmparser 0.201.0", + "wasmparser 0.217.0", "wasmtime-types", ] @@ -1906,19 +1928,6 @@ dependencies = [ "syn 2.0.87", ] -[[package]] -name = "derive_more" -version = "0.99.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version", - "syn 2.0.87", -] - [[package]] name = "derive_more" version = "1.0.0" @@ -1934,9 +1943,11 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ + "convert_case", "proc-macro2", "quote", "syn 2.0.87", + "unicode-xid", ] [[package]] @@ -2185,6 +2196,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + +[[package]] +name = "embedded-io" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" + [[package]] name = "ena" version = "0.14.3" @@ -3784,8 +3807,7 @@ 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?rev=0f8365151f44785f7bead4e5500258fd5c8944e6#0f8365151f44785f7bead4e5500258fd5c8944e6" dependencies = [ "frc42_hasher", "frc42_macros", @@ -3798,8 +3820,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?rev=0f8365151f44785f7bead4e5500258fd5c8944e6#0f8365151f44785f7bead4e5500258fd5c8944e6" dependencies = [ "fvm_sdk", "fvm_shared", @@ -3809,8 +3830,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?rev=0f8365151f44785f7bead4e5500258fd5c8944e6#0f8365151f44785f7bead4e5500258fd5c8944e6" dependencies = [ "blake2b_simd", "frc42_hasher", @@ -3992,15 +4012,15 @@ dependencies = [ [[package]] name = "fvm" -version = "4.3.3" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1cffe3c513337263e8f07825f1f3e4749a3a16e239af144c12314e912920d63" +checksum = "7e2bc545e9b8a6c4e08ec78c712469c542b3e9310ae3091c1b60ddb48e20862b" dependencies = [ "ambassador", "anyhow", "arbitrary", "cid", - "derive_more 0.99.18", + "derive_more", "filecoin-proofs-api", "fvm-wasm-instrument", "fvm_ipld_amt", @@ -4023,7 +4043,6 @@ dependencies = [ "thiserror 1.0.69", "wasmtime", "wasmtime-environ", - "wasmtime-runtime", "yastl", ] @@ -4036,7 +4055,7 @@ dependencies = [ "anyhow", "wasm-encoder 0.20.0", "wasmparser 0.95.0", - "wasmprinter", + "wasmprinter 0.2.80", ] [[package]] @@ -4132,9 +4151,9 @@ dependencies = [ [[package]] name = "fvm_sdk" -version = "4.3.3" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e53061f4d51562b90fb3fe9be7a3ab9650a9bd8f08cc6b48d25e6bfe052a21b" +checksum = "3b2df521d41de41c34ac712720abdd6e29e68e3ed922554db70dbf8bc49a82b7" dependencies = [ "cid", "fvm_ipld_encoding", @@ -4147,9 +4166,9 @@ dependencies = [ [[package]] name = "fvm_shared" -version = "4.3.3" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d3355d3bd2eb159a734a06d67dbb21b067a99540f5aefaf7d0d26503ccc73e3" +checksum = "bb7838d3fc1eeeb47c7a8e32bdc3b37e6d806ac261cb96e38f15b503df671648" dependencies = [ "anyhow", "arbitrary", @@ -4172,7 +4191,7 @@ dependencies = [ "serde", "serde_tuple", "thiserror 1.0.69", - "unsigned-varint 0.7.2", + "unsigned-varint 0.8.0", ] [[package]] @@ -4239,9 +4258,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" dependencies = [ "fallible-iterator", "indexmap 2.6.0", @@ -4338,15 +4357,6 @@ dependencies = [ "ahash 0.7.8", ] -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash 0.8.11", -] - [[package]] name = "hashbrown" version = "0.14.5" @@ -4354,6 +4364,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", + "serde", ] [[package]] @@ -4419,6 +4430,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + [[package]] name = "heck" version = "0.5.0" @@ -4875,6 +4892,12 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "id-arena" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" + [[package]] name = "ident_case" version = "1.0.1" @@ -6298,10 +6321,10 @@ dependencies = [ ] [[package]] -name = "mach" -version = "0.3.2" +name = "mach2" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" dependencies = [ "libc", ] @@ -6361,15 +6384,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - [[package]] name = "merkle-tree-rs" version = "0.1.0" @@ -6816,24 +6830,15 @@ dependencies = [ "syn 2.0.87", ] -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "crc32fast", - "hashbrown 0.14.5", - "indexmap 2.6.0", - "memchr", -] - [[package]] name = "object" version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ + "crc32fast", + "hashbrown 0.15.1", + "indexmap 2.6.0", "memchr", ] @@ -7403,6 +7408,18 @@ dependencies = [ "winapi", ] +[[package]] +name = "postcard" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e" +dependencies = [ + "cobs", + "embedded-io 0.4.0", + "embedded-io 0.6.1", + "serde", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -7903,13 +7920,13 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.9.3" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" +checksum = "12908dbeb234370af84d0579b9f68258a0f67e201412dd9a2814e6f45b2fc0f0" dependencies = [ - "hashbrown 0.13.2", + "hashbrown 0.14.5", "log", - "rustc-hash 1.1.0", + "rustc-hash 2.0.0", "slice-group-by", "smallvec", ] @@ -8374,7 +8391,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aa7ffc1c0ef49b0452c6e2986abf2b07743320641ffd5fc63d552458e3b779b" dependencies = [ "cfg-if", - "derive_more 1.0.0", + "derive_more", "parity-scale-codec", "scale-info-derive", ] @@ -8895,6 +8912,9 @@ name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] [[package]] name = "snap" @@ -10402,9 +10422,9 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.201.0" +version = "0.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9c7d2731df60006819b013f64ccc2019691deccf6e11a1804bc850cd6748f1a" +checksum = "7b88b0814c9a2b323a9b46c687e726996c255ac8b64aa237dd11c81ed4854760" dependencies = [ "leb128", ] @@ -10432,13 +10452,16 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.201.0" +version = "0.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84e5df6dba6c0d7fafc63a450f1738451ed7a0b52295d83e868218fa286bf708" +checksum = "ca917a21307d3adf2b9857b94dd05ebf8496bdcff4437a9b9fb3899d3e6c74e7" dependencies = [ + "ahash 0.8.11", "bitflags 2.6.0", + "hashbrown 0.14.5", "indexmap 2.6.0", "semver", + "serde", ] [[package]] @@ -10451,52 +10474,93 @@ dependencies = [ "wasmparser 0.121.2", ] +[[package]] +name = "wasmprinter" +version = "0.217.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dc568b3e0d47e8f96ea547c90790cfa783f0205160c40de894a427114185ce" +dependencies = [ + "anyhow", + "termcolor", + "wasmparser 0.217.0", +] + [[package]] name = "wasmtime" -version = "19.0.2" +version = "25.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e300c0e3f19dc9064e3b17ce661088646c70dbdde36aab46470ed68ba58db7d" +checksum = "f38dbf42dc56a6fe41ccd77211ea8ec90855de05e52cd00df5a0a3bca87d6147" dependencies = [ "anyhow", - "bincode", + "bitflags 2.6.0", "bumpalo", + "cc", "cfg-if", - "gimli 0.28.1", + "hashbrown 0.14.5", "indexmap 2.6.0", "libc", + "libm", "log", - "object 0.32.2", + "mach2", + "memfd", + "object", "once_cell", "paste", + "postcard", + "psm", "rayon", "rustix", "serde", "serde_derive", - "serde_json", + "smallvec", + "sptr", "target-lexicon", - "wasmparser 0.201.0", + "wasmparser 0.217.0", + "wasmtime-asm-macros", + "wasmtime-component-macro", "wasmtime-cranelift", "wasmtime-environ", "wasmtime-jit-icache-coherence", - "wasmtime-runtime", "wasmtime-slab", + "wasmtime-versioned-export-macros", "windows-sys 0.52.0", ] [[package]] name = "wasmtime-asm-macros" -version = "19.0.2" +version = "25.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "110aa598e02a136fb095ca70fa96367fc16bab55256a131e66f9b58f16c73daf" +checksum = "30e0c7f9983c2d60109a939d9ab0e0df301901085c3608e1c22c27c98390a027" dependencies = [ "cfg-if", ] +[[package]] +name = "wasmtime-component-macro" +version = "25.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0929ffffaca32dd8770b56848c94056036963ca05de25fb47cac644e20262168" +dependencies = [ + "anyhow", + "proc-macro2", + "quote", + "syn 2.0.87", + "wasmtime-component-util", + "wasmtime-wit-bindgen", + "wit-parser", +] + +[[package]] +name = "wasmtime-component-util" +version = "25.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc29d2b56629d66d2fd791d1b46471d0016e0d684ed2dc299e870d127082268" + [[package]] name = "wasmtime-cranelift" -version = "19.0.2" +version = "25.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e923262451a4b5b39fe02f69f1338d56356db470e289ea1887346b9c7f592738" +checksum = "f8c8af1197703f4de556a274384adf5db36a146f9892bc9607bad16881e75c80" dependencies = [ "anyhow", "cfg-if", @@ -10506,116 +10570,77 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.28.1", + "gimli 0.29.0", "log", - "object 0.32.2", + "object", + "smallvec", "target-lexicon", "thiserror 1.0.69", - "wasmparser 0.201.0", - "wasmtime-cranelift-shared", + "wasmparser 0.217.0", "wasmtime-environ", "wasmtime-versioned-export-macros", ] -[[package]] -name = "wasmtime-cranelift-shared" -version = "19.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "508898cbbea0df81a5d29cfc1c7c72431a1bc4c9e89fd9514b4c868474c05c7a" -dependencies = [ - "anyhow", - "cranelift-codegen", - "cranelift-control", - "cranelift-native", - "gimli 0.28.1", - "object 0.32.2", - "target-lexicon", - "wasmtime-environ", -] - [[package]] name = "wasmtime-environ" -version = "19.0.2" +version = "25.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7e3f2aa72dbb64c19708646e1ff97650f34e254598b82bad5578ea9c80edd30" +checksum = "3f1b5af7bac868c5bce3b78a366a10677caacf6e6467c156301297e36ed31f3e" dependencies = [ "anyhow", - "bincode", + "cranelift-bitset", "cranelift-entity", - "gimli 0.28.1", + "gimli 0.29.0", "indexmap 2.6.0", "log", - "object 0.32.2", + "object", + "postcard", "serde", "serde_derive", "target-lexicon", - "thiserror 1.0.69", - "wasmparser 0.201.0", + "wasm-encoder 0.217.0", + "wasmparser 0.217.0", + "wasmprinter 0.217.0", "wasmtime-types", ] [[package]] name = "wasmtime-jit-icache-coherence" -version = "19.0.2" +version = "25.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c22ca2ef4d87b23d400660373453e274b2251bc2d674e3102497f690135e04b0" -dependencies = [ - "cfg-if", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "wasmtime-runtime" -version = "19.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1806ee242ca4fd183309b7406e4e83ae7739b7569f395d56700de7c7ef9f5eb8" +checksum = "5d7314e32c624f645ad7d6b9fc3ac89eb7d2b9aa06695d6445cec087958ec27d" dependencies = [ "anyhow", - "cc", "cfg-if", - "indexmap 2.6.0", "libc", - "log", - "mach", - "memfd", - "memoffset", - "paste", - "psm", - "rustix", - "sptr", - "wasm-encoder 0.201.0", - "wasmtime-asm-macros", - "wasmtime-environ", - "wasmtime-versioned-export-macros", - "wasmtime-wmemcheck", "windows-sys 0.52.0", ] [[package]] name = "wasmtime-slab" -version = "19.0.2" +version = "25.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c58bef9ce877fd06acb58f08d003af17cb05cc51225b455e999fbad8e584c0" +checksum = "f75cba1a8cc327839f493cfc3036c9de3d077d59ab76296bc710ee5f95be5391" [[package]] name = "wasmtime-types" -version = "19.0.2" +version = "25.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cebe297aa063136d9d2e5b347c1528868aa43c2c8d0e1eb0eec144567e38fe0f" +checksum = "c6d83a7816947a4974e2380c311eacb1db009b8bad86081dc726b705603c93c7" dependencies = [ + "anyhow", "cranelift-entity", "serde", "serde_derive", - "thiserror 1.0.69", - "wasmparser 0.201.0", + "smallvec", + "wasmparser 0.217.0", ] [[package]] name = "wasmtime-versioned-export-macros" -version = "19.0.2" +version = "25.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffaafa5c12355b1a9ee068e9295d50c4ca0a400c721950cdae4f5b54391a2da5" +checksum = "6879a8e168aef3fe07335343b7fbede12fa494215e83322e173d4018e124a846" dependencies = [ "proc-macro2", "quote", @@ -10623,10 +10648,16 @@ dependencies = [ ] [[package]] -name = "wasmtime-wmemcheck" -version = "19.0.2" +name = "wasmtime-wit-bindgen" +version = "25.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a8c62e9df8322b2166d2a6f096fbec195ddb093748fd74170dcf25ef596769" +checksum = "3f571f63ac1d532e986eb3973bbef3a45e4ae83de521a8d573b0fe0594dc9608" +dependencies = [ + "anyhow", + "heck 0.4.1", + "indexmap 2.6.0", + "wit-parser", +] [[package]] name = "web-sys" @@ -10924,6 +10955,24 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "wit-parser" +version = "0.217.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb893dcd6d370cfdf19a0d9adfcd403efb8e544e1a0ea3a8b81a21fe392eaa78" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 2.6.0", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser 0.217.0", +] + [[package]] name = "write16" version = "1.0.0" diff --git a/Cargo.toml b/Cargo.toml index 1ecd69560..eca33bc9b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -194,9 +194,9 @@ openssl = { version = "0.10", features = ["vendored"] } # pull in crates as transitive dependencies that do not support Wasm architector. If this # happens, try removing "crypto" feature from fvm_shared dependency in contracts/binding/Cargo.toml # and run `cargo build`. Then add the "crypto" feature back and run `cargo build` again. -fvm = { version = "4.3.0", default-features = false } # no opencl feature or it fails on CI -fvm_shared = { version = "4.3.0" } -fvm_sdk = { version = "4.3.0" } +fvm = { version = "4.4.0", default-features = false } # no opencl feature or it fails on CI +fvm_shared = { version = "4.4.0" } +fvm_sdk = { version = "4.4.0" } fvm_ipld_blockstore = "0.2.0" @@ -228,7 +228,7 @@ cid = { version = "0.10.1", default-features = false, features = [ "std", ] } -frc42_dispatch = "7.0.0" +frc42_dispatch = { git = "https://github.com/filecoin-project/actors-utils", rev = "0f8365151f44785f7bead4e5500258fd5c8944e6" } # Using the same tendermint-rs dependency as tower-abci. From both we are interested in v037 modules. tower-abci = { version = "0.7" } From 7ae8f66ec13aec84ebbcf5500a3a6dad5831f408 Mon Sep 17 00:00:00 2001 From: LePremierHomme <57456510+LePremierHomme@users.noreply.github.com> Date: Wed, 20 Nov 2024 21:29:35 +0530 Subject: [PATCH 3/6] add fvm features ["verify-signature"] --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index eca33bc9b..c226151a5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -194,7 +194,7 @@ openssl = { version = "0.10", features = ["vendored"] } # pull in crates as transitive dependencies that do not support Wasm architector. If this # happens, try removing "crypto" feature from fvm_shared dependency in contracts/binding/Cargo.toml # and run `cargo build`. Then add the "crypto" feature back and run `cargo build` again. -fvm = { version = "4.4.0", default-features = false } # no opencl feature or it fails on CI +fvm = { version = "4.4.0", features = ["verify-signature"], default-features = false } # no opencl feature or it fails on CI fvm_shared = { version = "4.4.0" } fvm_sdk = { version = "4.4.0" } From a454ed76269067e78757953215351a3fcfa6d03d Mon Sep 17 00:00:00 2001 From: LePremierHomme <57456510+LePremierHomme@users.noreply.github.com> Date: Thu, 21 Nov 2024 10:43:06 +0530 Subject: [PATCH 4/6] _debug_ --- fendermint/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fendermint/Makefile b/fendermint/Makefile index ef76d32d6..a3b630734 100644 --- a/fendermint/Makefile +++ b/fendermint/Makefile @@ -50,11 +50,15 @@ e2e: docker-build | cargo-make ${MAKE} e2e-only e2e-only: + df -h cd testing/smoke-test && cargo make --profile $(PROFILE) + df -h cd testing/snapshot-test && cargo make --profile $(PROFILE) + df -h cd testing/graph-test && cargo make --profile $(PROFILE) + df -h PROFILE=$(PROFILE) cargo test --locked --package fendermint_materializer - + df -h clean: cargo clean rm $(BUILTIN_ACTORS_BUNDLE) From 0af4ceaa38fb7ed487d4473d2c799a3742a5630f Mon Sep 17 00:00:00 2001 From: LePremierHomme <57456510+LePremierHomme@users.noreply.github.com> Date: Thu, 21 Nov 2024 17:24:31 +0530 Subject: [PATCH 5/6] _debug_ --- fendermint/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fendermint/Makefile b/fendermint/Makefile index a3b630734..3ae268387 100644 --- a/fendermint/Makefile +++ b/fendermint/Makefile @@ -50,15 +50,12 @@ e2e: docker-build | cargo-make ${MAKE} e2e-only e2e-only: - df -h cd testing/smoke-test && cargo make --profile $(PROFILE) - df -h cd testing/snapshot-test && cargo make --profile $(PROFILE) - df -h cd testing/graph-test && cargo make --profile $(PROFILE) - df -h + cargo clean PROFILE=$(PROFILE) cargo test --locked --package fendermint_materializer - df -h + clean: cargo clean rm $(BUILTIN_ACTORS_BUNDLE) From fe2ab23c44f14660df1343d8d3cb3b61e3fd4d86 Mon Sep 17 00:00:00 2001 From: LePremierHomme <57456510+LePremierHomme@users.noreply.github.com> Date: Thu, 21 Nov 2024 17:52:35 +0530 Subject: [PATCH 6/6] apply ${PROFILE} properly --- fendermint/Makefile | 7 +++++-- fendermint/testing/graph-test/Makefile.toml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fendermint/Makefile b/fendermint/Makefile index 3ae268387..6fbe3fa3d 100644 --- a/fendermint/Makefile +++ b/fendermint/Makefile @@ -53,8 +53,11 @@ e2e-only: cd testing/smoke-test && cargo make --profile $(PROFILE) cd testing/snapshot-test && cargo make --profile $(PROFILE) cd testing/graph-test && cargo make --profile $(PROFILE) - cargo clean - PROFILE=$(PROFILE) cargo test --locked --package fendermint_materializer +ifeq ($(PROFILE), release) + cargo test --release --locked --package fendermint_materializer +else + cargo test --locked --package fendermint_materializer +endif clean: cargo clean diff --git a/fendermint/testing/graph-test/Makefile.toml b/fendermint/testing/graph-test/Makefile.toml index 3fe2c024e..0966d5e0a 100644 --- a/fendermint/testing/graph-test/Makefile.toml +++ b/fendermint/testing/graph-test/Makefile.toml @@ -30,7 +30,7 @@ run_task = { name = [ [tasks.greeter-example] script = """ cd ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/fendermint -cargo run -p fendermint_eth_api --example greeter -- \ +cargo run --profile ${PROFILE} -p fendermint_eth_api --example greeter -- \ --secret-key testing/graph-test/test-data/keys/veronica.sk \ --out ${TEST_DATA_DIR}/greeter.json \ ${VERBOSITY}