From d82a411036dda8eefc151f1cb8272775b00af031 Mon Sep 17 00:00:00 2001 From: hanabi1224 Date: Wed, 16 Apr 2025 02:36:18 +0800 Subject: [PATCH] chore(deps): bump fvm_shared --- Cargo.toml | 34 ++++++++++---------- actors/market/src/v12/policy.rs | 4 +-- actors/market/src/v13/ext.rs | 2 +- actors/market/src/v13/policy.rs | 4 +-- actors/miner/src/v12/bitfield_queue.rs | 3 +- actors/miner/src/v12/deadline_info.rs | 3 +- actors/miner/src/v12/deadline_state.rs | 3 +- actors/miner/src/v12/deadlines.rs | 3 +- actors/miner/src/v12/expiration_queue.rs | 3 +- actors/miner/src/v12/monies.rs | 4 +-- actors/miner/src/v12/partition_state.rs | 3 +- actors/miner/src/v12/policy.rs | 5 ++- actors/miner/src/v12/sectors.rs | 3 +- actors/miner/src/v12/state.rs | 6 ++-- actors/miner/src/v12/types.rs | 2 +- actors/miner/src/v12/vesting_state.rs | 3 +- actors/miner/src/v13/bitfield_queue.rs | 3 +- actors/miner/src/v13/deadline_info.rs | 3 +- actors/miner/src/v13/deadline_state.rs | 3 +- actors/miner/src/v13/deadlines.rs | 3 +- actors/miner/src/v13/expiration_queue.rs | 3 +- actors/miner/src/v13/ext.rs | 2 +- actors/miner/src/v13/monies.rs | 4 +-- actors/miner/src/v13/partition_state.rs | 3 +- actors/miner/src/v13/policy.rs | 5 ++- actors/miner/src/v13/sectors.rs | 3 +- actors/miner/src/v13/state.rs | 6 ++-- actors/miner/src/v13/types.rs | 2 +- actors/miner/src/v13/vesting_state.rs | 3 +- actors/power/src/v12/ext.rs | 2 +- actors/power/src/v12/state.rs | 2 +- actors/power/src/v12/types.rs | 2 +- actors/power/src/v13/ext.rs | 2 +- actors/power/src/v13/state.rs | 2 +- actors/power/src/v13/types.rs | 2 +- actors/reward/src/v12/expneg.rs | 2 +- actors/reward/src/v12/logic.rs | 2 +- actors/reward/src/v12/state.rs | 5 +-- actors/reward/src/v12/types.rs | 2 +- actors/reward/src/v13/expneg.rs | 2 +- actors/reward/src/v13/logic.rs | 2 +- actors/reward/src/v13/state.rs | 5 +-- actors/reward/src/v13/types.rs | 2 +- actors/reward/src/v14/expneg.rs | 2 +- actors/reward/src/v14/logic.rs | 2 +- actors/reward/src/v14/types.rs | 2 +- fil_actors_shared/src/v12/builtin/network.rs | 4 +-- fil_actors_shared/src/v12/mod.rs | 2 +- fil_actors_shared/src/v12/runtime/policy.rs | 2 +- fil_actors_shared/src/v13/builtin/network.rs | 4 +-- fil_actors_shared/src/v13/mod.rs | 2 +- fil_actors_shared/src/v13/runtime/policy.rs | 2 +- 52 files changed, 102 insertions(+), 82 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d49cda3d..2daac5c1 100644 --- a/Cargo.toml +++ b/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" } diff --git a/actors/market/src/v12/policy.rs b/actors/market/src/v12/policy.rs index 50daf2e3..43927f83 100644 --- a/actors/market/src/v12/policy.rs +++ b/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()), ) } diff --git a/actors/market/src/v13/ext.rs b/actors/market/src/v13/ext.rs index 04d0246f..353aab6b 100644 --- a/actors/market/src/v13/ext.rs +++ b/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::*; diff --git a/actors/market/src/v13/policy.rs b/actors/market/src/v13/policy.rs index 98d2719f..e7d0cb96 100644 --- a/actors/market/src/v13/policy.rs +++ b/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()), ) } diff --git a/actors/miner/src/v12/bitfield_queue.rs b/actors/miner/src/v12/bitfield_queue.rs index dfc0285a..e1dc2ff5 100644 --- a/actors/miner/src/v12/bitfield_queue.rs +++ b/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. diff --git a/actors/miner/src/v12/deadline_info.rs b/actors/miner/src/v12/deadline_info.rs index 3ce3f2e3..432b00fa 100644 --- a/actors/miner/src/v12/deadline_info.rs +++ b/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. diff --git a/actors/miner/src/v12/deadline_state.rs b/actors/miner/src/v12/deadline_state.rs index 5b924f3e..d1966a74 100644 --- a/actors/miner/src/v12/deadline_state.rs +++ b/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}; diff --git a/actors/miner/src/v12/deadlines.rs b/actors/miner/src/v12/deadlines.rs index dda8dd35..bf7be4f1 100644 --- a/actors/miner/src/v12/deadlines.rs +++ b/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}; diff --git a/actors/miner/src/v12/expiration_queue.rs b/actors/miner/src/v12/expiration_queue.rs index 7269a52f..b2a31dcc 100644 --- a/actors/miner/src/v12/expiration_queue.rs +++ b/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}; diff --git a/actors/miner/src/v12/monies.rs b/actors/miner/src/v12/monies.rs index 0f1f88b3..e04a93f6 100644 --- a/actors/miner/src/v12/monies.rs +++ b/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; diff --git a/actors/miner/src/v12/partition_state.rs b/actors/miner/src/v12/partition_state.rs index 66580060..3a75ca24 100644 --- a/actors/miner/src/v12/partition_state.rs +++ b/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}; diff --git a/actors/miner/src/v12/policy.rs b/actors/miner/src/v12/policy.rs index 94c6ae48..17e4c973 100644 --- a/actors/miner/src/v12/policy.rs +++ b/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; diff --git a/actors/miner/src/v12/sectors.rs b/actors/miner/src/v12/sectors.rs index 56bfc6fc..07cfa7d0 100644 --- a/actors/miner/src/v12/sectors.rs +++ b/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; diff --git a/actors/miner/src/v12/state.rs b/actors/miner/src/v12/state.rs index 9a20b763..10d020d1 100644 --- a/actors/miner/src/v12/state.rs +++ b/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; diff --git a/actors/miner/src/v12/types.rs b/actors/miner/src/v12/types.rs index 0c98582a..07e84e23 100644 --- a/actors/miner/src/v12/types.rs +++ b/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; diff --git a/actors/miner/src/v12/vesting_state.rs b/actors/miner/src/v12/vesting_state.rs index 31363af3..d2eaf685 100644 --- a/actors/miner/src/v12/vesting_state.rs +++ b/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; diff --git a/actors/miner/src/v13/bitfield_queue.rs b/actors/miner/src/v13/bitfield_queue.rs index 40237c4f..4344e4c5 100644 --- a/actors/miner/src/v13/bitfield_queue.rs +++ b/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. diff --git a/actors/miner/src/v13/deadline_info.rs b/actors/miner/src/v13/deadline_info.rs index 3ce3f2e3..432b00fa 100644 --- a/actors/miner/src/v13/deadline_info.rs +++ b/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. diff --git a/actors/miner/src/v13/deadline_state.rs b/actors/miner/src/v13/deadline_state.rs index b41fff08..63e28482 100644 --- a/actors/miner/src/v13/deadline_state.rs +++ b/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}; diff --git a/actors/miner/src/v13/deadlines.rs b/actors/miner/src/v13/deadlines.rs index 5edf7085..dae171bf 100644 --- a/actors/miner/src/v13/deadlines.rs +++ b/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}; diff --git a/actors/miner/src/v13/expiration_queue.rs b/actors/miner/src/v13/expiration_queue.rs index 8daf09be..37befb6f 100644 --- a/actors/miner/src/v13/expiration_queue.rs +++ b/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}; diff --git a/actors/miner/src/v13/ext.rs b/actors/miner/src/v13/ext.rs index bcab1e47..3f024f81 100644 --- a/actors/miner/src/v13/ext.rs +++ b/actors/miner/src/v13/ext.rs @@ -1,6 +1,7 @@ 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; @@ -8,7 +9,6 @@ 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; diff --git a/actors/miner/src/v13/monies.rs b/actors/miner/src/v13/monies.rs index bbe9cc4e..04d01154 100644 --- a/actors/miner/src/v13/monies.rs +++ b/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; diff --git a/actors/miner/src/v13/partition_state.rs b/actors/miner/src/v13/partition_state.rs index 7ba81cf7..83c103d4 100644 --- a/actors/miner/src/v13/partition_state.rs +++ b/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}; diff --git a/actors/miner/src/v13/policy.rs b/actors/miner/src/v13/policy.rs index 1583cdee..711de58a 100644 --- a/actors/miner/src/v13/policy.rs +++ b/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; diff --git a/actors/miner/src/v13/sectors.rs b/actors/miner/src/v13/sectors.rs index 3a0a2d1c..cd633a9f 100644 --- a/actors/miner/src/v13/sectors.rs +++ b/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; diff --git a/actors/miner/src/v13/state.rs b/actors/miner/src/v13/state.rs index bb0b6fd2..b7c4aa96 100644 --- a/actors/miner/src/v13/state.rs +++ b/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; diff --git a/actors/miner/src/v13/types.rs b/actors/miner/src/v13/types.rs index d9beae7f..f1834ed4 100644 --- a/actors/miner/src/v13/types.rs +++ b/actors/miner/src/v13/types.rs @@ -5,6 +5,7 @@ use cid::Cid; use fvm_ipld_bitfield::BitField; use fvm_ipld_encoding::{strict_bytes, BytesDe}; use fvm_ipld_encoding::{tuple::*, RawBytes}; +use fvm_shared3::smooth::FilterEstimate; use fvm_shared4::address::Address; use fvm_shared4::bigint::bigint_ser; use fvm_shared4::clock::ChainEpoch; @@ -16,7 +17,6 @@ use fvm_shared4::sector::{ PoStProof, RegisteredAggregateProof, RegisteredPoStProof, RegisteredSealProof, RegisteredUpdateProof, SectorNumber, SectorSize, StoragePower, }; -use fvm_shared4::smooth::FilterEstimate; use fvm_shared4::ActorID; use crate::v13::ext::verifreg::AllocationID; diff --git a/actors/miner/src/v13/vesting_state.rs b/actors/miner/src/v13/vesting_state.rs index 31363af3..d2eaf685 100644 --- a/actors/miner/src/v13/vesting_state.rs +++ b/actors/miner/src/v13/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; diff --git a/actors/power/src/v12/ext.rs b/actors/power/src/v12/ext.rs index 6b4790f6..a0544168 100644 --- a/actors/power/src/v12/ext.rs +++ b/actors/power/src/v12/ext.rs @@ -5,10 +5,10 @@ use cid::Cid; 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::sector::{RegisteredPoStProof, SectorNumber, StoragePower}; -use fvm_shared4::smooth::FilterEstimate; use fvm_shared4::METHOD_CONSTRUCTOR; use num_derive::FromPrimitive; diff --git a/actors/power/src/v12/state.rs b/actors/power/src/v12/state.rs index 2461df85..bc887d43 100644 --- a/actors/power/src/v12/state.rs +++ b/actors/power/src/v12/state.rs @@ -11,13 +11,13 @@ use fvm_ipld_blockstore::Blockstore; use fvm_ipld_encoding::tuple::*; use fvm_ipld_encoding::RawBytes; use fvm_ipld_hamt::BytesKey; +use fvm_shared3::smooth::FilterEstimate; use fvm_shared4::address::Address; use fvm_shared4::bigint::bigint_ser; use fvm_shared4::clock::ChainEpoch; use fvm_shared4::econ::TokenAmount; use fvm_shared4::error::ExitCode; use fvm_shared4::sector::{RegisteredPoStProof, StoragePower}; -use fvm_shared4::smooth::FilterEstimate; use fvm_shared4::ActorID; use integer_encoding::VarInt; use lazy_static::lazy_static; diff --git a/actors/power/src/v12/types.rs b/actors/power/src/v12/types.rs index 85328c12..76ab7d14 100644 --- a/actors/power/src/v12/types.rs +++ b/actors/power/src/v12/types.rs @@ -3,12 +3,12 @@ use fvm_ipld_encoding::tuple::*; use fvm_ipld_encoding::{strict_bytes, BytesDe, RawBytes}; +use fvm_shared3::smooth::FilterEstimate; use fvm_shared4::address::Address; use fvm_shared4::bigint::bigint_ser; use fvm_shared4::clock::ChainEpoch; use fvm_shared4::econ::TokenAmount; use fvm_shared4::sector::{RegisteredPoStProof, SealVerifyInfo, StoragePower}; -use fvm_shared4::smooth::FilterEstimate; use fvm_shared4::ActorID; use serde::{Deserialize, Serialize}; diff --git a/actors/power/src/v13/ext.rs b/actors/power/src/v13/ext.rs index 7a5737a9..1739d7b0 100644 --- a/actors/power/src/v13/ext.rs +++ b/actors/power/src/v13/ext.rs @@ -2,10 +2,10 @@ use cid::Cid; 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::sector::{RegisteredPoStProof, SectorNumber, StoragePower}; -use fvm_shared4::smooth::FilterEstimate; use fvm_shared4::METHOD_CONSTRUCTOR; use num_derive::FromPrimitive; diff --git a/actors/power/src/v13/state.rs b/actors/power/src/v13/state.rs index 74e785c7..f659385c 100644 --- a/actors/power/src/v13/state.rs +++ b/actors/power/src/v13/state.rs @@ -11,13 +11,13 @@ use fvm_ipld_blockstore::Blockstore; use fvm_ipld_encoding::tuple::*; use fvm_ipld_encoding::RawBytes; use fvm_ipld_hamt::BytesKey; +use fvm_shared3::smooth::FilterEstimate; use fvm_shared4::address::Address; use fvm_shared4::bigint::bigint_ser; use fvm_shared4::clock::ChainEpoch; use fvm_shared4::econ::TokenAmount; use fvm_shared4::error::ExitCode; use fvm_shared4::sector::{RegisteredPoStProof, StoragePower}; -use fvm_shared4::smooth::FilterEstimate; use fvm_shared4::ActorID; use integer_encoding::VarInt; use lazy_static::lazy_static; diff --git a/actors/power/src/v13/types.rs b/actors/power/src/v13/types.rs index 85328c12..76ab7d14 100644 --- a/actors/power/src/v13/types.rs +++ b/actors/power/src/v13/types.rs @@ -3,12 +3,12 @@ use fvm_ipld_encoding::tuple::*; use fvm_ipld_encoding::{strict_bytes, BytesDe, RawBytes}; +use fvm_shared3::smooth::FilterEstimate; use fvm_shared4::address::Address; use fvm_shared4::bigint::bigint_ser; use fvm_shared4::clock::ChainEpoch; use fvm_shared4::econ::TokenAmount; use fvm_shared4::sector::{RegisteredPoStProof, SealVerifyInfo, StoragePower}; -use fvm_shared4::smooth::FilterEstimate; use fvm_shared4::ActorID; use serde::{Deserialize, Serialize}; diff --git a/actors/reward/src/v12/expneg.rs b/actors/reward/src/v12/expneg.rs index 0b6d6ce2..fc7083ab 100644 --- a/actors/reward/src/v12/expneg.rs +++ b/actors/reward/src/v12/expneg.rs @@ -1,8 +1,8 @@ // Copyright 2019-2022 ChainSafe Systems // SPDX-License-Identifier: Apache-2.0, MIT +use fvm_shared3::math::{poly_parse, poly_val, PRECISION}; use fvm_shared4::bigint::{BigInt, Integer}; -use fvm_shared4::math::{poly_parse, poly_val, PRECISION}; use lazy_static::lazy_static; lazy_static! { diff --git a/actors/reward/src/v12/logic.rs b/actors/reward/src/v12/logic.rs index 1e5ab05f..5a193950 100644 --- a/actors/reward/src/v12/logic.rs +++ b/actors/reward/src/v12/logic.rs @@ -3,10 +3,10 @@ use std::str::FromStr; +use fvm_shared3::math::PRECISION; 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 lazy_static::lazy_static; diff --git a/actors/reward/src/v12/state.rs b/actors/reward/src/v12/state.rs index c11f773f..3ab19869 100644 --- a/actors/reward/src/v12/state.rs +++ b/actors/reward/src/v12/state.rs @@ -7,8 +7,9 @@ use fvm_shared4::bigint::bigint_ser; use fvm_shared4::clock::{ChainEpoch, EPOCH_UNDEFINED}; use fvm_shared4::econ::TokenAmount; -use fvm_shared4::sector::{Spacetime, StoragePower}; -use fvm_shared4::smooth::FilterEstimate; +use fvm_shared3::sector::Spacetime; +use fvm_shared3::smooth::FilterEstimate; +use fvm_shared4::sector::StoragePower; use lazy_static::lazy_static; use num_derive::FromPrimitive; diff --git a/actors/reward/src/v12/types.rs b/actors/reward/src/v12/types.rs index 3afe5a79..b539888f 100644 --- a/actors/reward/src/v12/types.rs +++ b/actors/reward/src/v12/types.rs @@ -20,7 +20,7 @@ pub struct AwardBlockRewardParams { pub win_count: i64, } -pub use fvm_shared4::reward::ThisEpochRewardReturn; +pub use fvm_shared3::reward::ThisEpochRewardReturn; #[derive(Clone, Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)] #[serde(transparent)] diff --git a/actors/reward/src/v13/expneg.rs b/actors/reward/src/v13/expneg.rs index 0b6d6ce2..fc7083ab 100644 --- a/actors/reward/src/v13/expneg.rs +++ b/actors/reward/src/v13/expneg.rs @@ -1,8 +1,8 @@ // Copyright 2019-2022 ChainSafe Systems // SPDX-License-Identifier: Apache-2.0, MIT +use fvm_shared3::math::{poly_parse, poly_val, PRECISION}; use fvm_shared4::bigint::{BigInt, Integer}; -use fvm_shared4::math::{poly_parse, poly_val, PRECISION}; use lazy_static::lazy_static; lazy_static! { diff --git a/actors/reward/src/v13/logic.rs b/actors/reward/src/v13/logic.rs index 7cf2915f..33894a9a 100644 --- a/actors/reward/src/v13/logic.rs +++ b/actors/reward/src/v13/logic.rs @@ -3,10 +3,10 @@ use std::str::FromStr; +use fvm_shared3::math::PRECISION; 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 lazy_static::lazy_static; diff --git a/actors/reward/src/v13/state.rs b/actors/reward/src/v13/state.rs index c11f773f..3ab19869 100644 --- a/actors/reward/src/v13/state.rs +++ b/actors/reward/src/v13/state.rs @@ -7,8 +7,9 @@ use fvm_shared4::bigint::bigint_ser; use fvm_shared4::clock::{ChainEpoch, EPOCH_UNDEFINED}; use fvm_shared4::econ::TokenAmount; -use fvm_shared4::sector::{Spacetime, StoragePower}; -use fvm_shared4::smooth::FilterEstimate; +use fvm_shared3::sector::Spacetime; +use fvm_shared3::smooth::FilterEstimate; +use fvm_shared4::sector::StoragePower; use lazy_static::lazy_static; use num_derive::FromPrimitive; diff --git a/actors/reward/src/v13/types.rs b/actors/reward/src/v13/types.rs index 3afe5a79..b539888f 100644 --- a/actors/reward/src/v13/types.rs +++ b/actors/reward/src/v13/types.rs @@ -20,7 +20,7 @@ pub struct AwardBlockRewardParams { pub win_count: i64, } -pub use fvm_shared4::reward::ThisEpochRewardReturn; +pub use fvm_shared3::reward::ThisEpochRewardReturn; #[derive(Clone, Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)] #[serde(transparent)] diff --git a/actors/reward/src/v14/expneg.rs b/actors/reward/src/v14/expneg.rs index 0b6d6ce2..fc7083ab 100644 --- a/actors/reward/src/v14/expneg.rs +++ b/actors/reward/src/v14/expneg.rs @@ -1,8 +1,8 @@ // Copyright 2019-2022 ChainSafe Systems // SPDX-License-Identifier: Apache-2.0, MIT +use fvm_shared3::math::{poly_parse, poly_val, PRECISION}; use fvm_shared4::bigint::{BigInt, Integer}; -use fvm_shared4::math::{poly_parse, poly_val, PRECISION}; use lazy_static::lazy_static; lazy_static! { diff --git a/actors/reward/src/v14/logic.rs b/actors/reward/src/v14/logic.rs index 089081a4..c9be88ef 100644 --- a/actors/reward/src/v14/logic.rs +++ b/actors/reward/src/v14/logic.rs @@ -10,7 +10,7 @@ use fvm_shared4::sector::StoragePower; use lazy_static::lazy_static; use super::expneg::expneg; -use fvm_shared4::math::PRECISION; +use fvm_shared3::math::PRECISION; lazy_static! { /// Floor(e^(ln[1 + 100%] / epochsInYear) * 2^128 diff --git a/actors/reward/src/v14/types.rs b/actors/reward/src/v14/types.rs index 3afe5a79..b539888f 100644 --- a/actors/reward/src/v14/types.rs +++ b/actors/reward/src/v14/types.rs @@ -20,7 +20,7 @@ pub struct AwardBlockRewardParams { pub win_count: i64, } -pub use fvm_shared4::reward::ThisEpochRewardReturn; +pub use fvm_shared3::reward::ThisEpochRewardReturn; #[derive(Clone, Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)] #[serde(transparent)] diff --git a/fil_actors_shared/src/v12/builtin/network.rs b/fil_actors_shared/src/v12/builtin/network.rs index 8b93a2a7..2cbb296c 100644 --- a/fil_actors_shared/src/v12/builtin/network.rs +++ b/fil_actors_shared/src/v12/builtin/network.rs @@ -1,8 +1,8 @@ // Copyright 2019-2022 ChainSafe Systems // SPDX-License-Identifier: Apache-2.0, MIT -use fvm_shared4::clock::EPOCH_DURATION_SECONDS; -pub use fvm_shared4::BLOCKS_PER_EPOCH as EXPECTED_LEADERS_PER_EPOCH; +use fvm_shared3::clock::EPOCH_DURATION_SECONDS; +pub use fvm_shared3::BLOCKS_PER_EPOCH as EXPECTED_LEADERS_PER_EPOCH; pub const SECONDS_IN_HOUR: i64 = 3600; pub const SECONDS_IN_DAY: i64 = 86400; diff --git a/fil_actors_shared/src/v12/mod.rs b/fil_actors_shared/src/v12/mod.rs index 321bec28..de52e565 100644 --- a/fil_actors_shared/src/v12/mod.rs +++ b/fil_actors_shared/src/v12/mod.rs @@ -6,8 +6,8 @@ use fvm_ipld_amt::Amt; use fvm_ipld_blockstore::Blockstore; use fvm_ipld_hamt::Sha256; use fvm_ipld_hamt::{BytesKey, Error as HamtError, Hamt}; +pub use fvm_shared3::BLOCKS_PER_EPOCH as EXPECTED_LEADERS_PER_EPOCH; use fvm_shared4::bigint::BigInt; -pub use fvm_shared4::BLOCKS_PER_EPOCH as EXPECTED_LEADERS_PER_EPOCH; use serde::de::DeserializeOwned; use serde::Serialize; use unsigned_varint::decode::Error as UVarintError; diff --git a/fil_actors_shared/src/v12/runtime/policy.rs b/fil_actors_shared/src/v12/runtime/policy.rs index 6f707b80..bfb5333c 100644 --- a/fil_actors_shared/src/v12/runtime/policy.rs +++ b/fil_actors_shared/src/v12/runtime/policy.rs @@ -220,8 +220,8 @@ impl Default for Policy { } pub mod policy_constants { + use fvm_shared3::clock::EPOCH_DURATION_SECONDS; use fvm_shared4::clock::ChainEpoch; - use fvm_shared4::clock::EPOCH_DURATION_SECONDS; use crate::v12::builtin::*; diff --git a/fil_actors_shared/src/v13/builtin/network.rs b/fil_actors_shared/src/v13/builtin/network.rs index 8b93a2a7..2cbb296c 100644 --- a/fil_actors_shared/src/v13/builtin/network.rs +++ b/fil_actors_shared/src/v13/builtin/network.rs @@ -1,8 +1,8 @@ // Copyright 2019-2022 ChainSafe Systems // SPDX-License-Identifier: Apache-2.0, MIT -use fvm_shared4::clock::EPOCH_DURATION_SECONDS; -pub use fvm_shared4::BLOCKS_PER_EPOCH as EXPECTED_LEADERS_PER_EPOCH; +use fvm_shared3::clock::EPOCH_DURATION_SECONDS; +pub use fvm_shared3::BLOCKS_PER_EPOCH as EXPECTED_LEADERS_PER_EPOCH; pub const SECONDS_IN_HOUR: i64 = 3600; pub const SECONDS_IN_DAY: i64 = 86400; diff --git a/fil_actors_shared/src/v13/mod.rs b/fil_actors_shared/src/v13/mod.rs index a1d87ac7..3d80583d 100644 --- a/fil_actors_shared/src/v13/mod.rs +++ b/fil_actors_shared/src/v13/mod.rs @@ -6,8 +6,8 @@ use fvm_ipld_amt::Amt; use fvm_ipld_blockstore::Blockstore; use fvm_ipld_hamt::Sha256; use fvm_ipld_hamt::{BytesKey, Error as HamtError, Hamt}; +pub use fvm_shared3::BLOCKS_PER_EPOCH as EXPECTED_LEADERS_PER_EPOCH; use fvm_shared4::bigint::BigInt; -pub use fvm_shared4::BLOCKS_PER_EPOCH as EXPECTED_LEADERS_PER_EPOCH; use serde::de::DeserializeOwned; use serde::Serialize; use unsigned_varint::decode::Error as UVarintError; diff --git a/fil_actors_shared/src/v13/runtime/policy.rs b/fil_actors_shared/src/v13/runtime/policy.rs index 416e9ba4..3c0c31b3 100644 --- a/fil_actors_shared/src/v13/runtime/policy.rs +++ b/fil_actors_shared/src/v13/runtime/policy.rs @@ -220,8 +220,8 @@ impl Default for Policy { } pub mod policy_constants { + use fvm_shared3::clock::EPOCH_DURATION_SECONDS; use fvm_shared4::clock::ChainEpoch; - use fvm_shared4::clock::EPOCH_DURATION_SECONDS; use crate::v13::builtin::*;