[v3] chore: update deps (#2044)

* [v3] chore: update deps All except multihash/cid. * [v3] test: use the correct actors version We want v10, not master.
filecoin-project · Sep 12, 2024 · 2e3984f · 2e3984f
1 parent 122a9ac
commit 2e3984f
Show file tree

Hide file tree

Showing 9 changed files with 1,283 additions and 909 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/fvm/Cargo.toml b/fvm/Cargo.toml
@@ -18,14 +18,14 @@ num-traits = "0.2"
 cid = { workspace = true, features = ["serde-codec"] }
 multihash = { workspace = true, features = ["sha2", "sha3", "ripemd"] }
 fvm_shared = { version = "3.10.0", path = "../shared", features = ["crypto"] }
-fvm_ipld_hamt = { version = "0.8.0" }
+fvm_ipld_hamt = { version = "0.9.0" }
 fvm_ipld_amt = { version = "0.6.1" }
 fvm_ipld_blockstore = { version = "0.2.0" }
 fvm_ipld_encoding = { version = "0.4.0" }
 serde = { version = "1.0", features = ["derive"] }
 serde_tuple = "0.5"
 lazy_static = "1.4.0"
-derive_more = "0.99.17"
+derive_more = { version = "1.0.0", features = ["full"] }
 replace_with = "0.1.7"
 filecoin-proofs-api = { version = "18", default-features = false }
 rayon = "1"

diff --git a/fvm/src/kernel/error.rs b/fvm/src/kernel/error.rs
@@ -1,7 +1,5 @@
 // Copyright 2021-2023 Protocol Labs
 // SPDX-License-Identifier: Apache-2.0, MIT
-use std::fmt::Display;
-
 use derive_more::Display;
 use fvm_shared::error::ErrorNumber;
 

diff --git a/shared/Cargo.toml b/shared/Cargo.toml
@@ -19,7 +19,7 @@ data-encoding-macro = "0.1.13"
 lazy_static = "1.4.0"
 cid = { workspace = true, features = ["serde-codec", "std"] }
 multihash = { workspace = true }
-unsigned-varint = "0.7.1"
+unsigned-varint = "0.8.0"
 anyhow = "1.0.71"
 fvm_ipld_encoding = { version = "0.4" }
 serde = { version = "1", default-features = false }

diff --git a/testing/conformance/Cargo.toml b/testing/conformance/Cargo.toml
@@ -24,19 +24,19 @@ log = "0.4.19"
 futures = "0.3.28"
 async-std = { version = "1.12", features = ["attributes"] }
 wasmtime = { workspace = true }
-base64 = "0.21.2"
+base64 = "0.22.1"
 flate2 = { version = "1.0" }
 colored = "2"
 either = "1.8.1"
-itertools = "0.11.0"
+itertools = "0.13.0"
 num_cpus = "1.15.0"
 serde_json = { version = "1.0", features = ["raw_value"] }
 walkdir = "2.3"
 regex = { version = "1.8" }
 ittapi-rs = { version = "0.3.0", optional = true }
 libipld-core = { version = "0.16.0", features = ["serde-codec"] }
 tar = { version = "0.4.38", default-features = false }
-zstd = { version = "0.12.3", default-features = false }
+zstd = { version = "0.13.2", default-features = false }
 
 [dependencies.fvm]
 version = "3.10.0"
@@ -49,7 +49,7 @@ vtune = ["wasmtime/profiling", "ittapi-rs"]
 m2-native = []
 
 [dev-dependencies]
-env_logger = "0.10.0"
+env_logger = "0.11.5"
 criterion = { version = "0.5", features = ["async_std"] }
 
 [[bin]]

diff --git a/testing/integration/Cargo.toml b/testing/integration/Cargo.toml
@@ -29,7 +29,7 @@ thiserror = "1.0.40"
 wasmtime = { workspace = true }
 
 [dev-dependencies]
-actors-v10 = { package = "fil_builtin_actors_bundle", git = "https://github.com/filecoin-project/builtin-actors", branch = "master" }
+actors-v10 = { package = "fil_builtin_actors_bundle", git = "https://github.com/filecoin-project/builtin-actors", tag = "v10.0.0" }
 fvm_test_actors = { path = "../test_actors" }
 fvm_gas_calibration_shared = { path = "../calibration/shared" }
 blake2b_simd = "1.0.1"

diff --git a/testing/integration/tests/gasfuzz.rs b/testing/integration/tests/gasfuzz.rs
@@ -88,7 +88,12 @@ fn gasfuzz_get_exec_trace() -> ExecutionTrace {
         .unwrap();
 
     let create_res = testkit::fevm::create_contract(&mut tester, &mut account, &contract).unwrap();
-    assert!(create_res.msg_receipt.exit_code.is_success());
+    assert_eq!(
+        create_res.msg_receipt.exit_code,
+        ExitCode::OK,
+        "{:?}",
+        create_res.failure_info
+    );
 
     let create_return: testkit::fevm::CreateReturn =
         create_res.msg_receipt.return_data.deserialize().unwrap();

diff --git a/testing/test_actors/actors/fil-syscall-actor/Cargo.toml b/testing/test_actors/actors/fil-syscall-actor/Cargo.toml
@@ -10,7 +10,7 @@ fvm_sdk = { version = "3.3.0", path = "../../../../sdk" }
 fvm_shared = { version = "3.6.0", path = "../../../../shared" }
 minicov = {version = "0.3", optional = true}
 actors_v10_runtime = { package = "fil_actors_runtime", git = "https://github.com/filecoin-project/builtin-actors", branch = "master" }
-multihash = { workspace = true }
+multihash = { workspace = true, features = ["sha3", "sha2", "ripemd"]  }
 
 [lib]
 crate-type = ["cdylib"] ## cdylib is necessary for Wasm build

diff --git a/tools/fvm-bench/Cargo.toml b/tools/fvm-bench/Cargo.toml
@@ -10,5 +10,5 @@ fvm_shared = { path = "../../shared" }
 anyhow = "1.0.71"
 clap = { version = "4.3.9", features = ["derive", "std", "help", "usage", "error-context"], default-features = false }
 hex = "0.4.3"
-env_logger = "0.10.0"
+env_logger = "0.11.5"
 fvm = { path = "../../fvm", default-features = false }