Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
818 changes: 424 additions & 394 deletions Cargo.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ authors = ["Protocol Labs", "Filecoin Core Devs"]

[workspace.dependencies]
cid = { version = "0.11.1", default-features = false }
multihash = { version = "0.19.2", default-features = false }
multihash = { version = "0.19.3", default-features = false }
multihash-codetable = { version = "0.1.4", default-features = false }
multihash-derive = { version = "0.9.1", default-features = false }
fvm_ipld_hamt = { version = "0.10.2"}
fvm_ipld_amt = { version = "0.7.3"}
fvm_ipld_car = { version = "0.8.1" }
fvm_ipld_hamt = { version = "0.10.4"}
fvm_ipld_amt = { version = "0.7.4"}
fvm_ipld_car = { version = "0.8.2" }
fvm_ipld_blockstore = { version = "0.3.1" }
fvm_ipld_encoding = { version = "0.5.1" }
fvm_ipld_encoding = { version = "0.5.3" }
wasmtime = {version = "31.0.0", default-features = false, features = ["cranelift", "pooling-allocator", "parallel-compilation", "runtime"] }

fvm = { path = "fvm", version = "~2.10.0", default-features = false }
Expand Down
24 changes: 12 additions & 12 deletions fvm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ keywords = ["filecoin", "web3", "wasm"]
crate-type = ["lib"]

[dependencies]
anyhow = { version = "1.0.47", features = ["backtrace"] }
thiserror = "1.0.30"
anyhow = { version = "1.0.97", features = ["backtrace"] }
thiserror = "2.0.12"
num-traits = "0.2"
derive_builder = "0.20.1"
num-derive = "0.4.0"
derive_builder = "0.20.2"
num-derive = "0.4.2"
cid = { workspace = true, features = ["serde-codec"] }
multihash-codetable = { workspace = true, features = ["sha2", "sha3", "ripemd"] }
multihash-derive = { workspace = true }
Expand All @@ -28,24 +28,24 @@ fvm_ipld_encoding = { workspace = true }
serde = { version = "1.0", features = ["derive"] }
serde_tuple = "0.5"
serde_repr = "0.1"
lazy_static = "1.4.0"
lazy_static = "1.5.0"
derive-getters = "0.5.0"
derive_more = { version = "1.0.0", features = ["full"] }
derive_more = { version = "2.0.1", features = ["full"] }
replace_with = "0.1.7"
filecoin-proofs-api = { version = "18", default-features = false }
rayon = "1"
num_cpus = "1.13.0"
log = "0.4.14"
byteorder = "1.4.3"
blake2b_simd = "1.0.0"
num_cpus = "1.16.0"
log = "0.4.27"
byteorder = "1.5.0"
blake2b_simd = "1.0.3"
fvm-wasm-instrument = { version = "0.2.0", features = ["bulk"] }
yastl = "0.1.2"
arbitrary = {version = "1.1.0", optional = true, features = ["derive"]}
arbitrary = {version = "1.4.1", optional = true, features = ["derive"]}
rand = "0.8.5"
wasmtime = { workspace = true }

[dev-dependencies]
pretty_assertions = "1.2.1"
pretty_assertions = "1.4.1"
fvm = { path = ".", features = ["testing"], default-features = false }

[features]
Expand Down
3 changes: 2 additions & 1 deletion fvm/src/kernel/error.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use derive_more::Display;
use derive_more::Display; // macro
use fvm_shared::error::ErrorNumber;
use std::fmt::Display; // trait

/// Execution result.
pub type Result<T> = std::result::Result<T, ExecutionError>;
Expand Down
8 changes: 4 additions & 4 deletions sdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ crate-type = ["lib"]
cid = { workspace = true }
fvm_shared = { workspace = true }
## num-traits; disabling default features makes it play nice with no_std.
num-traits = { version = "0.2.14", default-features = false }
lazy_static = { version = "1.4.0" }
log = "0.4.14"
thiserror = "1.0.30"
num-traits = { version = "0.2.19", default-features = false }
lazy_static = { version = "1.5.0" }
log = "0.4.27"
thiserror = "2.0.12"
fvm_ipld_encoding = { workspace = true }

[features]
Expand Down
24 changes: 12 additions & 12 deletions shared/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,40 +8,40 @@ repository.workspace = true
authors = ["ChainSafe Systems <[email protected]>", "Protocol Labs", "Filecoin Core Devs"]

