diff --git a/.cargo/config.toml b/.cargo/config.toml index 4eb6b35778c0..e9173e0425d9 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,38 +1,10 @@ -[alias] -b = "build" -c = "check" -d = "doc" -t = "test" -r = "run" - [build] incremental = true -# might be helpful but we don't enforce sccache installation atm -# https://github.com/mozilla/sccache -# rustc-wrapper = "sccache" - -# For details checkout https://jondot.medium.com/8-steps-for-troubleshooting-your-rust-build-times-2ffc965fd13e -[target.x86_64-unknown-linux-gnu] -# clang has been listed as prerequisite in the doc -linker = "clang" -# enable avx2 by default since it's available on almost all x86_64 CPUs -rustflags = ["-Ctarget-feature=+avx2,+fma", "-Zshare-generics=y", "--cfg", "tokio_unstable"] - -[target.x86_64-unknown-linux-musl] -# clang has been listed as prerequisite in the doc -linker = "clang" -# enable avx2 by default since it's available on almost all x86_64 CPUs -rustflags = ["-Ctarget-feature=+avx2,+fma", "-Zshare-generics=y", "--cfg", "tokio_unstable"] - -[target.x86_64-apple-darwin] -# zld might help here -# brew install michaeleisel/zld/zld -# "-Clink-arg=-fuse-ld=zld" -# For details checkout https://jondot.medium.com/8-steps-for-troubleshooting-your-rust-build-times-2ffc965fd13e -rustflags = ["-Zshare-generics=y", "--cfg", "tokio_unstable"] -[target.aarch64-apple-darwin] -rustflags = ["-Zshare-generics=y", "--cfg", "tokio_unstable"] +# TODO(aatifsyed): remove - this can be pushed out to readme +# In all cases, pass --cfg=tokio_unstable for tokio console integration +# See (https://github.com/ChainSafe/forest/pull/2245) +rustflags = ["--cfg=tokio_unstable"] [net] git-fetch-with-cli = true diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 463a4270aaf6..ccb5d6b42e17 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,8 +14,6 @@ on: - main env: - # https://doc.rust-lang.org/nightly/rustdoc/unstable-features.html#--index-page-provide-a-top-level-landing-page-for-docs - RUSTDOCFLAGS: "-Dwarnings -Zunstable-options --enable-index-page" CACHE_TIMEOUT_MINUTES: 5 SCCACHE_ENDPOINT: ${{ vars.SCCACHE_ENDPOINT }} SCCACHE_BUCKET: ${{ vars.SCCACHE_BUCKET }} @@ -54,8 +52,8 @@ jobs: RUSTFLAGS: "-Cstrip=symbols" - name: Execute MDBook run: make mdbook-build - - name: Build rustdoc - run: make rustdoc + - name: Build vendored docs + run: make vendored-docs env: CC: "sccache clang" CXX: "sccache clang++" diff --git a/.rustfmt.toml b/.rustfmt.toml deleted file mode 100644 index e911a2d03704..000000000000 --- a/.rustfmt.toml +++ /dev/null @@ -1,5 +0,0 @@ -# Doc: https://rust-lang.github.io/rustfmt/ -imports_granularity = "Crate" -group_imports = "StdExternalCrate" -hex_literal_case = "Lower" -wrap_comments = true diff --git a/Cargo.lock b/Cargo.lock index 207857df5538..f80c9be68d81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,22 +2,13 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "addr2line" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" -dependencies = [ - "gimli 0.26.2", -] - [[package]] name = "addr2line" version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ - "gimli 0.27.2", + "gimli", ] [[package]] @@ -698,12 +689,12 @@ version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ - "addr2line 0.19.0", + "addr2line", "cc", "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.30.3", + "object", "rustc-demangle", ] @@ -1581,27 +1572,27 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.89.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "593b398dd0c5b1e2e3a9c3dae8584e287894ea84e361949ad506376e99196265" +checksum = "1277fbfa94bc82c8ec4af2ded3e639d49ca5f7f3c7eeab2c66accd135ece4e70" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.89.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc0d8faabd099ea15ab33d49d150e5572c04cfeb95d675fd41286739b754629" +checksum = "c6e8c31ad3b2270e9aeec38723888fe1b0ace3bea2b06b3f749ccf46661d3220" dependencies = [ - "arrayvec 0.7.2", "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", "cranelift-isle", - "gimli 0.26.2", + "gimli", + "hashbrown 0.13.2", "log", "regalloc2", "smallvec", @@ -1610,33 +1601,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.89.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac1669e42579476f001571d6ba4b825fac686282c97b88b18f8e34242066a81" +checksum = "c8ac5ac30d62b2d66f12651f6b606dbdfd9c2cfd0908de6b387560a277c5c9da" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.89.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2a1b1eef9640ab72c1e7b583ac678083855a509da34b4b4378bd99954127c20" +checksum = "dd82b8b376247834b59ed9bdc0ddeb50f517452827d4a11bccf5937b213748b8" [[package]] name = "cranelift-entity" -version = "0.89.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eea4e17c3791fd8134640b26242a9ddbd7c67db78f0bad98cb778bf563ef81a0" +checksum = "40099d38061b37e505e63f89bab52199037a72b931ad4868d9089ff7268660b0" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.89.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca1474b5302348799656d43a40eacd716a3b46169405a3af812832c9edf77b4" +checksum = "64a25d9d0a0ae3079c463c34115ec59507b4707175454f0eee0891e83e30e82d" dependencies = [ "cranelift-codegen", "log", @@ -1646,15 +1637,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.89.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77aa537f020ea43483100153278e7215d41695bdcef9eea6642d122675f64249" +checksum = "80de6a7d0486e4acbd5f9f87ec49912bf4c8fb6aea00087b989685460d4469ba" [[package]] name = "cranelift-native" -version = "0.89.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bdc6b65241a95b7d8eafbf4e114c082e49b80162a2dcd9c6bcc5989c3310c9e" +checksum = "bb6b03e0e03801c4b3fd8ce0758a94750c07a44e7944cc0ffbf0d3f2e7c79b00" dependencies = [ "cranelift-codegen", "libc", @@ -1663,9 +1654,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.89.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb6359f606a1c80ccaa04fae9dbbb504615ec7a49b6c212b341080fff7a65dd" +checksum = "ff3220489a3d928ad91e59dd7aeaa8b3de18afb554a6211213673a71c90737ac" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1673,7 +1664,7 @@ dependencies = [ "itertools 0.10.5", "log", "smallvec", - "wasmparser 0.92.0", + "wasmparser 0.102.0", "wasmtime-types", ] @@ -2440,17 +2431,6 @@ dependencies = [ "serde", ] -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - [[package]] name = "errno" version = "0.3.1" @@ -2600,14 +2580,14 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "fil_actor_account_state" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b187f415da309f586e78dcb93b0fc2ef4d87c48a83ea10ed67698153c9242c78" +checksum = "aa040a44de760ae56a5b7548041c46a85ede01fc037fd7c456ad1e468d13e30c" dependencies = [ "frc42_dispatch", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", - "fvm_shared 3.3.0", + "fvm_shared 2.4.0", + "fvm_shared 3.3.1", "num-derive", "num-traits", "serde", @@ -2615,13 +2595,13 @@ dependencies = [ [[package]] name = "fil_actor_cron_state" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebf1ba16d3463dbc1994ee13046bbf4779d2b09c09814ceffee02b20469cce1a" +checksum = "fb36b3ee5781626b405e1fe265461eda93c65fd527e6a50440d5846210790d48" dependencies = [ "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", - "fvm_shared 3.3.0", + "fvm_shared 2.4.0", + "fvm_shared 3.3.1", "num-derive", "num-traits", "serde", @@ -2629,17 +2609,17 @@ dependencies = [ [[package]] name = "fil_actor_datacap_state" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a3e19bc02375ac1bd1846f3ec4c9b1d9d9bc1100bf4116ba3fcf833c7b86805" +checksum = "d31986103f2f25a54ee2f0a2ea0a43de9b45df8af352b39d3e6f2afc9b8f6306" dependencies = [ "fil_actors_shared", "frc42_dispatch", "frc46_token", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", - "fvm_shared 3.3.0", + "fvm_shared 2.4.0", + "fvm_shared 3.3.1", "num-derive", "num-traits", "serde", @@ -2647,13 +2627,13 @@ dependencies = [ [[package]] name = "fil_actor_evm_shared_state" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed3723f5c77039a08973272486777ee0cc829282e2bbd1c8241663e41d6dd8" +checksum = "b257560fbbd2df65a2c48b190163d878ce5110845d93b6d7d88e399fa8fd4777" dependencies = [ "fil_actors_shared", "fvm_ipld_encoding 0.3.3", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "hex", "serde", "uint", @@ -2661,15 +2641,15 @@ dependencies = [ [[package]] name = "fil_actor_evm_state" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0ecbde9e08b2b94e85a58b3d8c951aa3ef9cd37aae8c01299ad2bc6248c3ac" +checksum = "5a31e5608b5943e5444c25e0c62711fd0c61173593c748341a111abe20e528b3" dependencies = [ "cid", "fil_actor_evm_shared_state", "frc42_dispatch", "fvm_ipld_encoding 0.3.3", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "hex-literal", "num-derive", "num-traits", @@ -2678,9 +2658,9 @@ dependencies = [ [[package]] name = "fil_actor_init_state" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ce8135e0abbbef389cba5463a09f3388a6dfdcad10a00c46b58c37c056827b5" +checksum = "b7c7021a905a0fcdf6eec29b7b414ca586aee04bb198e932f9aeee7463e0753f" dependencies = [ "anyhow", "cid", @@ -2689,8 +2669,8 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.3.0", - "fvm_shared 3.3.0", + "fvm_shared 2.4.0", + "fvm_shared 3.3.1", "num-derive", "num-traits", "serde", @@ -2698,9 +2678,9 @@ dependencies = [ [[package]] name = "fil_actor_interface" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad5d9aad0bc17842d843da7d0b2ba9a45fe6eeb429d1840f71107238c483d60" +checksum = "78608e0e8db5e291b576a1650d885ccd8e6c55801e852a3318b718a92a6f5cec" dependencies = [ "anyhow", "cid", @@ -2719,8 +2699,8 @@ dependencies = [ "fvm_ipld_bitfield", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", - "fvm_shared 3.3.0", + "fvm_shared 2.4.0", + "fvm_shared 3.3.1", "lazy_static", "num", "regex", @@ -2731,9 +2711,9 @@ dependencies = [ [[package]] name = "fil_actor_market_state" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6fa0e995d6105a32764310ae69798d7b385c8fab79a12f7073a3821a8db8e4" +checksum = "7f1842a1adc93d767dcbac0718b9bd59da040dd3a91c823889af3e3f1c0d2ca7" dependencies = [ "anyhow", "cid", @@ -2744,8 +2724,8 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.3.0", - "fvm_shared 3.3.0", + "fvm_shared 2.4.0", + "fvm_shared 3.3.1", "libipld-core 0.14.0", "num-bigint", "num-derive", @@ -2755,9 +2735,9 @@ dependencies = [ [[package]] name = "fil_actor_miner_state" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c813a2ac23cf3839c894bb298aec7b8cd60bb72dfd0969a72f5e3d75f7b7c3" +checksum = "a88cca98cb3ccfe7d16f298a8810d4a49991862fb779466fbe42e3190d2b6fe3" dependencies = [ "anyhow", "cid", @@ -2769,8 +2749,8 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.3.0", - "fvm_shared 3.3.0", + "fvm_shared 2.4.0", + "fvm_shared 3.3.1", "itertools 0.10.5", "lazy_static", "multihash 0.16.3", @@ -2782,9 +2762,9 @@ dependencies = [ [[package]] name = "fil_actor_multisig_state" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf69d3ef248bde1bf918a82c9569a1370ba791fad79715fec9331b864b530b06" +checksum = "47e322f81cb630d5e574015fcac5f1a911eef6df5747aba9bdfe2158362cdcb5" dependencies = [ "anyhow", "cid", @@ -2793,8 +2773,8 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.3.0", - "fvm_shared 3.3.0", + "fvm_shared 2.4.0", + "fvm_shared 3.3.1", "indexmap", "integer-encoding", "num-derive", @@ -2804,9 +2784,9 @@ dependencies = [ [[package]] name = "fil_actor_power_state" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9aa1d743813f85668c1fcfd4ea7bd8c6801c7d680082206befab579841aa703" +checksum = "e3b99e5ce4bf17e297a50b781d5e73cbbe4a884500959e7109750d6e746c86b0" dependencies = [ "anyhow", "cid", @@ -2815,8 +2795,8 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.3.0", - "fvm_shared 3.3.0", + "fvm_shared 2.4.0", + "fvm_shared 3.3.1", "integer-encoding", "lazy_static", "num-derive", @@ -2826,13 +2806,13 @@ dependencies = [ [[package]] name = "fil_actor_reward_state" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2e9ed3f14f42a3271dd4b0bde27d856921f1663d01ed90c11e3bf28155937f4" +checksum = "ae8c6f064dd6f796824167dd36dd68e9f7cbb90069e154d2b7b9552fd2bd2727" dependencies = [ "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", - "fvm_shared 3.3.0", + "fvm_shared 2.4.0", + "fvm_shared 3.3.1", "lazy_static", "num-derive", "num-traits", @@ -2841,13 +2821,13 @@ dependencies = [ [[package]] name = "fil_actor_system_state" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc0710525208487a4509fbbfa920e545a857dd8d42786cfd8e7ad83643dfd5e" +checksum = "c07d5dfcc3777f8ec4eefbe4bd51499a2157608a4f608cbaf7c0d84128aa3d68" dependencies = [ "cid", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "num-derive", "num-traits", "serde", @@ -2855,9 +2835,9 @@ dependencies = [ [[package]] name = "fil_actor_verifreg_state" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aef9da0968812cf86404d138a29d9e6f4bbfbede4e52dda724bafe514b9de64" +checksum = "4fe6aca497abb108dedbb037d4205cadc30c68833e5f6eb22205e455c5444901" dependencies = [ "anyhow", "cid", @@ -2865,8 +2845,8 @@ dependencies = [ "frc42_dispatch", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", - "fvm_shared 3.3.0", + "fvm_shared 2.4.0", + "fvm_shared 3.3.1", "num-derive", "num-traits", "serde", @@ -2874,9 +2854,9 @@ dependencies = [ [[package]] name = "fil_actors_shared" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9b943dbb4ba114540d7e20d512b3cd6eb279be02195341e56f917b049316af2" +checksum = "80100c8ef62b379bdfaaebb402d1c5ed168ae55d6b2726b9d278b27a1bbaf4ba" dependencies = [ "anyhow", "cid", @@ -2884,8 +2864,8 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.3.0", - "fvm_shared 3.3.0", + "fvm_shared 2.4.0", + "fvm_shared 3.3.1", "lazy_static", "multihash 0.16.3", "num", @@ -2915,26 +2895,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "filecoin-hashers" -version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04ac783ebbc0fa47fa3f4491a83ee46e7a5909384b5786dfd5319722b173a50f" -dependencies = [ - "anyhow", - "bellperson", - "blstrs", - "ff", - "generic-array", - "hex", - "lazy_static", - "merkletree", - "neptune", - "rand 0.8.5", - "serde", - "sha2 0.10.6", -] - [[package]] name = "filecoin-hashers" version = "9.0.0" @@ -2955,38 +2915,6 @@ dependencies = [ "sha2 0.10.6", ] -[[package]] -name = "filecoin-proofs" -version = "13.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59bfd144962260633b7b5151f1cf38a93c26a53238f52dae8baf414e0b329a00" -dependencies = [ - "anyhow", - "bellperson", - "bincode", - "blake2b_simd", - "blstrs", - "filecoin-hashers 8.0.0", - "fr32 6.0.0", - "generic-array", - "hex", - "lazy_static", - "log", - "memmap2", - "merkletree", - "once_cell", - "rand 0.8.5", - "rayon", - "serde", - "serde_json", - "sha2 0.10.6", - "storage-proofs-core 13.0.0", - "storage-proofs-porep 13.0.0", - "storage-proofs-post 13.0.0", - "storage-proofs-update 13.0.0", - "typenum", -] - [[package]] name = "filecoin-proofs" version = "14.0.0" @@ -2998,8 +2926,8 @@ dependencies = [ "bincode", "blake2b_simd", "blstrs", - "filecoin-hashers 9.0.0", - "fr32 7.0.0", + "filecoin-hashers", + "fr32", "generic-array", "hex", "lazy_static", @@ -3012,31 +2940,13 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.6", - "storage-proofs-core 14.0.0", - "storage-proofs-porep 14.0.0", - "storage-proofs-post 14.0.0", - "storage-proofs-update 14.0.0", + "storage-proofs-core", + "storage-proofs-porep", + "storage-proofs-post", + "storage-proofs-update", "typenum", ] -[[package]] -name = "filecoin-proofs-api" -version = "13.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e5b3d55a6acea686b5c7c908de9388a4d1812fa993f2060fd969b609225bdd7" -dependencies = [ - "anyhow", - "bellperson", - "bincode", - "blstrs", - "filecoin-hashers 8.0.0", - "filecoin-proofs 13.0.0", - "fr32 6.0.0", - "lazy_static", - "serde", - "storage-proofs-core 13.0.0", -] - [[package]] name = "filecoin-proofs-api" version = "14.0.0" @@ -3047,12 +2957,12 @@ dependencies = [ "bellperson", "bincode", "blstrs", - "filecoin-hashers 9.0.0", - "filecoin-proofs 14.0.0", - "fr32 7.0.0", + "filecoin-hashers", + "filecoin-proofs", + "fr32", "lazy_static", "serde", - "storage-proofs-core 14.0.0", + "storage-proofs-core", ] [[package]] @@ -3125,7 +3035,7 @@ dependencies = [ "futures", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "hex", "human-repr", "jsonrpc-v2", @@ -3222,7 +3132,7 @@ dependencies = [ "byteorder", "forest_shim", "forest_utils", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "hex", "parking_lot 0.12.1", "quickcheck", @@ -3250,7 +3160,7 @@ dependencies = [ "forest_test_utils", "forest_utils", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "hex", "lazy_static", "log", @@ -3293,8 +3203,8 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_car", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.3.0", - "fvm_shared 3.3.0", + "fvm_shared 2.4.0", + "fvm_shared 3.3.1", "lazy_static", "libipld", "log", @@ -3336,8 +3246,8 @@ dependencies = [ "fvm_ipld_amt 0.5.1", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.3.0", - "fvm_shared 3.3.0", + "fvm_shared 2.4.0", + "fvm_shared 3.3.1", "lazy_static", "log", "lru", @@ -3469,7 +3379,7 @@ dependencies = [ "cid", "fil_actor_interface", "fil_actors_shared", - "filecoin-proofs-api 14.0.0", + "filecoin-proofs-api", "forest_beacon", "forest_blocks", "forest_chain", @@ -3483,7 +3393,7 @@ dependencies = [ "futures", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "lazy_static", "nonempty", "num", @@ -3534,13 +3444,13 @@ dependencies = [ "forest_message", "forest_networks", "forest_shim", - "fvm 2.3.0", - "fvm 3.3.1", + "fvm 2.4.0", + "fvm 3.4.0", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", - "fvm_shared 3.3.0", + "fvm_shared 2.4.0", + "fvm_shared 3.3.1", "lazy_static", "log", "num", @@ -3562,7 +3472,7 @@ dependencies = [ "forest_json", "forest_utils", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "indexmap", "lazy_static", "libipld", @@ -3590,11 +3500,11 @@ dependencies = [ "forest_shim", "forest_test_utils", "forest_utils", - "fvm 2.3.0", + "fvm 2.4.0", "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", - "fvm_shared 3.3.0", + "fvm_shared 2.4.0", + "fvm_shared 3.3.1", "multihash 0.16.3", "num", "num-bigint", @@ -3654,7 +3564,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_car", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "lazy_static", "libp2p", "log", @@ -3710,8 +3620,8 @@ dependencies = [ "forest_shim", "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", - "fvm_shared 3.3.0", + "fvm_shared 2.4.0", + "fvm_shared 3.3.1", "quickcheck", "rand 0.8.5", "serde", @@ -3739,11 +3649,11 @@ dependencies = [ "forest_state_manager", "forest_utils", "futures", - "fvm 3.3.1", + "fvm 3.4.0", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.3.0", - "fvm_shared 3.3.0", + "fvm_shared 2.4.0", + "fvm_shared 3.3.1", "lazy_static", "log", "lru", @@ -3786,7 +3696,7 @@ dependencies = [ "fil_actors_shared", "forest_beacon", "forest_shim", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "lazy_static", "multiaddr", "serde", @@ -3845,7 +3755,7 @@ dependencies = [ "futures", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "hex", "http", "jsonrpc-v2", @@ -3890,7 +3800,7 @@ dependencies = [ "forest_shim", "forest_state_manager", "fvm_ipld_blockstore", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "jsonrpc-v2", "once_cell", "parking_lot 0.12.1", @@ -3923,14 +3833,14 @@ dependencies = [ "anyhow", "bls-signatures", "cid", - "filecoin-proofs-api 14.0.0", - "fvm 2.3.0", - "fvm 3.3.1", + "filecoin-proofs-api", + "fvm 2.4.0", + "fvm 3.4.0", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", - "fvm_shared 3.3.0", + "fvm_shared 2.4.0", + "fvm_shared 3.3.1", "lazy_static", "num", "num-bigint", @@ -3952,7 +3862,7 @@ dependencies = [ "cid", "fil_actor_interface", "fil_actors_shared", - "filecoin-proofs-api 14.0.0", + "filecoin-proofs-api", "forest_beacon", "forest_blocks", "forest_chain", @@ -3966,13 +3876,13 @@ dependencies = [ "forest_state_migration", "forest_utils", "futures", - "fvm 2.3.0", - "fvm 3.3.1", + "fvm 2.4.0", + "fvm 3.4.0", "fvm_ipld_amt 0.5.1", "fvm_ipld_bitfield", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "lazy_static", "lru", "num", @@ -4067,7 +3977,7 @@ dependencies = [ "const_format", "cs_serde_bytes", "digest 0.10.6", - "filecoin-proofs-api 14.0.0", + "filecoin-proofs-api", "flume", "forest_shim", "futures", @@ -4111,20 +4021,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fr32" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54886e6035e8df26591853a500ad8024709aaec78948f080496fbd8477618690" -dependencies = [ - "anyhow", - "blstrs", - "byte-slice-cast", - "byteorder", - "ff", - "thiserror", -] - [[package]] name = "fr32" version = "7.0.0" @@ -4149,7 +4045,7 @@ dependencies = [ "frc42_macros", "fvm_ipld_encoding 0.2.3", "fvm_sdk", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "thiserror", ] @@ -4160,7 +4056,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cf52e60a67e9ad15cd4909ef8c8e45ab3744015dbb603efd8dfbdbfc7ce95b7" dependencies = [ "fvm_sdk", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "thiserror", ] @@ -4192,7 +4088,7 @@ dependencies = [ "fvm_ipld_encoding 0.2.3", "fvm_ipld_hamt 0.5.1", "fvm_sdk", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "integer-encoding", "num-traits", "serde", @@ -4350,9 +4246,9 @@ dependencies = [ [[package]] name = "fvm" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8b6a711f111c3c02ae2429045004b4c3b5aaba68bc13e9fdec76e60e81c2d5" +checksum = "6a39581df015d28776519d941f62becdf7ff40f081be6ffbeb1d8880806416e0" dependencies = [ "anyhow", "blake2b_simd", @@ -4361,13 +4257,13 @@ dependencies = [ "derive-getters", "derive_builder 0.11.2", "derive_more", - "filecoin-proofs-api 13.0.0", + "filecoin-proofs-api", "fvm-wasm-instrument 0.2.0", "fvm_ipld_amt 0.4.2", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", "fvm_ipld_hamt 0.5.1", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "lazy_static", "log", "multihash 0.16.3", @@ -4387,21 +4283,21 @@ dependencies = [ [[package]] name = "fvm" -version = "3.3.1" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8002580816862be6681259cf5ad4217f47046edace1d4a339e11e8682aad241b" +checksum = "28a482a7a27dc5da0824d2eb61ccc044cae3ce5a05a743237b9a8a53793163d4" dependencies = [ "anyhow", "byteorder", "cid", "derive_more", - "filecoin-proofs-api 14.0.0", + "filecoin-proofs-api", "fvm-wasm-instrument 0.4.0", "fvm_ipld_amt 0.5.1", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "lazy_static", "log", "minstant", @@ -4454,7 +4350,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", "fvm_sdk", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "num-traits", "serde", "serde_tuple", @@ -4616,7 +4512,7 @@ checksum = "bb46d7b26e1609de1a3b7470cbd190d78f2d01fdf1b317f741bdd3ac8f59825e" dependencies = [ "cid", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "lazy_static", "log", "num-traits", @@ -4625,9 +4521,9 @@ dependencies = [ [[package]] name = "fvm_shared" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518880fbf3facd8ba26298e27d0aa7c43459d14a2511d22d2a3f39abf3b73f6a" +checksum = "05eebc49ba13d8aae14c396e4d700c83361eca673cae9c0bfc69cb6e754bd468" dependencies = [ "anyhow", "arbitrary", @@ -4638,7 +4534,7 @@ dependencies = [ "cs_serde_bytes", "data-encoding", "data-encoding-macro", - "filecoin-proofs-api 13.0.0", + "filecoin-proofs-api", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", "lazy_static", @@ -4658,9 +4554,9 @@ dependencies = [ [[package]] name = "fvm_shared" -version = "3.3.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9135fcd5414eec454b4fd53c9414ae7611e7e7fcdf0db54f6b17658c94be05df" +checksum = "2ad76f06f7d59215844900d018ffc5c863a370afab9c329bae290305722f8d60" dependencies = [ "anyhow", "arbitrary", @@ -4670,7 +4566,7 @@ dependencies = [ "cid", "data-encoding", "data-encoding-macro", - "filecoin-proofs-api 14.0.0", + "filecoin-proofs-api", "fvm_ipld_encoding 0.3.3", "lazy_static", "libsecp256k1", @@ -4782,21 +4678,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" dependencies = [ "fallible-iterator", "indexmap", "stable_deref_trait", ] -[[package]] -name = "gimli" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" - [[package]] name = "git-version" version = "0.3.5" @@ -5259,12 +5149,6 @@ dependencies = [ "webrtc-util", ] -[[package]] -name = "io-lifetimes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" - [[package]] name = "io-lifetimes" version = "1.0.10" @@ -5301,7 +5185,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", - "io-lifetimes 1.0.10", + "io-lifetimes", "rustix 0.37.15", "windows-sys 0.48.0", ] @@ -6084,12 +5968,6 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" -[[package]] -name = "linux-raw-sys" -version = "0.0.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" - [[package]] name = "linux-raw-sys" version = "0.1.4" @@ -6798,24 +6676,15 @@ dependencies = [ "libc", ] -[[package]] -name = "object" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" -dependencies = [ - "crc32fast", - "hashbrown 0.12.3", - "indexmap", - "memchr", -] - [[package]] name = "object" version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ + "crc32fast", + "hashbrown 0.13.2", + "indexmap", "memchr", ] @@ -7783,9 +7652,9 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.4.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b2eab54204ea0117fe9a060537e0b07a4e72f7c7d182361ecc346cab2240e5" +checksum = "80535183cae11b149d618fbd3c37e38d7cda589d82d7769e196ca9a9042d7621" dependencies = [ "fxhash", "log", @@ -8064,20 +7933,6 @@ dependencies = [ "nom", ] -[[package]] -name = "rustix" -version = "0.35.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" -dependencies = [ - "bitflags", - "errno 0.2.8", - "io-lifetimes 0.7.5", - "libc", - "linux-raw-sys 0.0.46", - "windows-sys 0.42.0", -] - [[package]] name = "rustix" version = "0.36.13" @@ -8085,8 +7940,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a38f9520be93aba504e8ca974197f46158de5dcaa9fa04b57c57cd6a679d658" dependencies = [ "bitflags", - "errno 0.3.1", - "io-lifetimes 1.0.10", + "errno", + "io-lifetimes", "libc", "linux-raw-sys 0.1.4", "windows-sys 0.45.0", @@ -8099,8 +7954,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0661814f891c57c930a610266415528da53c4933e6dea5fb350cbfe048a9ece" dependencies = [ "bitflags", - "errno 0.3.1", - "io-lifetimes 1.0.10", + "errno", + "io-lifetimes", "libc", "linux-raw-sys 0.3.5", "windows-sys 0.48.0", @@ -8603,21 +8458,6 @@ dependencies = [ "cc", ] -[[package]] -name = "sha2raw" -version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b391e41e31b302788683ab67b5e2ec4f25040dc52f24e625fdd9cd3809f41cc3" -dependencies = [ - "byteorder", - "cpufeatures", - "digest 0.10.6", - "fake-simd", - "lazy_static", - "opaque-debug", - "sha2-asm", -] - [[package]] name = "sha2raw" version = "9.0.0" @@ -8877,41 +8717,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f3b6b32ae82412fb897ef134867d53a294f57ba5b758f06d71e865352c3e207" -[[package]] -name = "storage-proofs-core" -version = "13.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7bf5cd6d0a2f85914de385c09b9939b7ac894f1c3b628f216f8c13b7d22f04" -dependencies = [ - "aes 0.8.2", - "anyhow", - "bellperson", - "blake2b_simd", - "blstrs", - "byteorder", - "cbc", - "config", - "ff", - "filecoin-hashers 8.0.0", - "fr32 6.0.0", - "fs2", - "generic-array", - "itertools 0.10.5", - "lazy_static", - "log", - "memmap2", - "merkletree", - "num_cpus", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rayon", - "semver", - "serde", - "serde_json", - "sha2 0.10.6", - "thiserror", -] - [[package]] name = "storage-proofs-core" version = "14.0.0" @@ -8927,8 +8732,8 @@ dependencies = [ "cbc", "config", "ff", - "filecoin-hashers 9.0.0", - "fr32 7.0.0", + "filecoin-hashers", + "fr32", "fs2", "generic-array", "itertools 0.10.5", @@ -8947,44 +8752,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "storage-proofs-porep" -version = "13.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15ac4c7b0628871b76588ff15bde6f1e61e380e844cb2dac4d5882aae284d2d7" -dependencies = [ - "anyhow", - "bellperson", - "bincode", - "blstrs", - "byte-slice-cast", - "byteorder", - "crossbeam", - "fdlimit", - "ff", - "filecoin-hashers 8.0.0", - "fr32 6.0.0", - "generic-array", - "hex", - "lazy_static", - "libc", - "log", - "memmap2", - "merkletree", - "neptune", - "num-bigint", - "num-traits", - "num_cpus", - "pretty_assertions", - "rayon", - "serde", - "serde_json", - "sha2 0.10.6", - "sha2raw 8.0.0", - "storage-proofs-core 13.0.0", - "yastl", -] - [[package]] name = "storage-proofs-porep" version = "14.0.0" @@ -9000,8 +8767,8 @@ dependencies = [ "crossbeam", "fdlimit", "ff", - "filecoin-hashers 9.0.0", - "fr32 7.0.0", + "filecoin-hashers", + "fr32", "generic-array", "hex", "lazy_static", @@ -9019,34 +8786,11 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.6", - "sha2raw 9.0.0", - "storage-proofs-core 14.0.0", + "sha2raw", + "storage-proofs-core", "yastl", ] -[[package]] -name = "storage-proofs-post" -version = "13.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "207fd9dbdf2791a46c5fba617b39c623e7081a8b6608ad42b26d9d982073c104" -dependencies = [ - "anyhow", - "bellperson", - "blake2b_simd", - "blstrs", - "byteorder", - "ff", - "filecoin-hashers 8.0.0", - "fr32 6.0.0", - "generic-array", - "hex", - "log", - "rayon", - "serde", - "sha2 0.10.6", - "storage-proofs-core 13.0.0", -] - [[package]] name = "storage-proofs-post" version = "14.0.0" @@ -9059,39 +8803,15 @@ dependencies = [ "blstrs", "byteorder", "ff", - "filecoin-hashers 9.0.0", - "fr32 7.0.0", + "filecoin-hashers", + "fr32", "generic-array", "hex", "log", "rayon", "serde", "sha2 0.10.6", - "storage-proofs-core 14.0.0", -] - -[[package]] -name = "storage-proofs-update" -version = "13.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e31b37ab1ff191ea20ede4141dfb9b87cc861a36888a20c5ddeeb68b47cfd04" -dependencies = [ - "anyhow", - "bellperson", - "blstrs", - "ff", - "filecoin-hashers 8.0.0", - "fr32 6.0.0", - "generic-array", - "lazy_static", - "log", - "memmap2", - "merkletree", - "neptune", - "rayon", - "serde", - "storage-proofs-core 13.0.0", - "storage-proofs-porep 13.0.0", + "storage-proofs-core", ] [[package]] @@ -9104,8 +8824,8 @@ dependencies = [ "bellperson", "blstrs", "ff", - "filecoin-hashers 9.0.0", - "fr32 7.0.0", + "filecoin-hashers", + "fr32", "generic-array", "lazy_static", "log", @@ -9114,8 +8834,8 @@ dependencies = [ "neptune", "rayon", "serde", - "storage-proofs-core 14.0.0", - "storage-proofs-porep 14.0.0", + "storage-proofs-core", + "storage-proofs-porep", ] [[package]] @@ -10200,18 +9920,19 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.92.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da34cec2a8c23db906cdf8b26e988d7a7f0d549eb5d51299129647af61a1b37" +checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a" dependencies = [ "indexmap", + "url", ] [[package]] name = "wasmparser" -version = "0.95.0" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a" +checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b" dependencies = [ "indexmap", "url", @@ -10239,9 +9960,9 @@ dependencies = [ [[package]] name = "wasmtime" -version = "2.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743d37c265fa134a76de653c7e66be22590eaccd03da13cee99f3ac7a59cb826" +checksum = "f907fdead3153cb9bfb7a93bbd5b62629472dc06dee83605358c64c52ed3dda9" dependencies = [ "anyhow", "bincode", @@ -10249,35 +9970,35 @@ dependencies = [ "indexmap", "libc", "log", - "object 0.29.0", + "object", "once_cell", "paste", "psm", "rayon", "serde", "target-lexicon", - "wasmparser 0.92.0", + "wasmparser 0.102.0", "wasmtime-cranelift", "wasmtime-environ", "wasmtime-jit", "wasmtime-runtime", - "windows-sys 0.36.1", + "windows-sys 0.45.0", ] [[package]] name = "wasmtime-asm-macros" -version = "2.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de327cf46d5218315957138131ed904621e6f99018aa2da508c0dcf0c65f1bf2" +checksum = "d3b9daa7c14cd4fa3edbf69de994408d5f4b7b0959ac13fa69d465f6597f810d" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "wasmtime-cranelift" -version = "2.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "017c3605ccce867b3ba7f71d95e5652acc22b9dc2971ad6a6f9df4a8d7af2648" +checksum = "b1cefde0cce8cb700b1b21b6298a3837dba46521affd7b8c38a9ee2c869eee04" dependencies = [ "anyhow", "cranelift-codegen", @@ -10285,72 +10006,98 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.26.2", + "gimli", "log", - "object 0.29.0", + "object", "target-lexicon", "thiserror", - "wasmparser 0.92.0", + "wasmparser 0.102.0", + "wasmtime-cranelift-shared", + "wasmtime-environ", +] + +[[package]] +name = "wasmtime-cranelift-shared" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd041e382ef5aea1b9fc78442394f1a4f6d676ce457e7076ca4cb3f397882f8b" +dependencies = [ + "anyhow", + "cranelift-codegen", + "cranelift-native", + "gimli", + "object", + "target-lexicon", "wasmtime-environ", ] [[package]] name = "wasmtime-environ" -version = "2.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aec5c1f81aab9bb35997113c171b6bb9093afc90e3757c55e0c08dc9ac612e4" +checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949" dependencies = [ "anyhow", "cranelift-entity", - "gimli 0.26.2", + "gimli", "indexmap", "log", - "object 0.29.0", + "object", "serde", "target-lexicon", "thiserror", - "wasmparser 0.92.0", + "wasmparser 0.102.0", "wasmtime-types", ] [[package]] name = "wasmtime-jit" -version = "2.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c683893dbba3986aa71582a5332b87157fb95d34098de2e5f077c7f078726d" +checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244" dependencies = [ - "addr2line 0.17.0", + "addr2line", "anyhow", "bincode", "cfg-if 1.0.0", "cpp_demangle", - "gimli 0.26.2", + "gimli", "log", - "object 0.29.0", + "object", "rustc-demangle", - "rustix 0.35.13", "serde", "target-lexicon", - "thiserror", "wasmtime-environ", + "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.36.1", + "windows-sys 0.45.0", ] [[package]] name = "wasmtime-jit-debug" -version = "2.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2f8f15a81292eec468c79a4f887a37a3d02eb0c610f34ddbec607d3e9022f18" +checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846" dependencies = [ "once_cell", ] +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aecae978b13f7f67efb23bd827373ace4578f2137ec110bbf6a4a7cde4121bbd" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "windows-sys 0.45.0", +] + [[package]] name = "wasmtime-runtime" -version = "2.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09af6238c962e8220424c815a7b1a9a6d0ba0694f0ab0ae12a6cda1923935a0d" +checksum = "658cf6f325232b6760e202e5255d823da5e348fdea827eff0a2a22319000b441" dependencies = [ "anyhow", "cc", @@ -10360,27 +10107,26 @@ dependencies = [ "log", "mach", "memfd", - "memoffset 0.6.5", + "memoffset 0.8.0", "paste", "rand 0.8.5", - "rustix 0.35.13", - "thiserror", + "rustix 0.36.13", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", - "windows-sys 0.36.1", + "windows-sys 0.45.0", ] [[package]] name = "wasmtime-types" -version = "2.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dc3dd9521815984b35d6362f79e6b9c72475027cd1c71c44eb8df8fbf33a9fb" +checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f" dependencies = [ "cranelift-entity", "serde", "thiserror", - "wasmparser 0.92.0", + "wasmparser 0.102.0", ] [[package]] @@ -10726,19 +10472,6 @@ dependencies = [ "windows-targets 0.48.0", ] -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - [[package]] name = "windows-sys" version = "0.42.0" @@ -10820,12 +10553,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -10844,12 +10571,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -10868,12 +10589,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -10892,12 +10607,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -10928,12 +10637,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - [[package]] name = "windows_x86_64_msvc" version = "0.42.2" diff --git a/Cargo.toml b/Cargo.toml index fd22a90fa06b..2c40cab815e7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,15 +76,15 @@ flume = "0.10" fs_extra = "1.2" futures = "0.3" futures-util = "0.3" -fvm = { version = "~2.3", default-features = false } -fvm3 = { package = "fvm", default-features = false, version = "~3.3.1" } +fvm = { version = "~2.4", default-features = false } +fvm3 = { package = "fvm", default-features = false, version = "~3.4" } fvm_ipld_amt = "0.5" fvm_ipld_bitfield = "0.5" fvm_ipld_blockstore = "0.1" fvm_ipld_car = "0.6" fvm_ipld_encoding = "0.2" fvm_ipld_encoding3 = { package = "fvm_ipld_encoding", version = "0.3" } -fvm_shared = { version = "~2.3", default-features = false } +fvm_shared = { version = "~2.4", default-features = false } fvm_shared3 = { package = "fvm_shared", version = "~3.3", default-features = false } gethostname = "0.4" git-version = "0.3" @@ -146,13 +146,13 @@ unsigned-varint = { version = "0.7", default-features = false } url = { version = "2.3", features = ["serde"] } which = "4.3" -fil_actor_account_state = "3.0.0" -fil_actor_init_state = "3.0.0" -fil_actor_interface = "3.0.0" -fil_actor_miner_state = "3.0.0" -fil_actor_power_state = "3.0.0" -fil_actor_system_state = "3.0.0" -fil_actors_shared = "3.0.0" +fil_actor_account_state = "4" +fil_actor_init_state = "4" +fil_actor_interface = "4" +fil_actor_miner_state = "4" +fil_actor_power_state = "4" +fil_actor_system_state = "4" +fil_actors_shared = "4" forest_auth = { path = "./utils/auth" } forest_beacon = { path = "./blockchain/beacon" } diff --git a/Makefile b/Makefile index 95a92526d97d..62cac6b31cfc 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ SER_TESTS = "tests/serialization_tests" +VENDORED_DOCS_TOOLCHAIN := "nightly-2023-04-19" # Using https://github.com/tonistiigi/xx # Use in Docker images when cross-compiling. @@ -168,7 +169,15 @@ mdbook: mdbook-build: mdbook build ./documentation -rustdoc: - cargo doc --workspace --no-deps -.PHONY: clean clean-all lint lint-docker lint-clippy build release test test-all test-all-release test-release license test-vectors run-vectors pull-serialization-tests install-cli install-daemon install install-deps install-lint-tools docs run-serialization-vectors rustdoc +# When you visit https://chainsafe.github.io/forest/rustdoc you get an index.html +# listing all crates that are documented (which is then published in CI). +# This isn't included by default, so we use a nightly toolchain, and the +# (unstable) `--enable-index-page` option. +# https://doc.rust-lang.org/nightly/rustdoc/unstable-features.html#--index-page-provide-a-top-level-landing-page-for-docs +vendored-docs: + rustup toolchain install $(VENDORED_DOCS_TOOLCHAIN) + RUSTDOCFLAGS="-Dwarnings -Zunstable-options --enable-index-page" \ + cargo +$(VENDORED_DOCS_TOOLCHAIN) doc --workspace --no-deps + +.PHONY: clean clean-all lint lint-docker lint-clippy build release test test-all test-all-release test-release license test-vectors run-vectors pull-serialization-tests install-cli install-daemon install install-deps install-lint-tools docs run-serialization-vectors vendored-docs diff --git a/blockchain/chain_sync/src/tipset_syncer.rs b/blockchain/chain_sync/src/tipset_syncer.rs index 79bde30dd3d0..999fb94b9314 100644 --- a/blockchain/chain_sync/src/tipset_syncer.rs +++ b/blockchain/chain_sync/src/tipset_syncer.rs @@ -1371,7 +1371,6 @@ async fn validate_block anyhow::Result impl IntoResponse { let authorization_header = get_auth_header(headers); - #[allow(clippy::redundant_async_block)] ws.on_upgrade(move |socket| async { rpc_ws_handler_inner(socket, authorization_header, rpc_server).await }) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 164eebfd9c45..b71afb4b1c50 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly-2023-04-19" +channel = "1.69" components = ["clippy", "llvm-tools-preview", "rustfmt"] targets = ["wasm32-unknown-unknown"] diff --git a/utils/forest_shim/src/randomness.rs b/utils/forest_shim/src/randomness.rs index f27cb8185b77..dfee49593c36 100644 --- a/utils/forest_shim/src/randomness.rs +++ b/utils/forest_shim/src/randomness.rs @@ -12,7 +12,7 @@ use serde::{Deserialize, Serialize}; /// /// # Examples /// ``` -/// +/// /// // Create FVM2 Randomness normally /// let fvm2_rand = fvm_shared::randomness::Randomness(vec![]); /// diff --git a/utils/forest_shim/src/sector.rs b/utils/forest_shim/src/sector.rs index 929a9ad7bca6..9eccf5a71cb8 100644 --- a/utils/forest_shim/src/sector.rs +++ b/utils/forest_shim/src/sector.rs @@ -20,7 +20,7 @@ use crate::{version::NetworkVersion, Inner}; /// /// # Examples /// ``` -/// +/// /// // Create FVM2 RegisteredSealProof normally /// let fvm2_proof = fvm_shared::sector::RegisteredSealProof::StackedDRG2KiBV1; /// diff --git a/utils/genesis/src/lib.rs b/utils/genesis/src/lib.rs index 9e4fb4f907ce..abe3a7c9f8d8 100644 --- a/utils/genesis/src/lib.rs +++ b/utils/genesis/src/lib.rs @@ -199,7 +199,6 @@ where const BUFFER_CAPCITY_BYTES: usize = 1024 * 1024 * 1024; let (tx, rx) = flume::bounded(100); - #[allow(clippy::redundant_async_block)] let write_task = tokio::spawn(async move { store.buffered_write(rx, BUFFER_CAPCITY_BYTES).await }); let mut car_reader = CarReader::new(reader).await?;