Update FVM types (#1330)

* bump versions inline with next helix set

* temp bump to allow helix-onchain filecoin to build its integration tests

* update to new fvm versions

* unpatch helix libraries

Cargo.toml

@@ -32,7 +32,7 @@ fil_actor_verifreg = { version = "12.0.0", path = "./actors/verifreg", features
 
 [build-dependencies]
 fil_actor_bundler = "5.0.0"
-cid = { version = "0.8.3", default-features = false, features = ["serde-codec"] }
+cid = { version = "0.10.1", default-features = false, features = ["serde-codec"] }
 fil_actors_runtime = { version = "12.0.0", path = "runtime" }
 num-traits = "0.2.15"
 
@@ -66,9 +66,9 @@ members = [
 #fvm_ipld_bitfield = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" }
 #fvm_ipld_encoding = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" }
 #fvm_ipld_blockstore = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" }
-#fvm_actor_utils = { git = "https://github.com/helix-onchain/filecoin", branch = "main" }
-#frc42_dispatch = { git = "https://github.com/helix-onchain/filecoin", branch = "main" }
-#frc46_token = { git = "https://github.com/helix-onchain/filecoin", branch = "main" }
+#fvm_actor_utils = { git = "https://github.com/helix-onchain/filecoin", branch = "alex/update-fvm-ipld" }
+#frc42_dispatch = { git = "https://github.com/helix-onchain/filecoin", branch = "alex/update-fvm-ipld" }
+#frc46_token = { git = "https://github.com/helix-onchain/filecoin", branch = "alex/update-fvm-ipld" }
 
 ## 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.

actors/account/Cargo.toml

@@ -14,14 +14,14 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 fil_actors_runtime = { version = "12.0.0", path = "../../runtime" }
-frc42_dispatch = "3.2.0"
-fvm_actor_utils = "6.0.0"
-fvm_shared = { version = "3.2.0", default-features = false }
+frc42_dispatch = "3.3.0"
+fvm_actor_utils = "7.0.0"
+fvm_shared = { version = "3.4.0", default-features = false }
 serde = { version = "1.0.136", features = ["derive"] }
 num-traits = "0.2.14"
 num-derive = "0.3.3"
-fvm_ipld_blockstore = "0.1.1"
-fvm_ipld_encoding = "0.3.3"
+fvm_ipld_blockstore = "0.2.0"
+fvm_ipld_encoding = "0.4.0"
 anyhow = "1.0.65"
 
 [dev-dependencies]

actors/cron/Cargo.toml

@@ -15,13 +15,13 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 fil_actors_runtime = { version = "12.0.0", path = "../../runtime" }
-fvm_shared = { version = "3.2.0", default-features = false }
+fvm_shared = { version = "3.4.0", default-features = false }
 num-traits = "0.2.14"
 num-derive = "0.3.3"
 log = "0.4.14"
 serde = { version = "1.0.136", features = ["derive"] }
-fvm_ipld_blockstore = "0.1.1"
-fvm_ipld_encoding = "0.3.3"
+fvm_ipld_blockstore = "0.2.0"
+fvm_ipld_encoding = "0.4.0"
 
 [dev-dependencies]
 fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }

actors/datacap/Cargo.toml

@@ -16,14 +16,14 @@ crate-type = ["cdylib", "lib"]
 [dependencies]
 fil_actors_runtime = { version = "12.0.0", path = "../../runtime"}
 
-cid = { version = "0.8.3", default-features = false, features = ["serde-codec"] }
-frc42_dispatch = "3.2.0"
-frc46_token = "6.0.0"
-fvm_actor_utils = "6.0.0"
-fvm_ipld_blockstore = "0.1.1"
-fvm_ipld_encoding = "0.3.3"
-fvm_ipld_hamt = "0.6.1"
-fvm_shared = { version = "3.2.0", default-features = false }
+cid = { version = "0.10.1", default-features = false, features = ["serde-codec"] }
+frc42_dispatch = "3.3.0"
+frc46_token = "7.0.0"
+fvm_actor_utils = "7.0.0"
+fvm_ipld_blockstore = "0.2.0"
+fvm_ipld_encoding = "0.4.0"
+fvm_ipld_hamt = "0.7.0"
+fvm_shared = { version = "3.4.0", default-features = false }
 lazy_static = "1.4.0"
 num-derive = "0.3.3"
 num-traits = "0.2.14"

actors/eam/Cargo.toml

@@ -20,11 +20,11 @@ serde_tuple = "0.5"
 rlp = { version = "0.5.1", default-features = false }
 anyhow = "1.0.65"
 log = "0.4.14"
-fvm_ipld_blockstore = "0.1.1"
-fvm_ipld_encoding = "0.3.3"
-multihash = { version = "0.16.1", default-features = false }
-cid = "0.8.6"
-fvm_shared = { version = "3.2.0", default-features = false }
+fvm_ipld_blockstore = "0.2.0"
+fvm_ipld_encoding = "0.4.0"
+multihash = { version = "0.18.1", default-features = false }
+cid = { version = "0.10.1", default-features = false, features = ["serde-codec"] }
+fvm_shared = { version = "3.4.0", default-features = false }
 num-traits = "0.2.15"
 num-derive = "0.3.3"
 hex-literal = "0.3.4"

actors/ethaccount/Cargo.toml

@@ -15,11 +15,11 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 fil_actors_runtime = { version = "12.0.0", path = "../../runtime" }
-frc42_dispatch = "3.2.0"
-fvm_actor_utils = "6.0.0"
+frc42_dispatch = "3.3.0"
+fvm_actor_utils = "7.0.0"
 serde = { version = "1.0.136", features = ["derive"] }
-fvm_ipld_encoding = "0.3.3"
-fvm_shared = { version = "3.2.0", default-features = false }
+fvm_ipld_encoding = "0.4.0"
+fvm_shared = { version = "3.4.0", default-features = false }
 num-traits = "0.2.15"
 num-derive = "0.3.3"
 hex-literal = "0.3.4"

actors/evm/Cargo.toml

@@ -16,22 +16,22 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 fil_actors_runtime = { version = "12.0.0", path = "../../runtime" }
-fvm_shared = { version = "3.2.0", default-features = false }
-fvm_ipld_kamt = { version = "0.2.0" }
+fvm_shared = { version = "3.4.0", default-features = false }
+fvm_ipld_kamt = { version = "0.3.0" }
 serde = { version = "1.0.136", features = ["derive"] }
 serde_tuple = "0.5"
 num-traits = "0.2.14"
 num-derive = "0.3.3"
-cid = { version = "0.8.3", default-features = false, features = ["serde-codec"] }
+cid = { version = "0.10.1", default-features = false, features = ["serde-codec"] }
 anyhow = "1.0.65"
 log = "0.4.14"
-fvm_ipld_blockstore = "0.1.1"
-fvm_ipld_encoding = "0.3.3"
-multihash = { version = "0.16.1", default-features = false }
+fvm_ipld_blockstore = "0.2.0"
+fvm_ipld_encoding = "0.4.0"
+multihash = { version = "0.18.1", default-features = false }
 hex = { version = "0.4.3", features = ["serde"] }
 hex-literal = "0.3.4"
 substrate-bn = { version = "0.6.0", default-features = false }
-frc42_dispatch = "3.2.0"
+frc42_dispatch = "3.3.0"
 fil_actors_evm_shared = { version = "12.0.0", path = "shared" }
 
 [dev-dependencies]

actors/evm/shared/Cargo.toml

@@ -10,8 +10,8 @@ keywords = ["filecoin", "web3", "wasm", "evm"]
 
 [dependencies]
 serde = { version = "1.0.136", features = ["derive"] }
-fvm_shared = { version = "3.2.0", default-features = false }
+fvm_shared = { version = "3.4.0", default-features = false }
 fil_actors_runtime = { version = "12.0.0", path = "../../../runtime" }
-fvm_ipld_encoding = "0.3.3"
+fvm_ipld_encoding = "0.4.0"
 uint = { version = "0.9.3", default-features = false }
 hex = "0.4.3"

actors/evm/src/interpreter/system.rs

@@ -1,5 +1,6 @@
 use std::borrow::Cow;
 
+use cid::multihash::Code;
 use fil_actors_evm_shared::{address::EthAddress, uints::U256};
 use fil_actors_runtime::{
     actor_error, extract_send_result, runtime::EMPTY_ARR_CID, AsActorError, EAM_ACTOR_ID,
@@ -14,7 +15,6 @@ use fvm_shared::econ::TokenAmount;
 use fvm_shared::error::{ErrorNumber, ExitCode};
 use fvm_shared::sys::SendFlags;
 use fvm_shared::{MethodNum, Response, IPLD_RAW, METHOD_SEND};
-use multihash::Code;
 
 use crate::state::{State, Tombstone};
 use crate::BytecodeHash;

actors/evm/tests/misc.rs

@@ -1,13 +1,13 @@
 mod asm;
 mod util;
 
+use cid::multihash::Multihash;
 use cid::Cid;
 use fil_actors_evm_shared::address::EthAddress;
 use fil_actors_evm_shared::uints::U256;
 use fvm_ipld_encoding::DAG_CBOR;
 use fvm_shared::chainid::ChainID;
 use fvm_shared::{address::Address, econ::TokenAmount};
-use multihash::Multihash;
 
 #[test]
 fn test_timestamp() {

actors/init/Cargo.toml

@@ -15,17 +15,17 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 fil_actors_runtime = { version = "12.0.0", path = "../../runtime" }
-frc42_dispatch = "3.2.0"
-fvm_shared = { version = "3.2.0", default-features = false }
-fvm_ipld_hamt = "0.6.1"
+frc42_dispatch = "3.3.0"
+fvm_shared = { version = "3.4.0", default-features = false }
+fvm_ipld_hamt = "0.7.0"
 serde = { version = "1.0.136", features = ["derive"] }
 num-traits = "0.2.14"
 num-derive = "0.3.3"
-cid = { version = "0.8.3", default-features = false, features = ["serde-codec"] }
+cid = { version = "0.10.1", default-features = false, features = ["serde-codec"] }
 anyhow = "1.0.65"
 log = "0.4.14"
-fvm_ipld_blockstore = "0.1.1"
-fvm_ipld_encoding = "0.3.3"
+fvm_ipld_blockstore = "0.2.0"
+fvm_ipld_encoding = "0.4.0"
 
 [dev-dependencies]
 fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }

actors/market/Cargo.toml

@@ -17,14 +17,14 @@ crate-type = ["cdylib", "lib"]
 fil_actors_runtime = { version = "12.0.0", path = "../../runtime"}
 
 anyhow = "1.0.65"
-cid = { version = "0.8.3", default-features = false, features = ["serde-codec"] }
-frc42_dispatch = "3.2.0"
-frc46_token = "6.0.0"
+cid = { version = "0.10.1", default-features = false, features = ["serde-codec"] }
+frc42_dispatch = "3.3.0"
+frc46_token = "7.0.0"
 fvm_ipld_bitfield = "0.5.4"
-fvm_ipld_blockstore = "0.1.1"
-fvm_ipld_encoding = "0.3.3"
-fvm_ipld_hamt = "0.6.1"
-fvm_shared = { version = "3.2.0", default-features = false }
+fvm_ipld_blockstore = "0.2.0"
+fvm_ipld_encoding = "0.4.0"
+fvm_ipld_hamt = "0.7.0"
+fvm_shared = { version = "3.4.0", default-features = false }
 integer-encoding = { version = "3.0.3", default-features = false }
 libipld-core = { version = "0.13.1", features = ["serde-codec"] }
 log = "0.4.14"
@@ -37,8 +37,8 @@ fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector
 fil_actor_power = { path = "../power" }
 fil_actor_reward = { path = "../reward" }
 fil_actor_verifreg = { path = "../verifreg" }
-fvm_ipld_amt = { version = "0.5.1", features = ["go-interop"] }
-multihash = { version = "0.16.1", default-features = false }
+fvm_ipld_amt = { version = "0.6.0", features = ["go-interop"] }
+multihash = { version = "0.18.1", default-features = false }
 regex = "1"
 itertools = "0.10"
 lazy_static = "1.4.0"

actors/miner/Cargo.toml

@@ -15,22 +15,22 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 fil_actors_runtime = { version = "12.0.0", path = "../../runtime" }
-frc42_dispatch = "3.2.0"
-fvm_shared = { version = "3.2.0", default-features = false }
+frc42_dispatch = "3.3.0"
+fvm_shared = { version = "3.4.0", default-features = false }
 fvm_ipld_bitfield = "0.5.4"
-fvm_ipld_amt = { version = "0.5.1", features = ["go-interop"] }
-fvm_ipld_hamt = "0.6.1"
+fvm_ipld_amt = { version = "0.6.0", features = ["go-interop"] }
+fvm_ipld_hamt = "0.7.0"
 serde = { version = "1.0.136", features = ["derive"] }
-cid = { version = "0.8.3", default-features = false, features = ["serde-codec"] }
+cid = { version = "0.10.1", default-features = false, features = ["serde-codec"] }
 num-traits = "0.2.14"
 num-derive = "0.3.3"
 lazy_static = "1.4.0"
 log = "0.4.14"
 byteorder = "1.4.3"
 anyhow = "1.0.65"
 itertools = "0.10.3"
-fvm_ipld_blockstore = "0.1.1"
-fvm_ipld_encoding = "0.3.3"
+fvm_ipld_blockstore = "0.2.0"
+fvm_ipld_encoding = "0.4.0"
 multihash = { version = "0.16.2", default-features = false }
 
 [dev-dependencies]
@@ -40,8 +40,8 @@ fil_actor_reward = { path = "../reward" }
 fil_actor_power = { path = "../power" }
 fil_actor_market = { path = "../market" }
 rand = "0.8.5"
-cid = { version = "0.8.3", default-features = false, features = ["serde-codec"] }
-multihash = { version = "0.16.1", default-features = false }
+cid = { version = "0.10.1", default-features = false, features = ["serde-codec"] }
+multihash = { version = "0.18.1", default-features = false }
 test-case = "2.2.1"
 
 [features]

actors/miner/src/commd.rs

@@ -1,8 +1,8 @@
+use cid::multihash::Multihash;
 use cid::{Cid, Version};
 use fil_actors_runtime::{actor_error, ActorError};
 use fvm_shared::commcid::{FIL_COMMITMENT_UNSEALED, SHA2_256_TRUNC254_PADDED};
 use fvm_shared::sector::RegisteredSealProof;
-use multihash::Multihash;
 use serde::{Deserialize, Serialize};
 
 /// CompactCommD represents a Cid with compact representation of context dependant zero value

actors/miner/src/lib.rs

@@ -9,6 +9,7 @@ use std::ops::Neg;
 
 use anyhow::{anyhow, Error};
 use byteorder::{BigEndian, ByteOrder, WriteBytesExt};
+use cid::multihash::Code::Blake2b256;
 use cid::Cid;
 use fvm_ipld_bitfield::{BitField, Validate};
 use fvm_ipld_blockstore::Blockstore;
@@ -26,7 +27,6 @@ use fvm_shared::smooth::FilterEstimate;
 use fvm_shared::{ActorID, METHOD_CONSTRUCTOR, METHOD_SEND};
 use itertools::Itertools;
 use log::{error, info, warn};
-use multihash::Code::Blake2b256;
 use num_derive::FromPrimitive;
 use num_traits::{Signed, Zero};
 

actors/miner/tests/state_harness.rs

@@ -1,4 +1,5 @@
 #![allow(dead_code)]
+use cid::multihash::Code::Blake2b256;
 use fil_actor_miner::MinerInfo;
 use fil_actor_miner::SectorPreCommitOnChainInfo;
 use fil_actor_miner::VestSpec;
@@ -13,7 +14,6 @@ use fvm_ipld_hamt::Error as HamtError;
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::sector::{SectorNumber, SectorSize};
 use fvm_shared::{clock::ChainEpoch, clock::QuantSpec, sector::RegisteredPoStProof};
-use multihash::Code::Blake2b256;
 
 use fil_actors_runtime::test_utils::*;
 

actors/miner/tests/util.rs

@@ -78,11 +78,11 @@ use fvm_shared::sector::{
 use fvm_shared::smooth::FilterEstimate;
 use fvm_shared::{MethodNum, HAMT_BIT_WIDTH, METHOD_SEND};
 
+use cid::multihash::MultihashDigest;
 use cid::Cid;
 use itertools::Itertools;
 use lazy_static::lazy_static;
 use multihash::derive::Multihash;
-use multihash::MultihashDigest;
 
 use fil_actor_miner::testing::{
     check_deadline_state_invariants, check_state_invariants, DeadlineStateSummary,

actors/multisig/Cargo.toml

@@ -17,13 +17,13 @@ crate-type = ["cdylib", "lib"]
 fil_actors_runtime = { version = "12.0.0", path = "../../runtime"}
 
 anyhow = "1.0.65"
-cid = { version = "0.8.3", default-features = false, features = ["serde-codec"] }
-frc42_dispatch = "3.2.0"
-fvm_actor_utils = "6.0.0"
-fvm_ipld_blockstore = "0.1.1"
-fvm_ipld_encoding = "0.3.3"
-fvm_ipld_hamt = "0.6.1"
-fvm_shared = { version = "3.2.0", default-features = false }
+cid = { version = "0.10.1", default-features = false, features = ["serde-codec"] }
+frc42_dispatch = "3.3.0"
+fvm_actor_utils = "7.0.0"
+fvm_ipld_blockstore = "0.2.0"
+fvm_ipld_encoding = "0.4.0"
+fvm_ipld_hamt = "0.7.0"
+fvm_shared = { version = "3.4.0", default-features = false }
 indexmap = { version = "1.8.0", features = ["serde-1"] }
 integer-encoding = { version = "3.0.3", default-features = false }
 num-derive = "0.3.3"

actors/paych/Cargo.toml

@@ -15,19 +15,19 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 fil_actors_runtime = { version = "12.0.0", path = "../../runtime" }
-frc42_dispatch = "3.2.0"
-fvm_shared = { version = "3.2.0", default-features = false }
+frc42_dispatch = "3.3.0"
+fvm_shared = { version = "3.4.0", default-features = false }
 num-traits = "0.2.14"
 num-derive = "0.3.3"
 serde = { version = "1.0.136", features = ["derive"] }
-cid = { version = "0.8.3", default-features = false, features = ["serde-codec"] }
+cid = { version = "0.10.1", default-features = false, features = ["serde-codec"] }
 anyhow = "1.0.65"
-fvm_ipld_blockstore = "0.1.1"
-fvm_ipld_encoding = "0.3.3"
+fvm_ipld_blockstore = "0.2.0"
+fvm_ipld_encoding = "0.4.0"
 
 [dev-dependencies]
 fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }
-fvm_ipld_amt = { version = "0.5.1", features = ["go-interop"] }
+fvm_ipld_amt = { version = "0.6.0", features = ["go-interop"] }
 derive_builder = "0.10.2"
 lazy_static = "1.4.0"