feature: Stabilize Compute Costs

core/primitives/Cargo.toml

@@ -51,14 +51,12 @@ protocol_feature_fix_staking_threshold = []
 protocol_feature_fix_contract_loading_cost = []
 protocol_feature_reject_blocks_with_outdated_protocol_version = []
 protocol_feature_flat_state = []
-protocol_feature_compute_costs = []
 nightly = [
   "nightly_protocol",
   "protocol_feature_fix_staking_threshold",
   "protocol_feature_fix_contract_loading_cost",
   "protocol_feature_reject_blocks_with_outdated_protocol_version",
   "protocol_feature_flat_state",
-  "protocol_feature_compute_costs",
 ]
 
 nightly_protocol = []

core/primitives/src/runtime/parameter_table.rs

@@ -96,10 +96,6 @@ impl TryFrom<&ParameterValue> for ParameterCost {
     fn try_from(value: &ParameterValue) -> Result<Self, Self::Error> {
         match value {
             ParameterValue::ParameterCost { gas, compute } => {
-                if !cfg!(feature = "protocol_feature_compute_costs") {
-                    assert_eq!(compute, gas, "Compute cost must match gas cost");
-                }
-
                 Ok(ParameterCost { gas: *gas, compute: *compute })
             }
             // If not specified, compute costs default to gas costs.

core/primitives/src/version.rs

@@ -139,6 +139,12 @@ pub enum ProtocolFeature {
     /// Meta Transaction NEP-366: https://github.com/near/NEPs/blob/master/neps/nep-0366.md
     DelegateAction,
 
+    /// Decouple compute and gas costs of operations to safely limit the compute time it takes to
+    /// process the chunk.
+    ///
+    /// Compute Costs NET-455: https://github.com/near/NEPs/blob/master/neps/nep-0455.md
+    ComputeCosts,
+
     /// In case not all validator seats are occupied our algorithm provide incorrect minimal seat
     /// price - it reports as alpha * sum_stake instead of alpha * sum_stake / (1 - alpha), where
     /// alpha is min stake ratio
@@ -152,8 +158,6 @@ pub enum ProtocolFeature {
     RejectBlocksWithOutdatedProtocolVersions,
     #[cfg(feature = "protocol_feature_flat_state")]
     FlatStorageReads,
-    #[cfg(feature = "protocol_feature_compute_costs")]
-    ComputeCosts,
 }
 
 /// Both, outgoing and incoming tcp connections to peers, will be rejected if `peer's`
@@ -238,6 +242,7 @@ impl ProtocolFeature {
             ProtocolFeature::Ed25519Verify
             | ProtocolFeature::ZeroBalanceAccount
             | ProtocolFeature::DelegateAction => 59,
+            ProtocolFeature::ComputeCosts => 61,
 
             // Nightly features
             #[cfg(feature = "protocol_feature_fix_staking_threshold")]
@@ -248,8 +253,6 @@ impl ProtocolFeature {
             ProtocolFeature::RejectBlocksWithOutdatedProtocolVersions => 132,
             #[cfg(feature = "protocol_feature_flat_state")]
             ProtocolFeature::FlatStorageReads => 135,
-            #[cfg(feature = "protocol_feature_compute_costs")]
-            ProtocolFeature::ComputeCosts => 136,
         }
     }
 }

runtime/runtime/Cargo.toml

@@ -34,7 +34,6 @@ near-vm-runner.workspace = true
 default = []
 dump_errors_schema = ["near-vm-errors/dump_errors_schema"]
 protocol_feature_flat_state = ["near-store/protocol_feature_flat_state", "near-vm-logic/protocol_feature_flat_state"]
-protocol_feature_compute_costs = ["near-primitives/protocol_feature_compute_costs"]
 nightly_protocol = ["near-primitives/nightly_protocol"]
 no_cpu_compatibility_checks = ["near-vm-runner/no_cpu_compatibility_checks"]
 

runtime/runtime/src/lib.rs

@@ -1287,8 +1287,7 @@ impl Runtime {
                     .expect("`process_transaction` must populate compute usage"),
             )?;
 
-            // TODO(#8032): Remove when compute costs are stabilized.
-            if !cfg!(feature = "protocol_feature_compute_costs") {
+            if !checked_feature!("stable", ComputeCosts, apply_state.current_protocol_version) {
                 assert_eq!(
                     total_compute_usage, total_gas_burnt,
                     "Compute usage must match burnt gas"
@@ -1337,8 +1336,8 @@ impl Runtime {
                         .compute_usage
                         .expect("`process_receipt` must populate compute usage"),
                 )?;
-                // TODO(#8032): Remove when compute costs are stabilized.
-                if !cfg!(feature = "protocol_feature_compute_costs") {
+
+                if !checked_feature!("stable", ComputeCosts, apply_state.current_protocol_version) {
                     assert_eq!(
                         total_compute_usage, total_gas_burnt,
                         "Compute usage must match burnt gas"
@@ -1594,7 +1593,6 @@ impl Runtime {
 
 #[cfg(test)]
 mod tests {
-    #[cfg(feature = "protocol_feature_compute_costs")]
     use assert_matches::assert_matches;
     use near_crypto::{InMemorySigner, KeyType, Signer};
     use near_primitives::account::AccessKey;
@@ -1611,7 +1609,6 @@ mod tests {
     use near_store::set_access_key;
     use near_store::test_utils::create_tries;
     use near_store::StoreCompiledContractCache;
-    #[cfg(feature = "protocol_feature_compute_costs")]
     use near_vm_logic::{ExtCosts, ParameterCost};
     use near_vm_runner::get_contract_cache_key;
     use near_vm_runner::internal::VMKind;
@@ -2553,7 +2550,6 @@ mod tests {
             .expect("Compilation result should be non-empty");
     }
 
-    #[cfg(feature = "protocol_feature_compute_costs")]
     #[test]
     fn test_compute_usage_limit() {
         let initial_balance = to_yocto(1_000_000);
@@ -2562,8 +2558,18 @@ mod tests {
             setup_runtime(initial_balance, initial_locked, 1);
 
         let mut free_config = RuntimeConfig::free();
-        let sha256_cost =
-            ParameterCost { gas: Gas::from(1u64), compute: Compute::from(10_000_000_000_000u64) };
+        let sha256_cost = ParameterCost {
+            gas: Gas::from(1_000_000u64),
+            compute: if checked_feature!(
+                "stable",
+                ComputeCosts,
+                apply_state.current_protocol_version
+            ) {
+                Compute::from(10_000_000_000_000u64)
+            } else {
+                Compute::from(1_000_000u64)
+            },
+        };
         free_config.wasm_config.ext_costs.costs[ExtCosts::sha256_base] = sha256_cost.clone();
         apply_state.config = Arc::new(free_config);
         // This allows us to execute 1 receipt with a function call per apply.
@@ -2583,7 +2589,7 @@ mod tests {
             vec![Action::FunctionCall(FunctionCallAction {
                 method_name: "ext_sha256".to_string(),
                 args: b"first".to_vec(),
-                gas: 1,
+                gas: sha256_cost.gas,
                 deposit: 0,
             })],
         );
@@ -2594,7 +2600,7 @@ mod tests {
             vec![Action::FunctionCall(FunctionCallAction {
                 method_name: "ext_sha256".to_string(),
                 args: b"second".to_vec(),
-                gas: 1,
+                gas: sha256_cost.gas,
                 deposit: 0,
             })],
         );