Fix #9393 (#9395)

We made a single letter mistake and passed values larger than `i32::MAX` to a function that did only supports `0..=i32::MAX`. This fix corrects the problem, introduces the necessary protocol versioning, a regression test and an additional assert to validate the inputs in the aforementioned function.

I ended up using the parameters for the behaviour flag in anticipation that I wouldn’t need to do this later as part of #9364.

chain/jsonrpc/jsonrpc-tests/res/genesis_config.json

@@ -69,4 +69,4 @@
   ],
   "use_production_config": false,
   "records": []
-}
+}

core/primitives-core/src/config.rs

@@ -22,6 +22,9 @@ pub struct VMConfig {
     /// Gas cost of a regular operation.
     pub regular_op_cost: u32,
 
+    /// Disable the fix for the #9393 issue in near-vm-runner.
+    pub disable_9393_fix: bool,
+
     /// Describes limits for VM and Runtime.
     pub limit_config: VMLimitConfig,
 }
@@ -179,6 +182,7 @@ impl VMConfig {
             ext_costs: ExtCostsConfig::test(),
             grow_mem_cost: 1,
             regular_op_cost: (SAFETY_MULTIPLIER as u32) * 1285457,
+            disable_9393_fix: false,
             limit_config: VMLimitConfig::test(),
         }
     }
@@ -196,6 +200,7 @@ impl VMConfig {
             ext_costs: ExtCostsConfig::free(),
             grow_mem_cost: 0,
             regular_op_cost: 0,
+            disable_9393_fix: false,
             // We shouldn't have any costs in the limit config.
             limit_config: VMLimitConfig { max_gas_burnt: u64::MAX, ..VMLimitConfig::test() },
         }

core/primitives-core/src/parameter.rs

@@ -145,6 +145,9 @@ pub enum Parameter {
     Wasmer2StackLimit,
     MaxLocalsPerContract,
     AccountIdValidityRulesVersion,
+
+    #[strum(serialize = "disable_9393_fix")]
+    Disable9393Fix,
 }
 
 #[derive(

core/primitives/res/runtime_configs/62.yaml

@@ -3,3 +3,6 @@
 # correct.
 max_stack_height: { old: 16384, new: 262144 }
 contract_prepare_version: { old: 1, new: 2 }
+
+# There was a bug for a short period of time that we need to reproduce...
+disable_9393_fix: { old: false, new: true }

core/primitives/res/runtime_configs/63.yaml

@@ -0,0 +1 @@
+disable_9393_fix: { old: true, new: false }

core/primitives/res/runtime_configs/parameters.snap

@@ -163,4 +163,5 @@ max_functions_number_per_contract                     10_000
 wasmer2_stack_limit                                  204_800
 max_locals_per_contract                            1_000_000
 account_id_validity_rules_version                          1
+disable_9393_fix                        false
 

core/primitives/res/runtime_configs/parameters.yaml

@@ -196,3 +196,5 @@ max_length_storage_value: 4_194_304
 max_promises_per_function_call_action: 1_024
 max_number_input_data_dependencies: 128
 account_id_validity_rules_version: 0
+
+disable_9393_fix: false

core/primitives/res/runtime_configs/parameters_testnet.yaml

@@ -192,3 +192,5 @@ max_length_storage_key: 4_194_304
 max_length_storage_value: 4_194_304
 max_promises_per_function_call_action: 1_024
 max_number_input_data_dependencies: 128
+
+disable_9393_fix: false

core/primitives/src/runtime/config_store.rs

@@ -32,6 +32,7 @@ static CONFIG_DIFFS: &[(ProtocolVersion, &str)] = &[
     (59, include_config!("59.yaml")),
     (61, include_config!("61.yaml")),
     (62, include_config!("62.yaml")),
+    (63, include_config!("63.yaml")),
 ];
 
 /// Testnet parameters for versions <= 29, which (incorrectly) differed from mainnet parameters

core/primitives/src/runtime/parameter_table.rs

@@ -19,6 +19,7 @@ pub(crate) enum ParameterValue {
     // for u128, but this is currently impossible to express in YAML (see
     // `canonicalize_yaml_string`).
     String(String),
+    Flag(bool),
 }
 
 #[derive(thiserror::Error, Debug)]
@@ -74,6 +75,22 @@ impl TryFrom<&ParameterValue> for u128 {
     }
 }
 
