chore: release v4.4.4 (#2078)

* feat: add nv25-skeleton (#2076) feat: add nv25-skeleton * chore: bump version, create changelog chore: bump version, create changelog * chore: update cargo.lock chore: update cargo.lock
filecoin-project · Nov 18, 2024 · c09d9a2 · c09d9a2
1 parent 4cb7342
commit c09d9a2
Show file tree

Hide file tree

Showing 9 changed files with 77 additions and 55 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ members = [
 ]
 
 [workspace.package]
-version = "4.4.3"
+version = "4.4.4"
 license = "MIT OR Apache-2.0"
 edition = "2021"
 repository = "https://github.com/filecoin-project/ref-fvm"
@@ -73,10 +73,10 @@ minstant = "0.1.3"
 coverage-helper = "0.2.0"
 
 # workspace (FVM)
-fvm = { path = "fvm", version = "~4.4.3", default-features = false }
-fvm_shared = { path = "shared", version = "~4.4.3", default-features = false }
-fvm_sdk = { path = "sdk", version = "~4.4.3" }
-fvm_integration_tests = { path = "testing/integration", version = "~4.4.3" }
+fvm = { path = "fvm", version = "~4.4.4", default-features = false }
+fvm_shared = { path = "shared", version = "~4.4.4", default-features = false }
+fvm_sdk = { path = "sdk", version = "~4.4.4" }
+fvm_integration_tests = { path = "testing/integration", version = "~4.4.4" }
 
 # workspace (other)
 fvm_ipld_amt = { path = "ipld/amt", version = "0.6.2" }

diff --git a/fvm/CHANGELOG.md b/fvm/CHANGELOG.md
@@ -4,6 +4,10 @@ Changes to the reference FVM implementation.
 
 ## [Unreleased]
 
+## 4.4.4 [2024-11-18]
+
+- feat: add `nv25-dev` feature flag [#2076](https://github.com/filecoin-project/ref-fvm/pull/2076)
+
 ## 4.4.3 [2024-10-21]
 
 - Update wasmtime to 25.0.2.

diff --git a/fvm/Cargo.toml b/fvm/Cargo.toml
@@ -60,3 +60,4 @@ gas_calibration = []
 # The current implementation keeps it by default for backward compatibility reason.
 # See <https://github.com/filecoin-project/ref-fvm/issues/2001>
 verify-signature = []
+nv25-dev = []
diff --git a/fvm/src/gas/price_list.rs b/fvm/src/gas/price_list.rs
@@ -1004,6 +1004,8 @@ pub fn price_list_by_network_version(network_version: NetworkVersion) -> &'stati
         NetworkVersion::V21 | NetworkVersion::V22 | NetworkVersion::V23 | NetworkVersion::V24 => {
             &WATERMELON_PRICES
         }
+        #[cfg(feature = "nv25-dev")]
+        NetworkVersion::V25 => &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
@@ -51,9 +51,14 @@ 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 = "nv25-dev"))]
         const SUPPORTED_VERSIONS: RangeInclusive<NetworkVersion> =
             NetworkVersion::V21..=NetworkVersion::V24;
 
+        #[cfg(feature = "nv25-dev")]
+        const SUPPORTED_VERSIONS: RangeInclusive<NetworkVersion> =
+            NetworkVersion::V21..=NetworkVersion::V25;
+
         debug!(
             "initializing a new machine, epoch={}, base_fee={}, nv={:?}, root={}",
             context.epoch, &context.base_fee, context.network_version, context.initial_state_root

diff --git a/sdk/CHANGELOG.md b/sdk/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## 4.4.4 [2024-11-18]
+
+- feat: add `nv25-dev` feature flag [#2076](https://github.com/filecoin-project/ref-fvm/pull/2076)
+
 ## 4.4.3 [2024-10-21]
 
 - Update wasmtime to 25.0.2.

diff --git a/shared/CHANGELOG.md b/shared/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## 4.4.4 [2024-11-18]
+
+- feat: add `nv25-dev` feature flag [#2076](https://github.com/filecoin-project/ref-fvm/pull/2076)
+
 ## 4.4.3 [2024-10-21]
 
 - Update wasmtime to 25.0.2.

diff --git a/shared/src/version/mod.rs b/shared/src/version/mod.rs
@@ -61,8 +61,10 @@ impl NetworkVersion {
     pub const V22: Self = Self(22);
     /// Waffle (builtin-actors v14)
     pub const V23: Self = Self(23);
-    /// TBD (builtin-actors v15)
+    /// TukTuk (builtin-actors v15)
     pub const V24: Self = Self(24);
+    /// TBD (builtin-actors v16)
+    pub const V25: Self = Self(25);
 
     pub const MAX: Self = Self(u32::MAX);