chore(deps): upgrade fvm_shared and cid

Cargo.toml

@@ -39,27 +39,27 @@ anyhow = "1.0"
 base64 = "0.22"
 bitflags = "2.4.2"
 byteorder = "1.4.3"
-cid = { version = "0.10", default-features = false, features = ["std"] }
-frc42_dispatch = "7.0.0"
-frc42_macros = "5"
-frc46_token = "11"
-fvm_ipld_amt = "0.6.1"
-fvm_ipld_bitfield = "0.6"
-fvm_ipld_blockstore = "0.2"
-fvm_ipld_encoding = "0.4"
-fvm_ipld_hamt = "0.9.0"
+cid = { version = "0.11", default-features = false, features = ["std"] }
+frc42_dispatch = "8"
+frc42_macros = "6"
+frc46_token = "12"
+fvm_ipld_amt = "0.7"
+fvm_ipld_bitfield = "0.7"
+fvm_ipld_blockstore = "0.3"
+fvm_ipld_encoding = "0.5"
+fvm_ipld_hamt = "0.10"
 fvm_shared = { version = "~2", default-features = false }
 fvm_shared3 = { package = "fvm_shared", version = "~3", default-features = false }
 fvm_shared4 = { package = "fvm_shared", version = "~4", default-features = false }
 hex = "0.4.3"
 hex-literal = "0.4"
 indexmap = { version = "2", features = ["serde"] }
 integer-encoding = { version = "4", default-features = false }
+ipld-core = { version = "0.4", features = ["serde"] }
 itertools = "0.13"
 lazy_static = "1.4"
-libipld-core = "0.16"
 log = "0.4"
-multihash = "0.18"
+multihash-codetable = { version = "0.1", features = ["sha2"] }
 num = "0.4.0"
 num-bigint = { version = "0.4.3", features = ["serde"] }
 num-derive = "0.4"
@@ -77,7 +77,7 @@ serde_repr = "0.1.18"
 serde_tuple = "1.0"
 serde_yaml = "0.9"
 sha2 = "0.10.8"
-thiserror = "1.0"
+thiserror = "2"
 toml = "0.8"
 uint = { version = "0.9.3", default-features = false }
 unsigned-varint = "0.8"

actors/market/Cargo.toml

@@ -25,8 +25,9 @@ fvm_ipld_hamt = { workspace = true }
 fvm_shared = { workspace = true }
 fvm_shared3 = { workspace = true }
 fvm_shared4 = { workspace = true }
+ipld-core = { workspace = true }
 lazy_static = { workspace = true }
-libipld-core = { workspace = true }
+multihash-codetable = { workspace = true }
 num-bigint = { workspace = true }
 num-derive = { workspace = true }
 num-traits = { workspace = true }

actors/market/src/v10/deal.rs

@@ -11,7 +11,7 @@ use fvm_shared3::commcid::{FIL_COMMITMENT_UNSEALED, SHA2_256_TRUNC254_PADDED};
 use fvm_shared3::crypto::signature::Signature;
 use fvm_shared3::econ::TokenAmount;
 use fvm_shared3::piece::PaddedPieceSize;
-use libipld_core::ipld::Ipld;
+use ipld_core::ipld::Ipld;
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use std::convert::{TryFrom, TryInto};
 

actors/market/src/v11/deal.rs

@@ -11,7 +11,7 @@ use fvm_shared3::commcid::{FIL_COMMITMENT_UNSEALED, SHA2_256_TRUNC254_PADDED};
 use fvm_shared3::crypto::signature::Signature;
 use fvm_shared3::econ::TokenAmount;
 use fvm_shared3::piece::PaddedPieceSize;
-use libipld_core::ipld::Ipld;
+use ipld_core::ipld::Ipld;
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use std::convert::{TryFrom, TryInto};
 

actors/market/src/v12/deal.rs

@@ -11,7 +11,7 @@ use fvm_shared4::commcid::{FIL_COMMITMENT_UNSEALED, SHA2_256_TRUNC254_PADDED};
 use fvm_shared4::crypto::signature::Signature;
 use fvm_shared4::econ::TokenAmount;
 use fvm_shared4::piece::PaddedPieceSize;
-use libipld_core::ipld::Ipld;
+use ipld_core::ipld::Ipld;
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use std::convert::{TryFrom, TryInto};
 

actors/market/src/v13/deal.rs

@@ -11,7 +11,7 @@ use fvm_shared4::crypto::signature::Signature;
 use fvm_shared4::econ::TokenAmount;
 use fvm_shared4::piece::PaddedPieceSize;
 use fvm_shared4::sector::SectorNumber;
