chore: update deps

Preparing for the nv21 code freeze. Notably, this updates wasmtime to v12.
filecoin-project · Sep 1, 2023 · 6b21389 · 6b21389
1 parent c56f541
commit 6b21389
Show file tree

Hide file tree

Showing 10 changed files with 500 additions and 593 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/fvm/Cargo.toml b/fvm/Cargo.toml
@@ -46,15 +46,15 @@ pretty_assertions = "1.3.0"
 fvm = { path = ".", features = ["testing"], default-features = false }
 
 [dependencies.wasmtime]
-version = "10.0.1"
+version = "12.0.1"
 default-features = false
 features = ["cranelift", "pooling-allocator", "parallel-compilation"]
 
 [dependencies.wasmtime-environ]
-version = "10.0.1"
+version = "12.0.1"
 
 [dependencies.wasmtime-runtime]
-version = "10.0.1"
+version = "12.0.1"
 default-features = false
 
 [features]

diff --git a/ipld/car/Cargo.toml b/ipld/car/Cargo.toml
@@ -12,7 +12,7 @@ cid = { workspace = true }
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"
 futures = "0.3.28"
-integer-encoding = { version = "3.0", features = ["futures_async"] }
+integer-encoding = { version = "4.0", features = ["futures_async"] }
 fvm_ipld_blockstore = { version = "0.2", path = "../blockstore" }
 fvm_ipld_encoding = { version = "0.4", path = "../encoding" }
 

diff --git a/ipld/car/src/lib.rs b/ipld/car/src/lib.rs
@@ -36,7 +36,7 @@ impl CarHeader {
     ) -> Result<(), Error>
     where
         W: AsyncWrite + Send + Unpin,
-        S: Stream<Item = (Cid, Vec<u8>)> + Unpin,
+        S: Stream<Item = (Cid, Vec<u8>)> + Unpin + Send,
     {
         // Write header bytes
         let header_bytes = to_vec(self)?;

diff --git a/shared/Cargo.toml b/shared/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/filecoin-project/ref-fvm"
 blake2b_simd = "1.0.1"
 thiserror = "1.0"
 num-traits = "0.2"
-num-derive = "0.3"
+num-derive = "0.4"
 num-bigint = "0.4"
 num-integer = "0.1"
 data-encoding = "2.4.0"

diff --git a/testing/calibration/shared/Cargo.toml b/testing/calibration/shared/Cargo.toml
@@ -12,4 +12,4 @@ fvm_shared = { version = "3.5.0", path = "../../../shared", features = ["testing
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 num-traits = "0.2"
-num-derive = "0.3"
+num-derive = "0.4"
diff --git a/testing/conformance/Cargo.toml b/testing/conformance/Cargo.toml
@@ -23,7 +23,7 @@ lazy_static = "1.4.0"
 log = "0.4.19"
 futures = "0.3.28"
 async-std = { version = "1.12", features = ["attributes"] }
-wasmtime = { version = "10.0.1", default-features = false }
+wasmtime = { version = "12.0.1", default-features = false }
 base64 = "0.21.2"
 flate2 = { version = "1.0" }
 colored = "2"

diff --git a/testing/integration/Cargo.toml b/testing/integration/Cargo.toml
@@ -28,7 +28,7 @@ serde_tuple = "0.5"
 thiserror = "1.0.40"
 
 [dependencies.wasmtime]
-version = "10.0.1"
+version = "12.0.1"
 default-features = false
 features = ["cranelift", "parallel-compilation"]
 

diff --git a/testing/test_actors/actors/fil-gas-calibration-actor/Cargo.toml b/testing/test_actors/actors/fil-gas-calibration-actor/Cargo.toml
@@ -11,7 +11,7 @@ fvm_ipld_encoding = { version = "0.4.0", path = "../../../../ipld/encoding" }
 fvm_gas_calibration_shared = { path = "../../../calibration/shared" }
 
 cid = { workspace = true }
-num-derive = "0.3"
+num-derive = "0.4"
 num-traits = "0.2"
 serde = { version = "1.0", features = ["derive"] }
 anyhow = "1.0.71"

diff --git a/tools/fvm-bench/Cargo.toml b/tools/fvm-bench/Cargo.toml
@@ -8,7 +8,7 @@ fvm_integration_tests = { path = "../../testing/integration" }
 fvm_ipld_encoding = { path = "../../ipld/encoding" }
 fvm_shared = { path = "../../shared" }
 anyhow = "1.0.71"
-clap = { version = "4.3.9", features = ["derive"] }
+clap = { version = "4.3.9", features = ["derive", "std", "help", "usage", "error-context"], default-features = false }
 hex = "0.4.3"
 env_logger = "0.10.0"
 fvm = { path = "../../fvm", default-features = false }