diff --git a/Cargo.toml b/Cargo.toml
index eae0a92e..0572bbc9 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 c7580651..43927f83 100644
--- a/actors/market/src/v12/policy.rs
+++ b/actors/market/src/v12/policy.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use fil_actors_shared::v12::runtime::Policy;
-use fvm_shared4::TOTAL_FILECOIN;
+use fvm_shared3::TOTAL_FILECOIN;
 use fvm_shared4::bigint::{BigInt, Integer};
 use fvm_shared4::econ::TokenAmount;
 use fvm_shared4::piece::PaddedPieceSize;
@@ -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 baa6bd03..a929cde0 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 26a2faf4..e7d0cb96 100644
--- a/actors/market/src/v13/policy.rs
+++ b/actors/market/src/v13/policy.rs
@@ -4,7 +4,7 @@
 use std::cmp::max;
 
 use fil_actors_shared::v13::runtime::Policy;
-use fvm_shared4::TOTAL_FILECOIN;
+use fvm_shared3::TOTAL_FILECOIN;
 use fvm_shared4::bigint::{BigInt, Integer};
 use fvm_shared4::econ::TokenAmount;
 use fvm_shared4::piece::PaddedPieceSize;
@@ -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 6a82086b..779c85a7 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::CborStore;
 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::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 e87e3539..67e3d552 100644
--- a/actors/miner/src/v12/deadlines.rs
+++ b/actors/miner/src/v12/deadlines.rs
@@ -5,7 +5,8 @@ use fil_actors_shared::v12::Array;
 use fil_actors_shared::v12::runtime::Policy;
 
 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 5aec63e6..5d408af8 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 58ad76f1..4f22445a 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::EXPECTED_LEADERS_PER_EPOCH;
 use fil_actors_shared::v12::network::EPOCHS_IN_DAY;
+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 440b9bdf..9998dfb0 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::{NO_QUANTIZATION, QuantSpec};
 use fvm_shared4::bigint::bigint_ser;
-use fvm_shared4::clock::{ChainEpoch, NO_QUANTIZATION, QuantSpec};
+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 bfe261cb..ee4420f9 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 5ff98ad6..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::{MAX_SECTOR_NUMBER, SectorNumber};
+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 72f65510..8ef5b140 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, EPOCH_UNDEFINED, QuantSpec};
+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::{MAX_SECTOR_NUMBER, RegisteredPoStProof, SectorNumber, SectorSize};
+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 11579e3f..dd4906e8 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::{BytesDe, strict_bytes};
+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 038da77a..d6fb3458 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::CborStore;
 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::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 ab5f18c2..61a93691 100644
--- a/actors/miner/src/v13/deadlines.rs
+++ b/actors/miner/src/v13/deadlines.rs
@@ -5,7 +5,8 @@ use fil_actors_shared::v13::Array;
 use fil_actors_shared::v13::runtime::Policy;
 
 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 3b4ead7f..bccb7107 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 cd2ff86c..1f81597f 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::RawBytes;
 use fvm_ipld_encoding::tuple::*;
+use fvm_shared3::smooth::FilterEstimate;
 use fvm_shared4::ActorID;
 use fvm_shared4::bigint::{BigInt, bigint_ser};
 use fvm_shared4::clock::ChainEpoch;
@@ -9,7 +10,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 fil_actors_shared::v13::BatchReturn;
 
diff --git a/actors/miner/src/v13/monies.rs b/actors/miner/src/v13/monies.rs
index 20d282e8..5052cdf7 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::EXPECTED_LEADERS_PER_EPOCH;
 use fil_actors_shared::v13::network::EPOCHS_IN_DAY;
+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 1434147e..bdb8bd1d 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::{NO_QUANTIZATION, QuantSpec};
 use fvm_shared4::bigint::bigint_ser;
-use fvm_shared4::clock::{ChainEpoch, NO_QUANTIZATION, QuantSpec};
+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 b7c2da46..22c6fda0 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 dad1dca8..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::{MAX_SECTOR_NUMBER, SectorNumber};
+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 ce644bb8..e46d756e 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, EPOCH_UNDEFINED, QuantSpec};
+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::{MAX_SECTOR_NUMBER, RegisteredPoStProof, SectorNumber, SectorSize};
+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 5a3130e9..2368d93b 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::{BytesDe, strict_bytes};
 use fvm_ipld_encoding::{RawBytes, tuple::*};