-use libipld_core::ipld::Ipld;
+use ipld_core::ipld::Ipld;
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use std::convert::{TryFrom, TryInto};
 

actors/market/src/v14/deal.rs

@@ -11,7 +11,7 @@ use fvm_shared4::crypto::signature::Signature;
 use fvm_shared4::econ::TokenAmount;
 use fvm_shared4::piece::PaddedPieceSize;
 use fvm_shared4::sector::SectorNumber;
-use libipld_core::ipld::Ipld;
+use ipld_core::ipld::Ipld;
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use std::convert::{TryFrom, TryInto};
 

actors/market/src/v15/deal.rs

@@ -11,7 +11,7 @@ use fvm_shared4::crypto::signature::Signature;
 use fvm_shared4::econ::TokenAmount;
 use fvm_shared4::piece::PaddedPieceSize;
 use fvm_shared4::sector::SectorNumber;
-use libipld_core::ipld::Ipld;
+use ipld_core::ipld::Ipld;
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use std::convert::{TryFrom, TryInto};
 

actors/market/src/v8/deal.rs

@@ -1,7 +1,6 @@
 // Copyright 2019-2022 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
-use cid::multihash::MultihashDigest;
 use cid::Cid;
 use fil_actors_shared::v8::DealWeight;
 use fvm_ipld_encoding::tuple::*;
@@ -11,7 +10,8 @@ use fvm_shared::clock::ChainEpoch;
 use fvm_shared::crypto::signature::Signature;
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::piece::PaddedPieceSize;
-use libipld_core::ipld::Ipld;
+use ipld_core::ipld::Ipld;
+use multihash_codetable::{Code, MultihashDigest};
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use std::convert::{TryFrom, TryInto};
 
@@ -128,7 +128,7 @@ impl DealProposal {
         let bytes = fvm_ipld_encoding::to_vec(self)?;
         Ok(Cid::new_v1(
             fvm_ipld_encoding::DAG_CBOR,
-            cid::multihash::Code::Blake2b256.digest(&bytes),
+            Code::Blake2b256.digest(&bytes),
         ))
     }
 }
