diff --git a/Cargo.lock b/Cargo.lock index c8de71ee9f..b6fdb97353 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -550,7 +550,7 @@ dependencies = [ "fil_actors_runtime", "fvm_ipld_blockstore", "fvm_ipld_encoding", - "fvm_shared 0.4.1", + "fvm_shared 0.5.0", "num-derive", "num-traits", "serde", @@ -581,7 +581,7 @@ dependencies = [ "fil_actors_runtime", "fvm_ipld_blockstore", "fvm_ipld_encoding", - "fvm_shared 0.4.1", + "fvm_shared 0.5.0", "log", "num-derive", "num-traits", @@ -598,7 +598,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding", "fvm_ipld_hamt", - "fvm_shared 0.4.1", + "fvm_shared 0.5.0", "log", "num-derive", "num-traits", @@ -618,7 +618,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding", "fvm_ipld_hamt", - "fvm_shared 0.4.1", + "fvm_shared 0.5.0", "libipld-core", "log", "num-derive", @@ -643,7 +643,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding", "fvm_ipld_hamt", - "fvm_shared 0.4.1", + "fvm_shared 0.5.0", "itertools", "lazy_static", "log", @@ -664,7 +664,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding", "fvm_ipld_hamt", - "fvm_shared 0.4.1", + "fvm_shared 0.5.0", "indexmap", "integer-encoding", "num-derive", @@ -683,7 +683,7 @@ dependencies = [ "fvm_ipld_amt", "fvm_ipld_blockstore", "fvm_ipld_encoding", - "fvm_shared 0.4.1", + "fvm_shared 0.5.0", "num-derive", "num-traits", "serde", @@ -699,7 +699,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding", "fvm_ipld_hamt", - "fvm_shared 0.4.1", + "fvm_shared 0.5.0", "indexmap", "integer-encoding", "lazy_static", @@ -716,7 +716,7 @@ dependencies = [ "fil_actors_runtime", "fvm_ipld_blockstore", "fvm_ipld_encoding", - "fvm_shared 0.4.1", + "fvm_shared 0.5.0", "lazy_static", "log", "num-derive", @@ -732,7 +732,7 @@ dependencies = [ "fil_actors_runtime", "fvm_ipld_blockstore", "fvm_ipld_encoding", - "fvm_shared 0.4.1", + "fvm_shared 0.5.0", "num-derive", "num-traits", "serde", @@ -748,7 +748,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding", "fvm_ipld_hamt", - "fvm_shared 0.4.1", + "fvm_shared 0.5.0", "lazy_static", "num-derive", "num-traits", @@ -770,7 +770,7 @@ dependencies = [ "fvm_ipld_encoding", "fvm_ipld_hamt", "fvm_sdk", - "fvm_shared 0.4.1", + "fvm_shared 0.5.0", "getrandom", "hex", "indexmap", @@ -927,7 +927,8 @@ dependencies = [ [[package]] name = "fvm_ipld_amt" version = "0.4.0" -source = "git+https://github.com/filecoin-project/ref-fvm#78530c8156332a7ab44d21ffdf42dd407b0ed2c7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3394e5f9c2adb4d586519bc24bbfd659366e01e7ffa6cda676be94a62bab474" dependencies = [ "ahash", "anyhow", @@ -943,7 +944,8 @@ dependencies = [ [[package]] name = "fvm_ipld_bitfield" version = "0.5.0" -source = "git+https://github.com/filecoin-project/ref-fvm#78530c8156332a7ab44d21ffdf42dd407b0ed2c7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9011349297962982b8ab2663c220034525ec0f95f408c2b561d3d98867f1a803" dependencies = [ "cs_serde_bytes", "fvm_ipld_encoding", @@ -955,7 +957,8 @@ dependencies = [ [[package]] name = "fvm_ipld_blockstore" version = "0.1.0" -source = "git+https://github.com/filecoin-project/ref-fvm#78530c8156332a7ab44d21ffdf42dd407b0ed2c7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1985eae58ec2fbf54535ce115c72a2141459fb7fb4ff7379e17bffae0e302578" dependencies = [ "anyhow", "cid", @@ -978,7 +981,8 @@ dependencies = [ [[package]] name = "fvm_ipld_encoding" version = "0.1.0" -source = "git+https://github.com/filecoin-project/ref-fvm#78530c8156332a7ab44d21ffdf42dd407b0ed2c7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43bd635987aac46a753ec81767713af35cb50f182c7cc49d3a429643ede0e709" dependencies = [ "anyhow", "cid", @@ -994,7 +998,8 @@ dependencies = [ [[package]] name = "fvm_ipld_hamt" version = "0.4.0" -source = "git+https://github.com/filecoin-project/ref-fvm#78530c8156332a7ab44d21ffdf42dd407b0ed2c7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a03c6ae361a882360bc0c0f47265b294429f096baa8d9467247bbd62c6a6683c" dependencies = [ "anyhow", "byteorder", @@ -1013,12 +1018,13 @@ dependencies = [ [[package]] name = "fvm_sdk" -version = "0.4.0" -source = "git+https://github.com/filecoin-project/ref-fvm#78530c8156332a7ab44d21ffdf42dd407b0ed2c7" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1da3325e5885d985e9066d65d030ac2ea4cef9f173cf0bbd04c2caa366562700" dependencies = [ "cid", "fvm_ipld_encoding", - "fvm_shared 0.4.1", + "fvm_shared 0.5.0", "lazy_static", "log", "num-traits", @@ -1057,8 +1063,9 @@ dependencies = [ [[package]] name = "fvm_shared" -version = "0.4.1" -source = "git+https://github.com/filecoin-project/ref-fvm#78530c8156332a7ab44d21ffdf42dd407b0ed2c7" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bfc24841f5519eec4d9d19ec1bc6a3562cd1e4be6c8fc2a5315ba34f3e392ba" dependencies = [ "anyhow", "bimap", @@ -1683,7 +1690,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding", "fvm_ipld_hamt", - "fvm_shared 0.4.1", + "fvm_shared 0.5.0", "indexmap", "log", "num-derive", diff --git a/Cargo.toml b/Cargo.toml index e4f96ccf31..74bdafd191 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,15 +39,14 @@ members = [ "test_vm", ] -[patch.crates-io] -# Needed until a new release is published -fvm_shared = { git = "https://github.com/filecoin-project/ref-fvm" } -fvm_sdk = { git = "https://github.com/filecoin-project/ref-fvm" } -fvm_ipld_hamt = { git = "https://github.com/filecoin-project/ref-fvm" } -fvm_ipld_amt = { git = "https://github.com/filecoin-project/ref-fvm" } -fvm_ipld_bitfield = { git = "https://github.com/filecoin-project/ref-fvm" } -fvm_ipld_encoding = { git = "https://github.com/filecoin-project/ref-fvm" } -fvm_ipld_blockstore = { git = "https://github.com/filecoin-project/ref-fvm" } +#[patch.crates-io] +#fvm_shared = { git = "https://github.com/filecoin-project/ref-fvm" } +#fvm_sdk = { git = "https://github.com/filecoin-project/ref-fvm" } +#fvm_ipld_hamt = { git = "https://github.com/filecoin-project/ref-fvm" } +#fvm_ipld_amt = { git = "https://github.com/filecoin-project/ref-fvm" } +#fvm_ipld_bitfield = { git = "https://github.com/filecoin-project/ref-fvm" } +#fvm_ipld_encoding = { git = "https://github.com/filecoin-project/ref-fvm" } +#fvm_ipld_blockstore = { git = "https://github.com/filecoin-project/ref-fvm" } ## Uncomment when working locally on ref-fvm and this repo simultaneously. ## Assumes the ref-fvm checkout is in a sibling directory with the same name. diff --git a/actors/account/Cargo.toml b/actors/account/Cargo.toml index efd0bee103..058399a97d 100644 --- a/actors/account/Cargo.toml +++ b/actors/account/Cargo.toml @@ -14,7 +14,7 @@ crate-type = ["cdylib", "lib"] [dependencies] fil_actors_runtime = { version = "8.0.0-alpha.1", path = "../runtime", features = ["fil-actor"] } -fvm_shared = { version = "0.4.1", default-features = false } +fvm_shared = { version = "0.5.0", default-features = false } serde = { version = "1.0.136", features = ["derive"] } num-traits = "0.2.14" num-derive = "0.3.3" diff --git a/actors/cron/Cargo.toml b/actors/cron/Cargo.toml index 3df75a4f40..60c59fcb44 100644 --- a/actors/cron/Cargo.toml +++ b/actors/cron/Cargo.toml @@ -15,7 +15,7 @@ crate-type = ["cdylib", "lib"] [dependencies] fil_actors_runtime = { version = "8.0.0-alpha.1", path = "../runtime", features = ["fil-actor"] } -fvm_shared = { version = "0.4.1", default-features = false } +fvm_shared = { version = "0.5.0", default-features = false } num-traits = "0.2.14" num-derive = "0.3.3" log = "0.4.14" diff --git a/actors/init/Cargo.toml b/actors/init/Cargo.toml index ea6412be27..b115a43c12 100644 --- a/actors/init/Cargo.toml +++ b/actors/init/Cargo.toml @@ -15,7 +15,7 @@ crate-type = ["cdylib", "lib"] [dependencies] fil_actors_runtime = { version = "8.0.0-alpha.1", path = "../runtime", features = ["fil-actor"] } -fvm_shared = { version = "0.4.1", default-features = false } +fvm_shared = { version = "0.5.0", default-features = false } fvm_ipld_hamt = "0.4.0" serde = { version = "1.0.136", features = ["derive"] } num-traits = "0.2.14" diff --git a/actors/market/Cargo.toml b/actors/market/Cargo.toml index f355c2c510..4a6279e7c0 100644 --- a/actors/market/Cargo.toml +++ b/actors/market/Cargo.toml @@ -16,7 +16,7 @@ crate-type = ["cdylib", "lib"] [dependencies] fil_actors_runtime = { version = "8.0.0-alpha.1", path = "../runtime", features = ["fil-actor"] } fvm_ipld_hamt = "0.4.0" -fvm_shared = { version = "0.4.1", default-features = false } +fvm_shared = { version = "0.5.0", default-features = false } fvm_ipld_bitfield = "0.5.0" num-traits = "0.2.14" num-derive = "0.3.3" diff --git a/actors/miner/Cargo.toml b/actors/miner/Cargo.toml index af6546ce05..425c8486e6 100644 --- a/actors/miner/Cargo.toml +++ b/actors/miner/Cargo.toml @@ -15,7 +15,7 @@ crate-type = ["cdylib", "lib"] [dependencies] fil_actors_runtime = { version = "8.0.0-alpha.1", path = "../runtime", features = ["fil-actor"] } -fvm_shared = { version = "0.4.1", default-features = false } +fvm_shared = { version = "0.5.0", default-features = false } fvm_ipld_bitfield = "0.5.0" fvm_ipld_amt = { version = "0.4.0", features = ["go-interop"] } fvm_ipld_hamt = "0.4.0" diff --git a/actors/multisig/Cargo.toml b/actors/multisig/Cargo.toml index d32cdbda77..97593669b0 100644 --- a/actors/multisig/Cargo.toml +++ b/actors/multisig/Cargo.toml @@ -15,7 +15,7 @@ crate-type = ["cdylib", "lib"] [dependencies] fil_actors_runtime = { version = "8.0.0-alpha.1", path = "../runtime", features = ["fil-actor"] } -fvm_shared = { version = "0.4.1", default-features = false } +fvm_shared = { version = "0.5.0", default-features = false } fvm_ipld_hamt = "0.4.0" num-traits = "0.2.14" num-derive = "0.3.3" diff --git a/actors/paych/Cargo.toml b/actors/paych/Cargo.toml index c017a922ec..b819796d04 100644 --- a/actors/paych/Cargo.toml +++ b/actors/paych/Cargo.toml @@ -15,7 +15,7 @@ crate-type = ["cdylib", "lib"] [dependencies] fil_actors_runtime = { version = "8.0.0-alpha.1", path = "../runtime", features = ["fil-actor"] } -fvm_shared = { version = "0.4.1", default-features = false } +fvm_shared = { version = "0.5.0", default-features = false } num-traits = "0.2.14" num-derive = "0.3.3" serde = { version = "1.0.136", features = ["derive"] } diff --git a/actors/power/Cargo.toml b/actors/power/Cargo.toml index 6cf29ee3e0..2e73779835 100644 --- a/actors/power/Cargo.toml +++ b/actors/power/Cargo.toml @@ -15,7 +15,7 @@ crate-type = ["cdylib", "lib"] [dependencies] fil_actors_runtime = { version = "8.0.0-alpha.1", path = "../runtime", features = ["fil-actor"] } -fvm_shared = { version = "0.4.1", default-features = false } +fvm_shared = { version = "0.5.0", default-features = false } fvm_ipld_hamt = "0.4.0" num-traits = "0.2.14" num-derive = "0.3.3" diff --git a/actors/reward/Cargo.toml b/actors/reward/Cargo.toml index 61b7ef2e3a..87b16a24c8 100644 --- a/actors/reward/Cargo.toml +++ b/actors/reward/Cargo.toml @@ -15,7 +15,7 @@ crate-type = ["cdylib", "lib"] [dependencies] fil_actors_runtime = { version = "8.0.0-alpha.1", path = "../runtime", features = ["fil-actor"] } -fvm_shared = { version = "0.4.1", default-features = false } +fvm_shared = { version = "0.5.0", default-features = false } num-traits = "0.2.14" num-derive = "0.3.3" log = "0.4.14" diff --git a/actors/runtime/Cargo.toml b/actors/runtime/Cargo.toml index 03f1b722ab..236f3b2e5b 100644 --- a/actors/runtime/Cargo.toml +++ b/actors/runtime/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/filecoin-project/builtin-actors" [dependencies] fvm_ipld_hamt = "0.4.0" fvm_ipld_amt = { version = "0.4.0", features = ["go-interop"] } -fvm_shared = { version = "0.4.1", default-features = false } +fvm_shared = { version = "0.5.0", default-features = false } num-traits = "0.2.14" num-derive = "0.3.3" serde = { version = "1.0.136", features = ["derive"] } @@ -27,7 +27,7 @@ thiserror = "1.0.30" getrandom = { version = "0.2.5", features = ["js"] } hex = { version = "0.4.3", optional = true } anyhow = "1.0.56" -fvm_sdk = { version = "0.4.0", optional = true } +fvm_sdk = { version = "0.5.0", optional = true } blake2b_simd = "1.0" fvm_ipld_blockstore = { version = "0.1" } fvm_ipld_encoding = "0.1.0" diff --git a/actors/system/Cargo.toml b/actors/system/Cargo.toml index f7d0346aa1..58aba472b7 100644 --- a/actors/system/Cargo.toml +++ b/actors/system/Cargo.toml @@ -15,7 +15,7 @@ crate-type = ["cdylib", "lib"] [dependencies] fil_actors_runtime = { version = "8.0.0-alpha.1", path = "../runtime", features = ["fil-actor"] } -fvm_shared = { version = "0.4.1", default-features = false } +fvm_shared = { version = "0.5.0", default-features = false } fvm_ipld_encoding = "0.1.0" fvm_ipld_blockstore = { version = "0.1.0" } num-traits = "0.2.14" diff --git a/actors/verifreg/Cargo.toml b/actors/verifreg/Cargo.toml index 8bea628782..b0b489f748 100644 --- a/actors/verifreg/Cargo.toml +++ b/actors/verifreg/Cargo.toml @@ -15,7 +15,7 @@ crate-type = ["cdylib", "lib"] [dependencies] fil_actors_runtime = { version = "8.0.0-alpha.1", path = "../runtime", features = ["fil-actor"] } -fvm_shared = { version = "0.4.1", default-features = false } +fvm_shared = { version = "0.5.0", default-features = false } serde = { version = "1.0.136", features = ["derive"] } num-traits = "0.2.14" num-derive = "0.3.3" diff --git a/test_vm/Cargo.toml b/test_vm/Cargo.toml index 23962500da..02bea8513c 100644 --- a/test_vm/Cargo.toml +++ b/test_vm/Cargo.toml @@ -11,7 +11,7 @@ keywords = ["filecoin", "web3", "wasm"] [dependencies] fil_actors_runtime = { version = "8.0.0-alpha.1", path = "../actors/runtime" } -fvm_shared = { version = "0.4.1", default-features = false } +fvm_shared = { version = "0.5.0", default-features = false } fvm_ipld_encoding = { version = "0.1.0", default-features = false } fvm_ipld_blockstore = { version = "0.1.0", default-features = false } fvm_ipld_hamt = "0.4.0"