chore(deps): bump fvm_shared

Cargo.toml

@@ -21,7 +21,7 @@ members = [
 resolver = "3"
 
 [workspace.package]
-version = "21.1.0"
+version = "22.0.0"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/ChainSafe/fil-actor-states"
 authors = [
@@ -39,9 +39,9 @@ base64 = "0.22"
 bitflags = "2"
 byteorder = "1"
 cid = { version = "0.11", default-features = false, features = ["std"] }
-frc42_dispatch = "9"
-frc42_macros = "7"
-frc46_token = "13"
+frc42_dispatch = "10"
+frc42_macros = "8"
+frc46_token = "14"
 fvm_ipld_amt = "0.7"
 fvm_ipld_bitfield = "0.7"
 fvm_ipld_blockstore = "0.3"
@@ -81,18 +81,18 @@ toml = "0.8"
 uint = { version = "0.10", default-features = false }
 unsigned-varint = "0.8"
 
-fil_actor_account_state = { version = "21.1.0", path = "./actors/account" }
-fil_actor_cron_state = { version = "21.1.0", path = "./actors/cron" }
-fil_actor_datacap_state = { version = "21.1.0", path = "./actors/datacap" }
-fil_actor_evm_state = { version = "21.1.0", path = "./actors/evm" }
-fil_actor_init_state = { version = "21.1.0", path = "./actors/init" }
-fil_actor_market_state = { version = "21.1.0", path = "./actors/market" }
-fil_actor_miner_state = { version = "21.1.0", path = "./actors/miner" }
-fil_actor_multisig_state = { version = "21.1.0", path = "./actors/multisig" }
-fil_actor_power_state = { version = "21.1.0", path = "./actors/power" }
-fil_actor_reward_state = { version = "21.1.0", path = "./actors/reward" }
-fil_actor_system_state = { version = "21.1.0", path = "./actors/system" }
-fil_actor_verifreg_state = { version = "21.1.0", path = "./actors/verifreg" }
-fil_actors_shared = { version = "21.1.0", path = "./fil_actors_shared" }
+fil_actor_account_state = { version = "22.0.0", path = "./actors/account" }
+fil_actor_cron_state = { version = "22.0.0", path = "./actors/cron" }
+fil_actor_datacap_state = { version = "22.0.0", path = "./actors/datacap" }
+fil_actor_evm_state = { version = "22.0.0", path = "./actors/evm" }
+fil_actor_init_state = { version = "22.0.0", path = "./actors/init" }
+fil_actor_market_state = { version = "22.0.0", path = "./actors/market" }
+fil_actor_miner_state = { version = "22.0.0", path = "./actors/miner" }
+fil_actor_multisig_state = { version = "22.0.0", path = "./actors/multisig" }
+fil_actor_power_state = { version = "22.0.0", path = "./actors/power" }
+fil_actor_reward_state = { version = "22.0.0", path = "./actors/reward" }
+fil_actor_system_state = { version = "22.0.0", path = "./actors/system" }
+fil_actor_verifreg_state = { version = "22.0.0", path = "./actors/verifreg" }
+fil_actors_shared = { version = "22.0.0", path = "./fil_actors_shared" }
 
 fil_actors_test_utils = { path = "./fil_actors_test_utils" }

actors/market/src/v12/policy.rs

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use fil_actors_shared::v12::runtime::Policy;
+use fvm_shared3::TOTAL_FILECOIN;
 use fvm_shared4::bigint::{BigInt, Integer};
 use fvm_shared4::econ::TokenAmount;
 use fvm_shared4::piece::PaddedPieceSize;
 use fvm_shared4::sector::StoragePower;
-use fvm_shared4::TOTAL_FILECOIN;
 use std::cmp::max;
 
 pub mod detail {
@@ -33,7 +33,7 @@ pub fn deal_provider_collateral_bounds(
     let denom: BigInt = power_share_denom * policy.prov_collateral_percent_supply_denom;
     (
         TokenAmount::from_atto(num.div_floor(&denom)),
-        TOTAL_FILECOIN.clone(),
+        TokenAmount::from_atto(TOTAL_FILECOIN.atto().clone()),
     )
 }
 

actors/market/src/v13/ext.rs

@@ -4,8 +4,8 @@ use fvm_shared4::address::Address;
 use fvm_shared4::bigint::bigint_ser;
 use fvm_shared4::econ::TokenAmount;
 
+use fvm_shared3::smooth::FilterEstimate;
 use fvm_shared4::sector::StoragePower;
-use fvm_shared4::smooth::FilterEstimate;
 
 pub mod account {
     use super::*;

actors/market/src/v13/policy.rs

@@ -4,11 +4,11 @@
 use std::cmp::max;
 
 use fil_actors_shared::v13::runtime::Policy;
+use fvm_shared3::TOTAL_FILECOIN;
 use fvm_shared4::bigint::{BigInt, Integer};
 use fvm_shared4::econ::TokenAmount;
 use fvm_shared4::piece::PaddedPieceSize;
 use fvm_shared4::sector::StoragePower;
-use fvm_shared4::TOTAL_FILECOIN;
 
 pub mod detail {
     /// Maximum length of a deal label.
@@ -34,7 +34,7 @@ pub fn deal_provider_collateral_bounds(
     let denom: BigInt = power_share_denom * policy.prov_collateral_percent_supply_denom;
     (
         TokenAmount::from_atto(num.div_floor(&denom)),
-        TOTAL_FILECOIN.clone(),
+        TokenAmount::from_atto(TOTAL_FILECOIN.atto().clone()),
     )
 }
 

actors/miner/src/v12/bitfield_queue.rs

@@ -8,7 +8,8 @@ use fil_actors_shared::v12::{ActorDowncast, Array};
 use fvm_ipld_amt::Error as AmtError;
 use fvm_ipld_bitfield::BitField;
 use fvm_ipld_blockstore::Blockstore;
-use fvm_shared4::clock::{ChainEpoch, QuantSpec};
+use fvm_shared3::clock::QuantSpec;
+use fvm_shared4::clock::ChainEpoch;
 use itertools::Itertools;
 
 /// Wrapper for working with an AMT[ChainEpoch]*Bitfield functioning as a queue, bucketed by epoch.

actors/miner/src/v12/deadline_info.rs

@@ -1,7 +1,8 @@
 // Copyright 2019-2022 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
-use fvm_shared4::clock::{ChainEpoch, QuantSpec};
+use fvm_shared3::clock::QuantSpec;
+use fvm_shared4::clock::ChainEpoch;
 use serde::{Deserialize, Serialize};
 
 /// Deadline calculations with respect to a current epoch.

actors/miner/src/v12/deadline_state.rs

@@ -13,7 +13,8 @@ use fvm_ipld_bitfield::BitField;
 use fvm_ipld_blockstore::Blockstore;
 use fvm_ipld_encoding::tuple::*;
 use fvm_ipld_encoding::CborStore;
-use fvm_shared4::clock::{ChainEpoch, QuantSpec};
+use fvm_shared3::clock::QuantSpec;
+use fvm_shared4::clock::ChainEpoch;
 use fvm_shared4::econ::TokenAmount;
 use fvm_shared4::error::ExitCode;
 use fvm_shared4::sector::{PoStProof, SectorSize};

actors/miner/src/v12/deadlines.rs

@@ -5,7 +5,8 @@ use fil_actors_shared::v12::runtime::Policy;
 use fil_actors_shared::v12::Array;
 
 use fvm_ipld_blockstore::Blockstore;
-use fvm_shared4::clock::{ChainEpoch, QuantSpec};
+use fvm_shared3::clock::QuantSpec;
+use fvm_shared4::clock::ChainEpoch;
 use fvm_shared4::sector::SectorNumber;
 
 use super::{DeadlineInfo, Deadlines, Partition};

actors/miner/src/v12/expiration_queue.rs

@@ -13,7 +13,8 @@ use fvm_ipld_bitfield::BitField;
 use fvm_ipld_blockstore::Blockstore;
 use fvm_ipld_encoding::tuple::*;
 
-use fvm_shared4::clock::{ChainEpoch, QuantSpec};
+use fvm_shared3::clock::QuantSpec;
+use fvm_shared4::clock::ChainEpoch;
 use fvm_shared4::econ::TokenAmount;
 use fvm_shared4::sector::{SectorNumber, SectorSize};
 use num_traits::{Signed, Zero};

actors/miner/src/v12/monies.rs

@@ -5,12 +5,12 @@ use std::cmp::{self, max};
 
 use fil_actors_shared::v12::network::EPOCHS_IN_DAY;
 use fil_actors_shared::v12::EXPECTED_LEADERS_PER_EPOCH;
+use fvm_shared3::math::PRECISION;
+use fvm_shared3::smooth::{self, FilterEstimate};
 use fvm_shared4::bigint::{BigInt, Integer};
 use fvm_shared4::clock::ChainEpoch;
 use fvm_shared4::econ::TokenAmount;
-use fvm_shared4::math::PRECISION;
 use fvm_shared4::sector::StoragePower;
-use fvm_shared4::smooth::{self, FilterEstimate};
 use lazy_static::lazy_static;
 use num_traits::Zero;
 

actors/miner/src/v12/partition_state.rs

@@ -12,8 +12,9 @@ use fil_actors_shared::v12::{ActorDowncast, Array};
 use fvm_ipld_bitfield::BitField;
 use fvm_ipld_blockstore::Blockstore;
 use fvm_ipld_encoding::tuple::*;
+use fvm_shared3::clock::{QuantSpec, NO_QUANTIZATION};
 use fvm_shared4::bigint::bigint_ser;
-use fvm_shared4::clock::{ChainEpoch, QuantSpec, NO_QUANTIZATION};
+use fvm_shared4::clock::ChainEpoch;
 use fvm_shared4::econ::TokenAmount;
 use fvm_shared4::error::ExitCode;
 use fvm_shared4::sector::{SectorSize, StoragePower};

actors/miner/src/v12/policy.rs

@@ -7,13 +7,12 @@ use cid::{Cid, Version};
 use fil_actors_shared::v12::network::*;
 use fil_actors_shared::v12::runtime::Policy;
 use fil_actors_shared::v12::{DealWeight, EXPECTED_LEADERS_PER_EPOCH};
+use fvm_shared3::sector::SectorQuality;
 use fvm_shared4::bigint::{BigInt, Integer};
 use fvm_shared4::clock::ChainEpoch;
 use fvm_shared4::commcid::{FIL_COMMITMENT_SEALED, POSEIDON_BLS12_381_A1_FC1};
 use fvm_shared4::econ::TokenAmount;
-use fvm_shared4::sector::{
-    RegisteredPoStProof, RegisteredSealProof, SectorQuality, SectorSize, StoragePower,
-};
+use fvm_shared4::sector::{RegisteredPoStProof, RegisteredSealProof, SectorSize, StoragePower};
 use lazy_static::lazy_static;
 
 use super::types::SectorOnChainInfo;

actors/miner/src/v12/sectors.rs

@@ -10,8 +10,9 @@ use fil_actors_shared::v12::{ActorDowncast, ActorError, Array};
 use fvm_ipld_amt::Error as AmtError;
 use fvm_ipld_bitfield::BitField;
 use fvm_ipld_blockstore::Blockstore;
+use fvm_shared3::sector::MAX_SECTOR_NUMBER;
 use fvm_shared4::error::ExitCode;
-use fvm_shared4::sector::{SectorNumber, MAX_SECTOR_NUMBER};
+use fvm_shared4::sector::SectorNumber;
 
 use super::SectorOnChainInfo;
 

actors/miner/src/v12/state.rs

@@ -20,10 +20,12 @@ 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_shared3::clock::QuantSpec;
+use fvm_shared3::sector::MAX_SECTOR_NUMBER;
+use fvm_shared4::clock::{ChainEpoch, EPOCH_UNDEFINED};
 use fvm_shared4::econ::TokenAmount;
 use fvm_shared4::error::ExitCode;
-use fvm_shared4::sector::{RegisteredPoStProof, SectorNumber, SectorSize, MAX_SECTOR_NUMBER};
+use fvm_shared4::sector::{RegisteredPoStProof, SectorNumber, SectorSize};
 use fvm_shared4::{ActorID, HAMT_BIT_WIDTH};
 use itertools::Itertools;
 use num_traits::Zero;

actors/miner/src/v12/types.rs

@@ -5,6 +5,7 @@ use cid::Cid;
 use fvm_ipld_bitfield::BitField;
 use fvm_ipld_encoding::tuple::*;
 use fvm_ipld_encoding::{strict_bytes, BytesDe};
+use fvm_shared3::smooth::FilterEstimate;
 use fvm_shared4::address::Address;
 use fvm_shared4::bigint::bigint_ser;
 use fvm_shared4::clock::ChainEpoch;
@@ -15,7 +16,6 @@ use fvm_shared4::sector::{
     PoStProof, RegisteredPoStProof, RegisteredSealProof, RegisteredUpdateProof, SectorNumber,
     SectorSize, StoragePower,
 };
-use fvm_shared4::smooth::FilterEstimate;
 use serde::{Deserialize, Serialize};
 
 use fil_actors_shared::v12::DealWeight;

actors/miner/src/v12/vesting_state.rs

@@ -4,7 +4,8 @@
 use std::{iter, mem};
 
 use fvm_ipld_encoding::tuple::*;
-use fvm_shared4::clock::{ChainEpoch, QuantSpec};
+use fvm_shared3::clock::QuantSpec;
+use fvm_shared4::clock::ChainEpoch;
 use fvm_shared4::econ::TokenAmount;
 use itertools::{EitherOrBoth, Itertools};
 use num_traits::Zero;

actors/miner/src/v13/bitfield_queue.rs

@@ -8,7 +8,8 @@ use fil_actors_shared::v13::{ActorDowncast, Array};
 use fvm_ipld_amt::Error as AmtError;
 use fvm_ipld_bitfield::BitField;
 use fvm_ipld_blockstore::Blockstore;
-use fvm_shared4::clock::{ChainEpoch, QuantSpec};
+use fvm_shared3::clock::QuantSpec;
+use fvm_shared4::clock::ChainEpoch;
 use itertools::Itertools;
 
 /// Wrapper for working with an AMT[ChainEpoch]*Bitfield functioning as a queue, bucketed by epoch.

actors/miner/src/v13/deadline_info.rs

@@ -1,7 +1,8 @@
 // Copyright 2019-2022 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
-use fvm_shared4::clock::{ChainEpoch, QuantSpec};
+use fvm_shared3::clock::QuantSpec;
+use fvm_shared4::clock::ChainEpoch;
 use serde::{Deserialize, Serialize};
 
 /// Deadline calculations with respect to a current epoch.

actors/miner/src/v13/deadline_state.rs

@@ -13,7 +13,8 @@ use fvm_ipld_bitfield::BitField;
 use fvm_ipld_blockstore::Blockstore;
 use fvm_ipld_encoding::tuple::*;
 use fvm_ipld_encoding::CborStore;
-use fvm_shared4::clock::{ChainEpoch, QuantSpec};
+use fvm_shared3::clock::QuantSpec;
+use fvm_shared4::clock::ChainEpoch;
 use fvm_shared4::econ::TokenAmount;
 use fvm_shared4::error::ExitCode;
 use fvm_shared4::sector::{PoStProof, SectorSize};

actors/miner/src/v13/deadlines.rs

@@ -5,7 +5,8 @@ use fil_actors_shared::v13::runtime::Policy;
 use fil_actors_shared::v13::Array;
 
 use fvm_ipld_blockstore::Blockstore;
-use fvm_shared4::clock::{ChainEpoch, QuantSpec};
+use fvm_shared3::clock::QuantSpec;
+use fvm_shared4::clock::ChainEpoch;
 use fvm_shared4::sector::SectorNumber;
 
 use super::{DeadlineInfo, Deadlines, Partition};

actors/miner/src/v13/expiration_queue.rs

@@ -13,7 +13,8 @@ use fvm_ipld_bitfield::BitField;
 use fvm_ipld_blockstore::Blockstore;
 use fvm_ipld_encoding::tuple::*;
 
-use fvm_shared4::clock::{ChainEpoch, QuantSpec};
+use fvm_shared3::clock::QuantSpec;
+use fvm_shared4::clock::ChainEpoch;
 use fvm_shared4::econ::TokenAmount;
 use fvm_shared4::sector::{SectorNumber, SectorSize};
 use num_traits::{Signed, Zero};

actors/miner/src/v13/ext.rs

@@ -1,14 +1,14 @@
 use cid::Cid;
 use fvm_ipld_encoding::tuple::*;
 use fvm_ipld_encoding::RawBytes;
+use fvm_shared3::smooth::FilterEstimate;
 use fvm_shared4::bigint::{bigint_ser, BigInt};
 use fvm_shared4::clock::ChainEpoch;
 use fvm_shared4::deal::DealID;
 use fvm_shared4::econ::TokenAmount;
 use fvm_shared4::piece::PaddedPieceSize;
 use fvm_shared4::sector::SectorNumber;
 use fvm_shared4::sector::{RegisteredSealProof, StoragePower};
-use fvm_shared4::smooth::FilterEstimate;
 use fvm_shared4::ActorID;
 
 use fil_actors_shared::v13::BatchReturn;

actors/miner/src/v13/monies.rs

@@ -5,12 +5,12 @@ use std::cmp::{self, max};
 
 use fil_actors_shared::v13::network::EPOCHS_IN_DAY;
 use fil_actors_shared::v13::EXPECTED_LEADERS_PER_EPOCH;
+use fvm_shared3::math::PRECISION;
+use fvm_shared3::smooth::{self, FilterEstimate};
 use fvm_shared4::bigint::{BigInt, Integer};
 use fvm_shared4::clock::ChainEpoch;
 use fvm_shared4::econ::TokenAmount;
-use fvm_shared4::math::PRECISION;
 use fvm_shared4::sector::StoragePower;
-use fvm_shared4::smooth::{self, FilterEstimate};
 use lazy_static::lazy_static;
 use num_traits::Zero;
 

actors/miner/src/v13/partition_state.rs

@@ -16,8 +16,9 @@ use fil_actors_shared::v13::{ActorDowncast, Array};
 use fvm_ipld_bitfield::BitField;
 use fvm_ipld_blockstore::Blockstore;
 use fvm_ipld_encoding::tuple::*;
+use fvm_shared3::clock::{QuantSpec, NO_QUANTIZATION};
 use fvm_shared4::bigint::bigint_ser;
-use fvm_shared4::clock::{ChainEpoch, QuantSpec, NO_QUANTIZATION};
+use fvm_shared4::clock::ChainEpoch;
 use fvm_shared4::econ::TokenAmount;
 use fvm_shared4::error::ExitCode;
 use fvm_shared4::sector::{SectorSize, StoragePower};

actors/miner/src/v13/policy.rs

@@ -7,13 +7,12 @@ use cid::{Cid, Version};
 use fil_actors_shared::v13::network::*;
 use fil_actors_shared::v13::runtime::Policy;
 use fil_actors_shared::v13::{DealWeight, EXPECTED_LEADERS_PER_EPOCH};
+use fvm_shared3::sector::SectorQuality;
 use fvm_shared4::bigint::{BigInt, Integer};
 use fvm_shared4::clock::ChainEpoch;
 use fvm_shared4::commcid::{FIL_COMMITMENT_SEALED, POSEIDON_BLS12_381_A1_FC1};
 use fvm_shared4::econ::TokenAmount;
-use fvm_shared4::sector::{
-    RegisteredPoStProof, RegisteredSealProof, SectorQuality, SectorSize, StoragePower,
-};
+use fvm_shared4::sector::{RegisteredPoStProof, RegisteredSealProof, SectorSize, StoragePower};
 use lazy_static::lazy_static;
 
 use super::types::SectorOnChainInfo;

actors/miner/src/v13/sectors.rs

@@ -10,8 +10,9 @@ use fil_actors_shared::v13::{ActorDowncast, ActorError, Array, AsActorError};
 use fvm_ipld_amt::Error as AmtError;
 use fvm_ipld_bitfield::BitField;
 use fvm_ipld_blockstore::Blockstore;
+use fvm_shared3::sector::MAX_SECTOR_NUMBER;
 use fvm_shared4::error::ExitCode;
-use fvm_shared4::sector::{SectorNumber, MAX_SECTOR_NUMBER};
+use fvm_shared4::sector::SectorNumber;
 
 use super::SectorOnChainInfo;
 

actors/miner/src/v13/state.rs

@@ -22,10 +22,12 @@ 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_shared3::clock::QuantSpec;
+use fvm_shared3::sector::MAX_SECTOR_NUMBER;
+use fvm_shared4::clock::{ChainEpoch, EPOCH_UNDEFINED};
 use fvm_shared4::econ::TokenAmount;
 use fvm_shared4::error::ExitCode;
-use fvm_shared4::sector::{RegisteredPoStProof, SectorNumber, SectorSize, MAX_SECTOR_NUMBER};
+use fvm_shared4::sector::{RegisteredPoStProof, SectorNumber, SectorSize};
 use fvm_shared4::{ActorID, HAMT_BIT_WIDTH};
 use itertools::Itertools;
 use num_traits::Zero;