+use fvm_shared3::smooth::FilterEstimate;
 use fvm_shared4::ActorID;
 use fvm_shared4::address::Address;
 use fvm_shared4::bigint::bigint_ser;
@@ -17,7 +18,6 @@ use fvm_shared4::sector::{
     PoStProof, RegisteredAggregateProof, RegisteredPoStProof, RegisteredSealProof,
     RegisteredUpdateProof, SectorNumber, SectorSize, StoragePower,
 };
-use fvm_shared4::smooth::FilterEstimate;
 
 use crate::v13::ext::verifreg::AllocationID;
 use fil_actors_shared::v13::{BatchReturn, DealWeight};
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 db70000f..5c6b0964 100644
--- a/actors/power/src/v12/ext.rs
+++ b/actors/power/src/v12/ext.rs
@@ -5,11 +5,11 @@ use cid::Cid;
 use fvm_ipld_encoding::tuple::*;
 use fvm_ipld_encoding::{BytesDe, strict_bytes};
 
+use fvm_shared3::smooth::FilterEstimate;
 use fvm_shared4::METHOD_CONSTRUCTOR;
 use fvm_shared4::address::Address;
 use fvm_shared4::bigint::bigint_ser;
 use fvm_shared4::sector::{RegisteredPoStProof, SectorNumber, StoragePower};