+impl TryFrom<&ParameterValue> for bool {
+    type Error = ValueConversionError;
+
+    fn try_from(value: &ParameterValue) -> Result<Self, Self::Error> {
+        match value {
+            ParameterValue::Flag(b) => Ok(*b),
+            ParameterValue::String(s) => match &**s {
+                "true" => Ok(true),
+                "false" => Ok(false),
+                _ => Err(ValueConversionError::ParseType("bool", value.clone())),
+            },
+            _ => Err(ValueConversionError::ParseType("bool", value.clone())),
+        }
+    }
+}
+
 impl TryFrom<&ParameterValue> for Rational32 {
     type Error = ValueConversionError;
 
@@ -177,6 +194,7 @@ impl core::fmt::Display for ParameterValue {
                 )
             }
             ParameterValue::String(v) => write!(f, "{v}"),
+            ParameterValue::Flag(b) => write!(f, "{b:?}"),
         }
     }
 }
@@ -270,6 +288,7 @@ impl TryFrom<&ParameterTable> for RuntimeConfig {
                 },
                 grow_mem_cost: params.get(Parameter::WasmGrowMemCost)?,
                 regular_op_cost: params.get(Parameter::WasmRegularOpCost)?,
+                disable_9393_fix: params.get(Parameter::Disable9393Fix)?,
                 limit_config: serde_yaml::from_value(params.yaml_map(Parameter::vm_limits()))
                     .map_err(InvalidConfigError::InvalidYaml)?,
             },

core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__0.json.snap

@@ -172,6 +172,7 @@ expression: config_view
     },
     "grow_mem_cost": 1,
     "regular_op_cost": 3856371,
+    "disable_9393_fix": false,
     "limit_config": {
       "max_gas_burnt": 200000000000000,
       "max_stack_height": 16384,

core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__42.json.snap

@@ -172,6 +172,7 @@ expression: config_view
     },
     "grow_mem_cost": 1,
     "regular_op_cost": 3856371,
+    "disable_9393_fix": false,
     "limit_config": {
       "max_gas_burnt": 200000000000000,
       "max_stack_height": 16384,

core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__48.json.snap

@@ -172,6 +172,7 @@ expression: config_view
     },
     "grow_mem_cost": 1,
     "regular_op_cost": 2207874,
+    "disable_9393_fix": false,
     "limit_config": {
       "max_gas_burnt": 200000000000000,
       "max_stack_height": 16384,

core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__49.json.snap

@@ -172,6 +172,7 @@ expression: config_view
     },
     "grow_mem_cost": 1,
     "regular_op_cost": 822756,
+    "disable_9393_fix": false,
     "limit_config": {
       "max_gas_burnt": 200000000000000,
       "max_stack_height": 16384,

core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__50.json.snap

@@ -172,6 +172,7 @@ expression: config_view
     },
     "grow_mem_cost": 1,
     "regular_op_cost": 822756,
+    "disable_9393_fix": false,
     "limit_config": {
       "max_gas_burnt": 200000000000000,
       "max_stack_height": 16384,

core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__52.json.snap

@@ -172,6 +172,7 @@ expression: config_view
     },
     "grow_mem_cost": 1,
     "regular_op_cost": 822756,
+    "disable_9393_fix": false,
     "limit_config": {
       "max_gas_burnt": 300000000000000,
       "max_stack_height": 16384,

core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__53.json.snap

@@ -172,6 +172,7 @@ expression: config_view
     },
     "grow_mem_cost": 1,
     "regular_op_cost": 822756,
+    "disable_9393_fix": false,
     "limit_config": {
       "max_gas_burnt": 300000000000000,
       "max_stack_height": 16384,

core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__57.json.snap

@@ -172,6 +172,7 @@ expression: config_view
     },
     "grow_mem_cost": 1,
     "regular_op_cost": 822756,
+    "disable_9393_fix": false,
     "limit_config": {
       "max_gas_burnt": 300000000000000,
       "max_stack_height": 16384,

core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__59.json.snap

@@ -172,6 +172,7 @@ expression: config_view
     },
     "grow_mem_cost": 1,
     "regular_op_cost": 822756,
+    "disable_9393_fix": false,
     "limit_config": {
       "max_gas_burnt": 300000000000000,
       "max_stack_height": 16384,

core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__61.json.snap

@@ -172,6 +172,7 @@ expression: config_view
     },
     "grow_mem_cost": 1,
     "regular_op_cost": 822756,
+    "disable_9393_fix": false,
     "limit_config": {
       "max_gas_burnt": 300000000000000,
       "max_stack_height": 16384,

core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__62.json.snap

@@ -172,6 +172,7 @@ expression: config_view
     },
     "grow_mem_cost": 1,
     "regular_op_cost": 822756,
+    "disable_9393_fix": true,
     "limit_config": {
       "max_gas_burnt": 300000000000000,
       "max_stack_height": 262144,