[dependencies]
blake2b_simd = "1.0.0"
thiserror = "1.0"
blake2b_simd = "1.0.3"
thiserror = "2.0"
num-traits = "0.2"
num-derive = "0.4"
num-bigint = "0.4"
num-integer = "0.1"
data-encoding = "2.3.2"
data-encoding-macro = "0.1.12"
lazy_static = "1.4.0"
log = "0.4.8"
data-encoding = "2.8.0"
data-encoding-macro = "0.1.17"
lazy_static = "1.5.0"
log = "0.4.27"
cid = { workspace = true, features = ["serde-codec", "std"] }
multihash = { workspace = true }
unsigned-varint = "0.8.0"
anyhow = "1.0.51"
anyhow = "1.0.97"
fvm_ipld_blockstore = { workspace = true }
fvm_ipld_encoding = { workspace = true }
serde = { version = "1", default-features = false }
serde_tuple = "0.5"
serde_repr = "0.1"
serde_bytes = { package = "cs_serde_bytes", version = "0.12" }
arbitrary = { version = "1.1", optional = true, features = ["derive"]}
arbitrary = { version = "1.4", optional = true, features = ["derive"]}

## non-wasm dependencies; these dependencies and the respective code is
## only activated through non-default features, which the Kernel enables, but
## not the actors.
filecoin-proofs-api = { version = "18", default-features = false, optional = true }
k256 = { version = "0.13.4", features = ["ecdsa"], default-features = false, optional = true }
bls-signatures = { version = "0.15", default-features = false, optional = true }
byteorder = "1.4.3"
byteorder = "1.5.0"

[dev-dependencies]
rand = "0.8"
rand_chacha = "0.3"
serde_json = "1.0.56"
rand = "0.8.5"
rand_chacha = "0.3.1"
serde_json = "1.0.140"
multihash = { workspace = true }
multihash-codetable = { workspace = true, features = ["sha2", "sha3", "ripemd"] }

Expand Down
6 changes: 3 additions & 3 deletions shared/src/address/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ pub enum Error {
InvalidPayload,
#[error("Invalid address length")]
InvalidLength,
#[error("Invalid payload length, wanted: {} got: {0}", PAYLOAD_HASH_LEN)]
#[error("Invalid payload length, wanted: {exp} got: {0}", exp=PAYLOAD_HASH_LEN)]
InvalidPayloadLength(usize),
#[error("Invalid BLS pub key length, wanted: {} got: {0}", BLS_PUB_LEN)]
#[error("Invalid BLS pub key length, wanted: {exp} got: {0}", exp=BLS_PUB_LEN)]
InvalidBLSLength(usize),
#[error("Invalid SECP pub key length, wanted: {} got: {0}", SECP_PUB_LEN)]
#[error("Invalid SECP pub key length, wanted: {exp} got: {0}", exp=SECP_PUB_LEN)]
InvalidSECPLength(usize),
#[error("Invalid address checksum")]
InvalidChecksum,
Expand Down
1 change: 0 additions & 1 deletion shared/src/sector/post.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

use cid::Cid;
use fvm_ipld_encoding::Cbor;
use serde_tuple::*;

use super::*;
use crate::randomness::Randomness;
Expand Down
40 changes: 20 additions & 20 deletions testing/conformance/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,38 +17,38 @@ fvm_ipld_car = { workspace = true }
fvm_ipld_blockstore = { workspace = true }
fvm_ipld_encoding = { workspace = true }

anyhow = "1.0.47"
thiserror = "1.0.30"
anyhow = "1.0.97"
thiserror = "2.0.12"
num-traits = "0.2"
derive_builder = "0.20.1"
derive_builder = "0.20.2"
ahash = "0.8"
num-derive = "0.4.0"
num-derive = "0.4.2"
cid = { workspace = true }
serde = { version = "1.0", features = ["derive"] }
serde_tuple = "0.5"
serde_repr = "0.1"
lazy_static = "1.4.0"
lazy_static = "1.5.0"
derive-getters = "0.5.0"
derive_more = { version = "1.0.0", features = ["full"] }
derive_more = { version = "2.0.1", features = ["full"] }
replace_with = "0.1.7"
log = "0.4.14"
byteorder = "1.4.3"
futures = "0.3.19"
async-std = { version = "1.9", features = ["attributes"] }
log = "0.4.27"
byteorder = "1.5.0"
futures = "0.3.31"
async-std = { version = "1.13", features = ["attributes"] }
wasmtime = { workspace = true }
base64 = "0.22.1"
flate2 = { version = "1.0" }
colored = "2"
either = "1.6.1"
itertools = "0.13.0"
num_cpus = "1.13.1"
flate2 = { version = "1.1" }
colored = "3"
either = "1.15.0"
itertools = "0.14.0"
num_cpus = "1.16.0"
serde_json = { version = "1.0", features = ["raw_value"] }
walkdir = "2.3"
regex = { version = "1.8" }
walkdir = "2.5"
regex = { version = "1.11" }
ittapi-rs = { version = "0.3.0", optional = true }
ipld-core = { version = "0.4.1", features = ["serde"] }
tar = { version = "0.4.38", default-features = false }
zstd = { version = "0.13.2", default-features = false }
ipld-core = { version = "0.4.2", features = ["serde"] }
tar = { version = "0.4.44", default-features = false }
zstd = { version = "0.13.3", default-features = false }

[features]
vtune = ["wasmtime/profiling", "ittapi-rs"]
Expand Down
Loading