@@ -153,8 +153,8 @@ pub struct DealState {
 #[cfg(feature = "arb")]
 impl quickcheck::Arbitrary for DealProposal {
     fn arbitrary(g: &mut quickcheck::Gen) -> Self {
-        use cid::multihash::Code::Blake2b256;
         use fvm_ipld_encoding::DAG_CBOR;
+        use multihash_codetable::Code::Blake2b256;
 
         Self {
             piece_cid: Cid::new_v1(DAG_CBOR, Blake2b256.digest(String::arbitrary(g).as_bytes())),

actors/market/src/v9/deal.rs

@@ -10,7 +10,7 @@ use fvm_shared::clock::ChainEpoch;
 use fvm_shared::crypto::signature::Signature;
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::piece::PaddedPieceSize;
-use libipld_core::ipld::Ipld;
+use ipld_core::ipld::Ipld;
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use std::convert::{TryFrom, TryInto};
 

actors/miner/Cargo.toml

@@ -31,7 +31,7 @@ fvm_shared3 = { workspace = true }
 fvm_shared4 = { workspace = true }
 itertools = { workspace = true }
 lazy_static = { workspace = true }
-multihash = { workspace = true }
+multihash-codetable = { workspace = true }
 num-bigint = { workspace = true }
 num-derive = { workspace = true }
 num-traits = { workspace = true }

actors/miner/src/v10/commd.rs

@@ -1,12 +1,12 @@
 // Copyright 2019-2022 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
+use cid::multihash::Multihash;
 use cid::{Cid, Version};
 use fil_actors_shared::actor_error_v10;
 use fil_actors_shared::v10::ActorError;
 use fvm_shared3::commcid::{FIL_COMMITMENT_UNSEALED, SHA2_256_TRUNC254_PADDED};
 use fvm_shared3::sector::RegisteredSealProof;
-use multihash::Multihash;
 use serde::{Deserialize, Serialize};
 
 /// `CompactCommD` represents a Cid with compact representation of context dependent zero value

actors/miner/src/v10/deadline_state.rs

@@ -5,7 +5,6 @@ use std::cmp;
 use std::collections::BTreeSet;
 
 use anyhow::anyhow;
-use cid::multihash::Code;
 use cid::Cid;
 use fil_actors_shared::actor_error_v10;
 use fil_actors_shared::v10::runtime::Policy;
@@ -18,6 +17,7 @@ use fvm_shared3::clock::{ChainEpoch, QuantSpec};
 use fvm_shared3::econ::TokenAmount;
 use fvm_shared3::error::ExitCode;
 use fvm_shared3::sector::{PoStProof, SectorSize};
+use multihash_codetable::Code;
 use num_traits::{Signed, Zero};
 
 use super::SECTORS_AMT_BITWIDTH;

actors/miner/src/v10/state.rs

@@ -5,7 +5,6 @@ use std::cmp;
 use std::ops::Neg;
 
 use anyhow::{anyhow, Error};
-use cid::multihash::Code;
 use cid::Cid;
 use fil_actors_shared::actor_error_v10;
 use fil_actors_shared::v10::runtime::Policy;
@@ -25,6 +24,7 @@ use fvm_shared3::error::ExitCode;
 use fvm_shared3::sector::{RegisteredPoStProof, SectorNumber, SectorSize, MAX_SECTOR_NUMBER};
 use fvm_shared3::{ActorID, HAMT_BIT_WIDTH};
 use itertools::Itertools;
+use multihash_codetable::Code;
 use num_traits::Zero;
 
 use super::beneficiary::*;

actors/miner/src/v11/commd.rs

@@ -1,12 +1,12 @@
 // Copyright 2019-2022 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
+use cid::multihash::Multihash;
 use cid::{Cid, Version};
 use fil_actors_shared::actor_error_v11;
 use fil_actors_shared::v11::ActorError;
 use fvm_shared3::commcid::{FIL_COMMITMENT_UNSEALED, SHA2_256_TRUNC254_PADDED};
 use fvm_shared3::sector::RegisteredSealProof;
-use multihash::Multihash;
 use serde::{Deserialize, Serialize};
 
 /// CompactCommD represents a Cid with compact representation of context dependant zero value

actors/miner/src/v11/deadline_state.rs

@@ -5,7 +5,6 @@ use std::cmp;
 use std::collections::BTreeSet;
 
 use anyhow::anyhow;
-use cid::multihash::Code;
 use cid::Cid;
 use fil_actors_shared::actor_error_v11;
 use fil_actors_shared::v11::runtime::Policy;
@@ -18,6 +17,7 @@ use fvm_shared3::clock::{ChainEpoch, QuantSpec};
 use fvm_shared3::econ::TokenAmount;
 use fvm_shared3::error::ExitCode;
 use fvm_shared3::sector::{PoStProof, SectorSize};
+use multihash_codetable::Code;
 use num_traits::{Signed, Zero};
 
 use super::SECTORS_AMT_BITWIDTH;

actors/miner/src/v11/state.rs

@@ -5,7 +5,6 @@ use std::cmp;
 use std::ops::Neg;
 
 use anyhow::{anyhow, Error};
-use cid::multihash::Code;
 use cid::Cid;
 use fil_actors_shared::actor_error_v11;
 use fil_actors_shared::v11::runtime::Policy;
@@ -19,6 +18,7 @@ use fvm_ipld_encoding::tuple::*;
 use fvm_ipld_encoding::{strict_bytes, BytesDe, CborStore};
 use fvm_ipld_hamt::Error as HamtError;
 use fvm_shared3::address::Address;
+use multihash_codetable::Code;
 
 use fvm_shared3::clock::{ChainEpoch, QuantSpec, EPOCH_UNDEFINED};
 use fvm_shared3::econ::TokenAmount;

actors/miner/src/v12/deadline_state.rs

@@ -5,7 +5,6 @@ use std::cmp;
 use std::collections::BTreeSet;
 
 use anyhow::anyhow;
-use cid::multihash::Code;
 use cid::Cid;
 use fil_actors_shared::actor_error_v12;
 use fil_actors_shared::v12::runtime::Policy;
@@ -18,6 +17,7 @@ use fvm_shared4::clock::{ChainEpoch, QuantSpec};
 use fvm_shared4::econ::TokenAmount;
 use fvm_shared4::error::ExitCode;
 use fvm_shared4::sector::{PoStProof, SectorSize};
+use multihash_codetable::Code;
 use num_traits::{Signed, Zero};
 
 use super::{

actors/miner/src/v12/state.rs

@@ -5,7 +5,6 @@ use std::cmp;
 use std::ops::Neg;
 
 use anyhow::{anyhow, Error};
-use cid::multihash::Code;
 use cid::Cid;
 use fil_actors_shared::actor_error_v12;
 use fil_actors_shared::v12::runtime::Policy;
@@ -19,6 +18,7 @@ use fvm_ipld_encoding::tuple::*;
 use fvm_ipld_encoding::{strict_bytes, BytesDe, CborStore};
 use fvm_ipld_hamt::Error as HamtError;
 use fvm_shared4::address::Address;
+use multihash_codetable::Code;
 
 use fvm_shared4::clock::{ChainEpoch, QuantSpec, EPOCH_UNDEFINED};
 use fvm_shared4::econ::TokenAmount;

actors/miner/src/v13/deadline_state.rs

@@ -5,7 +5,6 @@ use std::cmp;
 use std::collections::BTreeSet;
 
 use anyhow::anyhow;
-use cid::multihash::Code;
 use cid::Cid;
 use fil_actors_shared::actor_error_v13;
 use fil_actors_shared::v13::runtime::Policy;
@@ -18,6 +17,7 @@ use fvm_shared4::clock::{ChainEpoch, QuantSpec};
 use fvm_shared4::econ::TokenAmount;
 use fvm_shared4::error::ExitCode;
 use fvm_shared4::sector::{PoStProof, SectorSize};
+use multihash_codetable::Code;
 use num_traits::{Signed, Zero};
 
 use super::{

actors/miner/src/v13/state.rs

@@ -6,7 +6,6 @@ use std::cmp;
 use std::ops::Neg;
 
 use anyhow::{anyhow, Error};
-use cid::multihash::Code;
 use cid::Cid;
 use fil_actors_shared::actor_error_v13;
 use fil_actors_shared::v13::runtime::Policy;
@@ -21,6 +20,7 @@ use fvm_ipld_encoding::tuple::*;
 use fvm_ipld_encoding::{strict_bytes, BytesDe, CborStore};
 use fvm_ipld_hamt::Error as HamtError;
 use fvm_shared4::address::Address;
+use multihash_codetable::Code;
 
 use fvm_shared4::clock::{ChainEpoch, QuantSpec, EPOCH_UNDEFINED};
 use fvm_shared4::econ::TokenAmount;

actors/miner/src/v14/deadline_state.rs

@@ -5,7 +5,6 @@ use std::cmp;
 use std::collections::BTreeSet;
 
 use anyhow::anyhow;
-use cid::multihash::Code;
 use cid::Cid;
 use fvm_ipld_bitfield::BitField;
 use fvm_ipld_blockstore::Blockstore;
@@ -15,6 +14,7 @@ use fvm_shared4::clock::ChainEpoch;
 use fvm_shared4::econ::TokenAmount;
 use fvm_shared4::error::ExitCode;
 use fvm_shared4::sector::{PoStProof, SectorSize};
+use multihash_codetable::Code;
 use num_traits::{Signed, Zero};
 
 use fil_actors_shared::actor_error_v14;

actors/miner/src/v14/state.rs

@@ -6,7 +6,6 @@ use std::cmp;
 use std::ops::Neg;
 
 use anyhow::{anyhow, Error};
-use cid::multihash::Code;
 use cid::Cid;
 use fvm_ipld_amt::Error as AmtError;
 use fvm_ipld_bitfield::BitField;
@@ -20,6 +19,7 @@ use fvm_shared4::error::ExitCode;
 use fvm_shared4::sector::{RegisteredPoStProof, SectorNumber, SectorSize};
 use fvm_shared4::{ActorID, HAMT_BIT_WIDTH};
 use itertools::Itertools;
+use multihash_codetable::Code;
 use num_traits::Zero;
 
 use fil_actors_shared::actor_error_v14;

actors/miner/src/v15/deadline_state.rs

@@ -5,7 +5,6 @@ use std::cmp;
 use std::collections::BTreeSet;
 
 use anyhow::anyhow;
-use cid::multihash::Code;
 use cid::Cid;
 use fvm_ipld_bitfield::BitField;
 use fvm_ipld_blockstore::Blockstore;
@@ -15,6 +14,7 @@ use fvm_shared4::clock::ChainEpoch;
 use fvm_shared4::econ::TokenAmount;
 use fvm_shared4::error::ExitCode;
 use fvm_shared4::sector::{PoStProof, SectorSize};
+use multihash_codetable::Code;
 use num_traits::{Signed, Zero};
 
 use fil_actors_shared::actor_error_v15;

actors/miner/src/v15/state.rs

@@ -6,7 +6,6 @@ use std::cmp;
 use std::ops::Neg;
 
 use anyhow::{anyhow, Error};
-use cid::multihash::Code;
 use cid::Cid;
 use fvm_ipld_amt::Error as AmtError;
 use fvm_ipld_bitfield::BitField;
@@ -20,6 +19,7 @@ use fvm_shared4::error::ExitCode;
 use fvm_shared4::sector::{RegisteredPoStProof, SectorNumber, SectorSize};
 use fvm_shared4::{ActorID, HAMT_BIT_WIDTH};
 use itertools::Itertools;
+use multihash_codetable::Code;
 use num_traits::Zero;
 
 use fil_actors_shared::actor_error_v15;