feat: enable nv22 support (#1970)

We should have done this in v4.1, but I guess we're going straight for v4.1.1.
filecoin-project · Jan 25, 2024 · 9179b45 · 9179b45
1 parent c61a45e
commit 9179b45
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 7 deletions.
diff --git a/fvm/Cargo.toml b/fvm/Cargo.toml
@@ -60,4 +60,3 @@ arb = ["arbitrary", "quickcheck", "fvm_shared/arb"]
 m2-native = []
 upgrade-actor = []
 gas_calibration = []
-nv22-dev = []
diff --git a/fvm/src/gas/price_list.rs b/fvm/src/gas/price_list.rs
@@ -968,7 +968,6 @@ impl PriceList {
 pub fn price_list_by_network_version(network_version: NetworkVersion) -> &'static PriceList {
     match network_version {
         NetworkVersion::V21 => &WATERMELON_PRICES,
-        #[cfg(feature = "nv22-dev")]
         _ if network_version == NetworkVersion::V22 => &WATERMELON_PRICES,
         _ => panic!("network version {nv} not supported", nv = network_version),
     }

diff --git a/fvm/src/machine/default.rs b/fvm/src/machine/default.rs
@@ -58,11 +58,6 @@ where
     /// * `blockstore`: The underlying [blockstore][`Blockstore`] for reading/writing state.
     /// * `externs`: Client-provided ["external"][`Externs`] methods for accessing chain state.
     pub fn new(context: &MachineContext, blockstore: B, externs: E) -> anyhow::Result<Self> {
-        #[cfg(not(feature = "nv22-dev"))]
-        const SUPPORTED_VERSIONS: RangeInclusive<NetworkVersion> =
-            NetworkVersion::V21..=NetworkVersion::V21;
-
-        #[cfg(feature = "nv22-dev")]
         const SUPPORTED_VERSIONS: RangeInclusive<NetworkVersion> =
             NetworkVersion::V21..=NetworkVersion::V22;