From 45483bf6657e743b5544d22153ded875f8adeecd Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Mon, 15 May 2023 15:17:29 +0100 Subject: [PATCH 01/23] mark: aatifsyed/stable-rust-toolchain From 3d8cbfeb7720006041ba1eec3d2c4918d12e0abc Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Mon, 15 May 2023 15:39:25 +0100 Subject: [PATCH 02/23] fix: use stable rust --- .cargo/config.toml | 39 +++++++++----------------------------- .github/workflows/docs.yml | 3 +-- rust-toolchain.toml | 2 +- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 4eb6b35778c0..af9ae4a7c5a0 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,38 +1,17 @@ -[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"] +# In all cases, pass --cfg=tokio_unstable for tokio console integration +# See(https://github.com/ChainSafe/forest/pull/2245) +# on x86_64-linux-*, most CPUs support the specified vector instructions, so use those -[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"] +# Note, rustflags aren't additive, so we can't specify tokio_unstable in `build.rustflags` +# So we use a `cfg(foo)` and `cfg(not(foo))` for our common flags. +[target.'cfg(all(target_arch = "x86_64", target_os = "linux"))'] +rustflags = ["--cfg=tokio_unstable", "-Ctarget-feature=+avx2,+fma"] -[target.aarch64-apple-darwin] -rustflags = ["-Zshare-generics=y", "--cfg", "tokio_unstable"] +[target.'cfg(not(all(target_arch = "x86_64", target_os = "linux")))'] +rustflags = ["--cfg=tokio_unstable"] [net] git-fetch-with-cli = true diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 463a4270aaf6..fb05ff37330d 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,8 +14,7 @@ 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" + RUSTDOCFLAGS: "-Dwarnings" CACHE_TIMEOUT_MINUTES: 5 SCCACHE_ENDPOINT: ${{ vars.SCCACHE_ENDPOINT }} SCCACHE_BUCKET: ${{ vars.SCCACHE_BUCKET }} 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"] From 1387877d2633948fb3328d21126a6b4fe5beb39d Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Mon, 15 May 2023 23:30:48 +0100 Subject: [PATCH 03/23] fix: remove unknown clippy lints --- blockchain/chain_sync/src/tipset_syncer.rs | 1 - forest/daemon/src/daemon.rs | 2 -- node/db/src/rolling/gc.rs | 1 - node/rpc/src/rpc_ws_handler.rs | 1 - utils/genesis/src/lib.rs | 1 - 5 files changed, 6 deletions(-) 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/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?; From d51613d0a25c9b4d278492ffbc0ba711ab7a234c Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Mon, 15 May 2023 23:46:16 +0100 Subject: [PATCH 04/23] fix: include index.html for rustdoc --- .github/workflows/docs.yml | 8 ++++++-- Makefile | 3 --- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index fb05ff37330d..2aa150f7e46b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,6 @@ on: - main env: - RUSTDOCFLAGS: "-Dwarnings" CACHE_TIMEOUT_MINUTES: 5 SCCACHE_ENDPOINT: ${{ vars.SCCACHE_ENDPOINT }} SCCACHE_BUCKET: ${{ vars.SCCACHE_BUCKET }} @@ -54,8 +53,13 @@ jobs: - name: Execute MDBook run: make mdbook-build - name: Build rustdoc - run: make rustdoc + run: cargo +nightly-2023-04-19 doc --workspace --no-deps env: + # When you visit https://chainsafe.github.io/forest/rustdoc you get an index.html + # listing all crates that are documented (copied out below). + # This isn't included by default, so we use 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 + RUSTDOCFLAGS: -Dwarnings -Zunstable-options --enable-index-page CC: "sccache clang" CXX: "sccache clang++" - name: Link Checker (Docs) diff --git a/Makefile b/Makefile index 95a92526d97d..7238b7b69a99 100644 --- a/Makefile +++ b/Makefile @@ -168,7 +168,4 @@ 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 From 9cfc10144d1a92867421f735de5e6113ea223d89 Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Tue, 16 May 2023 00:12:25 +0100 Subject: [PATCH 05/23] fix: remove rustfmt --- .rustfmt.toml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .rustfmt.toml 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 From 8e4197535c59fa34ac5949c8c97d2267224a16e7 Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Tue, 16 May 2023 00:13:27 +0100 Subject: [PATCH 06/23] fix: cargo fmt --- utils/forest_shim/src/randomness.rs | 2 +- utils/forest_shim/src/sector.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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; /// From b88c850a79d553d64f8e671ab91dd00590425b67 Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Tue, 16 May 2023 00:15:32 +0100 Subject: [PATCH 07/23] fix: install toolchain for documenting --- .github/workflows/docs.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 2aa150f7e46b..98f357179059 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -53,12 +53,15 @@ jobs: - name: Execute MDBook run: make mdbook-build - name: Build rustdoc - run: cargo +nightly-2023-04-19 doc --workspace --no-deps + run: |- + rustup toolchain install $toolchain + cargo +$toolchain --workspace --no-deps env: - # When you visit https://chainsafe.github.io/forest/rustdoc you get an index.html - # listing all crates that are documented (copied out below). - # This isn't included by default, so we use 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 + # When you visit https://chainsafe.github.io/forest/rustdoc you get an index.html + # listing all crates that are documented (copied out below). + # This isn't included by default, so we use 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 + toolchain: nightly-2023-04-19 RUSTDOCFLAGS: -Dwarnings -Zunstable-options --enable-index-page CC: "sccache clang" CXX: "sccache clang++" From 4f0104b3849831c9a19a715b7ac418c5b9da8110 Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Tue, 16 May 2023 00:31:41 +0100 Subject: [PATCH 08/23] try: rustup install ... --component rustfmt --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 98f357179059..e729efa8e192 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -54,7 +54,7 @@ jobs: run: make mdbook-build - name: Build rustdoc run: |- - rustup toolchain install $toolchain + rustup toolchain install $toolchain --component rustfmt cargo +$toolchain --workspace --no-deps env: # When you visit https://chainsafe.github.io/forest/rustdoc you get an index.html From 8e14772be42fc23fb5b6773efeae51a7418b55d0 Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Tue, 16 May 2023 00:41:56 +0100 Subject: [PATCH 09/23] try: get cargo version --- .github/workflows/docs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index e729efa8e192..e686487ddcb9 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -55,6 +55,7 @@ jobs: - name: Build rustdoc run: |- rustup toolchain install $toolchain --component rustfmt + cargo +$toolchain --version cargo +$toolchain --workspace --no-deps env: # When you visit https://chainsafe.github.io/forest/rustdoc you get an index.html From 2095eeea20d18923e2effa7788cc31a76f81fc7d Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Tue, 16 May 2023 00:47:48 +0100 Subject: [PATCH 10/23] fix: command typo --- .github/workflows/docs.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index e686487ddcb9..b17f5efe633b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -55,8 +55,7 @@ jobs: - name: Build rustdoc run: |- rustup toolchain install $toolchain --component rustfmt - cargo +$toolchain --version - cargo +$toolchain --workspace --no-deps + cargo +$toolchain doc --workspace --no-deps env: # When you visit https://chainsafe.github.io/forest/rustdoc you get an index.html # listing all crates that are documented (copied out below). From 4d04c29a121f72c25fc1bbb27cc7900c1d4eb0be Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Tue, 16 May 2023 12:17:16 +0100 Subject: [PATCH 11/23] tweak: remove avx2 --- .cargo/config.toml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index af9ae4a7c5a0..c36eefbdf15c 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -2,15 +2,7 @@ incremental = true # In all cases, pass --cfg=tokio_unstable for tokio console integration -# See(https://github.com/ChainSafe/forest/pull/2245) -# on x86_64-linux-*, most CPUs support the specified vector instructions, so use those - -# Note, rustflags aren't additive, so we can't specify tokio_unstable in `build.rustflags` -# So we use a `cfg(foo)` and `cfg(not(foo))` for our common flags. -[target.'cfg(all(target_arch = "x86_64", target_os = "linux"))'] -rustflags = ["--cfg=tokio_unstable", "-Ctarget-feature=+avx2,+fma"] - -[target.'cfg(not(all(target_arch = "x86_64", target_os = "linux")))'] +# See (https://github.com/ChainSafe/forest/pull/2245) rustflags = ["--cfg=tokio_unstable"] [net] From 3f525e206f2a5e1b4abf4671ae3f47b639443174 Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Wed, 17 May 2023 22:43:16 +0100 Subject: [PATCH 12/23] tweak: add todos to cargo config --- .cargo/config.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.cargo/config.toml b/.cargo/config.toml index c36eefbdf15c..50834caf583a 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,6 +1,8 @@ +# TODO(aatifsyed): remove this file once we have a dev/ci container [build] incremental = true +# 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"] From 8b41bc1775d710afc0afe28b8b2a7bb4bf12bb87 Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Wed, 17 May 2023 22:44:48 +0100 Subject: [PATCH 13/23] fix: extraneous component added in CI --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index b17f5efe633b..6eac1129df71 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -54,7 +54,7 @@ jobs: run: make mdbook-build - name: Build rustdoc run: |- - rustup toolchain install $toolchain --component rustfmt + rustup toolchain install $toolchain cargo +$toolchain doc --workspace --no-deps env: # When you visit https://chainsafe.github.io/forest/rustdoc you get an index.html From fcb6c4c15afb58ba639d404de0d25115a91757ed Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Mon, 22 May 2023 17:21:22 +0100 Subject: [PATCH 14/23] nomerge: demonstrate dependency --- Cargo.lock | 1549 ++++++++++++++++++++++++++-------------------------- Cargo.toml | 13 +- 2 files changed, 791 insertions(+), 771 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 207857df5538..38c0fbe4146c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "aes-gcm" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c" +checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" dependencies = [ "aead 0.5.2", "aes 0.8.2", @@ -186,9 +186,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6342bd4f5a1205d7f41e94a41a901f5647c938cdfa96036338e8533c9d6c2450" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" dependencies = [ "anstyle", "anstyle-parse", @@ -308,7 +308,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.20", + "time 0.3.21", ] [[package]] @@ -324,7 +324,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.20", + "time 0.3.21", ] [[package]] @@ -457,7 +457,7 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.15", + "rustix 0.37.19", "slab", "socket2", "waker-fn", @@ -480,7 +480,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -509,28 +509,6 @@ dependencies = [ "wasm-bindgen-futures", ] -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite 0.2.9", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - [[package]] name = "async-task" version = "4.4.0" @@ -545,7 +523,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -613,7 +591,7 @@ dependencies = [ "serde", "serde-xml-rs", "thiserror", - "time 0.3.20", + "time 0.3.21", "url", ] @@ -634,7 +612,7 @@ checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" dependencies = [ "async-trait", "axum-core", - "base64 0.21.0", + "base64 0.21.1", "bitflags", "bytes 1.4.0", "futures-util", @@ -702,7 +680,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide", + "miniz_oxide 0.6.2", "object 0.30.3", "rustc-demangle", ] @@ -727,9 +705,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "3f1e31e207a6b8fb791a38ea3105e6cb541f55e4d029902d3039a4ad07cc4105" [[package]] name = "base64ct" @@ -748,7 +726,7 @@ dependencies = [ "blstrs", "byteorder", "crossbeam-channel", - "digest 0.10.6", + "digest 0.10.7", "ec-gpu", "ec-gpu-gen", "ff", @@ -867,7 +845,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -1093,9 +1071,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bstr" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" dependencies = [ "memchr", "once_cell", @@ -1105,9 +1083,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.1" +version = "3.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" +checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" [[package]] name = "byte-slice-cast" @@ -1326,9 +1304,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.2.7" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" +checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" dependencies = [ "clap_builder", "clap_derive", @@ -1337,9 +1315,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.2.7" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" +checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" dependencies = [ "anstream", "anstyle", @@ -1350,21 +1328,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.2.0" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] name = "clap_lex" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] name = "clipboard-win" @@ -1377,16 +1355,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - [[package]] name = "colorchoice" version = "1.0.0" @@ -1429,22 +1397,22 @@ dependencies = [ [[package]] name = "console" -version = "0.15.5" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "console-api" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e57ff02e8ad8e06ab9731d5dc72dc23bef9200778eae1a89d555d8c42e5d4a86" +checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e" dependencies = [ "prost", "prost-types", @@ -1454,9 +1422,9 @@ dependencies = [ [[package]] name = "console-subscriber" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a3a81dfaf6b66bce5d159eddae701e3a002f194d378cbf7be5f053c281d9be" +checksum = "57ab2224a0311582eb03adba4caaf18644f7b1f10a760803a803b9b605187fc7" dependencies = [ "console-api", "crossbeam-channel", @@ -1464,7 +1432,7 @@ dependencies = [ "futures", "hdrhistogram", "humantime", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "prost-types", "serde", "serde_json", @@ -1585,7 +1553,16 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "593b398dd0c5b1e2e3a9c3dae8584e287894ea84e361949ad506376e99196265" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.89.2", +] + +[[package]] +name = "cranelift-bforest" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1277fbfa94bc82c8ec4af2ded3e639d49ca5f7f3c7eeab2c66accd135ece4e70" +dependencies = [ + "cranelift-entity 0.95.1", ] [[package]] @@ -1596,14 +1573,34 @@ checksum = "afc0d8faabd099ea15ab33d49d150e5572c04cfeb95d675fd41286739b754629" dependencies = [ "arrayvec 0.7.2", "bumpalo", - "cranelift-bforest", - "cranelift-codegen-meta", - "cranelift-codegen-shared", - "cranelift-entity", - "cranelift-isle", + "cranelift-bforest 0.89.2", + "cranelift-codegen-meta 0.89.2", + "cranelift-codegen-shared 0.89.2", + "cranelift-entity 0.89.2", + "cranelift-isle 0.89.2", "gimli 0.26.2", "log", - "regalloc2", + "regalloc2 0.4.2", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-codegen" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6e8c31ad3b2270e9aeec38723888fe1b0ace3bea2b06b3f749ccf46661d3220" +dependencies = [ + "bumpalo", + "cranelift-bforest 0.95.1", + "cranelift-codegen-meta 0.95.1", + "cranelift-codegen-shared 0.95.1", + "cranelift-entity 0.95.1", + "cranelift-isle 0.95.1", + "gimli 0.27.2", + "hashbrown 0.13.2", + "log", + "regalloc2 0.6.1", "smallvec", "target-lexicon", ] @@ -1614,7 +1611,16 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ac1669e42579476f001571d6ba4b825fac686282c97b88b18f8e34242066a81" dependencies = [ - "cranelift-codegen-shared", + "cranelift-codegen-shared 0.89.2", +] + +[[package]] +name = "cranelift-codegen-meta" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ac5ac30d62b2d66f12651f6b606dbdfd9c2cfd0908de6b387560a277c5c9da" +dependencies = [ + "cranelift-codegen-shared 0.95.1", ] [[package]] @@ -1623,6 +1629,12 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2a1b1eef9640ab72c1e7b583ac678083855a509da34b4b4378bd99954127c20" +[[package]] +name = "cranelift-codegen-shared" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd82b8b376247834b59ed9bdc0ddeb50f517452827d4a11bccf5937b213748b8" + [[package]] name = "cranelift-entity" version = "0.89.2" @@ -1632,13 +1644,34 @@ dependencies = [ "serde", ] +[[package]] +name = "cranelift-entity" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40099d38061b37e505e63f89bab52199037a72b931ad4868d9089ff7268660b0" +dependencies = [ + "serde", +] + [[package]] name = "cranelift-frontend" version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fca1474b5302348799656d43a40eacd716a3b46169405a3af812832c9edf77b4" dependencies = [ - "cranelift-codegen", + "cranelift-codegen 0.89.2", + "log", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-frontend" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a25d9d0a0ae3079c463c34115ec59507b4707175454f0eee0891e83e30e82d" +dependencies = [ + "cranelift-codegen 0.95.1", "log", "smallvec", "target-lexicon", @@ -1650,13 +1683,30 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77aa537f020ea43483100153278e7215d41695bdcef9eea6642d122675f64249" +[[package]] +name = "cranelift-isle" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80de6a7d0486e4acbd5f9f87ec49912bf4c8fb6aea00087b989685460d4469ba" + [[package]] name = "cranelift-native" version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bdc6b65241a95b7d8eafbf4e114c082e49b80162a2dcd9c6bcc5989c3310c9e" dependencies = [ - "cranelift-codegen", + "cranelift-codegen 0.89.2", + "libc", + "target-lexicon", +] + +[[package]] +name = "cranelift-native" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb6b03e0e03801c4b3fd8ce0758a94750c07a44e7944cc0ffbf0d3f2e7c79b00" +dependencies = [ + "cranelift-codegen 0.95.1", "libc", "target-lexicon", ] @@ -1667,14 +1717,30 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb6359f606a1c80ccaa04fae9dbbb504615ec7a49b6c212b341080fff7a65dd" dependencies = [ - "cranelift-codegen", - "cranelift-entity", - "cranelift-frontend", + "cranelift-codegen 0.89.2", + "cranelift-entity 0.89.2", + "cranelift-frontend 0.89.2", "itertools 0.10.5", "log", "smallvec", "wasmparser 0.92.0", - "wasmtime-types", + "wasmtime-types 2.0.2", +] + +[[package]] +name = "cranelift-wasm" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff3220489a3d928ad91e59dd7aeaa8b3de18afb554a6211213673a71c90737ac" +dependencies = [ + "cranelift-codegen 0.95.1", + "cranelift-entity 0.95.1", + "cranelift-frontend 0.95.1", + "itertools 0.10.5", + "log", + "smallvec", + "wasmparser 0.102.0", + "wasmtime-types 8.0.1", ] [[package]] @@ -1881,50 +1947,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 2.0.15", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - [[package]] name = "daemonize-me" version = "2.0.1" @@ -1948,12 +1970,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c99d16b88c92aef47e58dadd53e87b4bd234c29934947a6cec8b466300f99b" +checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" dependencies = [ - "darling_core 0.20.0", - "darling_macro 0.20.0", + "darling_core 0.20.1", + "darling_macro 0.20.1", ] [[package]] @@ -1972,16 +1994,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ea05d2fcb27b53f7a98faddaf5f2914760330ab7703adfc9df13332b42189f9" +checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -1997,26 +2019,26 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bfb82b62b1b8a2a9808fb4caf844ede819a76cfc23b2827d7f94eefb49551eb" +checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ - "darling_core 0.20.0", + "darling_core 0.20.1", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] name = "data-encoding" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "data-encoding-macro" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86927b7cd2fe88fa698b87404b287ab98d1a0063a34071d92e575b72d3029aca" +checksum = "c904b33cc60130e1aeea4956ab803d08a3f4a0ca82d64ed757afac3891f2bb99" dependencies = [ "data-encoding", "data-encoding-macro-internal", @@ -2024,9 +2046,9 @@ dependencies = [ [[package]] name = "data-encoding-macro-internal" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db" +checksum = "8fdf3fce3ce863539ec1d7fd1b6dcc3c645663376b43ed376bbf887733e4f772" dependencies = [ "data-encoding", "syn 1.0.109", @@ -2203,9 +2225,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", "crypto-common", @@ -2264,13 +2286,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", ] [[package]] @@ -2375,7 +2397,7 @@ dependencies = [ "base16ct", "crypto-bigint", "der", - "digest 0.10.6", + "digest 0.10.7", "ff", "generic-array", "group", @@ -2516,7 +2538,7 @@ checksum = "55a9a55d1dab3b07854648d48e366f684aefe2ac78ae28cec3bf65e3cd53d9a3" dependencies = [ "execute-command-tokens", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -2568,7 +2590,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39ae6b3d9530211fb3b12a95374b8b0823be812f53d09e18c5675c0146b09642" dependencies = [ "cfg-if 1.0.0", - "rustix 0.37.15", + "rustix 0.37.19", "windows-sys 0.48.0", ] @@ -2601,13 +2623,12 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "fil_actor_account_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b187f415da309f586e78dcb93b0fc2ef4d87c48a83ea10ed67698153c9242c78" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" 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", @@ -2616,12 +2637,11 @@ dependencies = [ [[package]] name = "fil_actor_cron_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebf1ba16d3463dbc1994ee13046bbf4779d2b09c09814ceffee02b20469cce1a" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" 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", @@ -2630,16 +2650,15 @@ dependencies = [ [[package]] name = "fil_actor_datacap_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a3e19bc02375ac1bd1846f3ec4c9b1d9d9bc1100bf4116ba3fcf833c7b86805" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" 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", @@ -2648,12 +2667,11 @@ dependencies = [ [[package]] name = "fil_actor_evm_shared_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed3723f5c77039a08973272486777ee0cc829282e2bbd1c8241663e41d6dd8" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "fil_actors_shared", "fvm_ipld_encoding 0.3.3", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "hex", "serde", "uint", @@ -2662,14 +2680,13 @@ dependencies = [ [[package]] name = "fil_actor_evm_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0ecbde9e08b2b94e85a58b3d8c951aa3ef9cd37aae8c01299ad2bc6248c3ac" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" 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", @@ -2679,8 +2696,7 @@ dependencies = [ [[package]] name = "fil_actor_init_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ce8135e0abbbef389cba5463a09f3388a6dfdcad10a00c46b58c37c056827b5" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2689,8 +2705,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", @@ -2699,8 +2715,7 @@ dependencies = [ [[package]] name = "fil_actor_interface" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad5d9aad0bc17842d843da7d0b2ba9a45fe6eeb429d1840f71107238c483d60" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2719,8 +2734,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", @@ -2732,8 +2747,7 @@ dependencies = [ [[package]] name = "fil_actor_market_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6fa0e995d6105a32764310ae69798d7b385c8fab79a12f7073a3821a8db8e4" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2744,8 +2758,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", @@ -2756,8 +2770,7 @@ dependencies = [ [[package]] name = "fil_actor_miner_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c813a2ac23cf3839c894bb298aec7b8cd60bb72dfd0969a72f5e3d75f7b7c3" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2769,8 +2782,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", @@ -2783,8 +2796,7 @@ dependencies = [ [[package]] name = "fil_actor_multisig_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf69d3ef248bde1bf918a82c9569a1370ba791fad79715fec9331b864b530b06" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2793,8 +2805,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", @@ -2805,8 +2817,7 @@ dependencies = [ [[package]] name = "fil_actor_power_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9aa1d743813f85668c1fcfd4ea7bd8c6801c7d680082206befab579841aa703" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2815,8 +2826,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", @@ -2827,12 +2838,11 @@ dependencies = [ [[package]] name = "fil_actor_reward_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2e9ed3f14f42a3271dd4b0bde27d856921f1663d01ed90c11e3bf28155937f4" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" 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", @@ -2842,12 +2852,11 @@ dependencies = [ [[package]] name = "fil_actor_system_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc0710525208487a4509fbbfa920e545a857dd8d42786cfd8e7ad83643dfd5e" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "cid", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "num-derive", "num-traits", "serde", @@ -2856,8 +2865,7 @@ dependencies = [ [[package]] name = "fil_actor_verifreg_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aef9da0968812cf86404d138a29d9e6f4bbfbede4e52dda724bafe514b9de64" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2865,8 +2873,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", @@ -2875,8 +2883,7 @@ dependencies = [ [[package]] name = "fil_actors_shared" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9b943dbb4ba114540d7e20d512b3cd6eb279be02195341e56f917b049316af2" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2884,8 +2891,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 +2922,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 +2942,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 +2953,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 +2967,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,23 +2984,23 @@ 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]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", "libz-sys", - "miniz_oxide", + "miniz_oxide 0.7.1", ] [[package]] @@ -3094,7 +3031,7 @@ dependencies = [ "anyhow", "assert_cmd", "atty", - "base64 0.21.0", + "base64 0.21.1", "bigdecimal", "boa_engine", "cfg-if 1.0.0", @@ -3125,7 +3062,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", @@ -3145,7 +3082,7 @@ dependencies = [ "tempfile", "ticker", "tokio", - "toml 0.7.3", + "toml 0.7.4", ] [[package]] @@ -3217,12 +3154,12 @@ dependencies = [ "ahash 0.8.3", "anyhow", "async-trait", - "base64 0.21.0", + "base64 0.21.1", "bls-signatures", "byteorder", "forest_shim", "forest_utils", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "hex", "parking_lot 0.12.1", "quickcheck", @@ -3240,7 +3177,7 @@ version = "0.8.2" dependencies = [ "ahash 0.8.3", "anyhow", - "base64 0.21.0", + "base64 0.21.1", "cid", "derive_builder 0.12.0", "forest_beacon", @@ -3250,7 +3187,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", @@ -3275,7 +3212,7 @@ dependencies = [ "blake2b_simd", "bls-signatures", "cid", - "digest 0.10.6", + "digest 0.10.7", "flume", "forest_beacon", "forest_blocks", @@ -3293,12 +3230,12 @@ 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", - "lru", + "lru 0.9.0", "multihash 0.16.3", "num", "parking_lot 0.12.1", @@ -3316,7 +3253,7 @@ dependencies = [ "ahash 0.8.3", "anyhow", "async-trait", - "base64 0.21.0", + "base64 0.21.1", "chrono", "cid", "flume", @@ -3336,11 +3273,11 @@ 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", + "lru 0.9.0", "nonempty", "num", "num-bigint", @@ -3392,7 +3329,7 @@ dependencies = [ "tempfile", "tikv-jemallocator", "tokio", - "toml 0.7.3", + "toml 0.7.4", "tower-http", "tracing-appender", "tracing-loki", @@ -3469,7 +3406,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 +3420,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 +3471,13 @@ dependencies = [ "forest_message", "forest_networks", "forest_shim", - "fvm 2.3.0", + "fvm 2.4.0", "fvm 3.3.1", "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 +3499,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", @@ -3583,18 +3520,18 @@ name = "forest_json" version = "0.8.2" dependencies = [ "ahash 0.8.3", - "base64 0.21.0", + "base64 0.21.1", "cid", "data-encoding", "forest_message", "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", @@ -3611,7 +3548,7 @@ dependencies = [ "ahash 0.8.3", "anyhow", "argon2", - "base64 0.21.0", + "base64 0.21.1", "bls-signatures", "forest_json", "forest_shim", @@ -3654,7 +3591,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 +3647,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", @@ -3742,11 +3679,11 @@ dependencies = [ "fvm 3.3.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", + "lru 0.9.0", "num", "num-rational", "num-traits", @@ -3786,7 +3723,7 @@ dependencies = [ "fil_actors_shared", "forest_beacon", "forest_shim", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "lazy_static", "multiaddr", "serde", @@ -3819,7 +3756,7 @@ dependencies = [ "ahash 0.8.3", "anyhow", "axum", - "base64 0.21.0", + "base64 0.21.1", "cid", "crossbeam", "fil_actor_interface", @@ -3845,7 +3782,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,14 +3827,14 @@ 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", "serde", "serde_json", "serde_with", - "syn 2.0.15", + "syn 2.0.16", "tokio", ] @@ -3923,14 +3860,14 @@ dependencies = [ "anyhow", "bls-signatures", "cid", - "filecoin-proofs-api 14.0.0", - "fvm 2.3.0", + "filecoin-proofs-api", + "fvm 2.4.0", "fvm 3.3.1", "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 +3889,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,15 +3903,15 @@ dependencies = [ "forest_state_migration", "forest_utils", "futures", - "fvm 2.3.0", + "fvm 2.4.0", "fvm 3.3.1", "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", + "lru 0.9.0", "num", "num-traits", "once_cell", @@ -4040,7 +3977,7 @@ dependencies = [ name = "forest_test_utils" version = "0.8.2" dependencies = [ - "base64 0.21.0", + "base64 0.21.1", "cid", "forest_blocks", "forest_json", @@ -4066,8 +4003,8 @@ dependencies = [ "cid", "const_format", "cs_serde_bytes", - "digest 0.10.6", - "filecoin-proofs-api 14.0.0", + "digest 0.10.7", + "filecoin-proofs-api", "flume", "forest_shim", "futures", @@ -4077,7 +4014,7 @@ dependencies = [ "git-version", "human-repr", "hyper", - "hyper-rustls", + "hyper-rustls 0.23.2", "libc", "log", "memory-stats", @@ -4097,7 +4034,7 @@ dependencies = [ "tempfile", "thiserror", "tokio", - "toml 0.7.3", + "toml 0.7.4", "tracing", "url", ] @@ -4111,20 +4048,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 +4072,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 +4083,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 +4115,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", @@ -4294,7 +4217,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -4350,9 +4273,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 +4284,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", @@ -4381,7 +4304,7 @@ dependencies = [ "serde_repr", "serde_tuple", "thiserror", - "wasmtime", + "wasmtime 8.0.1", "yastl", ] @@ -4395,13 +4318,13 @@ dependencies = [ "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", @@ -4415,9 +4338,9 @@ dependencies = [ "serde", "serde_tuple", "thiserror", - "wasmtime", - "wasmtime-environ", - "wasmtime-runtime", + "wasmtime 2.0.2", + "wasmtime-environ 2.0.2", + "wasmtime-runtime 2.0.2", "yastl", ] @@ -4454,7 +4377,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 +4539,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 +4548,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 +4561,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 +4581,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 +4593,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", @@ -4728,12 +4651,12 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199523ba70af2b447640715e8c4bd2b5360313a71d2d69361ae4dd1dc31487dd" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" dependencies = [ "libc", - "windows 0.48.0", + "windows-targets 0.48.0", ] [[package]] @@ -4796,6 +4719,11 @@ name = "gimli" version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +dependencies = [ + "fallible-iterator", + "indexmap", + "stable_deref_trait", +] [[package]] name = "git-version" @@ -4852,9 +4780,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" dependencies = [ "bytes 1.4.0", "fnv", @@ -4989,7 +4917,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -5102,7 +5030,20 @@ dependencies = [ "rustls 0.20.8", "rustls-native-certs", "tokio", - "tokio-rustls", + "tokio-rustls 0.23.4", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +dependencies = [ + "http", + "hyper", + "rustls 0.21.1", + "tokio", + "tokio-rustls 0.24.0", ] [[package]] @@ -5133,12 +5074,11 @@ dependencies = [ [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] @@ -5302,7 +5242,7 @@ checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes 1.0.10", - "rustix 0.37.15", + "rustix 0.37.19", "windows-sys 0.48.0", ] @@ -5341,9 +5281,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" dependencies = [ "wasm-bindgen", ] @@ -5381,7 +5321,7 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.0", + "base64 0.21.1", "pem", "ring", "serde", @@ -5391,9 +5331,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" dependencies = [ "cpufeatures", ] @@ -5544,9 +5484,9 @@ checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" [[package]] name = "libm" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libmimalloc-sys" @@ -5593,9 +5533,9 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.39.1" +version = "0.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7f8b7d65c070a5a1b5f8f0510648189da08f787b8963f8e21219e0710733af" +checksum = "3c1df63c0b582aa434fb09b2d86897fa2b419ffeccf934b36f87fcedc8e835c2" dependencies = [ "either", "fnv", @@ -5635,14 +5575,15 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.44.3" +version = "0.44.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac213adad69bd9866fe87c37fbf241626715e5cd454fb6df9841aa2b02440ee" +checksum = "70b34b6da8165c0bde35c82db8efda39b824776537e73973549e76cadb3a77c5" dependencies = [ "asynchronous-codec", - "base64 0.21.0", + "base64 0.21.1", "byteorder", "bytes 1.4.0", + "either", "fnv", "futures", "hex_fmt", @@ -5660,14 +5601,15 @@ dependencies = [ "smallvec", "thiserror", "unsigned-varint", + "void", "wasm-timer", ] [[package]] name = "libp2p-identify" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40d1da1f75baf824cfdc80f6aced51f7cbf8dc14e32363e9443570a80d4ee337" +checksum = "5455f472243e63b9c497ff320ded0314254a9eb751799a39c283c6f20b793f3c" dependencies = [ "asynchronous-codec", "either", @@ -5677,7 +5619,7 @@ dependencies = [ "libp2p-identity", "libp2p-swarm", "log", - "lru", + "lru 0.10.0", "quick-protobuf", "quick-protobuf-codec", "smallvec", @@ -5687,27 +5629,27 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a8ea433ae0cea7e3315354305237b9897afe45278b2118a7a57ca744e70fd27" +checksum = "9e2d584751cecb2aabaa56106be6be91338a60a0f4e420cf2af639204f596fc1" dependencies = [ "bs58", "ed25519-dalek", "log", "multiaddr", "multihash 0.17.0", - "prost", "quick-protobuf", "rand 0.8.5", + "sha2 0.10.6", "thiserror", "zeroize", ] [[package]] name = "libp2p-kad" -version = "0.43.2" +version = "0.43.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9647c76e63c4d0e9a10369cef9b929a2e5e8f03008b2097ab365fc4cb4e5318f" +checksum = "39d5ef876a2b2323d63c258e63c2f8e36f205fe5a11f0b3095d59635650790ff" dependencies = [ "arrayvec 0.7.2", "asynchronous-codec", @@ -5769,9 +5711,9 @@ dependencies = [ [[package]] name = "libp2p-noise" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c87c2803deffeae94108072a0387f8c9ff494af68a4908454c11c811e27b5e5" +checksum = "9c3673da89d29936bc6435bafc638e2f184180d554ce844db65915113f86ec5e" dependencies = [ "bytes 1.4.0", "curve25519-dalek 3.2.0", @@ -5831,27 +5773,25 @@ dependencies = [ [[package]] name = "libp2p-request-response" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "872b9d63fed44d9f81110c30be6c7ca5593a093576d2a95c5d018051e294d2e9" +checksum = "7ffdb374267d42dc5ed5bc53f6e601d4a64ac5964779c6e40bb9e4f14c1e30d5" dependencies = [ "async-trait", - "bytes 1.4.0", "futures", "instant", "libp2p-core", + "libp2p-identity", "libp2p-swarm", - "log", "rand 0.8.5", "smallvec", - "unsigned-varint", ] [[package]] name = "libp2p-swarm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd1e223f02fcd7e3790f9b954e2e81791810e3512daeb27fa97df7652e946bc2" +checksum = "903b3d592d7694e56204d211f29d31bc004be99386644ba8731fc3e3ef27b296" dependencies = [ "either", "fnv", @@ -5982,14 +5922,13 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.43.0" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d048cd82f72c8800655aa1ee9b808ea8c9d523a649d3579b3ef0cfe23952d7fd" +checksum = "4dcd21d950662700a385d4c6d68e2f5f54d778e97068cdd718522222ef513bda" dependencies = [ "futures", "libp2p-core", "log", - "parking_lot 0.12.1", "thiserror", "yamux", ] @@ -6060,24 +5999,15 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" dependencies = [ "cc", "pkg-config", "vcpkg", ] -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -6098,9 +6028,9 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "linux-raw-sys" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8776872cdc2f073ccaab02e336fa321328c1e02646ebcb9d2108d0baab480d" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "lock_api" @@ -6142,6 +6072,15 @@ dependencies = [ "hashbrown 0.13.2", ] +[[package]] +name = "lru" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03f1160296536f10c833a82dca22267d5486734230d47bf00bf435885814ba1e" +dependencies = [ + "hashbrown 0.13.2", +] + [[package]] name = "lru-cache" version = "0.1.2" @@ -6209,10 +6148,11 @@ checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" [[package]] name = "matrixmultiply" -version = "0.3.3" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb99c395ae250e1bf9133673f03ca9f97b7e71b705436bf8f089453445d1e9fe" +checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" dependencies = [ + "autocfg", "rawpointer", ] @@ -6233,7 +6173,7 @@ version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -6254,7 +6194,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" dependencies = [ - "rustix 0.37.15", + "rustix 0.37.19", ] [[package]] @@ -6347,9 +6287,9 @@ dependencies = [ [[package]] name = "minidom" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9ce45d459e358790a285e7609ff5ae4cfab88b75f237e8838e62029dda397b" +checksum = "f45614075738ce1b77a1768912a60c0227525971b03e09122a05b8a34a2a6278" dependencies = [ "rxml", ] @@ -6369,6 +6309,15 @@ dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + [[package]] name = "minstant" version = "0.1.2" @@ -6432,7 +6381,7 @@ dependencies = [ "blake2s_simd 1.0.1", "blake3", "core2", - "digest 0.10.6", + "digest 0.10.7", "multihash-derive", "ripemd", "serde", @@ -6449,7 +6398,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" dependencies = [ "core2", - "digest 0.10.6", + "digest 0.10.7", "multihash-derive", "sha2 0.10.6", "unsigned-varint", @@ -6785,7 +6734,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", - "libm 0.2.6", + "libm 0.2.7", ] [[package]] @@ -6816,6 +6765,9 @@ version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ + "crc32fast", + "hashbrown 0.13.2", + "indexmap", "memchr", ] @@ -7115,22 +7067,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", ] [[package]] @@ -7163,9 +7115,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "platforms" @@ -7208,7 +7160,7 @@ checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ "cpufeatures", "opaque-debug", - "universal-hash 0.5.0", + "universal-hash 0.5.1", ] [[package]] @@ -7232,7 +7184,7 @@ dependencies = [ "cfg-if 1.0.0", "cpufeatures", "opaque-debug", - "universal-hash 0.5.0", + "universal-hash 0.5.1", ] [[package]] @@ -7334,9 +7286,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" dependencies = [ "unicode-ident", ] @@ -7351,7 +7303,7 @@ dependencies = [ "byteorder", "hex", "lazy_static", - "rustix 0.36.13", + "rustix 0.36.14", ] [[package]] @@ -7573,9 +7525,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2", ] @@ -7735,7 +7687,7 @@ checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", "ring", - "time 0.3.20", + "time 0.3.21", "x509-parser 0.13.2", "yasna", ] @@ -7748,7 +7700,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", "ring", - "time 0.3.20", + "time 0.3.21", "yasna", ] @@ -7793,6 +7745,18 @@ dependencies = [ "smallvec", ] +[[package]] +name = "regalloc2" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80535183cae11b149d618fbd3c37e38d7cda589d82d7769e196ca9a9042d7621" +dependencies = [ + "fxhash", + "log", + "slice-group-by", + "smallvec", +] + [[package]] name = "regex" version = "1.8.1" @@ -7842,11 +7806,11 @@ checksum = "e3a8614ee435691de62bcffcf4a66d91b3594bf1428a5722e79103249a095690" [[package]] name = "reqwest" -version = "0.11.16" +version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ - "base64 0.21.0", + "base64 0.21.1", "bytes 1.4.0", "encoding_rs", "futures-core", @@ -7855,7 +7819,7 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls", + "hyper-rustls 0.24.0", "ipnet", "js-sys", "log", @@ -7863,13 +7827,13 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite 0.2.9", - "rustls 0.20.8", + "rustls 0.21.1", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.0", "tower-service", "url", "wasm-bindgen", @@ -7921,7 +7885,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -8030,7 +7994,7 @@ dependencies = [ "serde_derive", "sha2 0.10.6", "thiserror", - "time 0.3.20", + "time 0.3.21", "url", ] @@ -8080,9 +8044,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.13" +version = "0.36.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a38f9520be93aba504e8ca974197f46158de5dcaa9fa04b57c57cd6a679d658" +checksum = "14e4d67015953998ad0eb82887a0eb0129e18a7e2f3b7b0f6c422fddcd503d62" dependencies = [ "bitflags", "errno 0.3.1", @@ -8094,15 +8058,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.15" +version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0661814f891c57c930a610266415528da53c4933e6dea5fb350cbfe048a9ece" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ "bitflags", "errno 0.3.1", "io-lifetimes 1.0.10", "libc", - "linux-raw-sys 0.3.5", + "linux-raw-sys 0.3.8", "windows-sys 0.48.0", ] @@ -8131,6 +8095,18 @@ dependencies = [ "webpki 0.22.0", ] +[[package]] +name = "rustls" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct 0.7.0", +] + [[package]] name = "rustls-native-certs" version = "0.6.2" @@ -8149,7 +8125,17 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64 0.21.0", + "base64 0.21.1", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", ] [[package]] @@ -8194,22 +8180,20 @@ dependencies = [ [[package]] name = "rxml" -version = "0.8.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a071866b8c681dc2cfffa77184adc32b57b0caad4e620b6292609703bceb804" +checksum = "a98f186c7a2f3abbffb802984b7f1dfd65dac8be1aafdaabbca4137f53f0dff7" dependencies = [ "bytes 1.4.0", - "pin-project-lite 0.2.9", "rxml_validation", "smartstring", - "tokio", ] [[package]] name = "rxml_validation" -version = "0.8.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53bc79743f9a66c2fb1f951cd83735f275d46bfe466259fbc5897bb60a0d00ee" +checksum = "22a197350ece202f19a166d1ad6d9d6de145e1d2a8ef47db299abe164dbd7530" [[package]] name = "ryu" @@ -8265,12 +8249,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - [[package]] name = "sct" version = "0.6.1" @@ -8319,9 +8297,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ "bitflags", "core-foundation", @@ -8332,9 +8310,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" dependencies = [ "core-foundation-sys", "libc", @@ -8399,7 +8377,7 @@ checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -8442,14 +8420,14 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] name = "serde_spanned" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" dependencies = [ "serde", ] @@ -8500,7 +8478,7 @@ dependencies = [ "serde", "serde_json", "serde_with_macros", - "time 0.3.20", + "time 0.3.21", ] [[package]] @@ -8509,10 +8487,10 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ - "darling 0.20.0", + "darling 0.20.1", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -8532,7 +8510,7 @@ dependencies = [ name = "serialization_tests" version = "0.8.2" dependencies = [ - "base64 0.21.0", + "base64 0.21.1", "bls-signatures", "cid", "forest_blocks", @@ -8566,7 +8544,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -8590,7 +8568,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", "sha2-asm", ] @@ -8603,21 +8581,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" @@ -8626,7 +8589,7 @@ checksum = "d1ec45c74ebb91d25e61e14cfc1925e7571723ae14a38fc6c8bd0b2e516db101" dependencies = [ "byteorder", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", "fake-simd", "lazy_static", "opaque-debug", @@ -8635,11 +8598,11 @@ dependencies = [ [[package]] name = "sha3" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c2bb1a323307527314a36bfb73f24febb08ce2b8a554bf4ffd6f51ad15198c" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "keccak", ] @@ -8692,7 +8655,7 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "rand_core 0.6.4", ] @@ -8724,7 +8687,7 @@ dependencies = [ "num-bigint", "num-traits", "thiserror", - "time 0.3.20", + "time 0.3.21", ] [[package]] @@ -8744,9 +8707,9 @@ dependencies = [ [[package]] name = "slice-group-by" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" +checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "slotmap" @@ -8765,11 +8728,13 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "smartstring" -version = "0.2.10" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e714dff2b33f2321fdcd475b71cec79781a692d846f37f415fb395a1d2bcd48e" +checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" dependencies = [ + "autocfg", "static_assertions", + "version_check", ] [[package]] @@ -8877,41 +8842,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 +8857,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 +8877,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 +8892,8 @@ dependencies = [ "crossbeam", "fdlimit", "ff", - "filecoin-hashers 9.0.0", - "fr32 7.0.0", + "filecoin-hashers", + "fr32", "generic-array", "hex", "lazy_static", @@ -9019,34 +8911,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 +8928,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 +8949,8 @@ dependencies = [ "bellperson", "blstrs", "ff", - "filecoin-hashers 9.0.0", - "fr32 7.0.0", + "filecoin-hashers", + "fr32", "generic-array", "lazy_static", "log", @@ -9114,8 +8959,8 @@ dependencies = [ "neptune", "rayon", "serde", - "storage-proofs-core 14.0.0", - "storage-proofs-porep 14.0.0", + "storage-proofs-core", + "storage-proofs-porep", ] [[package]] @@ -9196,9 +9041,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" dependencies = [ "proc-macro2", "quote", @@ -9225,9 +9070,9 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags", "core-foundation", @@ -9265,19 +9110,10 @@ dependencies = [ "cfg-if 1.0.0", "fastrand", "redox_syscall 0.3.5", - "rustix 0.37.15", + "rustix 0.37.19", "windows-sys 0.45.0", ] -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - [[package]] name = "termtree" version = "0.4.1" @@ -9301,7 +9137,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -9362,9 +9198,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" dependencies = [ "itoa", "serde", @@ -9374,15 +9210,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" dependencies = [ "time-core", ] @@ -9414,9 +9250,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.0" +version = "1.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" +checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" dependencies = [ "autocfg", "bytes 1.4.0", @@ -9450,7 +9286,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -9464,6 +9300,16 @@ dependencies = [ "webpki 0.22.0", ] +[[package]] +name = "tokio-rustls" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +dependencies = [ + "rustls 0.21.1", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.14" @@ -9513,9 +9359,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" dependencies = [ "serde", "serde_spanned", @@ -9525,18 +9371,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "92d964908cec0d030b812013af25a0e57fddfadb1e066ecc6681d86253129d4f" dependencies = [ "indexmap", "serde", @@ -9547,14 +9393,13 @@ dependencies = [ [[package]] name = "tonic" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" +checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ - "async-stream", "async-trait", "axum", - "base64 0.13.1", + "base64 0.21.1", "bytes 1.4.0", "futures-core", "futures-util", @@ -9566,15 +9411,12 @@ dependencies = [ "percent-encoding", "pin-project", "prost", - "prost-derive", "tokio", "tokio-stream", - "tokio-util", "tower", "tower-layer", "tower-service", "tracing", - "tracing-futures", ] [[package]] @@ -9654,7 +9496,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" dependencies = [ "crossbeam-channel", - "time 0.3.20", + "time 0.3.21", "tracing-subscriber", ] @@ -9666,29 +9508,19 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", "valuable", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - [[package]] name = "tracing-log" version = "0.1.3" @@ -9935,9 +9767,9 @@ dependencies = [ [[package]] name = "universal-hash" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ "crypto-common", "subtle", @@ -9957,8 +9789,6 @@ checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" dependencies = [ "asynchronous-codec", "bytes 1.4.0", - "futures-io", - "futures-util", ] [[package]] @@ -9999,9 +9829,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2" +checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" dependencies = [ "getrandom 0.2.9", ] @@ -10110,9 +9940,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -10120,24 +9950,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -10147,9 +9977,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -10157,22 +9987,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" [[package]] name = "wasm-encoder" @@ -10219,9 +10049,19 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.104.0" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a396af81a7c56ad976131d6a35e4b693b78a1ea0357843bd436b4577e254a7d" +checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b" +dependencies = [ + "indexmap", + "url", +] + +[[package]] +name = "wasmparser" +version = "0.105.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83be9e0b3f9570dc1979a33ae7b89d032c73211564232b99976553e5c155ec32" dependencies = [ "indexmap", "url", @@ -10229,12 +10069,12 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.2.56" +version = "0.2.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "731da2505d5437cd5d6feb09457835f76186be13be7677fe00781ae99d5bbe8a" +checksum = "50b0e5ed7a74a065637f0d7798ce5f29cadb064980d24b0c82af5200122fa0d8" dependencies = [ "anyhow", - "wasmparser 0.104.0", + "wasmparser 0.105.0", ] [[package]] @@ -10257,13 +10097,40 @@ dependencies = [ "serde", "target-lexicon", "wasmparser 0.92.0", - "wasmtime-cranelift", - "wasmtime-environ", - "wasmtime-jit", - "wasmtime-runtime", + "wasmtime-cranelift 2.0.2", + "wasmtime-environ 2.0.2", + "wasmtime-jit 2.0.2", + "wasmtime-runtime 2.0.2", "windows-sys 0.36.1", ] +[[package]] +name = "wasmtime" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f907fdead3153cb9bfb7a93bbd5b62629472dc06dee83605358c64c52ed3dda9" +dependencies = [ + "anyhow", + "bincode", + "cfg-if 1.0.0", + "indexmap", + "libc", + "log", + "object 0.30.3", + "once_cell", + "paste", + "psm", + "rayon", + "serde", + "target-lexicon", + "wasmparser 0.102.0", + "wasmtime-cranelift 8.0.1", + "wasmtime-environ 8.0.1", + "wasmtime-jit 8.0.1", + "wasmtime-runtime 8.0.1", + "windows-sys 0.45.0", +] + [[package]] name = "wasmtime-asm-macros" version = "2.0.2" @@ -10273,6 +10140,15 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "wasmtime-asm-macros" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b9daa7c14cd4fa3edbf69de994408d5f4b7b0959ac13fa69d465f6597f810d" +dependencies = [ + "cfg-if 1.0.0", +] + [[package]] name = "wasmtime-cranelift" version = "2.0.2" @@ -10280,18 +10156,55 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "017c3605ccce867b3ba7f71d95e5652acc22b9dc2971ad6a6f9df4a8d7af2648" dependencies = [ "anyhow", - "cranelift-codegen", - "cranelift-entity", - "cranelift-frontend", - "cranelift-native", - "cranelift-wasm", + "cranelift-codegen 0.89.2", + "cranelift-entity 0.89.2", + "cranelift-frontend 0.89.2", + "cranelift-native 0.89.2", + "cranelift-wasm 0.89.2", "gimli 0.26.2", "log", "object 0.29.0", "target-lexicon", "thiserror", "wasmparser 0.92.0", - "wasmtime-environ", + "wasmtime-environ 2.0.2", +] + +[[package]] +name = "wasmtime-cranelift" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1cefde0cce8cb700b1b21b6298a3837dba46521affd7b8c38a9ee2c869eee04" +dependencies = [ + "anyhow", + "cranelift-codegen 0.95.1", + "cranelift-entity 0.95.1", + "cranelift-frontend 0.95.1", + "cranelift-native 0.95.1", + "cranelift-wasm 0.95.1", + "gimli 0.27.2", + "log", + "object 0.30.3", + "target-lexicon", + "thiserror", + "wasmparser 0.102.0", + "wasmtime-cranelift-shared", + "wasmtime-environ 8.0.1", +] + +[[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 0.95.1", + "cranelift-native 0.95.1", + "gimli 0.27.2", + "object 0.30.3", + "target-lexicon", + "wasmtime-environ 8.0.1", ] [[package]] @@ -10301,7 +10214,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aec5c1f81aab9bb35997113c171b6bb9093afc90e3757c55e0c08dc9ac612e4" dependencies = [ "anyhow", - "cranelift-entity", + "cranelift-entity 0.89.2", "gimli 0.26.2", "indexmap", "log", @@ -10310,7 +10223,26 @@ dependencies = [ "target-lexicon", "thiserror", "wasmparser 0.92.0", - "wasmtime-types", + "wasmtime-types 2.0.2", +] + +[[package]] +name = "wasmtime-environ" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949" +dependencies = [ + "anyhow", + "cranelift-entity 0.95.1", + "gimli 0.27.2", + "indexmap", + "log", + "object 0.30.3", + "serde", + "target-lexicon", + "thiserror", + "wasmparser 0.102.0", + "wasmtime-types 8.0.1", ] [[package]] @@ -10332,11 +10264,34 @@ dependencies = [ "serde", "target-lexicon", "thiserror", - "wasmtime-environ", - "wasmtime-runtime", + "wasmtime-environ 2.0.2", + "wasmtime-runtime 2.0.2", "windows-sys 0.36.1", ] +[[package]] +name = "wasmtime-jit" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244" +dependencies = [ + "addr2line 0.19.0", + "anyhow", + "bincode", + "cfg-if 1.0.0", + "cpp_demangle", + "gimli 0.27.2", + "log", + "object 0.30.3", + "rustc-demangle", + "serde", + "target-lexicon", + "wasmtime-environ 8.0.1", + "wasmtime-jit-icache-coherence", + "wasmtime-runtime 8.0.1", + "windows-sys 0.45.0", +] + [[package]] name = "wasmtime-jit-debug" version = "2.0.2" @@ -10346,6 +10301,26 @@ dependencies = [ "once_cell", ] +[[package]] +name = "wasmtime-jit-debug" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +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" @@ -10365,29 +10340,65 @@ dependencies = [ "rand 0.8.5", "rustix 0.35.13", "thiserror", - "wasmtime-asm-macros", - "wasmtime-environ", - "wasmtime-jit-debug", + "wasmtime-asm-macros 2.0.2", + "wasmtime-environ 2.0.2", + "wasmtime-jit-debug 2.0.2", "windows-sys 0.36.1", ] +[[package]] +name = "wasmtime-runtime" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658cf6f325232b6760e202e5255d823da5e348fdea827eff0a2a22319000b441" +dependencies = [ + "anyhow", + "cc", + "cfg-if 1.0.0", + "indexmap", + "libc", + "log", + "mach", + "memfd", + "memoffset 0.8.0", + "paste", + "rand 0.8.5", + "rustix 0.36.14", + "wasmtime-asm-macros 8.0.1", + "wasmtime-environ 8.0.1", + "wasmtime-jit-debug 8.0.1", + "windows-sys 0.45.0", +] + [[package]] name = "wasmtime-types" version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dc3dd9521815984b35d6362f79e6b9c72475027cd1c71c44eb8df8fbf33a9fb" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.89.2", "serde", "thiserror", "wasmparser 0.92.0", ] +[[package]] +name = "wasmtime-types" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f" +dependencies = [ + "cranelift-entity 0.95.1", + "serde", + "thiserror", + "wasmparser 0.102.0", +] + [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" dependencies = [ "js-sys", "wasm-bindgen", @@ -10448,7 +10459,7 @@ dependencies = [ "sha2 0.10.6", "stun", "thiserror", - "time 0.3.20", + "time 0.3.21", "tokio", "turn", "url", @@ -10485,7 +10496,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "942be5bd85f072c3128396f6e5a9bfb93ca8c1939ded735d177b7bcba9a13d05" dependencies = [ "aes 0.6.0", - "aes-gcm 0.10.1", + "aes-gcm 0.10.2", "async-trait", "bincode", "block-modes", @@ -10644,9 +10655,9 @@ dependencies = [ [[package]] name = "wide" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b689b6c49d6549434bf944e6b0f39238cf63693cb7a147e9d887507fffa3b223" +checksum = "5cd0496a71f3cc6bc4bf0ed91346426a5099e93d89807e663162dc5a1069ff65" dependencies = [ "bytemuck", "safe_arch", @@ -10948,9 +10959,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.1" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" dependencies = [ "memchr", ] @@ -11011,7 +11022,7 @@ dependencies = [ "ring", "rusticata-macros", "thiserror", - "time 0.3.20", + "time 0.3.21", ] [[package]] @@ -11029,20 +11040,20 @@ dependencies = [ "oid-registry 0.6.1", "rusticata-macros", "thiserror", - "time 0.3.20", + "time 0.3.21", ] [[package]] name = "xml-rs" -version = "0.8.4" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" +checksum = "1690519550bfa95525229b9ca2350c63043a4857b3b0013811b2ccf4a2420b01" [[package]] name = "xsalsa20poly1305" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "472c385ee974833d7e59979eeb74175d56774be3768b5bcc581337e21396bda3" +checksum = "02a6dad357567f81cd78ee75f7c61f1b30bb2fe4390be8fb7c69e2ac8dffb6c7" dependencies = [ "aead 0.5.2", "poly1305 0.8.0", @@ -11077,7 +11088,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.20", + "time 0.3.21", ] [[package]] @@ -11107,7 +11118,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index fd22a90fa06b..3ecee516eb55 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,7 +76,7 @@ flume = "0.10" fs_extra = "1.2" futures = "0.3" futures-util = "0.3" -fvm = { version = "~2.3", default-features = false } +fvm = { version = "~2.4", default-features = false } fvm3 = { package = "fvm", default-features = false, version = "~3.3.1" } fvm_ipld_amt = "0.5" fvm_ipld_bitfield = "0.5" @@ -84,7 +84,7 @@ 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" @@ -199,3 +199,12 @@ lto = "off" strip = true panic = "abort" overflow-checks = true + +[patch.crates-io] +fil_actor_interface = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } +fil_actor_account_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } +fil_actor_init_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } +fil_actor_miner_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } +fil_actor_power_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } +fil_actor_system_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } +fil_actors_shared = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } From da7253e091da51430c072abafade1369a523e8a4 Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Mon, 22 May 2023 17:37:25 +0100 Subject: [PATCH 15/23] Revert "nomerge: demonstrate dependency" This reverts commit 0a22dd1f3bb827eb373e90904b74600a90bbb584. --- Cargo.lock | 1553 ++++++++++++++++++++++++++-------------------------- Cargo.toml | 13 +- 2 files changed, 773 insertions(+), 793 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 38c0fbe4146c..193c31688ddc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "aes-gcm" -version = "0.10.2" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" +checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c" dependencies = [ "aead 0.5.2", "aes 0.8.2", @@ -186,9 +186,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.3.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "6342bd4f5a1205d7f41e94a41a901f5647c938cdfa96036338e8533c9d6c2450" dependencies = [ "anstyle", "anstyle-parse", @@ -308,7 +308,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.21", + "time 0.3.20", ] [[package]] @@ -324,7 +324,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.21", + "time 0.3.20", ] [[package]] @@ -457,7 +457,7 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.19", + "rustix 0.37.15", "slab", "socket2", "waker-fn", @@ -480,7 +480,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.15", ] [[package]] @@ -509,6 +509,28 @@ dependencies = [ "wasm-bindgen-futures", ] +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite 0.2.9", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + [[package]] name = "async-task" version = "4.4.0" @@ -523,7 +545,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.15", ] [[package]] @@ -591,7 +613,7 @@ dependencies = [ "serde", "serde-xml-rs", "thiserror", - "time 0.3.21", + "time 0.3.20", "url", ] @@ -612,7 +634,7 @@ checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" dependencies = [ "async-trait", "axum-core", - "base64 0.21.1", + "base64 0.21.0", "bitflags", "bytes 1.4.0", "futures-util", @@ -680,7 +702,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide", "object 0.30.3", "rustc-demangle", ] @@ -705,9 +727,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f1e31e207a6b8fb791a38ea3105e6cb541f55e4d029902d3039a4ad07cc4105" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" [[package]] name = "base64ct" @@ -726,7 +748,7 @@ dependencies = [ "blstrs", "byteorder", "crossbeam-channel", - "digest 0.10.7", + "digest 0.10.6", "ec-gpu", "ec-gpu-gen", "ff", @@ -845,7 +867,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "digest 0.10.7", + "digest 0.10.6", ] [[package]] @@ -1071,9 +1093,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bstr" -version = "1.5.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" dependencies = [ "memchr", "once_cell", @@ -1083,9 +1105,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.2" +version = "3.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" +checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" [[package]] name = "byte-slice-cast" @@ -1304,9 +1326,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.0" +version = "4.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" dependencies = [ "clap_builder", "clap_derive", @@ -1315,9 +1337,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.0" +version = "4.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" dependencies = [ "anstream", "anstyle", @@ -1328,21 +1350,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.15", ] [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] name = "clipboard-win" @@ -1355,6 +1377,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + [[package]] name = "colorchoice" version = "1.0.0" @@ -1397,22 +1429,22 @@ dependencies = [ [[package]] name = "console" -version = "0.15.7" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.45.0", + "windows-sys 0.42.0", ] [[package]] name = "console-api" -version = "0.5.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e" +checksum = "e57ff02e8ad8e06ab9731d5dc72dc23bef9200778eae1a89d555d8c42e5d4a86" dependencies = [ "prost", "prost-types", @@ -1422,9 +1454,9 @@ dependencies = [ [[package]] name = "console-subscriber" -version = "0.1.9" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ab2224a0311582eb03adba4caaf18644f7b1f10a760803a803b9b605187fc7" +checksum = "22a3a81dfaf6b66bce5d159eddae701e3a002f194d378cbf7be5f053c281d9be" dependencies = [ "console-api", "crossbeam-channel", @@ -1432,7 +1464,7 @@ dependencies = [ "futures", "hdrhistogram", "humantime", - "parking_lot 0.12.1", + "parking_lot 0.11.2", "prost-types", "serde", "serde_json", @@ -1553,16 +1585,7 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "593b398dd0c5b1e2e3a9c3dae8584e287894ea84e361949ad506376e99196265" dependencies = [ - "cranelift-entity 0.89.2", -] - -[[package]] -name = "cranelift-bforest" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1277fbfa94bc82c8ec4af2ded3e639d49ca5f7f3c7eeab2c66accd135ece4e70" -dependencies = [ - "cranelift-entity 0.95.1", + "cranelift-entity", ] [[package]] @@ -1573,34 +1596,14 @@ checksum = "afc0d8faabd099ea15ab33d49d150e5572c04cfeb95d675fd41286739b754629" dependencies = [ "arrayvec 0.7.2", "bumpalo", - "cranelift-bforest 0.89.2", - "cranelift-codegen-meta 0.89.2", - "cranelift-codegen-shared 0.89.2", - "cranelift-entity 0.89.2", - "cranelift-isle 0.89.2", + "cranelift-bforest", + "cranelift-codegen-meta", + "cranelift-codegen-shared", + "cranelift-entity", + "cranelift-isle", "gimli 0.26.2", "log", - "regalloc2 0.4.2", - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cranelift-codegen" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6e8c31ad3b2270e9aeec38723888fe1b0ace3bea2b06b3f749ccf46661d3220" -dependencies = [ - "bumpalo", - "cranelift-bforest 0.95.1", - "cranelift-codegen-meta 0.95.1", - "cranelift-codegen-shared 0.95.1", - "cranelift-entity 0.95.1", - "cranelift-isle 0.95.1", - "gimli 0.27.2", - "hashbrown 0.13.2", - "log", - "regalloc2 0.6.1", + "regalloc2", "smallvec", "target-lexicon", ] @@ -1611,16 +1614,7 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ac1669e42579476f001571d6ba4b825fac686282c97b88b18f8e34242066a81" dependencies = [ - "cranelift-codegen-shared 0.89.2", -] - -[[package]] -name = "cranelift-codegen-meta" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ac5ac30d62b2d66f12651f6b606dbdfd9c2cfd0908de6b387560a277c5c9da" -dependencies = [ - "cranelift-codegen-shared 0.95.1", + "cranelift-codegen-shared", ] [[package]] @@ -1629,12 +1623,6 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2a1b1eef9640ab72c1e7b583ac678083855a509da34b4b4378bd99954127c20" -[[package]] -name = "cranelift-codegen-shared" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd82b8b376247834b59ed9bdc0ddeb50f517452827d4a11bccf5937b213748b8" - [[package]] name = "cranelift-entity" version = "0.89.2" @@ -1644,34 +1632,13 @@ dependencies = [ "serde", ] -[[package]] -name = "cranelift-entity" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40099d38061b37e505e63f89bab52199037a72b931ad4868d9089ff7268660b0" -dependencies = [ - "serde", -] - [[package]] name = "cranelift-frontend" version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fca1474b5302348799656d43a40eacd716a3b46169405a3af812832c9edf77b4" dependencies = [ - "cranelift-codegen 0.89.2", - "log", - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cranelift-frontend" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a25d9d0a0ae3079c463c34115ec59507b4707175454f0eee0891e83e30e82d" -dependencies = [ - "cranelift-codegen 0.95.1", + "cranelift-codegen", "log", "smallvec", "target-lexicon", @@ -1683,30 +1650,13 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77aa537f020ea43483100153278e7215d41695bdcef9eea6642d122675f64249" -[[package]] -name = "cranelift-isle" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80de6a7d0486e4acbd5f9f87ec49912bf4c8fb6aea00087b989685460d4469ba" - [[package]] name = "cranelift-native" version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bdc6b65241a95b7d8eafbf4e114c082e49b80162a2dcd9c6bcc5989c3310c9e" dependencies = [ - "cranelift-codegen 0.89.2", - "libc", - "target-lexicon", -] - -[[package]] -name = "cranelift-native" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6b03e0e03801c4b3fd8ce0758a94750c07a44e7944cc0ffbf0d3f2e7c79b00" -dependencies = [ - "cranelift-codegen 0.95.1", + "cranelift-codegen", "libc", "target-lexicon", ] @@ -1717,30 +1667,14 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb6359f606a1c80ccaa04fae9dbbb504615ec7a49b6c212b341080fff7a65dd" dependencies = [ - "cranelift-codegen 0.89.2", - "cranelift-entity 0.89.2", - "cranelift-frontend 0.89.2", + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", "itertools 0.10.5", "log", "smallvec", "wasmparser 0.92.0", - "wasmtime-types 2.0.2", -] - -[[package]] -name = "cranelift-wasm" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff3220489a3d928ad91e59dd7aeaa8b3de18afb554a6211213673a71c90737ac" -dependencies = [ - "cranelift-codegen 0.95.1", - "cranelift-entity 0.95.1", - "cranelift-frontend 0.95.1", - "itertools 0.10.5", - "log", - "smallvec", - "wasmparser 0.102.0", - "wasmtime-types 8.0.1", + "wasmtime-types", ] [[package]] @@ -1947,6 +1881,50 @@ dependencies = [ "zeroize", ] +[[package]] +name = "cxx" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn 2.0.15", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + [[package]] name = "daemonize-me" version = "2.0.1" @@ -1970,12 +1948,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" +checksum = "e7c99d16b88c92aef47e58dadd53e87b4bd234c29934947a6cec8b466300f99b" dependencies = [ - "darling_core 0.20.1", - "darling_macro 0.20.1", + "darling_core 0.20.0", + "darling_macro 0.20.0", ] [[package]] @@ -1994,16 +1972,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" +checksum = "2ea05d2fcb27b53f7a98faddaf5f2914760330ab7703adfc9df13332b42189f9" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.16", + "syn 2.0.15", ] [[package]] @@ -2019,26 +1997,26 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" +checksum = "7bfb82b62b1b8a2a9808fb4caf844ede819a76cfc23b2827d7f94eefb49551eb" dependencies = [ - "darling_core 0.20.1", + "darling_core 0.20.0", "quote", - "syn 2.0.16", + "syn 2.0.15", ] [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" [[package]] name = "data-encoding-macro" -version = "0.1.13" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c904b33cc60130e1aeea4956ab803d08a3f4a0ca82d64ed757afac3891f2bb99" +checksum = "86927b7cd2fe88fa698b87404b287ab98d1a0063a34071d92e575b72d3029aca" dependencies = [ "data-encoding", "data-encoding-macro-internal", @@ -2046,9 +2024,9 @@ dependencies = [ [[package]] name = "data-encoding-macro-internal" -version = "0.1.11" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fdf3fce3ce863539ec1d7fd1b6dcc3c645663376b43ed376bbf887733e4f772" +checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db" dependencies = [ "data-encoding", "syn 1.0.109", @@ -2225,9 +2203,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.7" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer 0.10.4", "crypto-common", @@ -2286,13 +2264,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 1.0.109", ] [[package]] @@ -2397,7 +2375,7 @@ dependencies = [ "base16ct", "crypto-bigint", "der", - "digest 0.10.7", + "digest 0.10.6", "ff", "generic-array", "group", @@ -2538,7 +2516,7 @@ checksum = "55a9a55d1dab3b07854648d48e366f684aefe2ac78ae28cec3bf65e3cd53d9a3" dependencies = [ "execute-command-tokens", "quote", - "syn 2.0.16", + "syn 2.0.15", ] [[package]] @@ -2590,7 +2568,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39ae6b3d9530211fb3b12a95374b8b0823be812f53d09e18c5675c0146b09642" dependencies = [ "cfg-if 1.0.0", - "rustix 0.37.19", + "rustix 0.37.15", "windows-sys 0.48.0", ] @@ -2623,12 +2601,13 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "fil_actor_account_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b187f415da309f586e78dcb93b0fc2ef4d87c48a83ea10ed67698153c9242c78" dependencies = [ "frc42_dispatch", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", - "fvm_shared 3.3.1", + "fvm_shared 2.3.0", + "fvm_shared 3.3.0", "num-derive", "num-traits", "serde", @@ -2637,11 +2616,12 @@ dependencies = [ [[package]] name = "fil_actor_cron_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebf1ba16d3463dbc1994ee13046bbf4779d2b09c09814ceffee02b20469cce1a" dependencies = [ "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", - "fvm_shared 3.3.1", + "fvm_shared 2.3.0", + "fvm_shared 3.3.0", "num-derive", "num-traits", "serde", @@ -2650,15 +2630,16 @@ dependencies = [ [[package]] name = "fil_actor_datacap_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a3e19bc02375ac1bd1846f3ec4c9b1d9d9bc1100bf4116ba3fcf833c7b86805" dependencies = [ "fil_actors_shared", "frc42_dispatch", "frc46_token", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", - "fvm_shared 3.3.1", + "fvm_shared 2.3.0", + "fvm_shared 3.3.0", "num-derive", "num-traits", "serde", @@ -2667,11 +2648,12 @@ dependencies = [ [[package]] name = "fil_actor_evm_shared_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ed3723f5c77039a08973272486777ee0cc829282e2bbd1c8241663e41d6dd8" dependencies = [ "fil_actors_shared", "fvm_ipld_encoding 0.3.3", - "fvm_shared 3.3.1", + "fvm_shared 3.3.0", "hex", "serde", "uint", @@ -2680,13 +2662,14 @@ dependencies = [ [[package]] name = "fil_actor_evm_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e0ecbde9e08b2b94e85a58b3d8c951aa3ef9cd37aae8c01299ad2bc6248c3ac" dependencies = [ "cid", "fil_actor_evm_shared_state", "frc42_dispatch", "fvm_ipld_encoding 0.3.3", - "fvm_shared 3.3.1", + "fvm_shared 3.3.0", "hex-literal", "num-derive", "num-traits", @@ -2696,7 +2679,8 @@ dependencies = [ [[package]] name = "fil_actor_init_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ce8135e0abbbef389cba5463a09f3388a6dfdcad10a00c46b58c37c056827b5" dependencies = [ "anyhow", "cid", @@ -2705,8 +2689,8 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.4.0", - "fvm_shared 3.3.1", + "fvm_shared 2.3.0", + "fvm_shared 3.3.0", "num-derive", "num-traits", "serde", @@ -2715,7 +2699,8 @@ dependencies = [ [[package]] name = "fil_actor_interface" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ad5d9aad0bc17842d843da7d0b2ba9a45fe6eeb429d1840f71107238c483d60" dependencies = [ "anyhow", "cid", @@ -2734,8 +2719,8 @@ dependencies = [ "fvm_ipld_bitfield", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", - "fvm_shared 3.3.1", + "fvm_shared 2.3.0", + "fvm_shared 3.3.0", "lazy_static", "num", "regex", @@ -2747,7 +2732,8 @@ dependencies = [ [[package]] name = "fil_actor_market_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a6fa0e995d6105a32764310ae69798d7b385c8fab79a12f7073a3821a8db8e4" dependencies = [ "anyhow", "cid", @@ -2758,8 +2744,8 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.4.0", - "fvm_shared 3.3.1", + "fvm_shared 2.3.0", + "fvm_shared 3.3.0", "libipld-core 0.14.0", "num-bigint", "num-derive", @@ -2770,7 +2756,8 @@ dependencies = [ [[package]] name = "fil_actor_miner_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c813a2ac23cf3839c894bb298aec7b8cd60bb72dfd0969a72f5e3d75f7b7c3" dependencies = [ "anyhow", "cid", @@ -2782,8 +2769,8 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.4.0", - "fvm_shared 3.3.1", + "fvm_shared 2.3.0", + "fvm_shared 3.3.0", "itertools 0.10.5", "lazy_static", "multihash 0.16.3", @@ -2796,7 +2783,8 @@ dependencies = [ [[package]] name = "fil_actor_multisig_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf69d3ef248bde1bf918a82c9569a1370ba791fad79715fec9331b864b530b06" dependencies = [ "anyhow", "cid", @@ -2805,8 +2793,8 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.4.0", - "fvm_shared 3.3.1", + "fvm_shared 2.3.0", + "fvm_shared 3.3.0", "indexmap", "integer-encoding", "num-derive", @@ -2817,7 +2805,8 @@ dependencies = [ [[package]] name = "fil_actor_power_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9aa1d743813f85668c1fcfd4ea7bd8c6801c7d680082206befab579841aa703" dependencies = [ "anyhow", "cid", @@ -2826,8 +2815,8 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.4.0", - "fvm_shared 3.3.1", + "fvm_shared 2.3.0", + "fvm_shared 3.3.0", "integer-encoding", "lazy_static", "num-derive", @@ -2838,11 +2827,12 @@ dependencies = [ [[package]] name = "fil_actor_reward_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2e9ed3f14f42a3271dd4b0bde27d856921f1663d01ed90c11e3bf28155937f4" dependencies = [ "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", - "fvm_shared 3.3.1", + "fvm_shared 2.3.0", + "fvm_shared 3.3.0", "lazy_static", "num-derive", "num-traits", @@ -2852,11 +2842,12 @@ dependencies = [ [[package]] name = "fil_actor_system_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbc0710525208487a4509fbbfa920e545a857dd8d42786cfd8e7ad83643dfd5e" dependencies = [ "cid", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "num-derive", "num-traits", "serde", @@ -2865,7 +2856,8 @@ dependencies = [ [[package]] name = "fil_actor_verifreg_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aef9da0968812cf86404d138a29d9e6f4bbfbede4e52dda724bafe514b9de64" dependencies = [ "anyhow", "cid", @@ -2873,8 +2865,8 @@ dependencies = [ "frc42_dispatch", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", - "fvm_shared 3.3.1", + "fvm_shared 2.3.0", + "fvm_shared 3.3.0", "num-derive", "num-traits", "serde", @@ -2883,7 +2875,8 @@ dependencies = [ [[package]] name = "fil_actors_shared" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9b943dbb4ba114540d7e20d512b3cd6eb279be02195341e56f917b049316af2" dependencies = [ "anyhow", "cid", @@ -2891,8 +2884,8 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.4.0", - "fvm_shared 3.3.1", + "fvm_shared 2.3.0", + "fvm_shared 3.3.0", "lazy_static", "multihash 0.16.3", "num", @@ -2922,6 +2915,26 @@ 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" @@ -2942,6 +2955,38 @@ 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" @@ -2953,8 +2998,8 @@ dependencies = [ "bincode", "blake2b_simd", "blstrs", - "filecoin-hashers", - "fr32", + "filecoin-hashers 9.0.0", + "fr32 7.0.0", "generic-array", "hex", "lazy_static", @@ -2967,13 +3012,31 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.6", - "storage-proofs-core", - "storage-proofs-porep", - "storage-proofs-post", - "storage-proofs-update", + "storage-proofs-core 14.0.0", + "storage-proofs-porep 14.0.0", + "storage-proofs-post 14.0.0", + "storage-proofs-update 14.0.0", "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" @@ -2984,23 +3047,23 @@ dependencies = [ "bellperson", "bincode", "blstrs", - "filecoin-hashers", - "filecoin-proofs", - "fr32", + "filecoin-hashers 9.0.0", + "filecoin-proofs 14.0.0", + "fr32 7.0.0", "lazy_static", "serde", - "storage-proofs-core", + "storage-proofs-core 14.0.0", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", "libz-sys", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -3031,7 +3094,7 @@ dependencies = [ "anyhow", "assert_cmd", "atty", - "base64 0.21.1", + "base64 0.21.0", "bigdecimal", "boa_engine", "cfg-if 1.0.0", @@ -3062,7 +3125,7 @@ dependencies = [ "futures", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "hex", "human-repr", "jsonrpc-v2", @@ -3082,7 +3145,7 @@ dependencies = [ "tempfile", "ticker", "tokio", - "toml 0.7.4", + "toml 0.7.3", ] [[package]] @@ -3154,12 +3217,12 @@ dependencies = [ "ahash 0.8.3", "anyhow", "async-trait", - "base64 0.21.1", + "base64 0.21.0", "bls-signatures", "byteorder", "forest_shim", "forest_utils", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "hex", "parking_lot 0.12.1", "quickcheck", @@ -3177,7 +3240,7 @@ version = "0.8.2" dependencies = [ "ahash 0.8.3", "anyhow", - "base64 0.21.1", + "base64 0.21.0", "cid", "derive_builder 0.12.0", "forest_beacon", @@ -3187,7 +3250,7 @@ dependencies = [ "forest_test_utils", "forest_utils", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "hex", "lazy_static", "log", @@ -3212,7 +3275,7 @@ dependencies = [ "blake2b_simd", "bls-signatures", "cid", - "digest 0.10.7", + "digest 0.10.6", "flume", "forest_beacon", "forest_blocks", @@ -3230,12 +3293,12 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_car", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.4.0", - "fvm_shared 3.3.1", + "fvm_shared 2.3.0", + "fvm_shared 3.3.0", "lazy_static", "libipld", "log", - "lru 0.9.0", + "lru", "multihash 0.16.3", "num", "parking_lot 0.12.1", @@ -3253,7 +3316,7 @@ dependencies = [ "ahash 0.8.3", "anyhow", "async-trait", - "base64 0.21.1", + "base64 0.21.0", "chrono", "cid", "flume", @@ -3273,11 +3336,11 @@ dependencies = [ "fvm_ipld_amt 0.5.1", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.4.0", - "fvm_shared 3.3.1", + "fvm_shared 2.3.0", + "fvm_shared 3.3.0", "lazy_static", "log", - "lru 0.9.0", + "lru", "nonempty", "num", "num-bigint", @@ -3329,7 +3392,7 @@ dependencies = [ "tempfile", "tikv-jemallocator", "tokio", - "toml 0.7.4", + "toml 0.7.3", "tower-http", "tracing-appender", "tracing-loki", @@ -3406,7 +3469,7 @@ dependencies = [ "cid", "fil_actor_interface", "fil_actors_shared", - "filecoin-proofs-api", + "filecoin-proofs-api 14.0.0", "forest_beacon", "forest_blocks", "forest_chain", @@ -3420,7 +3483,7 @@ dependencies = [ "futures", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "lazy_static", "nonempty", "num", @@ -3471,13 +3534,13 @@ dependencies = [ "forest_message", "forest_networks", "forest_shim", - "fvm 2.4.0", + "fvm 2.3.0", "fvm 3.3.1", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", - "fvm_shared 3.3.1", + "fvm_shared 2.3.0", + "fvm_shared 3.3.0", "lazy_static", "log", "num", @@ -3499,7 +3562,7 @@ dependencies = [ "forest_json", "forest_utils", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "indexmap", "lazy_static", "libipld", @@ -3520,18 +3583,18 @@ name = "forest_json" version = "0.8.2" dependencies = [ "ahash 0.8.3", - "base64 0.21.1", + "base64 0.21.0", "cid", "data-encoding", "forest_message", "forest_shim", "forest_test_utils", "forest_utils", - "fvm 2.4.0", + "fvm 2.3.0", "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", - "fvm_shared 3.3.1", + "fvm_shared 2.3.0", + "fvm_shared 3.3.0", "multihash 0.16.3", "num", "num-bigint", @@ -3548,7 +3611,7 @@ dependencies = [ "ahash 0.8.3", "anyhow", "argon2", - "base64 0.21.1", + "base64 0.21.0", "bls-signatures", "forest_json", "forest_shim", @@ -3591,7 +3654,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_car", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "lazy_static", "libp2p", "log", @@ -3647,8 +3710,8 @@ dependencies = [ "forest_shim", "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", - "fvm_shared 3.3.1", + "fvm_shared 2.3.0", + "fvm_shared 3.3.0", "quickcheck", "rand 0.8.5", "serde", @@ -3679,11 +3742,11 @@ dependencies = [ "fvm 3.3.1", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.4.0", - "fvm_shared 3.3.1", + "fvm_shared 2.3.0", + "fvm_shared 3.3.0", "lazy_static", "log", - "lru 0.9.0", + "lru", "num", "num-rational", "num-traits", @@ -3723,7 +3786,7 @@ dependencies = [ "fil_actors_shared", "forest_beacon", "forest_shim", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "lazy_static", "multiaddr", "serde", @@ -3756,7 +3819,7 @@ dependencies = [ "ahash 0.8.3", "anyhow", "axum", - "base64 0.21.1", + "base64 0.21.0", "cid", "crossbeam", "fil_actor_interface", @@ -3782,7 +3845,7 @@ dependencies = [ "futures", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", - "fvm_shared 3.3.1", + "fvm_shared 3.3.0", "hex", "http", "jsonrpc-v2", @@ -3827,14 +3890,14 @@ dependencies = [ "forest_shim", "forest_state_manager", "fvm_ipld_blockstore", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "jsonrpc-v2", "once_cell", "parking_lot 0.12.1", "serde", "serde_json", "serde_with", - "syn 2.0.16", + "syn 2.0.15", "tokio", ] @@ -3860,14 +3923,14 @@ dependencies = [ "anyhow", "bls-signatures", "cid", - "filecoin-proofs-api", - "fvm 2.4.0", + "filecoin-proofs-api 14.0.0", + "fvm 2.3.0", "fvm 3.3.1", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", - "fvm_shared 3.3.1", + "fvm_shared 2.3.0", + "fvm_shared 3.3.0", "lazy_static", "num", "num-bigint", @@ -3889,7 +3952,7 @@ dependencies = [ "cid", "fil_actor_interface", "fil_actors_shared", - "filecoin-proofs-api", + "filecoin-proofs-api 14.0.0", "forest_beacon", "forest_blocks", "forest_chain", @@ -3903,15 +3966,15 @@ dependencies = [ "forest_state_migration", "forest_utils", "futures", - "fvm 2.4.0", + "fvm 2.3.0", "fvm 3.3.1", "fvm_ipld_amt 0.5.1", "fvm_ipld_bitfield", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "lazy_static", - "lru 0.9.0", + "lru", "num", "num-traits", "once_cell", @@ -3977,7 +4040,7 @@ dependencies = [ name = "forest_test_utils" version = "0.8.2" dependencies = [ - "base64 0.21.1", + "base64 0.21.0", "cid", "forest_blocks", "forest_json", @@ -4003,8 +4066,8 @@ dependencies = [ "cid", "const_format", "cs_serde_bytes", - "digest 0.10.7", - "filecoin-proofs-api", + "digest 0.10.6", + "filecoin-proofs-api 14.0.0", "flume", "forest_shim", "futures", @@ -4014,7 +4077,7 @@ dependencies = [ "git-version", "human-repr", "hyper", - "hyper-rustls 0.23.2", + "hyper-rustls", "libc", "log", "memory-stats", @@ -4034,7 +4097,7 @@ dependencies = [ "tempfile", "thiserror", "tokio", - "toml 0.7.4", + "toml 0.7.3", "tracing", "url", ] @@ -4048,6 +4111,20 @@ 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" @@ -4072,7 +4149,7 @@ dependencies = [ "frc42_macros", "fvm_ipld_encoding 0.2.3", "fvm_sdk", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "thiserror", ] @@ -4083,7 +4160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cf52e60a67e9ad15cd4909ef8c8e45ab3744015dbb603efd8dfbdbfc7ce95b7" dependencies = [ "fvm_sdk", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "thiserror", ] @@ -4115,7 +4192,7 @@ dependencies = [ "fvm_ipld_encoding 0.2.3", "fvm_ipld_hamt 0.5.1", "fvm_sdk", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "integer-encoding", "num-traits", "serde", @@ -4217,7 +4294,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.15", ] [[package]] @@ -4273,9 +4350,9 @@ dependencies = [ [[package]] name = "fvm" -version = "2.4.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a39581df015d28776519d941f62becdf7ff40f081be6ffbeb1d8880806416e0" +checksum = "7a8b6a711f111c3c02ae2429045004b4c3b5aaba68bc13e9fdec76e60e81c2d5" dependencies = [ "anyhow", "blake2b_simd", @@ -4284,13 +4361,13 @@ dependencies = [ "derive-getters", "derive_builder 0.11.2", "derive_more", - "filecoin-proofs-api", + "filecoin-proofs-api 13.0.0", "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.4.0", + "fvm_shared 2.3.0", "lazy_static", "log", "multihash 0.16.3", @@ -4304,7 +4381,7 @@ dependencies = [ "serde_repr", "serde_tuple", "thiserror", - "wasmtime 8.0.1", + "wasmtime", "yastl", ] @@ -4318,13 +4395,13 @@ dependencies = [ "byteorder", "cid", "derive_more", - "filecoin-proofs-api", + "filecoin-proofs-api 14.0.0", "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.1", + "fvm_shared 3.3.0", "lazy_static", "log", "minstant", @@ -4338,9 +4415,9 @@ dependencies = [ "serde", "serde_tuple", "thiserror", - "wasmtime 2.0.2", - "wasmtime-environ 2.0.2", - "wasmtime-runtime 2.0.2", + "wasmtime", + "wasmtime-environ", + "wasmtime-runtime", "yastl", ] @@ -4377,7 +4454,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", "fvm_sdk", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "num-traits", "serde", "serde_tuple", @@ -4431,9 +4508,9 @@ dependencies = [ [[package]] name = "fvm_ipld_blockstore" -version = "0.1.2" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee8c75be2b58943e1a9755802d34d4c3934f6ea151b6be192ff98f644e515bd" +checksum = "688239a96199577f6705a3f9689abfd795f867f91f5847bc7e236017cc672df7" dependencies = [ "anyhow", "cid", @@ -4539,7 +4616,7 @@ checksum = "bb46d7b26e1609de1a3b7470cbd190d78f2d01fdf1b317f741bdd3ac8f59825e" dependencies = [ "cid", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "lazy_static", "log", "num-traits", @@ -4548,9 +4625,9 @@ dependencies = [ [[package]] name = "fvm_shared" -version = "2.4.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05eebc49ba13d8aae14c396e4d700c83361eca673cae9c0bfc69cb6e754bd468" +checksum = "518880fbf3facd8ba26298e27d0aa7c43459d14a2511d22d2a3f39abf3b73f6a" dependencies = [ "anyhow", "arbitrary", @@ -4561,7 +4638,7 @@ dependencies = [ "cs_serde_bytes", "data-encoding", "data-encoding-macro", - "filecoin-proofs-api", + "filecoin-proofs-api 13.0.0", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", "lazy_static", @@ -4581,9 +4658,9 @@ dependencies = [ [[package]] name = "fvm_shared" -version = "3.3.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad76f06f7d59215844900d018ffc5c863a370afab9c329bae290305722f8d60" +checksum = "9135fcd5414eec454b4fd53c9414ae7611e7e7fcdf0db54f6b17658c94be05df" dependencies = [ "anyhow", "arbitrary", @@ -4593,7 +4670,7 @@ dependencies = [ "cid", "data-encoding", "data-encoding-macro", - "filecoin-proofs-api", + "filecoin-proofs-api 14.0.0", "fvm_ipld_encoding 0.3.3", "lazy_static", "libsecp256k1", @@ -4651,12 +4728,12 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.4.3" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +checksum = "199523ba70af2b447640715e8c4bd2b5360313a71d2d69361ae4dd1dc31487dd" dependencies = [ "libc", - "windows-targets 0.48.0", + "windows 0.48.0", ] [[package]] @@ -4719,11 +4796,6 @@ name = "gimli" version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" -dependencies = [ - "fallible-iterator", - "indexmap", - "stable_deref_trait", -] [[package]] name = "git-version" @@ -4780,9 +4852,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.19" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" dependencies = [ "bytes 1.4.0", "fnv", @@ -4917,7 +4989,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.7", + "digest 0.10.6", ] [[package]] @@ -5030,20 +5102,7 @@ dependencies = [ "rustls 0.20.8", "rustls-native-certs", "tokio", - "tokio-rustls 0.23.4", -] - -[[package]] -name = "hyper-rustls" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" -dependencies = [ - "http", - "hyper", - "rustls 0.21.1", - "tokio", - "tokio-rustls 0.24.0", + "tokio-rustls", ] [[package]] @@ -5074,11 +5133,12 @@ dependencies = [ [[package]] name = "iana-time-zone-haiku" -version = "0.1.2" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" dependencies = [ - "cc", + "cxx", + "cxx-build", ] [[package]] @@ -5242,7 +5302,7 @@ checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes 1.0.10", - "rustix 0.37.19", + "rustix 0.37.15", "windows-sys 0.48.0", ] @@ -5281,9 +5341,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] @@ -5321,7 +5381,7 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.1", + "base64 0.21.0", "pem", "ring", "serde", @@ -5331,9 +5391,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.4" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" dependencies = [ "cpufeatures", ] @@ -5484,9 +5544,9 @@ checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" [[package]] name = "libm" -version = "0.2.7" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "libmimalloc-sys" @@ -5533,9 +5593,9 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.39.2" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c1df63c0b582aa434fb09b2d86897fa2b419ffeccf934b36f87fcedc8e835c2" +checksum = "9b7f8b7d65c070a5a1b5f8f0510648189da08f787b8963f8e21219e0710733af" dependencies = [ "either", "fnv", @@ -5575,15 +5635,14 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.44.4" +version = "0.44.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b34b6da8165c0bde35c82db8efda39b824776537e73973549e76cadb3a77c5" +checksum = "eac213adad69bd9866fe87c37fbf241626715e5cd454fb6df9841aa2b02440ee" dependencies = [ "asynchronous-codec", - "base64 0.21.1", + "base64 0.21.0", "byteorder", "bytes 1.4.0", - "either", "fnv", "futures", "hex_fmt", @@ -5601,15 +5660,14 @@ dependencies = [ "smallvec", "thiserror", "unsigned-varint", - "void", "wasm-timer", ] [[package]] name = "libp2p-identify" -version = "0.42.2" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5455f472243e63b9c497ff320ded0314254a9eb751799a39c283c6f20b793f3c" +checksum = "40d1da1f75baf824cfdc80f6aced51f7cbf8dc14e32363e9443570a80d4ee337" dependencies = [ "asynchronous-codec", "either", @@ -5619,7 +5677,7 @@ dependencies = [ "libp2p-identity", "libp2p-swarm", "log", - "lru 0.10.0", + "lru", "quick-protobuf", "quick-protobuf-codec", "smallvec", @@ -5629,27 +5687,27 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.1.2" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e2d584751cecb2aabaa56106be6be91338a60a0f4e420cf2af639204f596fc1" +checksum = "8a8ea433ae0cea7e3315354305237b9897afe45278b2118a7a57ca744e70fd27" dependencies = [ "bs58", "ed25519-dalek", "log", "multiaddr", "multihash 0.17.0", + "prost", "quick-protobuf", "rand 0.8.5", - "sha2 0.10.6", "thiserror", "zeroize", ] [[package]] name = "libp2p-kad" -version = "0.43.3" +version = "0.43.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39d5ef876a2b2323d63c258e63c2f8e36f205fe5a11f0b3095d59635650790ff" +checksum = "9647c76e63c4d0e9a10369cef9b929a2e5e8f03008b2097ab365fc4cb4e5318f" dependencies = [ "arrayvec 0.7.2", "asynchronous-codec", @@ -5711,9 +5769,9 @@ dependencies = [ [[package]] name = "libp2p-noise" -version = "0.42.2" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3673da89d29936bc6435bafc638e2f184180d554ce844db65915113f86ec5e" +checksum = "9c87c2803deffeae94108072a0387f8c9ff494af68a4908454c11c811e27b5e5" dependencies = [ "bytes 1.4.0", "curve25519-dalek 3.2.0", @@ -5773,25 +5831,27 @@ dependencies = [ [[package]] name = "libp2p-request-response" -version = "0.24.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffdb374267d42dc5ed5bc53f6e601d4a64ac5964779c6e40bb9e4f14c1e30d5" +checksum = "872b9d63fed44d9f81110c30be6c7ca5593a093576d2a95c5d018051e294d2e9" dependencies = [ "async-trait", + "bytes 1.4.0", "futures", "instant", "libp2p-core", - "libp2p-identity", "libp2p-swarm", + "log", "rand 0.8.5", "smallvec", + "unsigned-varint", ] [[package]] name = "libp2p-swarm" -version = "0.42.2" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "903b3d592d7694e56204d211f29d31bc004be99386644ba8731fc3e3ef27b296" +checksum = "bd1e223f02fcd7e3790f9b954e2e81791810e3512daeb27fa97df7652e946bc2" dependencies = [ "either", "fnv", @@ -5922,13 +5982,14 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.43.1" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd21d950662700a385d4c6d68e2f5f54d778e97068cdd718522222ef513bda" +checksum = "d048cd82f72c8800655aa1ee9b808ea8c9d523a649d3579b3ef0cfe23952d7fd" dependencies = [ "futures", "libp2p-core", "log", + "parking_lot 0.12.1", "thiserror", "yamux", ] @@ -5999,15 +6060,24 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" dependencies = [ "cc", "pkg-config", "vcpkg", ] +[[package]] +name = "link-cplusplus" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -6028,9 +6098,9 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "2e8776872cdc2f073ccaab02e336fa321328c1e02646ebcb9d2108d0baab480d" [[package]] name = "lock_api" @@ -6072,15 +6142,6 @@ dependencies = [ "hashbrown 0.13.2", ] -[[package]] -name = "lru" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03f1160296536f10c833a82dca22267d5486734230d47bf00bf435885814ba1e" -dependencies = [ - "hashbrown 0.13.2", -] - [[package]] name = "lru-cache" version = "0.1.2" @@ -6148,11 +6209,10 @@ checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" [[package]] name = "matrixmultiply" -version = "0.3.7" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" +checksum = "bb99c395ae250e1bf9133673f03ca9f97b7e71b705436bf8f089453445d1e9fe" dependencies = [ - "autocfg", "rawpointer", ] @@ -6173,7 +6233,7 @@ version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" dependencies = [ - "digest 0.10.7", + "digest 0.10.6", ] [[package]] @@ -6194,7 +6254,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" dependencies = [ - "rustix 0.37.19", + "rustix 0.37.15", ] [[package]] @@ -6287,9 +6347,9 @@ dependencies = [ [[package]] name = "minidom" -version = "0.15.2" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f45614075738ce1b77a1768912a60c0227525971b03e09122a05b8a34a2a6278" +checksum = "2e9ce45d459e358790a285e7609ff5ae4cfab88b75f237e8838e62029dda397b" dependencies = [ "rxml", ] @@ -6309,15 +6369,6 @@ dependencies = [ "adler", ] -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - [[package]] name = "minstant" version = "0.1.2" @@ -6381,7 +6432,7 @@ dependencies = [ "blake2s_simd 1.0.1", "blake3", "core2", - "digest 0.10.7", + "digest 0.10.6", "multihash-derive", "ripemd", "serde", @@ -6398,7 +6449,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" dependencies = [ "core2", - "digest 0.10.7", + "digest 0.10.6", "multihash-derive", "sha2 0.10.6", "unsigned-varint", @@ -6734,7 +6785,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", - "libm 0.2.7", + "libm 0.2.6", ] [[package]] @@ -6765,9 +6816,6 @@ version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ - "crc32fast", - "hashbrown 0.13.2", - "indexmap", "memchr", ] @@ -7067,22 +7115,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.0" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 1.0.109", ] [[package]] @@ -7115,9 +7163,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "platforms" @@ -7160,7 +7208,7 @@ checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ "cpufeatures", "opaque-debug", - "universal-hash 0.5.1", + "universal-hash 0.5.0", ] [[package]] @@ -7184,7 +7232,7 @@ dependencies = [ "cfg-if 1.0.0", "cpufeatures", "opaque-debug", - "universal-hash 0.5.1", + "universal-hash 0.5.0", ] [[package]] @@ -7286,9 +7334,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.58" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -7303,7 +7351,7 @@ dependencies = [ "byteorder", "hex", "lazy_static", - "rustix 0.36.14", + "rustix 0.36.13", ] [[package]] @@ -7525,9 +7573,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.27" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -7687,7 +7735,7 @@ checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", "ring", - "time 0.3.21", + "time 0.3.20", "x509-parser 0.13.2", "yasna", ] @@ -7700,7 +7748,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", "ring", - "time 0.3.21", + "time 0.3.20", "yasna", ] @@ -7745,18 +7793,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "regalloc2" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80535183cae11b149d618fbd3c37e38d7cda589d82d7769e196ca9a9042d7621" -dependencies = [ - "fxhash", - "log", - "slice-group-by", - "smallvec", -] - [[package]] name = "regex" version = "1.8.1" @@ -7806,11 +7842,11 @@ checksum = "e3a8614ee435691de62bcffcf4a66d91b3594bf1428a5722e79103249a095690" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" dependencies = [ - "base64 0.21.1", + "base64 0.21.0", "bytes 1.4.0", "encoding_rs", "futures-core", @@ -7819,7 +7855,7 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls 0.24.0", + "hyper-rustls", "ipnet", "js-sys", "log", @@ -7827,13 +7863,13 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite 0.2.9", - "rustls 0.21.1", + "rustls 0.20.8", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-rustls 0.24.0", + "tokio-rustls", "tower-service", "url", "wasm-bindgen", @@ -7885,7 +7921,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" dependencies = [ - "digest 0.10.7", + "digest 0.10.6", ] [[package]] @@ -7994,7 +8030,7 @@ dependencies = [ "serde_derive", "sha2 0.10.6", "thiserror", - "time 0.3.21", + "time 0.3.20", "url", ] @@ -8044,9 +8080,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.14" +version = "0.36.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e4d67015953998ad0eb82887a0eb0129e18a7e2f3b7b0f6c422fddcd503d62" +checksum = "3a38f9520be93aba504e8ca974197f46158de5dcaa9fa04b57c57cd6a679d658" dependencies = [ "bitflags", "errno 0.3.1", @@ -8058,15 +8094,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.19" +version = "0.37.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "a0661814f891c57c930a610266415528da53c4933e6dea5fb350cbfe048a9ece" dependencies = [ "bitflags", "errno 0.3.1", "io-lifetimes 1.0.10", "libc", - "linux-raw-sys 0.3.8", + "linux-raw-sys 0.3.5", "windows-sys 0.48.0", ] @@ -8095,18 +8131,6 @@ dependencies = [ "webpki 0.22.0", ] -[[package]] -name = "rustls" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" -dependencies = [ - "log", - "ring", - "rustls-webpki", - "sct 0.7.0", -] - [[package]] name = "rustls-native-certs" version = "0.6.2" @@ -8125,17 +8149,7 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64 0.21.1", -] - -[[package]] -name = "rustls-webpki" -version = "0.100.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" -dependencies = [ - "ring", - "untrusted", + "base64 0.21.0", ] [[package]] @@ -8180,20 +8194,22 @@ dependencies = [ [[package]] name = "rxml" -version = "0.9.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a98f186c7a2f3abbffb802984b7f1dfd65dac8be1aafdaabbca4137f53f0dff7" +checksum = "1a071866b8c681dc2cfffa77184adc32b57b0caad4e620b6292609703bceb804" dependencies = [ "bytes 1.4.0", + "pin-project-lite 0.2.9", "rxml_validation", "smartstring", + "tokio", ] [[package]] name = "rxml_validation" -version = "0.9.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a197350ece202f19a166d1ad6d9d6de145e1d2a8ef47db299abe164dbd7530" +checksum = "53bc79743f9a66c2fb1f951cd83735f275d46bfe466259fbc5897bb60a0d00ee" [[package]] name = "ryu" @@ -8249,6 +8265,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "scratch" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" + [[package]] name = "sct" version = "0.6.1" @@ -8297,9 +8319,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ "bitflags", "core-foundation", @@ -8310,9 +8332,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ "core-foundation-sys", "libc", @@ -8377,7 +8399,7 @@ checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.15", ] [[package]] @@ -8420,14 +8442,14 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.15", ] [[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" dependencies = [ "serde", ] @@ -8478,7 +8500,7 @@ dependencies = [ "serde", "serde_json", "serde_with_macros", - "time 0.3.21", + "time 0.3.20", ] [[package]] @@ -8487,10 +8509,10 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ - "darling 0.20.1", + "darling 0.20.0", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.15", ] [[package]] @@ -8510,7 +8532,7 @@ dependencies = [ name = "serialization_tests" version = "0.8.2" dependencies = [ - "base64 0.21.1", + "base64 0.21.0", "bls-signatures", "cid", "forest_blocks", @@ -8544,7 +8566,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.7", + "digest 0.10.6", ] [[package]] @@ -8568,7 +8590,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.7", + "digest 0.10.6", "sha2-asm", ] @@ -8581,6 +8603,21 @@ 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" @@ -8589,7 +8626,7 @@ checksum = "d1ec45c74ebb91d25e61e14cfc1925e7571723ae14a38fc6c8bd0b2e516db101" dependencies = [ "byteorder", "cpufeatures", - "digest 0.10.7", + "digest 0.10.6", "fake-simd", "lazy_static", "opaque-debug", @@ -8598,11 +8635,11 @@ dependencies = [ [[package]] name = "sha3" -version = "0.10.8" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +checksum = "54c2bb1a323307527314a36bfb73f24febb08ce2b8a554bf4ffd6f51ad15198c" dependencies = [ - "digest 0.10.7", + "digest 0.10.6", "keccak", ] @@ -8655,7 +8692,7 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ - "digest 0.10.7", + "digest 0.10.6", "rand_core 0.6.4", ] @@ -8687,7 +8724,7 @@ dependencies = [ "num-bigint", "num-traits", "thiserror", - "time 0.3.21", + "time 0.3.20", ] [[package]] @@ -8707,9 +8744,9 @@ dependencies = [ [[package]] name = "slice-group-by" -version = "0.3.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" +checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" [[package]] name = "slotmap" @@ -8728,13 +8765,11 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "smartstring" -version = "1.0.1" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" +checksum = "e714dff2b33f2321fdcd475b71cec79781a692d846f37f415fb395a1d2bcd48e" dependencies = [ - "autocfg", "static_assertions", - "version_check", ] [[package]] @@ -8842,6 +8877,41 @@ 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" @@ -8857,8 +8927,8 @@ dependencies = [ "cbc", "config", "ff", - "filecoin-hashers", - "fr32", + "filecoin-hashers 9.0.0", + "fr32 7.0.0", "fs2", "generic-array", "itertools 0.10.5", @@ -8877,6 +8947,44 @@ 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" @@ -8892,8 +9000,8 @@ dependencies = [ "crossbeam", "fdlimit", "ff", - "filecoin-hashers", - "fr32", + "filecoin-hashers 9.0.0", + "fr32 7.0.0", "generic-array", "hex", "lazy_static", @@ -8911,11 +9019,34 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.6", - "sha2raw", - "storage-proofs-core", + "sha2raw 9.0.0", + "storage-proofs-core 14.0.0", "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" @@ -8928,15 +9059,39 @@ dependencies = [ "blstrs", "byteorder", "ff", - "filecoin-hashers", - "fr32", + "filecoin-hashers 9.0.0", + "fr32 7.0.0", "generic-array", "hex", "log", "rayon", "serde", "sha2 0.10.6", - "storage-proofs-core", + "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", ] [[package]] @@ -8949,8 +9104,8 @@ dependencies = [ "bellperson", "blstrs", "ff", - "filecoin-hashers", - "fr32", + "filecoin-hashers 9.0.0", + "fr32 7.0.0", "generic-array", "lazy_static", "log", @@ -8959,8 +9114,8 @@ dependencies = [ "neptune", "rayon", "serde", - "storage-proofs-core", - "storage-proofs-porep", + "storage-proofs-core 14.0.0", + "storage-proofs-porep 14.0.0", ] [[package]] @@ -9041,9 +9196,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.16" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ "proc-macro2", "quote", @@ -9070,9 +9225,9 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd" dependencies = [ "bitflags", "core-foundation", @@ -9110,10 +9265,19 @@ dependencies = [ "cfg-if 1.0.0", "fastrand", "redox_syscall 0.3.5", - "rustix 0.37.19", + "rustix 0.37.15", "windows-sys 0.45.0", ] +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + [[package]] name = "termtree" version = "0.4.1" @@ -9137,7 +9301,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.15", ] [[package]] @@ -9198,9 +9362,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.21" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" dependencies = [ "itoa", "serde", @@ -9210,15 +9374,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" dependencies = [ "time-core", ] @@ -9250,9 +9414,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.1" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" dependencies = [ "autocfg", "bytes 1.4.0", @@ -9286,7 +9450,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.15", ] [[package]] @@ -9300,16 +9464,6 @@ dependencies = [ "webpki 0.22.0", ] -[[package]] -name = "tokio-rustls" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" -dependencies = [ - "rustls 0.21.1", - "tokio", -] - [[package]] name = "tokio-stream" version = "0.1.14" @@ -9359,9 +9513,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.4" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" dependencies = [ "serde", "serde_spanned", @@ -9371,18 +9525,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.9" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d964908cec0d030b812013af25a0e57fddfadb1e066ecc6681d86253129d4f" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" dependencies = [ "indexmap", "serde", @@ -9393,13 +9547,14 @@ dependencies = [ [[package]] name = "tonic" -version = "0.9.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" +checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" dependencies = [ + "async-stream", "async-trait", "axum", - "base64 0.21.1", + "base64 0.13.1", "bytes 1.4.0", "futures-core", "futures-util", @@ -9411,12 +9566,15 @@ dependencies = [ "percent-encoding", "pin-project", "prost", + "prost-derive", "tokio", "tokio-stream", + "tokio-util", "tower", "tower-layer", "tower-service", "tracing", + "tracing-futures", ] [[package]] @@ -9496,7 +9654,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" dependencies = [ "crossbeam-channel", - "time 0.3.21", + "time 0.3.20", "tracing-subscriber", ] @@ -9508,19 +9666,29 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.15", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ "once_cell", "valuable", ] +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + [[package]] name = "tracing-log" version = "0.1.3" @@ -9767,9 +9935,9 @@ dependencies = [ [[package]] name = "universal-hash" -version = "0.5.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5" dependencies = [ "crypto-common", "subtle", @@ -9789,6 +9957,8 @@ checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" dependencies = [ "asynchronous-codec", "bytes 1.4.0", + "futures-io", + "futures-util", ] [[package]] @@ -9829,9 +9999,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.3" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2" dependencies = [ "getrandom 0.2.9", ] @@ -9940,9 +10110,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -9950,24 +10120,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.16", + "syn 1.0.109", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.36" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -9977,9 +10147,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -9987,22 +10157,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "wasm-encoder" @@ -10049,19 +10219,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.102.0" +version = "0.104.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b" -dependencies = [ - "indexmap", - "url", -] - -[[package]] -name = "wasmparser" -version = "0.105.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83be9e0b3f9570dc1979a33ae7b89d032c73211564232b99976553e5c155ec32" +checksum = "6a396af81a7c56ad976131d6a35e4b693b78a1ea0357843bd436b4577e254a7d" dependencies = [ "indexmap", "url", @@ -10069,12 +10229,12 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.2.57" +version = "0.2.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50b0e5ed7a74a065637f0d7798ce5f29cadb064980d24b0c82af5200122fa0d8" +checksum = "731da2505d5437cd5d6feb09457835f76186be13be7677fe00781ae99d5bbe8a" dependencies = [ "anyhow", - "wasmparser 0.105.0", + "wasmparser 0.104.0", ] [[package]] @@ -10097,40 +10257,13 @@ dependencies = [ "serde", "target-lexicon", "wasmparser 0.92.0", - "wasmtime-cranelift 2.0.2", - "wasmtime-environ 2.0.2", - "wasmtime-jit 2.0.2", - "wasmtime-runtime 2.0.2", + "wasmtime-cranelift", + "wasmtime-environ", + "wasmtime-jit", + "wasmtime-runtime", "windows-sys 0.36.1", ] -[[package]] -name = "wasmtime" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f907fdead3153cb9bfb7a93bbd5b62629472dc06dee83605358c64c52ed3dda9" -dependencies = [ - "anyhow", - "bincode", - "cfg-if 1.0.0", - "indexmap", - "libc", - "log", - "object 0.30.3", - "once_cell", - "paste", - "psm", - "rayon", - "serde", - "target-lexicon", - "wasmparser 0.102.0", - "wasmtime-cranelift 8.0.1", - "wasmtime-environ 8.0.1", - "wasmtime-jit 8.0.1", - "wasmtime-runtime 8.0.1", - "windows-sys 0.45.0", -] - [[package]] name = "wasmtime-asm-macros" version = "2.0.2" @@ -10140,15 +10273,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "wasmtime-asm-macros" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b9daa7c14cd4fa3edbf69de994408d5f4b7b0959ac13fa69d465f6597f810d" -dependencies = [ - "cfg-if 1.0.0", -] - [[package]] name = "wasmtime-cranelift" version = "2.0.2" @@ -10156,55 +10280,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "017c3605ccce867b3ba7f71d95e5652acc22b9dc2971ad6a6f9df4a8d7af2648" dependencies = [ "anyhow", - "cranelift-codegen 0.89.2", - "cranelift-entity 0.89.2", - "cranelift-frontend 0.89.2", - "cranelift-native 0.89.2", - "cranelift-wasm 0.89.2", + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", + "cranelift-native", + "cranelift-wasm", "gimli 0.26.2", "log", "object 0.29.0", "target-lexicon", "thiserror", "wasmparser 0.92.0", - "wasmtime-environ 2.0.2", -] - -[[package]] -name = "wasmtime-cranelift" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1cefde0cce8cb700b1b21b6298a3837dba46521affd7b8c38a9ee2c869eee04" -dependencies = [ - "anyhow", - "cranelift-codegen 0.95.1", - "cranelift-entity 0.95.1", - "cranelift-frontend 0.95.1", - "cranelift-native 0.95.1", - "cranelift-wasm 0.95.1", - "gimli 0.27.2", - "log", - "object 0.30.3", - "target-lexicon", - "thiserror", - "wasmparser 0.102.0", - "wasmtime-cranelift-shared", - "wasmtime-environ 8.0.1", -] - -[[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 0.95.1", - "cranelift-native 0.95.1", - "gimli 0.27.2", - "object 0.30.3", - "target-lexicon", - "wasmtime-environ 8.0.1", + "wasmtime-environ", ] [[package]] @@ -10214,7 +10301,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aec5c1f81aab9bb35997113c171b6bb9093afc90e3757c55e0c08dc9ac612e4" dependencies = [ "anyhow", - "cranelift-entity 0.89.2", + "cranelift-entity", "gimli 0.26.2", "indexmap", "log", @@ -10223,26 +10310,7 @@ dependencies = [ "target-lexicon", "thiserror", "wasmparser 0.92.0", - "wasmtime-types 2.0.2", -] - -[[package]] -name = "wasmtime-environ" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949" -dependencies = [ - "anyhow", - "cranelift-entity 0.95.1", - "gimli 0.27.2", - "indexmap", - "log", - "object 0.30.3", - "serde", - "target-lexicon", - "thiserror", - "wasmparser 0.102.0", - "wasmtime-types 8.0.1", + "wasmtime-types", ] [[package]] @@ -10264,34 +10332,11 @@ dependencies = [ "serde", "target-lexicon", "thiserror", - "wasmtime-environ 2.0.2", - "wasmtime-runtime 2.0.2", + "wasmtime-environ", + "wasmtime-runtime", "windows-sys 0.36.1", ] -[[package]] -name = "wasmtime-jit" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244" -dependencies = [ - "addr2line 0.19.0", - "anyhow", - "bincode", - "cfg-if 1.0.0", - "cpp_demangle", - "gimli 0.27.2", - "log", - "object 0.30.3", - "rustc-demangle", - "serde", - "target-lexicon", - "wasmtime-environ 8.0.1", - "wasmtime-jit-icache-coherence", - "wasmtime-runtime 8.0.1", - "windows-sys 0.45.0", -] - [[package]] name = "wasmtime-jit-debug" version = "2.0.2" @@ -10301,26 +10346,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "wasmtime-jit-debug" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -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" @@ -10340,65 +10365,29 @@ dependencies = [ "rand 0.8.5", "rustix 0.35.13", "thiserror", - "wasmtime-asm-macros 2.0.2", - "wasmtime-environ 2.0.2", - "wasmtime-jit-debug 2.0.2", + "wasmtime-asm-macros", + "wasmtime-environ", + "wasmtime-jit-debug", "windows-sys 0.36.1", ] -[[package]] -name = "wasmtime-runtime" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658cf6f325232b6760e202e5255d823da5e348fdea827eff0a2a22319000b441" -dependencies = [ - "anyhow", - "cc", - "cfg-if 1.0.0", - "indexmap", - "libc", - "log", - "mach", - "memfd", - "memoffset 0.8.0", - "paste", - "rand 0.8.5", - "rustix 0.36.14", - "wasmtime-asm-macros 8.0.1", - "wasmtime-environ 8.0.1", - "wasmtime-jit-debug 8.0.1", - "windows-sys 0.45.0", -] - [[package]] name = "wasmtime-types" version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dc3dd9521815984b35d6362f79e6b9c72475027cd1c71c44eb8df8fbf33a9fb" dependencies = [ - "cranelift-entity 0.89.2", + "cranelift-entity", "serde", "thiserror", "wasmparser 0.92.0", ] -[[package]] -name = "wasmtime-types" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f" -dependencies = [ - "cranelift-entity 0.95.1", - "serde", - "thiserror", - "wasmparser 0.102.0", -] - [[package]] name = "web-sys" -version = "0.3.63" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -10459,7 +10448,7 @@ dependencies = [ "sha2 0.10.6", "stun", "thiserror", - "time 0.3.21", + "time 0.3.20", "tokio", "turn", "url", @@ -10496,7 +10485,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "942be5bd85f072c3128396f6e5a9bfb93ca8c1939ded735d177b7bcba9a13d05" dependencies = [ "aes 0.6.0", - "aes-gcm 0.10.2", + "aes-gcm 0.10.1", "async-trait", "bincode", "block-modes", @@ -10655,9 +10644,9 @@ dependencies = [ [[package]] name = "wide" -version = "0.7.9" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cd0496a71f3cc6bc4bf0ed91346426a5099e93d89807e663162dc5a1069ff65" +checksum = "b689b6c49d6549434bf944e6b0f39238cf63693cb7a147e9d887507fffa3b223" dependencies = [ "bytemuck", "safe_arch", @@ -10959,9 +10948,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.6" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" dependencies = [ "memchr", ] @@ -11022,7 +11011,7 @@ dependencies = [ "ring", "rusticata-macros", "thiserror", - "time 0.3.21", + "time 0.3.20", ] [[package]] @@ -11040,20 +11029,20 @@ dependencies = [ "oid-registry 0.6.1", "rusticata-macros", "thiserror", - "time 0.3.21", + "time 0.3.20", ] [[package]] name = "xml-rs" -version = "0.8.11" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1690519550bfa95525229b9ca2350c63043a4857b3b0013811b2ccf4a2420b01" +checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" [[package]] name = "xsalsa20poly1305" -version = "0.9.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02a6dad357567f81cd78ee75f7c61f1b30bb2fe4390be8fb7c69e2ac8dffb6c7" +checksum = "472c385ee974833d7e59979eeb74175d56774be3768b5bcc581337e21396bda3" dependencies = [ "aead 0.5.2", "poly1305 0.8.0", @@ -11088,7 +11077,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.21", + "time 0.3.20", ] [[package]] @@ -11118,7 +11107,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.15", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 3ecee516eb55..fd22a90fa06b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,7 +76,7 @@ flume = "0.10" fs_extra = "1.2" futures = "0.3" futures-util = "0.3" -fvm = { version = "~2.4", default-features = false } +fvm = { version = "~2.3", default-features = false } fvm3 = { package = "fvm", default-features = false, version = "~3.3.1" } fvm_ipld_amt = "0.5" fvm_ipld_bitfield = "0.5" @@ -84,7 +84,7 @@ 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.4", default-features = false } +fvm_shared = { version = "~2.3", default-features = false } fvm_shared3 = { package = "fvm_shared", version = "~3.3", default-features = false } gethostname = "0.4" git-version = "0.3" @@ -199,12 +199,3 @@ lto = "off" strip = true panic = "abort" overflow-checks = true - -[patch.crates-io] -fil_actor_interface = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } -fil_actor_account_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } -fil_actor_init_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } -fil_actor_miner_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } -fil_actor_power_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } -fil_actor_system_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } -fil_actors_shared = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } From ef2ec11ff11308ed71daa77f5543e8b053596c56 Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Mon, 22 May 2023 17:44:42 +0100 Subject: [PATCH 16/23] try: cargo update -p fvm@2.3.0 -p fvm_shared@2.3.0 weird wasmtime errors :( --- Cargo.lock | 787 +++++++++++++++++++++++++++++------------------------ Cargo.toml | 13 +- 2 files changed, 437 insertions(+), 363 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 193c31688ddc..02e8ee384aed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1585,7 +1585,16 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "593b398dd0c5b1e2e3a9c3dae8584e287894ea84e361949ad506376e99196265" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.89.2", +] + +[[package]] +name = "cranelift-bforest" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1277fbfa94bc82c8ec4af2ded3e639d49ca5f7f3c7eeab2c66accd135ece4e70" +dependencies = [ + "cranelift-entity 0.95.1", ] [[package]] @@ -1596,14 +1605,34 @@ checksum = "afc0d8faabd099ea15ab33d49d150e5572c04cfeb95d675fd41286739b754629" dependencies = [ "arrayvec 0.7.2", "bumpalo", - "cranelift-bforest", - "cranelift-codegen-meta", - "cranelift-codegen-shared", - "cranelift-entity", - "cranelift-isle", + "cranelift-bforest 0.89.2", + "cranelift-codegen-meta 0.89.2", + "cranelift-codegen-shared 0.89.2", + "cranelift-entity 0.89.2", + "cranelift-isle 0.89.2", "gimli 0.26.2", "log", - "regalloc2", + "regalloc2 0.4.2", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-codegen" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6e8c31ad3b2270e9aeec38723888fe1b0ace3bea2b06b3f749ccf46661d3220" +dependencies = [ + "bumpalo", + "cranelift-bforest 0.95.1", + "cranelift-codegen-meta 0.95.1", + "cranelift-codegen-shared 0.95.1", + "cranelift-entity 0.95.1", + "cranelift-isle 0.95.1", + "gimli 0.27.2", + "hashbrown 0.13.2", + "log", + "regalloc2 0.6.1", "smallvec", "target-lexicon", ] @@ -1614,7 +1643,16 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ac1669e42579476f001571d6ba4b825fac686282c97b88b18f8e34242066a81" dependencies = [ - "cranelift-codegen-shared", + "cranelift-codegen-shared 0.89.2", +] + +[[package]] +name = "cranelift-codegen-meta" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ac5ac30d62b2d66f12651f6b606dbdfd9c2cfd0908de6b387560a277c5c9da" +dependencies = [ + "cranelift-codegen-shared 0.95.1", ] [[package]] @@ -1623,6 +1661,12 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2a1b1eef9640ab72c1e7b583ac678083855a509da34b4b4378bd99954127c20" +[[package]] +name = "cranelift-codegen-shared" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd82b8b376247834b59ed9bdc0ddeb50f517452827d4a11bccf5937b213748b8" + [[package]] name = "cranelift-entity" version = "0.89.2" @@ -1632,13 +1676,34 @@ dependencies = [ "serde", ] +[[package]] +name = "cranelift-entity" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40099d38061b37e505e63f89bab52199037a72b931ad4868d9089ff7268660b0" +dependencies = [ + "serde", +] + [[package]] name = "cranelift-frontend" version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fca1474b5302348799656d43a40eacd716a3b46169405a3af812832c9edf77b4" dependencies = [ - "cranelift-codegen", + "cranelift-codegen 0.89.2", + "log", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-frontend" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a25d9d0a0ae3079c463c34115ec59507b4707175454f0eee0891e83e30e82d" +dependencies = [ + "cranelift-codegen 0.95.1", "log", "smallvec", "target-lexicon", @@ -1650,13 +1715,30 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77aa537f020ea43483100153278e7215d41695bdcef9eea6642d122675f64249" +[[package]] +name = "cranelift-isle" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80de6a7d0486e4acbd5f9f87ec49912bf4c8fb6aea00087b989685460d4469ba" + [[package]] name = "cranelift-native" version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bdc6b65241a95b7d8eafbf4e114c082e49b80162a2dcd9c6bcc5989c3310c9e" dependencies = [ - "cranelift-codegen", + "cranelift-codegen 0.89.2", + "libc", + "target-lexicon", +] + +[[package]] +name = "cranelift-native" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb6b03e0e03801c4b3fd8ce0758a94750c07a44e7944cc0ffbf0d3f2e7c79b00" +dependencies = [ + "cranelift-codegen 0.95.1", "libc", "target-lexicon", ] @@ -1667,14 +1749,30 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb6359f606a1c80ccaa04fae9dbbb504615ec7a49b6c212b341080fff7a65dd" dependencies = [ - "cranelift-codegen", - "cranelift-entity", - "cranelift-frontend", + "cranelift-codegen 0.89.2", + "cranelift-entity 0.89.2", + "cranelift-frontend 0.89.2", "itertools 0.10.5", "log", "smallvec", "wasmparser 0.92.0", - "wasmtime-types", + "wasmtime-types 2.0.2", +] + +[[package]] +name = "cranelift-wasm" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff3220489a3d928ad91e59dd7aeaa8b3de18afb554a6211213673a71c90737ac" +dependencies = [ + "cranelift-codegen 0.95.1", + "cranelift-entity 0.95.1", + "cranelift-frontend 0.95.1", + "itertools 0.10.5", + "log", + "smallvec", + "wasmparser 0.102.0", + "wasmtime-types 8.0.1", ] [[package]] @@ -2601,12 +2699,11 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "fil_actor_account_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b187f415da309f586e78dcb93b0fc2ef4d87c48a83ea10ed67698153c9242c78" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "frc42_dispatch", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "num-derive", "num-traits", @@ -2616,11 +2713,10 @@ dependencies = [ [[package]] name = "fil_actor_cron_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebf1ba16d3463dbc1994ee13046bbf4779d2b09c09814ceffee02b20469cce1a" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "num-derive", "num-traits", @@ -2630,15 +2726,14 @@ dependencies = [ [[package]] name = "fil_actor_datacap_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a3e19bc02375ac1bd1846f3ec4c9b1d9d9bc1100bf4116ba3fcf833c7b86805" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "fil_actors_shared", "frc42_dispatch", "frc46_token", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "num-derive", "num-traits", @@ -2648,8 +2743,7 @@ dependencies = [ [[package]] name = "fil_actor_evm_shared_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed3723f5c77039a08973272486777ee0cc829282e2bbd1c8241663e41d6dd8" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "fil_actors_shared", "fvm_ipld_encoding 0.3.3", @@ -2662,8 +2756,7 @@ dependencies = [ [[package]] name = "fil_actor_evm_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0ecbde9e08b2b94e85a58b3d8c951aa3ef9cd37aae8c01299ad2bc6248c3ac" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "cid", "fil_actor_evm_shared_state", @@ -2679,8 +2772,7 @@ dependencies = [ [[package]] name = "fil_actor_init_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ce8135e0abbbef389cba5463a09f3388a6dfdcad10a00c46b58c37c056827b5" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2689,7 +2781,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "num-derive", "num-traits", @@ -2699,8 +2791,7 @@ dependencies = [ [[package]] name = "fil_actor_interface" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad5d9aad0bc17842d843da7d0b2ba9a45fe6eeb429d1840f71107238c483d60" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2719,7 +2810,7 @@ dependencies = [ "fvm_ipld_bitfield", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "lazy_static", "num", @@ -2732,8 +2823,7 @@ dependencies = [ [[package]] name = "fil_actor_market_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6fa0e995d6105a32764310ae69798d7b385c8fab79a12f7073a3821a8db8e4" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2744,7 +2834,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "libipld-core 0.14.0", "num-bigint", @@ -2756,8 +2846,7 @@ dependencies = [ [[package]] name = "fil_actor_miner_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c813a2ac23cf3839c894bb298aec7b8cd60bb72dfd0969a72f5e3d75f7b7c3" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2769,7 +2858,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "itertools 0.10.5", "lazy_static", @@ -2783,8 +2872,7 @@ dependencies = [ [[package]] name = "fil_actor_multisig_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf69d3ef248bde1bf918a82c9569a1370ba791fad79715fec9331b864b530b06" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2793,7 +2881,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "indexmap", "integer-encoding", @@ -2805,8 +2893,7 @@ dependencies = [ [[package]] name = "fil_actor_power_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9aa1d743813f85668c1fcfd4ea7bd8c6801c7d680082206befab579841aa703" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2815,7 +2902,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "integer-encoding", "lazy_static", @@ -2827,11 +2914,10 @@ dependencies = [ [[package]] name = "fil_actor_reward_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2e9ed3f14f42a3271dd4b0bde27d856921f1663d01ed90c11e3bf28155937f4" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "lazy_static", "num-derive", @@ -2842,12 +2928,11 @@ dependencies = [ [[package]] name = "fil_actor_system_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc0710525208487a4509fbbfa920e545a857dd8d42786cfd8e7ad83643dfd5e" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "cid", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "num-derive", "num-traits", "serde", @@ -2856,8 +2941,7 @@ dependencies = [ [[package]] name = "fil_actor_verifreg_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aef9da0968812cf86404d138a29d9e6f4bbfbede4e52dda724bafe514b9de64" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2865,7 +2949,7 @@ dependencies = [ "frc42_dispatch", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "num-derive", "num-traits", @@ -2875,8 +2959,7 @@ dependencies = [ [[package]] name = "fil_actors_shared" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9b943dbb4ba114540d7e20d512b3cd6eb279be02195341e56f917b049316af2" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2884,7 +2967,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "lazy_static", "multihash 0.16.3", @@ -2915,26 +2998,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 +3018,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 +3029,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 +3043,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 +3060,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 +3138,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 +3235,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 +3263,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,7 +3306,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_car", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "lazy_static", "libipld", @@ -3336,7 +3349,7 @@ dependencies = [ "fvm_ipld_amt 0.5.1", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "lazy_static", "log", @@ -3469,7 +3482,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 +3496,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,12 +3547,12 @@ dependencies = [ "forest_message", "forest_networks", "forest_shim", - "fvm 2.3.0", + "fvm 2.4.0", "fvm 3.3.1", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "lazy_static", "log", @@ -3562,7 +3575,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,10 +3603,10 @@ 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 2.4.0", "fvm_shared 3.3.0", "multihash 0.16.3", "num", @@ -3654,7 +3667,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,7 +3723,7 @@ dependencies = [ "forest_shim", "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "quickcheck", "rand 0.8.5", @@ -3742,7 +3755,7 @@ dependencies = [ "fvm 3.3.1", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "lazy_static", "log", @@ -3786,7 +3799,7 @@ dependencies = [ "fil_actors_shared", "forest_beacon", "forest_shim", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "lazy_static", "multiaddr", "serde", @@ -3890,7 +3903,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,13 +3936,13 @@ dependencies = [ "anyhow", "bls-signatures", "cid", - "filecoin-proofs-api 14.0.0", - "fvm 2.3.0", + "filecoin-proofs-api", + "fvm 2.4.0", "fvm 3.3.1", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "lazy_static", "num", @@ -3952,7 +3965,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 +3979,13 @@ dependencies = [ "forest_state_migration", "forest_utils", "futures", - "fvm 2.3.0", + "fvm 2.4.0", "fvm 3.3.1", "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 +4080,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 +4124,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 +4148,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 +4159,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 +4191,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 +4349,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 +4360,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", @@ -4381,7 +4380,7 @@ dependencies = [ "serde_repr", "serde_tuple", "thiserror", - "wasmtime", + "wasmtime 8.0.1", "yastl", ] @@ -4395,7 +4394,7 @@ dependencies = [ "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", @@ -4415,9 +4414,9 @@ dependencies = [ "serde", "serde_tuple", "thiserror", - "wasmtime", - "wasmtime-environ", - "wasmtime-runtime", + "wasmtime 2.0.2", + "wasmtime-environ 2.0.2", + "wasmtime-runtime 2.0.2", "yastl", ] @@ -4454,7 +4453,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", @@ -4508,9 +4507,9 @@ dependencies = [ [[package]] name = "fvm_ipld_blockstore" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688239a96199577f6705a3f9689abfd795f867f91f5847bc7e236017cc672df7" +checksum = "fee8c75be2b58943e1a9755802d34d4c3934f6ea151b6be192ff98f644e515bd" dependencies = [ "anyhow", "cid", @@ -4616,7 +4615,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 +4624,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 +4637,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", @@ -4670,7 +4669,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", @@ -4796,6 +4795,11 @@ name = "gimli" version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +dependencies = [ + "fallible-iterator", + "indexmap", + "stable_deref_trait", +] [[package]] name = "git-version" @@ -6816,6 +6820,9 @@ version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ + "crc32fast", + "hashbrown 0.13.2", + "indexmap", "memchr", ] @@ -7793,6 +7800,18 @@ dependencies = [ "smallvec", ] +[[package]] +name = "regalloc2" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80535183cae11b149d618fbd3c37e38d7cda589d82d7769e196ca9a9042d7621" +dependencies = [ + "fxhash", + "log", + "slice-group-by", + "smallvec", +] + [[package]] name = "regex" version = "1.8.1" @@ -8603,21 +8622,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 +8881,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 +8896,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 +8916,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 +8931,8 @@ dependencies = [ "crossbeam", "fdlimit", "ff", - "filecoin-hashers 9.0.0", - "fr32 7.0.0", + "filecoin-hashers", + "fr32", "generic-array", "hex", "lazy_static", @@ -9019,34 +8950,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 +8967,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 +8988,8 @@ dependencies = [ "bellperson", "blstrs", "ff", - "filecoin-hashers 9.0.0", - "fr32 7.0.0", + "filecoin-hashers", + "fr32", "generic-array", "lazy_static", "log", @@ -9114,8 +8998,8 @@ dependencies = [ "neptune", "rayon", "serde", - "storage-proofs-core 14.0.0", - "storage-proofs-porep 14.0.0", + "storage-proofs-core", + "storage-proofs-porep", ] [[package]] @@ -10217,6 +10101,16 @@ dependencies = [ "url", ] +[[package]] +name = "wasmparser" +version = "0.102.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b" +dependencies = [ + "indexmap", + "url", +] + [[package]] name = "wasmparser" version = "0.104.0" @@ -10257,13 +10151,40 @@ dependencies = [ "serde", "target-lexicon", "wasmparser 0.92.0", - "wasmtime-cranelift", - "wasmtime-environ", - "wasmtime-jit", - "wasmtime-runtime", + "wasmtime-cranelift 2.0.2", + "wasmtime-environ 2.0.2", + "wasmtime-jit 2.0.2", + "wasmtime-runtime 2.0.2", "windows-sys 0.36.1", ] +[[package]] +name = "wasmtime" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f907fdead3153cb9bfb7a93bbd5b62629472dc06dee83605358c64c52ed3dda9" +dependencies = [ + "anyhow", + "bincode", + "cfg-if 1.0.0", + "indexmap", + "libc", + "log", + "object 0.30.3", + "once_cell", + "paste", + "psm", + "rayon", + "serde", + "target-lexicon", + "wasmparser 0.102.0", + "wasmtime-cranelift 8.0.1", + "wasmtime-environ 8.0.1", + "wasmtime-jit 8.0.1", + "wasmtime-runtime 8.0.1", + "windows-sys 0.45.0", +] + [[package]] name = "wasmtime-asm-macros" version = "2.0.2" @@ -10273,6 +10194,15 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "wasmtime-asm-macros" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b9daa7c14cd4fa3edbf69de994408d5f4b7b0959ac13fa69d465f6597f810d" +dependencies = [ + "cfg-if 1.0.0", +] + [[package]] name = "wasmtime-cranelift" version = "2.0.2" @@ -10280,18 +10210,55 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "017c3605ccce867b3ba7f71d95e5652acc22b9dc2971ad6a6f9df4a8d7af2648" dependencies = [ "anyhow", - "cranelift-codegen", - "cranelift-entity", - "cranelift-frontend", - "cranelift-native", - "cranelift-wasm", + "cranelift-codegen 0.89.2", + "cranelift-entity 0.89.2", + "cranelift-frontend 0.89.2", + "cranelift-native 0.89.2", + "cranelift-wasm 0.89.2", "gimli 0.26.2", "log", "object 0.29.0", "target-lexicon", "thiserror", "wasmparser 0.92.0", - "wasmtime-environ", + "wasmtime-environ 2.0.2", +] + +[[package]] +name = "wasmtime-cranelift" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1cefde0cce8cb700b1b21b6298a3837dba46521affd7b8c38a9ee2c869eee04" +dependencies = [ + "anyhow", + "cranelift-codegen 0.95.1", + "cranelift-entity 0.95.1", + "cranelift-frontend 0.95.1", + "cranelift-native 0.95.1", + "cranelift-wasm 0.95.1", + "gimli 0.27.2", + "log", + "object 0.30.3", + "target-lexicon", + "thiserror", + "wasmparser 0.102.0", + "wasmtime-cranelift-shared", + "wasmtime-environ 8.0.1", +] + +[[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 0.95.1", + "cranelift-native 0.95.1", + "gimli 0.27.2", + "object 0.30.3", + "target-lexicon", + "wasmtime-environ 8.0.1", ] [[package]] @@ -10301,7 +10268,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aec5c1f81aab9bb35997113c171b6bb9093afc90e3757c55e0c08dc9ac612e4" dependencies = [ "anyhow", - "cranelift-entity", + "cranelift-entity 0.89.2", "gimli 0.26.2", "indexmap", "log", @@ -10310,7 +10277,26 @@ dependencies = [ "target-lexicon", "thiserror", "wasmparser 0.92.0", - "wasmtime-types", + "wasmtime-types 2.0.2", +] + +[[package]] +name = "wasmtime-environ" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949" +dependencies = [ + "anyhow", + "cranelift-entity 0.95.1", + "gimli 0.27.2", + "indexmap", + "log", + "object 0.30.3", + "serde", + "target-lexicon", + "thiserror", + "wasmparser 0.102.0", + "wasmtime-types 8.0.1", ] [[package]] @@ -10332,11 +10318,34 @@ dependencies = [ "serde", "target-lexicon", "thiserror", - "wasmtime-environ", - "wasmtime-runtime", + "wasmtime-environ 2.0.2", + "wasmtime-runtime 2.0.2", "windows-sys 0.36.1", ] +[[package]] +name = "wasmtime-jit" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244" +dependencies = [ + "addr2line 0.19.0", + "anyhow", + "bincode", + "cfg-if 1.0.0", + "cpp_demangle", + "gimli 0.27.2", + "log", + "object 0.30.3", + "rustc-demangle", + "serde", + "target-lexicon", + "wasmtime-environ 8.0.1", + "wasmtime-jit-icache-coherence", + "wasmtime-runtime 8.0.1", + "windows-sys 0.45.0", +] + [[package]] name = "wasmtime-jit-debug" version = "2.0.2" @@ -10346,6 +10355,26 @@ dependencies = [ "once_cell", ] +[[package]] +name = "wasmtime-jit-debug" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +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" @@ -10365,24 +10394,60 @@ dependencies = [ "rand 0.8.5", "rustix 0.35.13", "thiserror", - "wasmtime-asm-macros", - "wasmtime-environ", - "wasmtime-jit-debug", + "wasmtime-asm-macros 2.0.2", + "wasmtime-environ 2.0.2", + "wasmtime-jit-debug 2.0.2", "windows-sys 0.36.1", ] +[[package]] +name = "wasmtime-runtime" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658cf6f325232b6760e202e5255d823da5e348fdea827eff0a2a22319000b441" +dependencies = [ + "anyhow", + "cc", + "cfg-if 1.0.0", + "indexmap", + "libc", + "log", + "mach", + "memfd", + "memoffset 0.8.0", + "paste", + "rand 0.8.5", + "rustix 0.36.13", + "wasmtime-asm-macros 8.0.1", + "wasmtime-environ 8.0.1", + "wasmtime-jit-debug 8.0.1", + "windows-sys 0.45.0", +] + [[package]] name = "wasmtime-types" version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dc3dd9521815984b35d6362f79e6b9c72475027cd1c71c44eb8df8fbf33a9fb" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.89.2", "serde", "thiserror", "wasmparser 0.92.0", ] +[[package]] +name = "wasmtime-types" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f" +dependencies = [ + "cranelift-entity 0.95.1", + "serde", + "thiserror", + "wasmparser 0.102.0", +] + [[package]] name = "web-sys" version = "0.3.61" diff --git a/Cargo.toml b/Cargo.toml index fd22a90fa06b..3ecee516eb55 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,7 +76,7 @@ flume = "0.10" fs_extra = "1.2" futures = "0.3" futures-util = "0.3" -fvm = { version = "~2.3", default-features = false } +fvm = { version = "~2.4", default-features = false } fvm3 = { package = "fvm", default-features = false, version = "~3.3.1" } fvm_ipld_amt = "0.5" fvm_ipld_bitfield = "0.5" @@ -84,7 +84,7 @@ 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" @@ -199,3 +199,12 @@ lto = "off" strip = true panic = "abort" overflow-checks = true + +[patch.crates-io] +fil_actor_interface = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } +fil_actor_account_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } +fil_actor_init_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } +fil_actor_miner_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } +fil_actor_power_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } +fil_actor_system_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } +fil_actors_shared = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } From b0ad64bc7bfc558e5009e699b97213cbb580e5cb Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Mon, 22 May 2023 17:58:52 +0100 Subject: [PATCH 17/23] Revert "try: cargo update -p fvm@2.3.0 -p fvm_shared@2.3.0" This reverts commit d1f4499b4f17a731f656029df7668d02aa9fea1b. --- Cargo.lock | 787 ++++++++++++++++++++++++----------------------------- Cargo.toml | 13 +- 2 files changed, 363 insertions(+), 437 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 02e8ee384aed..193c31688ddc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1585,16 +1585,7 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "593b398dd0c5b1e2e3a9c3dae8584e287894ea84e361949ad506376e99196265" dependencies = [ - "cranelift-entity 0.89.2", -] - -[[package]] -name = "cranelift-bforest" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1277fbfa94bc82c8ec4af2ded3e639d49ca5f7f3c7eeab2c66accd135ece4e70" -dependencies = [ - "cranelift-entity 0.95.1", + "cranelift-entity", ] [[package]] @@ -1605,34 +1596,14 @@ checksum = "afc0d8faabd099ea15ab33d49d150e5572c04cfeb95d675fd41286739b754629" dependencies = [ "arrayvec 0.7.2", "bumpalo", - "cranelift-bforest 0.89.2", - "cranelift-codegen-meta 0.89.2", - "cranelift-codegen-shared 0.89.2", - "cranelift-entity 0.89.2", - "cranelift-isle 0.89.2", + "cranelift-bforest", + "cranelift-codegen-meta", + "cranelift-codegen-shared", + "cranelift-entity", + "cranelift-isle", "gimli 0.26.2", "log", - "regalloc2 0.4.2", - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cranelift-codegen" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6e8c31ad3b2270e9aeec38723888fe1b0ace3bea2b06b3f749ccf46661d3220" -dependencies = [ - "bumpalo", - "cranelift-bforest 0.95.1", - "cranelift-codegen-meta 0.95.1", - "cranelift-codegen-shared 0.95.1", - "cranelift-entity 0.95.1", - "cranelift-isle 0.95.1", - "gimli 0.27.2", - "hashbrown 0.13.2", - "log", - "regalloc2 0.6.1", + "regalloc2", "smallvec", "target-lexicon", ] @@ -1643,16 +1614,7 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ac1669e42579476f001571d6ba4b825fac686282c97b88b18f8e34242066a81" dependencies = [ - "cranelift-codegen-shared 0.89.2", -] - -[[package]] -name = "cranelift-codegen-meta" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ac5ac30d62b2d66f12651f6b606dbdfd9c2cfd0908de6b387560a277c5c9da" -dependencies = [ - "cranelift-codegen-shared 0.95.1", + "cranelift-codegen-shared", ] [[package]] @@ -1661,12 +1623,6 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2a1b1eef9640ab72c1e7b583ac678083855a509da34b4b4378bd99954127c20" -[[package]] -name = "cranelift-codegen-shared" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd82b8b376247834b59ed9bdc0ddeb50f517452827d4a11bccf5937b213748b8" - [[package]] name = "cranelift-entity" version = "0.89.2" @@ -1676,34 +1632,13 @@ dependencies = [ "serde", ] -[[package]] -name = "cranelift-entity" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40099d38061b37e505e63f89bab52199037a72b931ad4868d9089ff7268660b0" -dependencies = [ - "serde", -] - [[package]] name = "cranelift-frontend" version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fca1474b5302348799656d43a40eacd716a3b46169405a3af812832c9edf77b4" dependencies = [ - "cranelift-codegen 0.89.2", - "log", - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cranelift-frontend" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a25d9d0a0ae3079c463c34115ec59507b4707175454f0eee0891e83e30e82d" -dependencies = [ - "cranelift-codegen 0.95.1", + "cranelift-codegen", "log", "smallvec", "target-lexicon", @@ -1715,30 +1650,13 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77aa537f020ea43483100153278e7215d41695bdcef9eea6642d122675f64249" -[[package]] -name = "cranelift-isle" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80de6a7d0486e4acbd5f9f87ec49912bf4c8fb6aea00087b989685460d4469ba" - [[package]] name = "cranelift-native" version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bdc6b65241a95b7d8eafbf4e114c082e49b80162a2dcd9c6bcc5989c3310c9e" dependencies = [ - "cranelift-codegen 0.89.2", - "libc", - "target-lexicon", -] - -[[package]] -name = "cranelift-native" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6b03e0e03801c4b3fd8ce0758a94750c07a44e7944cc0ffbf0d3f2e7c79b00" -dependencies = [ - "cranelift-codegen 0.95.1", + "cranelift-codegen", "libc", "target-lexicon", ] @@ -1749,30 +1667,14 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb6359f606a1c80ccaa04fae9dbbb504615ec7a49b6c212b341080fff7a65dd" dependencies = [ - "cranelift-codegen 0.89.2", - "cranelift-entity 0.89.2", - "cranelift-frontend 0.89.2", + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", "itertools 0.10.5", "log", "smallvec", "wasmparser 0.92.0", - "wasmtime-types 2.0.2", -] - -[[package]] -name = "cranelift-wasm" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff3220489a3d928ad91e59dd7aeaa8b3de18afb554a6211213673a71c90737ac" -dependencies = [ - "cranelift-codegen 0.95.1", - "cranelift-entity 0.95.1", - "cranelift-frontend 0.95.1", - "itertools 0.10.5", - "log", - "smallvec", - "wasmparser 0.102.0", - "wasmtime-types 8.0.1", + "wasmtime-types", ] [[package]] @@ -2699,11 +2601,12 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "fil_actor_account_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b187f415da309f586e78dcb93b0fc2ef4d87c48a83ea10ed67698153c9242c78" dependencies = [ "frc42_dispatch", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "fvm_shared 3.3.0", "num-derive", "num-traits", @@ -2713,10 +2616,11 @@ dependencies = [ [[package]] name = "fil_actor_cron_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebf1ba16d3463dbc1994ee13046bbf4779d2b09c09814ceffee02b20469cce1a" dependencies = [ "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "fvm_shared 3.3.0", "num-derive", "num-traits", @@ -2726,14 +2630,15 @@ dependencies = [ [[package]] name = "fil_actor_datacap_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a3e19bc02375ac1bd1846f3ec4c9b1d9d9bc1100bf4116ba3fcf833c7b86805" dependencies = [ "fil_actors_shared", "frc42_dispatch", "frc46_token", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "fvm_shared 3.3.0", "num-derive", "num-traits", @@ -2743,7 +2648,8 @@ dependencies = [ [[package]] name = "fil_actor_evm_shared_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ed3723f5c77039a08973272486777ee0cc829282e2bbd1c8241663e41d6dd8" dependencies = [ "fil_actors_shared", "fvm_ipld_encoding 0.3.3", @@ -2756,7 +2662,8 @@ dependencies = [ [[package]] name = "fil_actor_evm_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e0ecbde9e08b2b94e85a58b3d8c951aa3ef9cd37aae8c01299ad2bc6248c3ac" dependencies = [ "cid", "fil_actor_evm_shared_state", @@ -2772,7 +2679,8 @@ dependencies = [ [[package]] name = "fil_actor_init_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ce8135e0abbbef389cba5463a09f3388a6dfdcad10a00c46b58c37c056827b5" dependencies = [ "anyhow", "cid", @@ -2781,7 +2689,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "fvm_shared 3.3.0", "num-derive", "num-traits", @@ -2791,7 +2699,8 @@ dependencies = [ [[package]] name = "fil_actor_interface" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ad5d9aad0bc17842d843da7d0b2ba9a45fe6eeb429d1840f71107238c483d60" dependencies = [ "anyhow", "cid", @@ -2810,7 +2719,7 @@ dependencies = [ "fvm_ipld_bitfield", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "fvm_shared 3.3.0", "lazy_static", "num", @@ -2823,7 +2732,8 @@ dependencies = [ [[package]] name = "fil_actor_market_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a6fa0e995d6105a32764310ae69798d7b385c8fab79a12f7073a3821a8db8e4" dependencies = [ "anyhow", "cid", @@ -2834,7 +2744,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "fvm_shared 3.3.0", "libipld-core 0.14.0", "num-bigint", @@ -2846,7 +2756,8 @@ dependencies = [ [[package]] name = "fil_actor_miner_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c813a2ac23cf3839c894bb298aec7b8cd60bb72dfd0969a72f5e3d75f7b7c3" dependencies = [ "anyhow", "cid", @@ -2858,7 +2769,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "fvm_shared 3.3.0", "itertools 0.10.5", "lazy_static", @@ -2872,7 +2783,8 @@ dependencies = [ [[package]] name = "fil_actor_multisig_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf69d3ef248bde1bf918a82c9569a1370ba791fad79715fec9331b864b530b06" dependencies = [ "anyhow", "cid", @@ -2881,7 +2793,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "fvm_shared 3.3.0", "indexmap", "integer-encoding", @@ -2893,7 +2805,8 @@ dependencies = [ [[package]] name = "fil_actor_power_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9aa1d743813f85668c1fcfd4ea7bd8c6801c7d680082206befab579841aa703" dependencies = [ "anyhow", "cid", @@ -2902,7 +2815,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "fvm_shared 3.3.0", "integer-encoding", "lazy_static", @@ -2914,10 +2827,11 @@ dependencies = [ [[package]] name = "fil_actor_reward_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2e9ed3f14f42a3271dd4b0bde27d856921f1663d01ed90c11e3bf28155937f4" dependencies = [ "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "fvm_shared 3.3.0", "lazy_static", "num-derive", @@ -2928,11 +2842,12 @@ dependencies = [ [[package]] name = "fil_actor_system_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbc0710525208487a4509fbbfa920e545a857dd8d42786cfd8e7ad83643dfd5e" dependencies = [ "cid", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "num-derive", "num-traits", "serde", @@ -2941,7 +2856,8 @@ dependencies = [ [[package]] name = "fil_actor_verifreg_state" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aef9da0968812cf86404d138a29d9e6f4bbfbede4e52dda724bafe514b9de64" dependencies = [ "anyhow", "cid", @@ -2949,7 +2865,7 @@ dependencies = [ "frc42_dispatch", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "fvm_shared 3.3.0", "num-derive", "num-traits", @@ -2959,7 +2875,8 @@ dependencies = [ [[package]] name = "fil_actors_shared" version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9b943dbb4ba114540d7e20d512b3cd6eb279be02195341e56f917b049316af2" dependencies = [ "anyhow", "cid", @@ -2967,7 +2884,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "fvm_shared 3.3.0", "lazy_static", "multihash 0.16.3", @@ -2998,6 +2915,26 @@ 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" @@ -3018,6 +2955,38 @@ 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" @@ -3029,8 +2998,8 @@ dependencies = [ "bincode", "blake2b_simd", "blstrs", - "filecoin-hashers", - "fr32", + "filecoin-hashers 9.0.0", + "fr32 7.0.0", "generic-array", "hex", "lazy_static", @@ -3043,13 +3012,31 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.6", - "storage-proofs-core", - "storage-proofs-porep", - "storage-proofs-post", - "storage-proofs-update", + "storage-proofs-core 14.0.0", + "storage-proofs-porep 14.0.0", + "storage-proofs-post 14.0.0", + "storage-proofs-update 14.0.0", "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" @@ -3060,12 +3047,12 @@ dependencies = [ "bellperson", "bincode", "blstrs", - "filecoin-hashers", - "filecoin-proofs", - "fr32", + "filecoin-hashers 9.0.0", + "filecoin-proofs 14.0.0", + "fr32 7.0.0", "lazy_static", "serde", - "storage-proofs-core", + "storage-proofs-core 14.0.0", ] [[package]] @@ -3138,7 +3125,7 @@ dependencies = [ "futures", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "hex", "human-repr", "jsonrpc-v2", @@ -3235,7 +3222,7 @@ dependencies = [ "byteorder", "forest_shim", "forest_utils", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "hex", "parking_lot 0.12.1", "quickcheck", @@ -3263,7 +3250,7 @@ dependencies = [ "forest_test_utils", "forest_utils", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "hex", "lazy_static", "log", @@ -3306,7 +3293,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_car", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "fvm_shared 3.3.0", "lazy_static", "libipld", @@ -3349,7 +3336,7 @@ dependencies = [ "fvm_ipld_amt 0.5.1", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "fvm_shared 3.3.0", "lazy_static", "log", @@ -3482,7 +3469,7 @@ dependencies = [ "cid", "fil_actor_interface", "fil_actors_shared", - "filecoin-proofs-api", + "filecoin-proofs-api 14.0.0", "forest_beacon", "forest_blocks", "forest_chain", @@ -3496,7 +3483,7 @@ dependencies = [ "futures", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "lazy_static", "nonempty", "num", @@ -3547,12 +3534,12 @@ dependencies = [ "forest_message", "forest_networks", "forest_shim", - "fvm 2.4.0", + "fvm 2.3.0", "fvm 3.3.1", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "fvm_shared 3.3.0", "lazy_static", "log", @@ -3575,7 +3562,7 @@ dependencies = [ "forest_json", "forest_utils", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "indexmap", "lazy_static", "libipld", @@ -3603,10 +3590,10 @@ dependencies = [ "forest_shim", "forest_test_utils", "forest_utils", - "fvm 2.4.0", + "fvm 2.3.0", "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "fvm_shared 3.3.0", "multihash 0.16.3", "num", @@ -3667,7 +3654,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_car", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "lazy_static", "libp2p", "log", @@ -3723,7 +3710,7 @@ dependencies = [ "forest_shim", "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "fvm_shared 3.3.0", "quickcheck", "rand 0.8.5", @@ -3755,7 +3742,7 @@ dependencies = [ "fvm 3.3.1", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "fvm_shared 3.3.0", "lazy_static", "log", @@ -3799,7 +3786,7 @@ dependencies = [ "fil_actors_shared", "forest_beacon", "forest_shim", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "lazy_static", "multiaddr", "serde", @@ -3903,7 +3890,7 @@ dependencies = [ "forest_shim", "forest_state_manager", "fvm_ipld_blockstore", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "jsonrpc-v2", "once_cell", "parking_lot 0.12.1", @@ -3936,13 +3923,13 @@ dependencies = [ "anyhow", "bls-signatures", "cid", - "filecoin-proofs-api", - "fvm 2.4.0", + "filecoin-proofs-api 14.0.0", + "fvm 2.3.0", "fvm 3.3.1", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "fvm_shared 3.3.0", "lazy_static", "num", @@ -3965,7 +3952,7 @@ dependencies = [ "cid", "fil_actor_interface", "fil_actors_shared", - "filecoin-proofs-api", + "filecoin-proofs-api 14.0.0", "forest_beacon", "forest_blocks", "forest_chain", @@ -3979,13 +3966,13 @@ dependencies = [ "forest_state_migration", "forest_utils", "futures", - "fvm 2.4.0", + "fvm 2.3.0", "fvm 3.3.1", "fvm_ipld_amt 0.5.1", "fvm_ipld_bitfield", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "lazy_static", "lru", "num", @@ -4080,7 +4067,7 @@ dependencies = [ "const_format", "cs_serde_bytes", "digest 0.10.6", - "filecoin-proofs-api", + "filecoin-proofs-api 14.0.0", "flume", "forest_shim", "futures", @@ -4124,6 +4111,20 @@ 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" @@ -4148,7 +4149,7 @@ dependencies = [ "frc42_macros", "fvm_ipld_encoding 0.2.3", "fvm_sdk", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "thiserror", ] @@ -4159,7 +4160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cf52e60a67e9ad15cd4909ef8c8e45ab3744015dbb603efd8dfbdbfc7ce95b7" dependencies = [ "fvm_sdk", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "thiserror", ] @@ -4191,7 +4192,7 @@ dependencies = [ "fvm_ipld_encoding 0.2.3", "fvm_ipld_hamt 0.5.1", "fvm_sdk", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "integer-encoding", "num-traits", "serde", @@ -4349,9 +4350,9 @@ dependencies = [ [[package]] name = "fvm" -version = "2.4.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a39581df015d28776519d941f62becdf7ff40f081be6ffbeb1d8880806416e0" +checksum = "7a8b6a711f111c3c02ae2429045004b4c3b5aaba68bc13e9fdec76e60e81c2d5" dependencies = [ "anyhow", "blake2b_simd", @@ -4360,13 +4361,13 @@ dependencies = [ "derive-getters", "derive_builder 0.11.2", "derive_more", - "filecoin-proofs-api", + "filecoin-proofs-api 13.0.0", "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.4.0", + "fvm_shared 2.3.0", "lazy_static", "log", "multihash 0.16.3", @@ -4380,7 +4381,7 @@ dependencies = [ "serde_repr", "serde_tuple", "thiserror", - "wasmtime 8.0.1", + "wasmtime", "yastl", ] @@ -4394,7 +4395,7 @@ dependencies = [ "byteorder", "cid", "derive_more", - "filecoin-proofs-api", + "filecoin-proofs-api 14.0.0", "fvm-wasm-instrument 0.4.0", "fvm_ipld_amt 0.5.1", "fvm_ipld_blockstore", @@ -4414,9 +4415,9 @@ dependencies = [ "serde", "serde_tuple", "thiserror", - "wasmtime 2.0.2", - "wasmtime-environ 2.0.2", - "wasmtime-runtime 2.0.2", + "wasmtime", + "wasmtime-environ", + "wasmtime-runtime", "yastl", ] @@ -4453,7 +4454,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", "fvm_sdk", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "num-traits", "serde", "serde_tuple", @@ -4507,9 +4508,9 @@ dependencies = [ [[package]] name = "fvm_ipld_blockstore" -version = "0.1.2" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee8c75be2b58943e1a9755802d34d4c3934f6ea151b6be192ff98f644e515bd" +checksum = "688239a96199577f6705a3f9689abfd795f867f91f5847bc7e236017cc672df7" dependencies = [ "anyhow", "cid", @@ -4615,7 +4616,7 @@ checksum = "bb46d7b26e1609de1a3b7470cbd190d78f2d01fdf1b317f741bdd3ac8f59825e" dependencies = [ "cid", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.4.0", + "fvm_shared 2.3.0", "lazy_static", "log", "num-traits", @@ -4624,9 +4625,9 @@ dependencies = [ [[package]] name = "fvm_shared" -version = "2.4.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05eebc49ba13d8aae14c396e4d700c83361eca673cae9c0bfc69cb6e754bd468" +checksum = "518880fbf3facd8ba26298e27d0aa7c43459d14a2511d22d2a3f39abf3b73f6a" dependencies = [ "anyhow", "arbitrary", @@ -4637,7 +4638,7 @@ dependencies = [ "cs_serde_bytes", "data-encoding", "data-encoding-macro", - "filecoin-proofs-api", + "filecoin-proofs-api 13.0.0", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", "lazy_static", @@ -4669,7 +4670,7 @@ dependencies = [ "cid", "data-encoding", "data-encoding-macro", - "filecoin-proofs-api", + "filecoin-proofs-api 14.0.0", "fvm_ipld_encoding 0.3.3", "lazy_static", "libsecp256k1", @@ -4795,11 +4796,6 @@ name = "gimli" version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" -dependencies = [ - "fallible-iterator", - "indexmap", - "stable_deref_trait", -] [[package]] name = "git-version" @@ -6820,9 +6816,6 @@ version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ - "crc32fast", - "hashbrown 0.13.2", - "indexmap", "memchr", ] @@ -7800,18 +7793,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "regalloc2" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80535183cae11b149d618fbd3c37e38d7cda589d82d7769e196ca9a9042d7621" -dependencies = [ - "fxhash", - "log", - "slice-group-by", - "smallvec", -] - [[package]] name = "regex" version = "1.8.1" @@ -8622,6 +8603,21 @@ 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" @@ -8881,6 +8877,41 @@ 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" @@ -8896,8 +8927,8 @@ dependencies = [ "cbc", "config", "ff", - "filecoin-hashers", - "fr32", + "filecoin-hashers 9.0.0", + "fr32 7.0.0", "fs2", "generic-array", "itertools 0.10.5", @@ -8916,6 +8947,44 @@ 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" @@ -8931,8 +9000,8 @@ dependencies = [ "crossbeam", "fdlimit", "ff", - "filecoin-hashers", - "fr32", + "filecoin-hashers 9.0.0", + "fr32 7.0.0", "generic-array", "hex", "lazy_static", @@ -8950,11 +9019,34 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.6", - "sha2raw", - "storage-proofs-core", + "sha2raw 9.0.0", + "storage-proofs-core 14.0.0", "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" @@ -8967,15 +9059,39 @@ dependencies = [ "blstrs", "byteorder", "ff", - "filecoin-hashers", - "fr32", + "filecoin-hashers 9.0.0", + "fr32 7.0.0", "generic-array", "hex", "log", "rayon", "serde", "sha2 0.10.6", - "storage-proofs-core", + "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", ] [[package]] @@ -8988,8 +9104,8 @@ dependencies = [ "bellperson", "blstrs", "ff", - "filecoin-hashers", - "fr32", + "filecoin-hashers 9.0.0", + "fr32 7.0.0", "generic-array", "lazy_static", "log", @@ -8998,8 +9114,8 @@ dependencies = [ "neptune", "rayon", "serde", - "storage-proofs-core", - "storage-proofs-porep", + "storage-proofs-core 14.0.0", + "storage-proofs-porep 14.0.0", ] [[package]] @@ -10101,16 +10217,6 @@ dependencies = [ "url", ] -[[package]] -name = "wasmparser" -version = "0.102.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b" -dependencies = [ - "indexmap", - "url", -] - [[package]] name = "wasmparser" version = "0.104.0" @@ -10151,40 +10257,13 @@ dependencies = [ "serde", "target-lexicon", "wasmparser 0.92.0", - "wasmtime-cranelift 2.0.2", - "wasmtime-environ 2.0.2", - "wasmtime-jit 2.0.2", - "wasmtime-runtime 2.0.2", + "wasmtime-cranelift", + "wasmtime-environ", + "wasmtime-jit", + "wasmtime-runtime", "windows-sys 0.36.1", ] -[[package]] -name = "wasmtime" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f907fdead3153cb9bfb7a93bbd5b62629472dc06dee83605358c64c52ed3dda9" -dependencies = [ - "anyhow", - "bincode", - "cfg-if 1.0.0", - "indexmap", - "libc", - "log", - "object 0.30.3", - "once_cell", - "paste", - "psm", - "rayon", - "serde", - "target-lexicon", - "wasmparser 0.102.0", - "wasmtime-cranelift 8.0.1", - "wasmtime-environ 8.0.1", - "wasmtime-jit 8.0.1", - "wasmtime-runtime 8.0.1", - "windows-sys 0.45.0", -] - [[package]] name = "wasmtime-asm-macros" version = "2.0.2" @@ -10194,15 +10273,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "wasmtime-asm-macros" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b9daa7c14cd4fa3edbf69de994408d5f4b7b0959ac13fa69d465f6597f810d" -dependencies = [ - "cfg-if 1.0.0", -] - [[package]] name = "wasmtime-cranelift" version = "2.0.2" @@ -10210,55 +10280,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "017c3605ccce867b3ba7f71d95e5652acc22b9dc2971ad6a6f9df4a8d7af2648" dependencies = [ "anyhow", - "cranelift-codegen 0.89.2", - "cranelift-entity 0.89.2", - "cranelift-frontend 0.89.2", - "cranelift-native 0.89.2", - "cranelift-wasm 0.89.2", + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", + "cranelift-native", + "cranelift-wasm", "gimli 0.26.2", "log", "object 0.29.0", "target-lexicon", "thiserror", "wasmparser 0.92.0", - "wasmtime-environ 2.0.2", -] - -[[package]] -name = "wasmtime-cranelift" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1cefde0cce8cb700b1b21b6298a3837dba46521affd7b8c38a9ee2c869eee04" -dependencies = [ - "anyhow", - "cranelift-codegen 0.95.1", - "cranelift-entity 0.95.1", - "cranelift-frontend 0.95.1", - "cranelift-native 0.95.1", - "cranelift-wasm 0.95.1", - "gimli 0.27.2", - "log", - "object 0.30.3", - "target-lexicon", - "thiserror", - "wasmparser 0.102.0", - "wasmtime-cranelift-shared", - "wasmtime-environ 8.0.1", -] - -[[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 0.95.1", - "cranelift-native 0.95.1", - "gimli 0.27.2", - "object 0.30.3", - "target-lexicon", - "wasmtime-environ 8.0.1", + "wasmtime-environ", ] [[package]] @@ -10268,7 +10301,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aec5c1f81aab9bb35997113c171b6bb9093afc90e3757c55e0c08dc9ac612e4" dependencies = [ "anyhow", - "cranelift-entity 0.89.2", + "cranelift-entity", "gimli 0.26.2", "indexmap", "log", @@ -10277,26 +10310,7 @@ dependencies = [ "target-lexicon", "thiserror", "wasmparser 0.92.0", - "wasmtime-types 2.0.2", -] - -[[package]] -name = "wasmtime-environ" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949" -dependencies = [ - "anyhow", - "cranelift-entity 0.95.1", - "gimli 0.27.2", - "indexmap", - "log", - "object 0.30.3", - "serde", - "target-lexicon", - "thiserror", - "wasmparser 0.102.0", - "wasmtime-types 8.0.1", + "wasmtime-types", ] [[package]] @@ -10318,34 +10332,11 @@ dependencies = [ "serde", "target-lexicon", "thiserror", - "wasmtime-environ 2.0.2", - "wasmtime-runtime 2.0.2", + "wasmtime-environ", + "wasmtime-runtime", "windows-sys 0.36.1", ] -[[package]] -name = "wasmtime-jit" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244" -dependencies = [ - "addr2line 0.19.0", - "anyhow", - "bincode", - "cfg-if 1.0.0", - "cpp_demangle", - "gimli 0.27.2", - "log", - "object 0.30.3", - "rustc-demangle", - "serde", - "target-lexicon", - "wasmtime-environ 8.0.1", - "wasmtime-jit-icache-coherence", - "wasmtime-runtime 8.0.1", - "windows-sys 0.45.0", -] - [[package]] name = "wasmtime-jit-debug" version = "2.0.2" @@ -10355,26 +10346,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "wasmtime-jit-debug" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -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" @@ -10394,60 +10365,24 @@ dependencies = [ "rand 0.8.5", "rustix 0.35.13", "thiserror", - "wasmtime-asm-macros 2.0.2", - "wasmtime-environ 2.0.2", - "wasmtime-jit-debug 2.0.2", + "wasmtime-asm-macros", + "wasmtime-environ", + "wasmtime-jit-debug", "windows-sys 0.36.1", ] -[[package]] -name = "wasmtime-runtime" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658cf6f325232b6760e202e5255d823da5e348fdea827eff0a2a22319000b441" -dependencies = [ - "anyhow", - "cc", - "cfg-if 1.0.0", - "indexmap", - "libc", - "log", - "mach", - "memfd", - "memoffset 0.8.0", - "paste", - "rand 0.8.5", - "rustix 0.36.13", - "wasmtime-asm-macros 8.0.1", - "wasmtime-environ 8.0.1", - "wasmtime-jit-debug 8.0.1", - "windows-sys 0.45.0", -] - [[package]] name = "wasmtime-types" version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dc3dd9521815984b35d6362f79e6b9c72475027cd1c71c44eb8df8fbf33a9fb" dependencies = [ - "cranelift-entity 0.89.2", + "cranelift-entity", "serde", "thiserror", "wasmparser 0.92.0", ] -[[package]] -name = "wasmtime-types" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f" -dependencies = [ - "cranelift-entity 0.95.1", - "serde", - "thiserror", - "wasmparser 0.102.0", -] - [[package]] name = "web-sys" version = "0.3.61" diff --git a/Cargo.toml b/Cargo.toml index 3ecee516eb55..fd22a90fa06b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,7 +76,7 @@ flume = "0.10" fs_extra = "1.2" futures = "0.3" futures-util = "0.3" -fvm = { version = "~2.4", default-features = false } +fvm = { version = "~2.3", default-features = false } fvm3 = { package = "fvm", default-features = false, version = "~3.3.1" } fvm_ipld_amt = "0.5" fvm_ipld_bitfield = "0.5" @@ -84,7 +84,7 @@ 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.4", default-features = false } +fvm_shared = { version = "~2.3", default-features = false } fvm_shared3 = { package = "fvm_shared", version = "~3.3", default-features = false } gethostname = "0.4" git-version = "0.3" @@ -199,12 +199,3 @@ lto = "off" strip = true panic = "abort" overflow-checks = true - -[patch.crates-io] -fil_actor_interface = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } -fil_actor_account_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } -fil_actor_init_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } -fil_actor_miner_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } -fil_actor_power_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } -fil_actor_system_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } -fil_actors_shared = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } From b5837c80ca65a061e575f404a4f8e66e380bb117 Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Mon, 22 May 2023 18:09:48 +0100 Subject: [PATCH 18/23] try: (and fail) to just update what we want --- Cargo.lock | 137 ++++++++++++++++++++++++----------------------------- Cargo.toml | 13 ++++- 2 files changed, 72 insertions(+), 78 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 193c31688ddc..0eb0c34e5b43 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2601,12 +2601,11 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "fil_actor_account_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b187f415da309f586e78dcb93b0fc2ef4d87c48a83ea10ed67698153c9242c78" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "frc42_dispatch", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "num-derive", "num-traits", @@ -2616,11 +2615,10 @@ dependencies = [ [[package]] name = "fil_actor_cron_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebf1ba16d3463dbc1994ee13046bbf4779d2b09c09814ceffee02b20469cce1a" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "num-derive", "num-traits", @@ -2630,15 +2628,14 @@ dependencies = [ [[package]] name = "fil_actor_datacap_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a3e19bc02375ac1bd1846f3ec4c9b1d9d9bc1100bf4116ba3fcf833c7b86805" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "fil_actors_shared", "frc42_dispatch", "frc46_token", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "num-derive", "num-traits", @@ -2648,8 +2645,7 @@ dependencies = [ [[package]] name = "fil_actor_evm_shared_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed3723f5c77039a08973272486777ee0cc829282e2bbd1c8241663e41d6dd8" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "fil_actors_shared", "fvm_ipld_encoding 0.3.3", @@ -2662,8 +2658,7 @@ dependencies = [ [[package]] name = "fil_actor_evm_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0ecbde9e08b2b94e85a58b3d8c951aa3ef9cd37aae8c01299ad2bc6248c3ac" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "cid", "fil_actor_evm_shared_state", @@ -2679,8 +2674,7 @@ dependencies = [ [[package]] name = "fil_actor_init_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ce8135e0abbbef389cba5463a09f3388a6dfdcad10a00c46b58c37c056827b5" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2689,7 +2683,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "num-derive", "num-traits", @@ -2699,8 +2693,7 @@ dependencies = [ [[package]] name = "fil_actor_interface" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad5d9aad0bc17842d843da7d0b2ba9a45fe6eeb429d1840f71107238c483d60" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2719,7 +2712,7 @@ dependencies = [ "fvm_ipld_bitfield", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "lazy_static", "num", @@ -2732,8 +2725,7 @@ dependencies = [ [[package]] name = "fil_actor_market_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6fa0e995d6105a32764310ae69798d7b385c8fab79a12f7073a3821a8db8e4" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2744,7 +2736,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "libipld-core 0.14.0", "num-bigint", @@ -2756,8 +2748,7 @@ dependencies = [ [[package]] name = "fil_actor_miner_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c813a2ac23cf3839c894bb298aec7b8cd60bb72dfd0969a72f5e3d75f7b7c3" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2769,7 +2760,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "itertools 0.10.5", "lazy_static", @@ -2783,8 +2774,7 @@ dependencies = [ [[package]] name = "fil_actor_multisig_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf69d3ef248bde1bf918a82c9569a1370ba791fad79715fec9331b864b530b06" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2793,7 +2783,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "indexmap", "integer-encoding", @@ -2805,8 +2795,7 @@ dependencies = [ [[package]] name = "fil_actor_power_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9aa1d743813f85668c1fcfd4ea7bd8c6801c7d680082206befab579841aa703" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2815,7 +2804,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "integer-encoding", "lazy_static", @@ -2827,11 +2816,10 @@ dependencies = [ [[package]] name = "fil_actor_reward_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2e9ed3f14f42a3271dd4b0bde27d856921f1663d01ed90c11e3bf28155937f4" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "lazy_static", "num-derive", @@ -2842,12 +2830,11 @@ dependencies = [ [[package]] name = "fil_actor_system_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc0710525208487a4509fbbfa920e545a857dd8d42786cfd8e7ad83643dfd5e" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "cid", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "num-derive", "num-traits", "serde", @@ -2856,8 +2843,7 @@ dependencies = [ [[package]] name = "fil_actor_verifreg_state" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aef9da0968812cf86404d138a29d9e6f4bbfbede4e52dda724bafe514b9de64" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2865,7 +2851,7 @@ dependencies = [ "frc42_dispatch", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "num-derive", "num-traits", @@ -2875,8 +2861,7 @@ dependencies = [ [[package]] name = "fil_actors_shared" version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9b943dbb4ba114540d7e20d512b3cd6eb279be02195341e56f917b049316af2" +source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" dependencies = [ "anyhow", "cid", @@ -2884,7 +2869,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "lazy_static", "multihash 0.16.3", @@ -3125,7 +3110,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 +3207,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 +3235,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,7 +3278,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_car", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "lazy_static", "libipld", @@ -3336,7 +3321,7 @@ dependencies = [ "fvm_ipld_amt 0.5.1", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "lazy_static", "log", @@ -3483,7 +3468,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,12 +3519,12 @@ dependencies = [ "forest_message", "forest_networks", "forest_shim", - "fvm 2.3.0", + "fvm 2.4.0", "fvm 3.3.1", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "lazy_static", "log", @@ -3562,7 +3547,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,10 +3575,10 @@ 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 2.4.0", "fvm_shared 3.3.0", "multihash 0.16.3", "num", @@ -3654,7 +3639,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,7 +3695,7 @@ dependencies = [ "forest_shim", "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "quickcheck", "rand 0.8.5", @@ -3742,7 +3727,7 @@ dependencies = [ "fvm 3.3.1", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "lazy_static", "log", @@ -3786,7 +3771,7 @@ dependencies = [ "fil_actors_shared", "forest_beacon", "forest_shim", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "lazy_static", "multiaddr", "serde", @@ -3890,7 +3875,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,13 +3908,13 @@ dependencies = [ "anyhow", "bls-signatures", "cid", - "filecoin-proofs-api 14.0.0", - "fvm 2.3.0", + "filecoin-proofs-api", + "fvm 2.4.0", "fvm 3.3.1", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", - "fvm_shared 2.3.0", + "fvm_shared 2.4.0", "fvm_shared 3.3.0", "lazy_static", "num", @@ -3966,13 +3951,13 @@ dependencies = [ "forest_state_migration", "forest_utils", "futures", - "fvm 2.3.0", + "fvm 2.4.0", "fvm 3.3.1", "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", @@ -4149,7 +4134,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 +4145,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 +4177,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 +4335,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", @@ -4367,7 +4352,7 @@ dependencies = [ "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", @@ -4454,7 +4439,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", @@ -4508,9 +4493,9 @@ dependencies = [ [[package]] name = "fvm_ipld_blockstore" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688239a96199577f6705a3f9689abfd795f867f91f5847bc7e236017cc672df7" +checksum = "fee8c75be2b58943e1a9755802d34d4c3934f6ea151b6be192ff98f644e515bd" dependencies = [ "anyhow", "cid", @@ -4616,7 +4601,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 +4610,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", diff --git a/Cargo.toml b/Cargo.toml index fd22a90fa06b..3ecee516eb55 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,7 +76,7 @@ flume = "0.10" fs_extra = "1.2" futures = "0.3" futures-util = "0.3" -fvm = { version = "~2.3", default-features = false } +fvm = { version = "~2.4", default-features = false } fvm3 = { package = "fvm", default-features = false, version = "~3.3.1" } fvm_ipld_amt = "0.5" fvm_ipld_bitfield = "0.5" @@ -84,7 +84,7 @@ 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" @@ -199,3 +199,12 @@ lto = "off" strip = true panic = "abort" overflow-checks = true + +[patch.crates-io] +fil_actor_interface = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } +fil_actor_account_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } +fil_actor_init_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } +fil_actor_miner_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } +fil_actor_power_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } +fil_actor_system_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } +fil_actors_shared = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } From 758b0f6c8d839852c449519d8cdb3a595b5f1dd3 Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Mon, 22 May 2023 18:11:55 +0100 Subject: [PATCH 19/23] fix: update lockfile --- Cargo.lock | 650 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 365 insertions(+), 285 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0eb0c34e5b43..02e8ee384aed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1585,7 +1585,16 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "593b398dd0c5b1e2e3a9c3dae8584e287894ea84e361949ad506376e99196265" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.89.2", +] + +[[package]] +name = "cranelift-bforest" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1277fbfa94bc82c8ec4af2ded3e639d49ca5f7f3c7eeab2c66accd135ece4e70" +dependencies = [ + "cranelift-entity 0.95.1", ] [[package]] @@ -1596,14 +1605,34 @@ checksum = "afc0d8faabd099ea15ab33d49d150e5572c04cfeb95d675fd41286739b754629" dependencies = [ "arrayvec 0.7.2", "bumpalo", - "cranelift-bforest", - "cranelift-codegen-meta", - "cranelift-codegen-shared", - "cranelift-entity", - "cranelift-isle", + "cranelift-bforest 0.89.2", + "cranelift-codegen-meta 0.89.2", + "cranelift-codegen-shared 0.89.2", + "cranelift-entity 0.89.2", + "cranelift-isle 0.89.2", "gimli 0.26.2", "log", - "regalloc2", + "regalloc2 0.4.2", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-codegen" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6e8c31ad3b2270e9aeec38723888fe1b0ace3bea2b06b3f749ccf46661d3220" +dependencies = [ + "bumpalo", + "cranelift-bforest 0.95.1", + "cranelift-codegen-meta 0.95.1", + "cranelift-codegen-shared 0.95.1", + "cranelift-entity 0.95.1", + "cranelift-isle 0.95.1", + "gimli 0.27.2", + "hashbrown 0.13.2", + "log", + "regalloc2 0.6.1", "smallvec", "target-lexicon", ] @@ -1614,7 +1643,16 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ac1669e42579476f001571d6ba4b825fac686282c97b88b18f8e34242066a81" dependencies = [ - "cranelift-codegen-shared", + "cranelift-codegen-shared 0.89.2", +] + +[[package]] +name = "cranelift-codegen-meta" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ac5ac30d62b2d66f12651f6b606dbdfd9c2cfd0908de6b387560a277c5c9da" +dependencies = [ + "cranelift-codegen-shared 0.95.1", ] [[package]] @@ -1623,6 +1661,12 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2a1b1eef9640ab72c1e7b583ac678083855a509da34b4b4378bd99954127c20" +[[package]] +name = "cranelift-codegen-shared" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd82b8b376247834b59ed9bdc0ddeb50f517452827d4a11bccf5937b213748b8" + [[package]] name = "cranelift-entity" version = "0.89.2" @@ -1632,13 +1676,34 @@ dependencies = [ "serde", ] +[[package]] +name = "cranelift-entity" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40099d38061b37e505e63f89bab52199037a72b931ad4868d9089ff7268660b0" +dependencies = [ + "serde", +] + [[package]] name = "cranelift-frontend" version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fca1474b5302348799656d43a40eacd716a3b46169405a3af812832c9edf77b4" dependencies = [ - "cranelift-codegen", + "cranelift-codegen 0.89.2", + "log", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-frontend" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a25d9d0a0ae3079c463c34115ec59507b4707175454f0eee0891e83e30e82d" +dependencies = [ + "cranelift-codegen 0.95.1", "log", "smallvec", "target-lexicon", @@ -1650,13 +1715,30 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77aa537f020ea43483100153278e7215d41695bdcef9eea6642d122675f64249" +[[package]] +name = "cranelift-isle" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80de6a7d0486e4acbd5f9f87ec49912bf4c8fb6aea00087b989685460d4469ba" + [[package]] name = "cranelift-native" version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bdc6b65241a95b7d8eafbf4e114c082e49b80162a2dcd9c6bcc5989c3310c9e" dependencies = [ - "cranelift-codegen", + "cranelift-codegen 0.89.2", + "libc", + "target-lexicon", +] + +[[package]] +name = "cranelift-native" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb6b03e0e03801c4b3fd8ce0758a94750c07a44e7944cc0ffbf0d3f2e7c79b00" +dependencies = [ + "cranelift-codegen 0.95.1", "libc", "target-lexicon", ] @@ -1667,14 +1749,30 @@ version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb6359f606a1c80ccaa04fae9dbbb504615ec7a49b6c212b341080fff7a65dd" dependencies = [ - "cranelift-codegen", - "cranelift-entity", - "cranelift-frontend", + "cranelift-codegen 0.89.2", + "cranelift-entity 0.89.2", + "cranelift-frontend 0.89.2", "itertools 0.10.5", "log", "smallvec", "wasmparser 0.92.0", - "wasmtime-types", + "wasmtime-types 2.0.2", +] + +[[package]] +name = "cranelift-wasm" +version = "0.95.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff3220489a3d928ad91e59dd7aeaa8b3de18afb554a6211213673a71c90737ac" +dependencies = [ + "cranelift-codegen 0.95.1", + "cranelift-entity 0.95.1", + "cranelift-frontend 0.95.1", + "itertools 0.10.5", + "log", + "smallvec", + "wasmparser 0.102.0", + "wasmtime-types 8.0.1", ] [[package]] @@ -2900,26 +2998,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" @@ -2940,38 +3018,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" @@ -2983,8 +3029,8 @@ dependencies = [ "bincode", "blake2b_simd", "blstrs", - "filecoin-hashers 9.0.0", - "fr32 7.0.0", + "filecoin-hashers", + "fr32", "generic-array", "hex", "lazy_static", @@ -2997,31 +3043,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" @@ -3032,12 +3060,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]] @@ -3454,7 +3482,7 @@ dependencies = [ "cid", "fil_actor_interface", "fil_actors_shared", - "filecoin-proofs-api 14.0.0", + "filecoin-proofs-api", "forest_beacon", "forest_blocks", "forest_chain", @@ -3937,7 +3965,7 @@ dependencies = [ "cid", "fil_actor_interface", "fil_actors_shared", - "filecoin-proofs-api 14.0.0", + "filecoin-proofs-api", "forest_beacon", "forest_blocks", "forest_chain", @@ -4052,7 +4080,7 @@ dependencies = [ "const_format", "cs_serde_bytes", "digest 0.10.6", - "filecoin-proofs-api 14.0.0", + "filecoin-proofs-api", "flume", "forest_shim", "futures", @@ -4096,20 +4124,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" @@ -4346,7 +4360,7 @@ 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", @@ -4366,7 +4380,7 @@ dependencies = [ "serde_repr", "serde_tuple", "thiserror", - "wasmtime", + "wasmtime 8.0.1", "yastl", ] @@ -4380,7 +4394,7 @@ dependencies = [ "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", @@ -4400,9 +4414,9 @@ dependencies = [ "serde", "serde_tuple", "thiserror", - "wasmtime", - "wasmtime-environ", - "wasmtime-runtime", + "wasmtime 2.0.2", + "wasmtime-environ 2.0.2", + "wasmtime-runtime 2.0.2", "yastl", ] @@ -4623,7 +4637,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", @@ -4655,7 +4669,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", @@ -4781,6 +4795,11 @@ name = "gimli" version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +dependencies = [ + "fallible-iterator", + "indexmap", + "stable_deref_trait", +] [[package]] name = "git-version" @@ -6801,6 +6820,9 @@ version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ + "crc32fast", + "hashbrown 0.13.2", + "indexmap", "memchr", ] @@ -7778,6 +7800,18 @@ dependencies = [ "smallvec", ] +[[package]] +name = "regalloc2" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80535183cae11b149d618fbd3c37e38d7cda589d82d7769e196ca9a9042d7621" +dependencies = [ + "fxhash", + "log", + "slice-group-by", + "smallvec", +] + [[package]] name = "regex" version = "1.8.1" @@ -8588,21 +8622,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" @@ -8862,41 +8881,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" @@ -8912,8 +8896,8 @@ dependencies = [ "cbc", "config", "ff", - "filecoin-hashers 9.0.0", - "fr32 7.0.0", + "filecoin-hashers", + "fr32", "fs2", "generic-array", "itertools 0.10.5", @@ -8932,44 +8916,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" @@ -8985,8 +8931,8 @@ dependencies = [ "crossbeam", "fdlimit", "ff", - "filecoin-hashers 9.0.0", - "fr32 7.0.0", + "filecoin-hashers", + "fr32", "generic-array", "hex", "lazy_static", @@ -9004,34 +8950,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" @@ -9044,39 +8967,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]] @@ -9089,8 +8988,8 @@ dependencies = [ "bellperson", "blstrs", "ff", - "filecoin-hashers 9.0.0", - "fr32 7.0.0", + "filecoin-hashers", + "fr32", "generic-array", "lazy_static", "log", @@ -9099,8 +8998,8 @@ dependencies = [ "neptune", "rayon", "serde", - "storage-proofs-core 14.0.0", - "storage-proofs-porep 14.0.0", + "storage-proofs-core", + "storage-proofs-porep", ] [[package]] @@ -10202,6 +10101,16 @@ dependencies = [ "url", ] +[[package]] +name = "wasmparser" +version = "0.102.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b" +dependencies = [ + "indexmap", + "url", +] + [[package]] name = "wasmparser" version = "0.104.0" @@ -10242,13 +10151,40 @@ dependencies = [ "serde", "target-lexicon", "wasmparser 0.92.0", - "wasmtime-cranelift", - "wasmtime-environ", - "wasmtime-jit", - "wasmtime-runtime", + "wasmtime-cranelift 2.0.2", + "wasmtime-environ 2.0.2", + "wasmtime-jit 2.0.2", + "wasmtime-runtime 2.0.2", "windows-sys 0.36.1", ] +[[package]] +name = "wasmtime" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f907fdead3153cb9bfb7a93bbd5b62629472dc06dee83605358c64c52ed3dda9" +dependencies = [ + "anyhow", + "bincode", + "cfg-if 1.0.0", + "indexmap", + "libc", + "log", + "object 0.30.3", + "once_cell", + "paste", + "psm", + "rayon", + "serde", + "target-lexicon", + "wasmparser 0.102.0", + "wasmtime-cranelift 8.0.1", + "wasmtime-environ 8.0.1", + "wasmtime-jit 8.0.1", + "wasmtime-runtime 8.0.1", + "windows-sys 0.45.0", +] + [[package]] name = "wasmtime-asm-macros" version = "2.0.2" @@ -10258,6 +10194,15 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "wasmtime-asm-macros" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b9daa7c14cd4fa3edbf69de994408d5f4b7b0959ac13fa69d465f6597f810d" +dependencies = [ + "cfg-if 1.0.0", +] + [[package]] name = "wasmtime-cranelift" version = "2.0.2" @@ -10265,18 +10210,55 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "017c3605ccce867b3ba7f71d95e5652acc22b9dc2971ad6a6f9df4a8d7af2648" dependencies = [ "anyhow", - "cranelift-codegen", - "cranelift-entity", - "cranelift-frontend", - "cranelift-native", - "cranelift-wasm", + "cranelift-codegen 0.89.2", + "cranelift-entity 0.89.2", + "cranelift-frontend 0.89.2", + "cranelift-native 0.89.2", + "cranelift-wasm 0.89.2", "gimli 0.26.2", "log", "object 0.29.0", "target-lexicon", "thiserror", "wasmparser 0.92.0", - "wasmtime-environ", + "wasmtime-environ 2.0.2", +] + +[[package]] +name = "wasmtime-cranelift" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1cefde0cce8cb700b1b21b6298a3837dba46521affd7b8c38a9ee2c869eee04" +dependencies = [ + "anyhow", + "cranelift-codegen 0.95.1", + "cranelift-entity 0.95.1", + "cranelift-frontend 0.95.1", + "cranelift-native 0.95.1", + "cranelift-wasm 0.95.1", + "gimli 0.27.2", + "log", + "object 0.30.3", + "target-lexicon", + "thiserror", + "wasmparser 0.102.0", + "wasmtime-cranelift-shared", + "wasmtime-environ 8.0.1", +] + +[[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 0.95.1", + "cranelift-native 0.95.1", + "gimli 0.27.2", + "object 0.30.3", + "target-lexicon", + "wasmtime-environ 8.0.1", ] [[package]] @@ -10286,7 +10268,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aec5c1f81aab9bb35997113c171b6bb9093afc90e3757c55e0c08dc9ac612e4" dependencies = [ "anyhow", - "cranelift-entity", + "cranelift-entity 0.89.2", "gimli 0.26.2", "indexmap", "log", @@ -10295,7 +10277,26 @@ dependencies = [ "target-lexicon", "thiserror", "wasmparser 0.92.0", - "wasmtime-types", + "wasmtime-types 2.0.2", +] + +[[package]] +name = "wasmtime-environ" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949" +dependencies = [ + "anyhow", + "cranelift-entity 0.95.1", + "gimli 0.27.2", + "indexmap", + "log", + "object 0.30.3", + "serde", + "target-lexicon", + "thiserror", + "wasmparser 0.102.0", + "wasmtime-types 8.0.1", ] [[package]] @@ -10317,11 +10318,34 @@ dependencies = [ "serde", "target-lexicon", "thiserror", - "wasmtime-environ", - "wasmtime-runtime", + "wasmtime-environ 2.0.2", + "wasmtime-runtime 2.0.2", "windows-sys 0.36.1", ] +[[package]] +name = "wasmtime-jit" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244" +dependencies = [ + "addr2line 0.19.0", + "anyhow", + "bincode", + "cfg-if 1.0.0", + "cpp_demangle", + "gimli 0.27.2", + "log", + "object 0.30.3", + "rustc-demangle", + "serde", + "target-lexicon", + "wasmtime-environ 8.0.1", + "wasmtime-jit-icache-coherence", + "wasmtime-runtime 8.0.1", + "windows-sys 0.45.0", +] + [[package]] name = "wasmtime-jit-debug" version = "2.0.2" @@ -10331,6 +10355,26 @@ dependencies = [ "once_cell", ] +[[package]] +name = "wasmtime-jit-debug" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +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" @@ -10350,24 +10394,60 @@ dependencies = [ "rand 0.8.5", "rustix 0.35.13", "thiserror", - "wasmtime-asm-macros", - "wasmtime-environ", - "wasmtime-jit-debug", + "wasmtime-asm-macros 2.0.2", + "wasmtime-environ 2.0.2", + "wasmtime-jit-debug 2.0.2", "windows-sys 0.36.1", ] +[[package]] +name = "wasmtime-runtime" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658cf6f325232b6760e202e5255d823da5e348fdea827eff0a2a22319000b441" +dependencies = [ + "anyhow", + "cc", + "cfg-if 1.0.0", + "indexmap", + "libc", + "log", + "mach", + "memfd", + "memoffset 0.8.0", + "paste", + "rand 0.8.5", + "rustix 0.36.13", + "wasmtime-asm-macros 8.0.1", + "wasmtime-environ 8.0.1", + "wasmtime-jit-debug 8.0.1", + "windows-sys 0.45.0", +] + [[package]] name = "wasmtime-types" version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dc3dd9521815984b35d6362f79e6b9c72475027cd1c71c44eb8df8fbf33a9fb" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.89.2", "serde", "thiserror", "wasmparser 0.92.0", ] +[[package]] +name = "wasmtime-types" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f" +dependencies = [ + "cranelift-entity 0.95.1", + "serde", + "thiserror", + "wasmparser 0.102.0", +] + [[package]] name = "web-sys" version = "0.3.61" From b2e0886bd74201a7256b26939364b25b8709ab8e Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Tue, 23 May 2023 10:36:37 +0100 Subject: [PATCH 20/23] try: cargo update -p fvm@3.3.1 --- Cargo.lock | 555 +++++++++-------------------------------------------- Cargo.toml | 2 +- 2 files changed, 90 insertions(+), 467 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 02e8ee384aed..8ee21ce4d854 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", ] @@ -1579,42 +1570,13 @@ dependencies = [ "libc", ] -[[package]] -name = "cranelift-bforest" -version = "0.89.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "593b398dd0c5b1e2e3a9c3dae8584e287894ea84e361949ad506376e99196265" -dependencies = [ - "cranelift-entity 0.89.2", -] - [[package]] name = "cranelift-bforest" version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1277fbfa94bc82c8ec4af2ded3e639d49ca5f7f3c7eeab2c66accd135ece4e70" dependencies = [ - "cranelift-entity 0.95.1", -] - -[[package]] -name = "cranelift-codegen" -version = "0.89.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc0d8faabd099ea15ab33d49d150e5572c04cfeb95d675fd41286739b754629" -dependencies = [ - "arrayvec 0.7.2", - "bumpalo", - "cranelift-bforest 0.89.2", - "cranelift-codegen-meta 0.89.2", - "cranelift-codegen-shared 0.89.2", - "cranelift-entity 0.89.2", - "cranelift-isle 0.89.2", - "gimli 0.26.2", - "log", - "regalloc2 0.4.2", - "smallvec", - "target-lexicon", + "cranelift-entity", ] [[package]] @@ -1624,58 +1586,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6e8c31ad3b2270e9aeec38723888fe1b0ace3bea2b06b3f749ccf46661d3220" dependencies = [ "bumpalo", - "cranelift-bforest 0.95.1", - "cranelift-codegen-meta 0.95.1", - "cranelift-codegen-shared 0.95.1", - "cranelift-entity 0.95.1", - "cranelift-isle 0.95.1", - "gimli 0.27.2", + "cranelift-bforest", + "cranelift-codegen-meta", + "cranelift-codegen-shared", + "cranelift-entity", + "cranelift-isle", + "gimli", "hashbrown 0.13.2", "log", - "regalloc2 0.6.1", + "regalloc2", "smallvec", "target-lexicon", ] -[[package]] -name = "cranelift-codegen-meta" -version = "0.89.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac1669e42579476f001571d6ba4b825fac686282c97b88b18f8e34242066a81" -dependencies = [ - "cranelift-codegen-shared 0.89.2", -] - [[package]] name = "cranelift-codegen-meta" version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8ac5ac30d62b2d66f12651f6b606dbdfd9c2cfd0908de6b387560a277c5c9da" dependencies = [ - "cranelift-codegen-shared 0.95.1", + "cranelift-codegen-shared", ] -[[package]] -name = "cranelift-codegen-shared" -version = "0.89.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2a1b1eef9640ab72c1e7b583ac678083855a509da34b4b4378bd99954127c20" - [[package]] name = "cranelift-codegen-shared" version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd82b8b376247834b59ed9bdc0ddeb50f517452827d4a11bccf5937b213748b8" -[[package]] -name = "cranelift-entity" -version = "0.89.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eea4e17c3791fd8134640b26242a9ddbd7c67db78f0bad98cb778bf563ef81a0" -dependencies = [ - "serde", -] - [[package]] name = "cranelift-entity" version = "0.95.1" @@ -1685,94 +1623,49 @@ dependencies = [ "serde", ] -[[package]] -name = "cranelift-frontend" -version = "0.89.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca1474b5302348799656d43a40eacd716a3b46169405a3af812832c9edf77b4" -dependencies = [ - "cranelift-codegen 0.89.2", - "log", - "smallvec", - "target-lexicon", -] - [[package]] name = "cranelift-frontend" version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64a25d9d0a0ae3079c463c34115ec59507b4707175454f0eee0891e83e30e82d" dependencies = [ - "cranelift-codegen 0.95.1", + "cranelift-codegen", "log", "smallvec", "target-lexicon", ] -[[package]] -name = "cranelift-isle" -version = "0.89.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77aa537f020ea43483100153278e7215d41695bdcef9eea6642d122675f64249" - [[package]] name = "cranelift-isle" version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80de6a7d0486e4acbd5f9f87ec49912bf4c8fb6aea00087b989685460d4469ba" -[[package]] -name = "cranelift-native" -version = "0.89.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bdc6b65241a95b7d8eafbf4e114c082e49b80162a2dcd9c6bcc5989c3310c9e" -dependencies = [ - "cranelift-codegen 0.89.2", - "libc", - "target-lexicon", -] - [[package]] name = "cranelift-native" version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb6b03e0e03801c4b3fd8ce0758a94750c07a44e7944cc0ffbf0d3f2e7c79b00" dependencies = [ - "cranelift-codegen 0.95.1", + "cranelift-codegen", "libc", "target-lexicon", ] -[[package]] -name = "cranelift-wasm" -version = "0.89.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb6359f606a1c80ccaa04fae9dbbb504615ec7a49b6c212b341080fff7a65dd" -dependencies = [ - "cranelift-codegen 0.89.2", - "cranelift-entity 0.89.2", - "cranelift-frontend 0.89.2", - "itertools 0.10.5", - "log", - "smallvec", - "wasmparser 0.92.0", - "wasmtime-types 2.0.2", -] - [[package]] name = "cranelift-wasm" version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff3220489a3d928ad91e59dd7aeaa8b3de18afb554a6211213673a71c90737ac" dependencies = [ - "cranelift-codegen 0.95.1", - "cranelift-entity 0.95.1", - "cranelift-frontend 0.95.1", + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", "itertools 0.10.5", "log", "smallvec", "wasmparser 0.102.0", - "wasmtime-types 8.0.1", + "wasmtime-types", ] [[package]] @@ -2538,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" @@ -2704,7 +2586,7 @@ dependencies = [ "frc42_dispatch", "fvm_ipld_encoding 0.3.3", "fvm_shared 2.4.0", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "num-derive", "num-traits", "serde", @@ -2717,7 +2599,7 @@ source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed dependencies = [ "fvm_ipld_encoding 0.3.3", "fvm_shared 2.4.0", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "num-derive", "num-traits", "serde", @@ -2734,7 +2616,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_shared 2.4.0", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "num-derive", "num-traits", "serde", @@ -2747,7 +2629,7 @@ source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed dependencies = [ "fil_actors_shared", "fvm_ipld_encoding 0.3.3", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "hex", "serde", "uint", @@ -2762,7 +2644,7 @@ dependencies = [ "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", @@ -2782,7 +2664,7 @@ dependencies = [ "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", "fvm_shared 2.4.0", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "num-derive", "num-traits", "serde", @@ -2811,7 +2693,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_shared 2.4.0", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "lazy_static", "num", "regex", @@ -2835,7 +2717,7 @@ dependencies = [ "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", "fvm_shared 2.4.0", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "libipld-core 0.14.0", "num-bigint", "num-derive", @@ -2859,7 +2741,7 @@ dependencies = [ "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", "fvm_shared 2.4.0", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "itertools 0.10.5", "lazy_static", "multihash 0.16.3", @@ -2882,7 +2764,7 @@ dependencies = [ "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", "fvm_shared 2.4.0", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "indexmap", "integer-encoding", "num-derive", @@ -2903,7 +2785,7 @@ dependencies = [ "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", "fvm_shared 2.4.0", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "integer-encoding", "lazy_static", "num-derive", @@ -2918,7 +2800,7 @@ source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed dependencies = [ "fvm_ipld_encoding 0.3.3", "fvm_shared 2.4.0", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "lazy_static", "num-derive", "num-traits", @@ -2950,7 +2832,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.3.3", "fvm_shared 2.4.0", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "num-derive", "num-traits", "serde", @@ -2968,7 +2850,7 @@ dependencies = [ "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt 0.6.1", "fvm_shared 2.4.0", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "lazy_static", "multihash 0.16.3", "num", @@ -3307,7 +3189,7 @@ dependencies = [ "fvm_ipld_car", "fvm_ipld_encoding 0.2.3", "fvm_shared 2.4.0", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "lazy_static", "libipld", "log", @@ -3350,7 +3232,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", "fvm_shared 2.4.0", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "lazy_static", "log", "lru", @@ -3548,12 +3430,12 @@ dependencies = [ "forest_networks", "forest_shim", "fvm 2.4.0", - "fvm 3.3.1", + "fvm 3.4.0", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", "fvm_shared 2.4.0", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "lazy_static", "log", "num", @@ -3607,7 +3489,7 @@ dependencies = [ "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", "fvm_shared 2.4.0", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "multihash 0.16.3", "num", "num-bigint", @@ -3724,7 +3606,7 @@ dependencies = [ "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", "fvm_shared 2.4.0", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "quickcheck", "rand 0.8.5", "serde", @@ -3752,11 +3634,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.4.0", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "lazy_static", "log", "lru", @@ -3858,7 +3740,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", @@ -3938,12 +3820,12 @@ dependencies = [ "cid", "filecoin-proofs-api", "fvm 2.4.0", - "fvm 3.3.1", + "fvm 3.4.0", "fvm_ipld_blockstore", "fvm_ipld_encoding 0.2.3", "fvm_ipld_encoding 0.3.3", "fvm_shared 2.4.0", - "fvm_shared 3.3.0", + "fvm_shared 3.3.1", "lazy_static", "num", "num-bigint", @@ -3980,7 +3862,7 @@ dependencies = [ "forest_utils", "futures", "fvm 2.4.0", - "fvm 3.3.1", + "fvm 3.4.0", "fvm_ipld_amt 0.5.1", "fvm_ipld_bitfield", "fvm_ipld_blockstore", @@ -4380,15 +4262,15 @@ dependencies = [ "serde_repr", "serde_tuple", "thiserror", - "wasmtime 8.0.1", + "wasmtime", "yastl", ] [[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", @@ -4400,7 +4282,7 @@ dependencies = [ "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", @@ -4414,9 +4296,9 @@ dependencies = [ "serde", "serde_tuple", "thiserror", - "wasmtime 2.0.2", - "wasmtime-environ 2.0.2", - "wasmtime-runtime 2.0.2", + "wasmtime", + "wasmtime-environ", + "wasmtime-runtime", "yastl", ] @@ -4657,9 +4539,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", @@ -4779,17 +4661,6 @@ dependencies = [ "polyval 0.6.0", ] -[[package]] -name = "gimli" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" -dependencies = [ - "fallible-iterator", - "indexmap", - "stable_deref_trait", -] - [[package]] name = "gimli" version = "0.27.2" @@ -5263,12 +5134,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" @@ -5305,7 +5170,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", ] @@ -6088,12 +5953,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" @@ -6802,18 +6661,6 @@ 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" @@ -7788,18 +7635,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "regalloc2" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b2eab54204ea0117fe9a060537e0b07a4e72f7c7d182361ecc346cab2240e5" -dependencies = [ - "fxhash", - "log", - "slice-group-by", - "smallvec", -] - [[package]] name = "regalloc2" version = "0.6.1" @@ -8083,20 +7918,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" @@ -8104,8 +7925,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", @@ -8118,8 +7939,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", @@ -10082,15 +9903,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wasmparser" -version = "0.92.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da34cec2a8c23db906cdf8b26e988d7a7f0d549eb5d51299129647af61a1b37" -dependencies = [ - "indexmap", -] - [[package]] name = "wasmparser" version = "0.95.0" @@ -10131,33 +9943,6 @@ dependencies = [ "wasmparser 0.104.0", ] -[[package]] -name = "wasmtime" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743d37c265fa134a76de653c7e66be22590eaccd03da13cee99f3ac7a59cb826" -dependencies = [ - "anyhow", - "bincode", - "cfg-if 1.0.0", - "indexmap", - "libc", - "log", - "object 0.29.0", - "once_cell", - "paste", - "psm", - "rayon", - "serde", - "target-lexicon", - "wasmparser 0.92.0", - "wasmtime-cranelift 2.0.2", - "wasmtime-environ 2.0.2", - "wasmtime-jit 2.0.2", - "wasmtime-runtime 2.0.2", - "windows-sys 0.36.1", -] - [[package]] name = "wasmtime" version = "8.0.1" @@ -10170,7 +9955,7 @@ dependencies = [ "indexmap", "libc", "log", - "object 0.30.3", + "object", "once_cell", "paste", "psm", @@ -10178,22 +9963,13 @@ dependencies = [ "serde", "target-lexicon", "wasmparser 0.102.0", - "wasmtime-cranelift 8.0.1", - "wasmtime-environ 8.0.1", - "wasmtime-jit 8.0.1", - "wasmtime-runtime 8.0.1", + "wasmtime-cranelift", + "wasmtime-environ", + "wasmtime-jit", + "wasmtime-runtime", "windows-sys 0.45.0", ] -[[package]] -name = "wasmtime-asm-macros" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de327cf46d5218315957138131ed904621e6f99018aa2da508c0dcf0c65f1bf2" -dependencies = [ - "cfg-if 1.0.0", -] - [[package]] name = "wasmtime-asm-macros" version = "8.0.1" @@ -10203,27 +9979,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "wasmtime-cranelift" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "017c3605ccce867b3ba7f71d95e5652acc22b9dc2971ad6a6f9df4a8d7af2648" -dependencies = [ - "anyhow", - "cranelift-codegen 0.89.2", - "cranelift-entity 0.89.2", - "cranelift-frontend 0.89.2", - "cranelift-native 0.89.2", - "cranelift-wasm 0.89.2", - "gimli 0.26.2", - "log", - "object 0.29.0", - "target-lexicon", - "thiserror", - "wasmparser 0.92.0", - "wasmtime-environ 2.0.2", -] - [[package]] name = "wasmtime-cranelift" version = "8.0.1" @@ -10231,19 +9986,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1cefde0cce8cb700b1b21b6298a3837dba46521affd7b8c38a9ee2c869eee04" dependencies = [ "anyhow", - "cranelift-codegen 0.95.1", - "cranelift-entity 0.95.1", - "cranelift-frontend 0.95.1", - "cranelift-native 0.95.1", - "cranelift-wasm 0.95.1", - "gimli 0.27.2", + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", + "cranelift-native", + "cranelift-wasm", + "gimli", "log", - "object 0.30.3", + "object", "target-lexicon", "thiserror", "wasmparser 0.102.0", "wasmtime-cranelift-shared", - "wasmtime-environ 8.0.1", + "wasmtime-environ", ] [[package]] @@ -10253,31 +10008,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd041e382ef5aea1b9fc78442394f1a4f6d676ce457e7076ca4cb3f397882f8b" dependencies = [ "anyhow", - "cranelift-codegen 0.95.1", - "cranelift-native 0.95.1", - "gimli 0.27.2", - "object 0.30.3", - "target-lexicon", - "wasmtime-environ 8.0.1", -] - -[[package]] -name = "wasmtime-environ" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aec5c1f81aab9bb35997113c171b6bb9093afc90e3757c55e0c08dc9ac612e4" -dependencies = [ - "anyhow", - "cranelift-entity 0.89.2", - "gimli 0.26.2", - "indexmap", - "log", - "object 0.29.0", - "serde", + "cranelift-codegen", + "cranelift-native", + "gimli", + "object", "target-lexicon", - "thiserror", - "wasmparser 0.92.0", - "wasmtime-types 2.0.2", + "wasmtime-environ", ] [[package]] @@ -10287,40 +10023,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949" dependencies = [ "anyhow", - "cranelift-entity 0.95.1", - "gimli 0.27.2", + "cranelift-entity", + "gimli", "indexmap", "log", - "object 0.30.3", + "object", "serde", "target-lexicon", "thiserror", "wasmparser 0.102.0", - "wasmtime-types 8.0.1", -] - -[[package]] -name = "wasmtime-jit" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c683893dbba3986aa71582a5332b87157fb95d34098de2e5f077c7f078726d" -dependencies = [ - "addr2line 0.17.0", - "anyhow", - "bincode", - "cfg-if 1.0.0", - "cpp_demangle", - "gimli 0.26.2", - "log", - "object 0.29.0", - "rustc-demangle", - "rustix 0.35.13", - "serde", - "target-lexicon", - "thiserror", - "wasmtime-environ 2.0.2", - "wasmtime-runtime 2.0.2", - "windows-sys 0.36.1", + "wasmtime-types", ] [[package]] @@ -10329,32 +10041,23 @@ version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244" dependencies = [ - "addr2line 0.19.0", + "addr2line", "anyhow", "bincode", "cfg-if 1.0.0", "cpp_demangle", - "gimli 0.27.2", + "gimli", "log", - "object 0.30.3", + "object", "rustc-demangle", "serde", "target-lexicon", - "wasmtime-environ 8.0.1", + "wasmtime-environ", "wasmtime-jit-icache-coherence", - "wasmtime-runtime 8.0.1", + "wasmtime-runtime", "windows-sys 0.45.0", ] -[[package]] -name = "wasmtime-jit-debug" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2f8f15a81292eec468c79a4f887a37a3d02eb0c610f34ddbec607d3e9022f18" -dependencies = [ - "once_cell", -] - [[package]] name = "wasmtime-jit-debug" version = "8.0.1" @@ -10375,31 +10078,6 @@ dependencies = [ "windows-sys 0.45.0", ] -[[package]] -name = "wasmtime-runtime" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09af6238c962e8220424c815a7b1a9a6d0ba0694f0ab0ae12a6cda1923935a0d" -dependencies = [ - "anyhow", - "cc", - "cfg-if 1.0.0", - "indexmap", - "libc", - "log", - "mach", - "memfd", - "memoffset 0.6.5", - "paste", - "rand 0.8.5", - "rustix 0.35.13", - "thiserror", - "wasmtime-asm-macros 2.0.2", - "wasmtime-environ 2.0.2", - "wasmtime-jit-debug 2.0.2", - "windows-sys 0.36.1", -] - [[package]] name = "wasmtime-runtime" version = "8.0.1" @@ -10418,31 +10096,19 @@ dependencies = [ "paste", "rand 0.8.5", "rustix 0.36.13", - "wasmtime-asm-macros 8.0.1", - "wasmtime-environ 8.0.1", - "wasmtime-jit-debug 8.0.1", + "wasmtime-asm-macros", + "wasmtime-environ", + "wasmtime-jit-debug", "windows-sys 0.45.0", ] -[[package]] -name = "wasmtime-types" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dc3dd9521815984b35d6362f79e6b9c72475027cd1c71c44eb8df8fbf33a9fb" -dependencies = [ - "cranelift-entity 0.89.2", - "serde", - "thiserror", - "wasmparser 0.92.0", -] - [[package]] name = "wasmtime-types" version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f" dependencies = [ - "cranelift-entity 0.95.1", + "cranelift-entity", "serde", "thiserror", "wasmparser 0.102.0", @@ -10791,19 +10457,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" @@ -10885,12 +10538,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" @@ -10909,12 +10556,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" @@ -10933,12 +10574,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" @@ -10957,12 +10592,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" @@ -10993,12 +10622,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 3ecee516eb55..f144aa14f722 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -77,7 +77,7 @@ fs_extra = "1.2" futures = "0.3" futures-util = "0.3" fvm = { version = "~2.4", default-features = false } -fvm3 = { package = "fvm", default-features = false, version = "~3.3.1" } +fvm3 = { package = "fvm", default-features = false, version = "~3.4" } fvm_ipld_amt = "0.5" fvm_ipld_bitfield = "0.5" fvm_ipld_blockstore = "0.1" From 76def65dc6b242e378b29a8932b4d13b33802e0e Mon Sep 17 00:00:00 2001 From: Josh Jones Date: Tue, 23 May 2023 06:55:22 -0500 Subject: [PATCH 21/23] Generate Daily Benchmark Results (#2367) From 3787c8f7b56e57d85ea186e941e993cf52c77f9e Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Tue, 23 May 2023 13:54:38 +0100 Subject: [PATCH 22/23] review: tweaks --- .cargo/config.toml | 1 - .github/workflows/docs.yml | 12 ++---------- Makefile | 14 +++++++++++++- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 50834caf583a..e9173e0425d9 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,4 +1,3 @@ -# TODO(aatifsyed): remove this file once we have a dev/ci container [build] incremental = true diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 6eac1129df71..ccb5d6b42e17 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -52,17 +52,9 @@ jobs: RUSTFLAGS: "-Cstrip=symbols" - name: Execute MDBook run: make mdbook-build - - name: Build rustdoc - run: |- - rustup toolchain install $toolchain - cargo +$toolchain doc --workspace --no-deps + - name: Build vendored docs + run: make vendored-docs env: - # When you visit https://chainsafe.github.io/forest/rustdoc you get an index.html - # listing all crates that are documented (copied out below). - # This isn't included by default, so we use 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 - toolchain: nightly-2023-04-19 - RUSTDOCFLAGS: -Dwarnings -Zunstable-options --enable-index-page CC: "sccache clang" CXX: "sccache clang++" - name: Link Checker (Docs) diff --git a/Makefile b/Makefile index 7238b7b69a99..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,4 +169,15 @@ mdbook: mdbook-build: mdbook build ./documentation -.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 From ec3f8c149d25f2e8a29806d43f9ea9225605ea87 Mon Sep 17 00:00:00 2001 From: Aatif Syed Date: Wed, 24 May 2023 11:22:17 +0100 Subject: [PATCH 23/23] fix: take published fil_actors... --- Cargo.lock | 75 ++++++++++++++++++++++++++++++++---------------------- Cargo.toml | 23 +++++------------ 2 files changed, 52 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8ee21ce4d854..f80c9be68d81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2580,8 +2580,9 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "fil_actor_account_state" -version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa040a44de760ae56a5b7548041c46a85ede01fc037fd7c456ad1e468d13e30c" dependencies = [ "frc42_dispatch", "fvm_ipld_encoding 0.3.3", @@ -2594,8 +2595,9 @@ dependencies = [ [[package]] name = "fil_actor_cron_state" -version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb36b3ee5781626b405e1fe265461eda93c65fd527e6a50440d5846210790d48" dependencies = [ "fvm_ipld_encoding 0.3.3", "fvm_shared 2.4.0", @@ -2607,8 +2609,9 @@ dependencies = [ [[package]] name = "fil_actor_datacap_state" -version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d31986103f2f25a54ee2f0a2ea0a43de9b45df8af352b39d3e6f2afc9b8f6306" dependencies = [ "fil_actors_shared", "frc42_dispatch", @@ -2624,8 +2627,9 @@ dependencies = [ [[package]] name = "fil_actor_evm_shared_state" -version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b257560fbbd2df65a2c48b190163d878ce5110845d93b6d7d88e399fa8fd4777" dependencies = [ "fil_actors_shared", "fvm_ipld_encoding 0.3.3", @@ -2637,8 +2641,9 @@ dependencies = [ [[package]] name = "fil_actor_evm_state" -version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a31e5608b5943e5444c25e0c62711fd0c61173593c748341a111abe20e528b3" dependencies = [ "cid", "fil_actor_evm_shared_state", @@ -2653,8 +2658,9 @@ dependencies = [ [[package]] name = "fil_actor_init_state" -version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c7021a905a0fcdf6eec29b7b414ca586aee04bb198e932f9aeee7463e0753f" dependencies = [ "anyhow", "cid", @@ -2672,8 +2678,9 @@ dependencies = [ [[package]] name = "fil_actor_interface" -version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78608e0e8db5e291b576a1650d885ccd8e6c55801e852a3318b718a92a6f5cec" dependencies = [ "anyhow", "cid", @@ -2704,8 +2711,9 @@ dependencies = [ [[package]] name = "fil_actor_market_state" -version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f1842a1adc93d767dcbac0718b9bd59da040dd3a91c823889af3e3f1c0d2ca7" dependencies = [ "anyhow", "cid", @@ -2727,8 +2735,9 @@ dependencies = [ [[package]] name = "fil_actor_miner_state" -version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a88cca98cb3ccfe7d16f298a8810d4a49991862fb779466fbe42e3190d2b6fe3" dependencies = [ "anyhow", "cid", @@ -2753,8 +2762,9 @@ dependencies = [ [[package]] name = "fil_actor_multisig_state" -version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e322f81cb630d5e574015fcac5f1a911eef6df5747aba9bdfe2158362cdcb5" dependencies = [ "anyhow", "cid", @@ -2774,8 +2784,9 @@ dependencies = [ [[package]] name = "fil_actor_power_state" -version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b99e5ce4bf17e297a50b781d5e73cbbe4a884500959e7109750d6e746c86b0" dependencies = [ "anyhow", "cid", @@ -2795,8 +2806,9 @@ dependencies = [ [[package]] name = "fil_actor_reward_state" -version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8c6f064dd6f796824167dd36dd68e9f7cbb90069e154d2b7b9552fd2bd2727" dependencies = [ "fvm_ipld_encoding 0.3.3", "fvm_shared 2.4.0", @@ -2809,8 +2821,9 @@ dependencies = [ [[package]] name = "fil_actor_system_state" -version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07d5dfcc3777f8ec4eefbe4bd51499a2157608a4f608cbaf7c0d84128aa3d68" dependencies = [ "cid", "fvm_ipld_encoding 0.3.3", @@ -2822,8 +2835,9 @@ dependencies = [ [[package]] name = "fil_actor_verifreg_state" -version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fe6aca497abb108dedbb037d4205cadc30c68833e5f6eb22205e455c5444901" dependencies = [ "anyhow", "cid", @@ -2840,8 +2854,9 @@ dependencies = [ [[package]] name = "fil_actors_shared" -version = "3.0.0" -source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=aatifsyed/remove-fvm#7f334005eedf858cbd27b67efe57140e5fd560f8" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80100c8ef62b379bdfaaebb402d1c5ed168ae55d6b2726b9d278b27a1bbaf4ba" dependencies = [ "anyhow", "cid", diff --git a/Cargo.toml b/Cargo.toml index f144aa14f722..2c40cab815e7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" } @@ -199,12 +199,3 @@ lto = "off" strip = true panic = "abort" overflow-checks = true - -[patch.crates-io] -fil_actor_interface = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } -fil_actor_account_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } -fil_actor_init_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } -fil_actor_miner_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } -fil_actor_power_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } -fil_actor_system_state = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" } -fil_actors_shared = { git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "aatifsyed/remove-fvm" }