-use fvm_shared4::smooth::FilterEstimate;
 use num_derive::FromPrimitive;
 
 pub mod init {
diff --git a/actors/power/src/v12/state.rs b/actors/power/src/v12/state.rs
index a2aa4f4a..bf869ca9 100644
--- a/actors/power/src/v12/state.rs
+++ b/actors/power/src/v12/state.rs
@@ -11,6 +11,7 @@ use fvm_ipld_blockstore::Blockstore;
 use fvm_ipld_encoding::RawBytes;
 use fvm_ipld_encoding::tuple::*;
 use fvm_ipld_hamt::BytesKey;
+use fvm_shared3::smooth::FilterEstimate;
 use fvm_shared4::ActorID;
 use fvm_shared4::address::Address;
 use fvm_shared4::bigint::bigint_ser;
@@ -18,7 +19,6 @@ 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 integer_encoding::VarInt;
 use lazy_static::lazy_static;
 use num_traits::Signed;
diff --git a/actors/power/src/v12/types.rs b/actors/power/src/v12/types.rs
index 68a42d17..e0f22e9a 100644
--- a/actors/power/src/v12/types.rs
+++ b/actors/power/src/v12/types.rs
@@ -3,13 +3,13 @@
 
 use fvm_ipld_encoding::tuple::*;
 use fvm_ipld_encoding::{BytesDe, RawBytes, strict_bytes};
+use fvm_shared3::smooth::FilterEstimate;
 use fvm_shared4::ActorID;
 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 serde::{Deserialize, Serialize};
 
diff --git a/actors/power/src/v13/ext.rs b/actors/power/src/v13/ext.rs
index 62acc2c8..098a66ff 100644
--- a/actors/power/src/v13/ext.rs
+++ b/actors/power/src/v13/ext.rs
@@ -2,11 +2,11 @@ use cid::Cid;
 use fvm_ipld_encoding::tuple::*;
 use fvm_ipld_encoding::{BytesDe, strict_bytes};
 
+use fvm_shared3::smooth::FilterEstimate;
 use fvm_shared4::METHOD_CONSTRUCTOR;
 use fvm_shared4::address::Address;
 use fvm_shared4::bigint::bigint_ser;
 use fvm_shared4::sector::{RegisteredPoStProof, SectorNumber, StoragePower};
-use fvm_shared4::smooth::FilterEstimate;
 use num_derive::FromPrimitive;
 
 pub mod init {
diff --git a/actors/power/src/v13/state.rs b/actors/power/src/v13/state.rs
index 6e0fd83c..91c7a6b0 100644
--- a/actors/power/src/v13/state.rs
+++ b/actors/power/src/v13/state.rs
@@ -11,6 +11,7 @@ use fvm_ipld_blockstore::Blockstore;
 use fvm_ipld_encoding::RawBytes;
 use fvm_ipld_encoding::tuple::*;
 use fvm_ipld_hamt::BytesKey;
+use fvm_shared3::smooth::FilterEstimate;
 use fvm_shared4::ActorID;
 use fvm_shared4::address::Address;
 use fvm_shared4::bigint::bigint_ser;
@@ -18,7 +19,6 @@ 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 integer_encoding::VarInt;
 use lazy_static::lazy_static;
 use num_traits::Signed;
diff --git a/actors/power/src/v13/types.rs b/actors/power/src/v13/types.rs
index 68a42d17..e0f22e9a 100644
--- a/actors/power/src/v13/types.rs
+++ b/actors/power/src/v13/types.rs
@@ -3,13 +3,13 @@
 
 use fvm_ipld_encoding::tuple::*;
 use fvm_ipld_encoding::{BytesDe, RawBytes, strict_bytes};
+use fvm_shared3::smooth::FilterEstimate;
 use fvm_shared4::ActorID;
 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 serde::{Deserialize, Serialize};
 
diff --git a/actors/reward/src/v12/expneg.rs b/actors/reward/src/v12/expneg.rs
index 60df52f2..46e8206a 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::{PRECISION, poly_parse, poly_val};
 use fvm_shared4::bigint::{BigInt, Integer};
-use fvm_shared4::math::{PRECISION, poly_parse, poly_val};
 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 60df52f2..46e8206a 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::{PRECISION, poly_parse, poly_val};
 use fvm_shared4::bigint::{BigInt, Integer};
-use fvm_shared4::math::{PRECISION, poly_parse, poly_val};
 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 60df52f2..46e8206a 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::{PRECISION, poly_parse, poly_val};
 use fvm_shared4::bigint::{BigInt, Integer};
-use fvm_shared4::math::{PRECISION, poly_parse, poly_val};
 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 623f1391..9f6c5055 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
 
-pub use fvm_shared4::BLOCKS_PER_EPOCH as EXPECTED_LEADERS_PER_EPOCH;
-use fvm_shared4::clock::EPOCH_DURATION_SECONDS;
+pub use fvm_shared3::BLOCKS_PER_EPOCH as EXPECTED_LEADERS_PER_EPOCH;
+use fvm_shared3::clock::EPOCH_DURATION_SECONDS;
 
 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 b34b8b11..95614a52 100644
--- a/fil_actors_shared/src/v12/mod.rs
+++ b/fil_actors_shared/src/v12/mod.rs
@@ -6,7 +6,7 @@ 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_shared4::BLOCKS_PER_EPOCH as EXPECTED_LEADERS_PER_EPOCH;
+pub use fvm_shared3::BLOCKS_PER_EPOCH as EXPECTED_LEADERS_PER_EPOCH;
 use fvm_shared4::bigint::BigInt;
 use serde::Serialize;
 use serde::de::DeserializeOwned;
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 623f1391..9f6c5055 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
 
-pub use fvm_shared4::BLOCKS_PER_EPOCH as EXPECTED_LEADERS_PER_EPOCH;
-use fvm_shared4::clock::EPOCH_DURATION_SECONDS;
+pub use fvm_shared3::BLOCKS_PER_EPOCH as EXPECTED_LEADERS_PER_EPOCH;
+use fvm_shared3::clock::EPOCH_DURATION_SECONDS;
 
 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 c737b84f..8704e925 100644
--- a/fil_actors_shared/src/v13/mod.rs
+++ b/fil_actors_shared/src/v13/mod.rs
@@ -6,7 +6,7 @@ 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_shared4::BLOCKS_PER_EPOCH as EXPECTED_LEADERS_PER_EPOCH;
+pub use fvm_shared3::BLOCKS_PER_EPOCH as EXPECTED_LEADERS_PER_EPOCH;
 use fvm_shared4::bigint::BigInt;
 use serde::Serialize;
 use serde::de::DeserializeOwned;
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::*;