chore: update ipld crates (#2085)

* chore: update ipld crates - cid - multihash - ipld-core This is a major breaking change and requires a bit of a refactor. * fix: not cbor
filecoin-project · Nov 22, 2024 · 40c4f33 · 40c4f33
1 parent 54a4da7
commit 40c4f33
Show file tree

Hide file tree

Showing 19 changed files with 154 additions and 154 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,15 +15,16 @@ repository = "https://github.com/filecoin-project/ref-fvm"
 authors = ["Protocol Labs", "Filecoin Core Devs"]
 
 [workspace.dependencies]
-cid = { version = "0.10.1", default-features = false }
-multihash = { version = "0.18.1", default-features = false }
-fvm_ipld_hamt = { version = "0.9.0"}
-fvm_ipld_amt = { version = "0.6.0"}
-fvm_ipld_car = { version = "0.7.0" }
-fvm_ipld_blockstore = { version = "0.2.0" }
-fvm_ipld_encoding = { version = "0.4.0" }
+cid = { version = "0.11.1", default-features = false }
+multihash = { version = "0.19.2", 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_blockstore = { version = "0.3.1" }
+fvm_ipld_encoding = { version = "0.5.1" }
 wasmtime = { version = "25.0.2", default-features = false, features = ["cranelift", "pooling-allocator", "parallel-compilation", "runtime"] }
-wasmtime-environ = "25.0.2"
 
 fvm = { path = "fvm", version = "~2.9.1", default-features = false }
 fvm_shared = { path = "shared", version = "~2.9.1", default-features = false }

diff --git a/fvm/Cargo.toml b/fvm/Cargo.toml
@@ -18,7 +18,8 @@ num-traits = "0.2"
 derive_builder = "0.20.1"
 num-derive = "0.4.0"
 cid = { workspace = true, features = ["serde-codec"] }
-multihash = { workspace = true }
+multihash-codetable = { workspace = true, features = ["sha2", "sha3", "ripemd"] }
+multihash-derive = { workspace = true }
 fvm_shared = { workspace = true, features = ["crypto"] }
 fvm_ipld_hamt = { workspace = true }
 fvm_ipld_amt = { workspace = true }

diff --git a/fvm/src/blockstore/buffered.rs b/fvm/src/blockstore/buffered.rs
@@ -268,10 +268,10 @@ where
 
 #[cfg(test)]
 mod tests {
-    use cid::multihash::{Code, Multihash};
     use fvm_ipld_blockstore::{Blockstore, MemoryBlockstore};
     use fvm_ipld_encoding::CborStore;
     use fvm_shared::{commcid, IDENTITY_HASH};
+    use multihash_codetable::{Code, Multihash};
     use serde::{Deserialize, Serialize};
 
     use super::*;
@@ -357,7 +357,7 @@ mod tests {
             mem.get_cbor::<(Cid, u8)>(&root_cid).unwrap(),
             Some((obj_cid, 1)),
         );
-        assert_eq!(buf_store.get_cbor::<u8>(&identity_cid).unwrap(), None);
+        assert_eq!(buf_store.get(&identity_cid).unwrap(), None);
         assert_eq!(buf_store.get(&unsealed_comm_cid).unwrap(), None);
         assert_eq!(buf_store.get(&sealed_comm_cid).unwrap(), None);
         assert_eq!(mem.get_cbor::<u8>(&unconnected).unwrap(), None);

diff --git a/fvm/src/kernel/default.rs b/fvm/src/kernel/default.rs
@@ -21,7 +21,7 @@ use fvm_shared::sector::SectorInfo;
 use fvm_shared::version::NetworkVersion;
 use fvm_shared::{commcid, ActorID};
 use lazy_static::lazy_static;
-use multihash::MultihashDigest;
+use multihash_codetable::{Code, Multihash, MultihashDigest};
 use rayon::iter::{IndexedParallelIterator, IntoParallelRefIterator, ParallelIterator};
 use std::io::Write;
 
@@ -293,7 +293,7 @@ where
         }
 
         let block = self.blocks.get(id)?;
-        let code = multihash::Code::try_from(hash_fun)
+        let code = Code::try_from(hash_fun)
             .map_err(|_| syscall_error!(IllegalCid; "invalid CID codec"))?;
 
         self.call_manager.charge_gas(
@@ -479,17 +479,12 @@ where
             })
     }
 
-    fn hash(&mut self, code: u64, data: &[u8]) -> Result<MultihashGeneric<64>> {
+    fn hash(&mut self, code: u64, data: &[u8]) -> Result<Multihash> {
         self.call_manager
             .charge_gas(self.call_manager.price_list().on_hashing(data.len()))?;
 
-        let hasher = SupportedHashes::try_from(code).map_err(|e| {
-            if let multihash::Error::UnsupportedCode(code) = e {
-                syscall_error!(IllegalArgument; "unsupported hash code {}", code)
-            } else {
-                syscall_error!(AssertionFailed; "hash expected unsupported code, got {}", e)
-            }
-        })?;
+        let hasher = SupportedHashes::try_from(code)
+            .map_err(|err| syscall_error!(IllegalArgument; "unsupported hash code {}", err.0))?;
         Ok(hasher.digest(data))
     }
 

diff --git a/fvm/src/kernel/hash.rs b/fvm/src/kernel/hash.rs
@@ -1,7 +1,8 @@
-use multihash::derive::Multihash;
-use multihash::{Blake2b256, Blake2b512, Keccak256, Ripemd160, Sha2_256};
+use multihash_codetable::{
+    Blake2b256, Blake2b512, Keccak256, MultihashDigest, Ripemd160, Sha2_256,
+};
 
-#[derive(Clone, Copy, Debug, Eq, Multihash, PartialEq)]
+#[derive(Clone, Copy, Debug, Eq, MultihashDigest, PartialEq)]
 #[mh(alloc_size = 64)]
 /// Codes and hashers supported by FVM.
 /// You _can_ use this hash directly inside of your actor,

diff --git a/fvm/src/kernel/mod.rs b/fvm/src/kernel/mod.rs
@@ -16,6 +16,7 @@ use fvm_shared::sector::{
 };
 use fvm_shared::version::NetworkVersion;
 use fvm_shared::{ActorID, MethodNum};
+use multihash_codetable::Multihash;
 
 mod hash;
 
@@ -25,7 +26,6 @@ pub mod default;
 mod error;
 
 pub use error::{ClassifyResult, Context, ExecutionError, Result, SyscallError};
-use multihash::MultihashGeneric;
 
 use crate::call_manager::CallManager;
 use crate::gas::{Gas, PriceList};
@@ -253,7 +253,7 @@ pub trait CryptoOps {
     /// `digest_out`, returning the size of the digest written to `digest_out`. If `digest_out` is
     /// to small to fit the entire digest, it will be truncated. If too large, the leftover space
     /// will not be overwritten.
-    fn hash(&mut self, code: u64, data: &[u8]) -> Result<MultihashGeneric<64>>;
+    fn hash(&mut self, code: u64, data: &[u8]) -> Result<Multihash>;
 
     /// Computes an unsealed sector CID (CommD) from its constituent piece CIDs (CommPs) and sizes.
     fn compute_unsealed_sector_cid(

diff --git a/fvm/src/lib.rs b/fvm/src/lib.rs
@@ -40,9 +40,9 @@ pub mod system_actor;
 
 pub mod trace;
 
-use cid::multihash::{Code, MultihashDigest};
 use cid::Cid;
 use fvm_ipld_encoding::{to_vec, DAG_CBOR};
+use multihash_codetable::{Code, MultihashDigest};
 
 lazy_static::lazy_static! {
     /// Cid of the empty array Cbor bytes (`EMPTY_ARR_BYTES`).
@@ -57,7 +57,7 @@ mod test {
     use fvm_ipld_blockstore::MemoryBlockstore;
     use fvm_ipld_encoding::CborStore;
     use fvm_shared::state::StateTreeVersion;
-    use multihash::Code;
+    use multihash_codetable::Code;
 
     use crate::call_manager::DefaultCallManager;
     use crate::externs::{Consensus, Externs, Rand};

diff --git a/fvm/src/machine/manifest.rs b/fvm/src/machine/manifest.rs
@@ -35,8 +35,8 @@ pub struct Manifest {
 const fn id_cid(name: &[u8]) -> Cid {
     use std::mem;
 
+    use cid::multihash::Multihash;
     use fvm_shared::{IDENTITY_HASH, IPLD_RAW};
-    use multihash::Multihash;
 
     // This code is ugly because const fns are a bit ugly right now:
     //

diff --git a/fvm/src/state_tree.rs b/fvm/src/state_tree.rs
@@ -5,7 +5,7 @@ use std::cell::RefCell;
 use std::collections::HashMap;
 
 use anyhow::{anyhow, Context as _};
-use cid::{multihash, Cid};
+use cid::Cid;
 use fvm_ipld_blockstore::Blockstore;
 use fvm_ipld_encoding::tuple::*;
 use fvm_ipld_encoding::CborStore;
@@ -208,7 +208,10 @@ where
             }
             StateTreeVersion::V3 | StateTreeVersion::V4 => {
                 let cid = store
-                    .put_cbor(&StateInfo0::default(), multihash::Code::Blake2b256)
+                    .put_cbor(
+                        &StateInfo0::default(),
+                        multihash_codetable::Code::Blake2b256,
+                    )
                     .context("failed to put state info")
                     .or_fatal()?;
                 Some(cid)
@@ -424,7 +427,7 @@ where
         // Set state for init actor in store and update root Cid
         actor.state = self
             .store()
-            .put_cbor(&state, multihash::Code::Blake2b256)
+            .put_cbor(&state, multihash_codetable::Code::Blake2b256)
             .or_fatal()?;
 
         self.set_actor(&crate::init_actor::INIT_ACTOR_ADDR, actor)?;
@@ -484,7 +487,7 @@ where
                 };
                 let root = self
                     .store()
-                    .put_cbor(obj, multihash::Code::Blake2b256)
+                    .put_cbor(obj, multihash_codetable::Code::Blake2b256)
                     .or_fatal()?;
                 Ok(root)
             }
@@ -629,8 +632,6 @@ pub mod json {
 
 #[cfg(test)]
 mod tests {
-    use cid::multihash::Code::Blake2b256;
-    use cid::multihash::Multihash;
     use cid::Cid;
     use fvm_ipld_blockstore::MemoryBlockstore;
     use fvm_ipld_encoding::{CborStore, DAG_CBOR};
@@ -640,6 +641,7 @@ mod tests {
     use fvm_shared::state::StateTreeVersion;
     use fvm_shared::{IDENTITY_HASH, IPLD_RAW};
     use lazy_static::lazy_static;
+    use multihash_codetable::{Code::Blake2b256, Multihash};
 
     use crate::init_actor;
     use crate::init_actor::INIT_ACTOR_ADDR;

diff --git a/fvm/tests/default_kernel/mod.rs b/fvm/tests/default_kernel/mod.rs
@@ -5,7 +5,7 @@ use std::rc::Rc;
 use fvm::kernel::default::DefaultKernel;
 use fvm::kernel::{Block, BlockRegistry};
 use fvm::Kernel;
-use multihash::Code;
+use multihash_codetable::Code;
 use num_traits::Zero;
 
 use super::*;

diff --git a/fvm/tests/default_kernel/ops.rs b/fvm/tests/default_kernel/ops.rs
@@ -7,7 +7,7 @@ mod ipld {
     use fvm::machine::Machine;
     use fvm_ipld_blockstore::Blockstore;
     use fvm_ipld_encoding::DAG_CBOR;
-    use multihash::MultihashDigest;
+    use multihash_codetable::MultihashDigest;
     use pretty_assertions::{assert_eq, assert_ne};
 
     use super::*;

diff --git a/fvm/tests/dummy.rs b/fvm/tests/dummy.rs
@@ -15,7 +15,7 @@ use fvm_ipld_encoding::CborStore;
 use fvm_shared::address::Address;
 use fvm_shared::state::StateTreeVersion;
 use fvm_shared::version::NetworkVersion;
-use multihash::Code;
+use multihash_codetable::Code;
 
 pub const STUB_NETWORK_VER: NetworkVersion = NetworkVersion::V15;
 

diff --git a/shared/Cargo.toml b/shared/Cargo.toml
@@ -19,7 +19,7 @@ data-encoding-macro = "0.1.12"
 lazy_static = "1.4.0"
 log = "0.4.8"
 cid = { workspace = true, features = ["serde-codec", "std"] }
-multihash = { workspace = true, features = ["multihash-impl", "sha2", "sha3", "ripemd"] }
+multihash = { workspace = true }
 unsigned-varint = "0.8.0"
 anyhow = "1.0.51"
 fvm_ipld_blockstore = { workspace = true }
@@ -42,7 +42,8 @@ byteorder = "1.4.3"
 rand = "0.8"
 rand_chacha = "0.3"
 serde_json = "1.0.56"
-multihash = { workspace = true, features = ["multihash-impl", "sha2", "sha3", "ripemd"] }
+multihash = { workspace = true }
+multihash-codetable = { workspace = true, features = ["sha2", "sha3", "ripemd"] }
 
 [features]
 default = []

diff --git a/shared/src/crypto/hash.rs b/shared/src/crypto/hash.rs
@@ -7,3 +7,9 @@ pub enum SupportedHashes {
     Keccak256 = 0x1b,
     Ripemd160 = 0x1053,
 }
+
+impl From<SupportedHashes> for u64 {
+    fn from(value: SupportedHashes) -> Self {
+        value as Self
+    }
+}
diff --git a/shared/tests/commcid_tests.rs b/shared/tests/commcid_tests.rs
@@ -1,9 +1,9 @@
 // Copyright 2019-2022 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
-use cid::multihash::{Code, Multihash, MultihashDigest};
 use cid::Cid;
 use fvm_shared::commcid::*;
+use multihash_codetable::{Code, Multihash, MultihashDigest};
 use rand::{thread_rng, Rng};
 
 fn rand_comm() -> Commitment {

diff --git a/testing/conformance/Cargo.toml b/testing/conformance/Cargo.toml
@@ -24,7 +24,6 @@ derive_builder = "0.20.1"
 ahash = "0.8"
 num-derive = "0.4.0"
 cid = { workspace = true }
-multihash = { workspace = true }
 serde = { version = "1.0", features = ["derive"] }
 serde_tuple = "0.5"
 serde_repr = "0.1"
@@ -47,7 +46,7 @@ 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"] }
+ipld-core = { version = "0.4.1", features = ["serde"] }
 tar = { version = "0.4.38", default-features = false }
 zstd = { version = "0.13.2", default-features = false }
 

diff --git a/testing/conformance/src/driver.rs b/testing/conformance/src/driver.rs
@@ -13,8 +13,8 @@ use fvm_shared::address::Protocol;
 use fvm_shared::crypto::signature::SECP_SIG_LEN;
 use fvm_shared::message::Message;
 use fvm_shared::receipt::Receipt;
+use ipld_core::ipld::Ipld;
 use lazy_static::lazy_static;
-use libipld_core::ipld::Ipld;
 use regex::Regex;
 use walkdir::DirEntry;
 

diff --git a/testing/conformance/src/vm.rs b/testing/conformance/src/vm.rs
@@ -1,5 +1,6 @@
 use std::convert::TryFrom;
 
+use cid::multihash::Multihash;
 use cid::Cid;
 use fvm::call_manager::{CallManager, DefaultCallManager, FinishRet, InvocationResult};
 use fvm::gas::{Gas, GasTracker, PriceList};
@@ -26,7 +27,6 @@ use fvm_shared::sector::{
 };
 use fvm_shared::version::NetworkVersion;
 use fvm_shared::{ActorID, MethodNum, TOTAL_FILECOIN};
-use multihash::MultihashGeneric;
 
 use crate::externs::TestExterns;
 use crate::vector::{MessageVector, Variant};
@@ -389,7 +389,7 @@ where
     K: Kernel<CallManager = TestCallManager<C>>,
 {
     // forwarded
-    fn hash(&mut self, code: u64, data: &[u8]) -> Result<MultihashGeneric<64>> {
+    fn hash(&mut self, code: u64, data: &[u8]) -> Result<Multihash<64>> {
         self.0.hash(code, data)
     }