near · Ekleog-NEAR · Nov 25, 2022 · Jan 4, 2023 · Jan 6, 2023 · Jan 6, 2023
@@ -33,6 +33,16 @@ members = [
     "integration-tests",
     "nearcore",
     "neard",
+    "runtime/near-vm/lib/api",
+    "runtime/near-vm/lib/compiler",
+    "runtime/near-vm/lib/compiler-singlepass",
+    "runtime/near-vm/lib/engine",
+    "runtime/near-vm/lib/engine-universal",
+    "runtime/near-vm/lib/vm",
+    "runtime/near-vm/lib/types",
+    "runtime/near-vm/tests/lib/wast",
+    "runtime/near-vm/tests/lib/compiler-test-derive",
+    "runtime/near-vm/fuzz",
     "runtime/near-vm-logic",
     "runtime/near-vm-runner",
     "runtime/near-vm-runner/fuzz",
@@ -114,6 +124,7 @@ ed25519-dalek = "1"
 elastic-array = "0.11"
 enum-map = "2.1.0"
 expect-test = "1.3.0"
+finite-wasm = { version = "0.3.0", features = ["instrument"] }
 flate2 = "1.0.22"
 fs2 = "0.4"
 futures = "0.3.5"
@@ -150,6 +161,7 @@ parity-wasm = { version = "0.42", default-features = false }
 parity-wasm_41 = { package = "parity-wasm", version = "0.41" }
 parking_lot = "0.12.1"
 pin-project = "1.0"
+prefix-sum-vec = "0.1.2"
 pretty_assertions = "1.2"
 primitive-types = { version = "0.10", default-features = false }
 prometheus = "0.13.1"
@@ -206,10 +218,10 @@ turn = "0.6"
 validator = "0.12"
 rkyv = { version = "0.7", features = ["strict"] }
 wasm-encoder = "0.11.0"
-wasm-smith = "0.10"
-wasmparser = "0.78"
+wasm-smith = "0.12"
+wasmparser = "0.99.0"
 wasmprinter = "0.2"
-wasmtime = { version = "4.0.0", default-features = false, features = ["cranelift"] }
+wasmtime = { version = "5.0.0", default-features = false, features = ["cranelift"] }
 wat = "1.0.40"
 webrtc-util = "0.7"
 xshell = "0.2.1"

diff --git a/chain/chain/src/tests/simple_chain.rs b/chain/chain/src/tests/simple_chain.rs
@@ -45,7 +45,7 @@ fn build_chain() {
     if cfg!(feature = "nightly") {
         insta::assert_display_snapshot!(hash, @"7f7HTgxYS9NbF61kqqQSD4ivtPj7hCReXqyMMqiUfMZq");
     } else {
-        insta::assert_display_snapshot!(hash, @"HC1942JdWWxiJb8zm5VyepB7iysDbBq8MfnZC7aSq7mK");
+        insta::assert_display_snapshot!(hash, @"3fK7Uu3HC9y9DPMsDNaAP8sv56UCK2ZV1txRhTriF9qb");
     }
 
     for i in 1..5 {
@@ -75,7 +75,7 @@ fn build_chain() {
     if cfg!(feature = "nightly") {
         insta::assert_display_snapshot!(hash, @"5GXKgTvpLBcSDncu3P8tdmFZ48m89rzUivJEtDTjp6oq");
     } else {
-        insta::assert_display_snapshot!(hash, @"8L1cHCc7Cx9SRPWpVtjPtEzQWamztMoHE3cxAcZtHTKv");
+        insta::assert_display_snapshot!(hash, @"7hQ4bvvu2TmgFVhELFThZPHFoBPwa74VT6D8uk79xPzB");
     }
 }
 

diff --git a/chain/client/src/test_utils.rs b/chain/client/src/test_utils.rs
@@ -1691,6 +1691,8 @@ impl TestEnv {
         self.clients[id].process_tx(tx, false, false)
     }
 
+    /// This function will actually bump to the latest protocol version instead of the provided one.
+    /// See https://github.com/near/nearcore/issues/8590 for details.
     pub fn upgrade_protocol(&mut self, protocol_version: ProtocolVersion) {
         assert_eq!(self.clients.len(), 1, "at the moment, this support only a single client");
 
@@ -1703,6 +1705,7 @@ impl TestEnv {
             self.clients[0].runtime_adapter.get_block_producer(&epoch_id, tip.height).unwrap();
 
         let mut block = self.clients[0].produce_block(tip.height + 1).unwrap().unwrap();
+        eprintln!("Producing block with version {protocol_version}");
         block.mut_header().set_latest_protocol_version(protocol_version);
         block.mut_header().resign(&create_test_signer(block_producer.as_str()));
 

diff --git a/chain/jsonrpc/jsonrpc-tests/res/genesis_config.json b/chain/jsonrpc/jsonrpc-tests/res/genesis_config.json
@@ -1,5 +1,5 @@
 {
-  "protocol_version": 59,
+  "protocol_version": 60,
   "genesis_time": "1970-01-01T00:00:00.000000000Z",
   "chain_id": "sample",
   "genesis_height": 0,

@@ -35,19 +35,18 @@ pub struct VMLimitConfig {
 
     /// How tall the stack is allowed to grow?
     ///
-    /// See <https://wiki.parity.io/WebAssembly-StackHeight> to find out
-    /// how the stack frame cost is calculated.
+    /// See <https://wiki.parity.io/WebAssembly-StackHeight> to find out how the stack frame cost
+    /// is calculated.
     pub max_stack_height: u32,
-    /// Whether a legacy version of stack limiting should be used, see
-    /// [`StackLimiterVersion`].
-    #[serde(default = "StackLimiterVersion::v0")]
-    pub stack_limiter_version: StackLimiterVersion,
+    /// Whether a legacy version of stack limiting should be used, see [`ContractPrepareVersion`].
+    #[serde(default = "ContractPrepareVersion::v0")]
+    pub contract_prepare_version: ContractPrepareVersion,
 
     /// The initial number of memory pages.
+    ///
     /// NOTE: It's not a limiter itself, but it's a value we use for initial_memory_pages.
     pub initial_memory_pages: u32,
-    /// What is the maximal memory pages amount is allowed to have for
-    /// a contract.
+    /// What is the maximal memory pages amount is allowed to have for a contract.
     pub max_memory_pages: u32,
 
     /// Limit of memory used by registers.
@@ -131,16 +130,22 @@ fn wasmer2_stack_limit_default() -> i32 {
     serde_repr::Deserialize_repr,
 )]
 #[repr(u8)]
-pub enum StackLimiterVersion {
-    /// Old, buggy version, don't use it unless specifically to support old protocol version.
+pub enum ContractPrepareVersion {
+    /// Oldest, buggiest version.
+    ///
+    /// Don't use it unless specifically to support old protocol version.
     V0,
-    /// What we use in today's protocol.
+    /// Old, slow and buggy version.
+    ///
+    /// Better than V0, but don’t use this nevertheless.
     V1,
+    /// finite-wasm 0.3.0 based contract preparation code.
+    V2,
 }
 
-impl StackLimiterVersion {
-    pub fn v0() -> StackLimiterVersion {
-        StackLimiterVersion::V0
+impl ContractPrepareVersion {
+    pub fn v0() -> ContractPrepareVersion {
+        ContractPrepareVersion::V0
     }
 }
 
@@ -205,8 +210,8 @@ impl VMLimitConfig {
 
             // NOTE: Stack height has to be 16K, otherwise Wasmer produces non-deterministic results.
             // For experimentation try `test_stack_overflow`.
-            max_stack_height: 16 * 1024, // 16Kib of stack.
-            stack_limiter_version: StackLimiterVersion::V1,
+            max_stack_height: 256 * 1024, // 256kiB of stack.
+            contract_prepare_version: ContractPrepareVersion::V2,
             initial_memory_pages: 2u32.pow(10), // 64Mib of memory.
             max_memory_pages: 2u32.pow(11),     // 128Mib of memory.
 

diff --git a/core/primitives-core/src/parameter.rs b/core/primitives-core/src/parameter.rs
@@ -121,7 +121,7 @@ pub enum Parameter {
     MaxGasBurnt,
     MaxGasBurntView,
     MaxStackHeight,
-    StackLimiterVersion,
+    ContractPrepareVersion,
     InitialMemoryPages,
     MaxMemoryPages,
     RegistersMemoryLimit,
@@ -186,7 +186,7 @@ impl Parameter {
         [
             Parameter::MaxGasBurnt,
             Parameter::MaxStackHeight,
-            Parameter::StackLimiterVersion,
+            Parameter::ContractPrepareVersion,
             Parameter::InitialMemoryPages,
             Parameter::MaxMemoryPages,
             Parameter::RegistersMemoryLimit,

diff --git a/core/primitives/res/runtime_configs/50.yaml b/core/primitives/res/runtime_configs/50.yaml
@@ -1 +1 @@
-stack_limiter_version: { old: 0, new: 1 }
+contract_prepare_version: { old: 0, new: 1 }
diff --git a/core/primitives/res/runtime_configs/60.yaml b/core/primitives/res/runtime_configs/60.yaml
@@ -0,0 +1 @@
+max_stack_height: { old: 16384, new: 262144 }
diff --git a/core/primitives/res/runtime_configs/parameters.snap b/core/primitives/res/runtime_configs/parameters.snap
@@ -138,8 +138,8 @@ wasm_alt_bn128_g1_sum_base                     3_000_000_000
 wasm_alt_bn128_g1_sum_element                  5_000_000_000
 max_gas_burnt                            300_000_000_000_000
 max_gas_burnt_view                       300_000_000_000_000
-max_stack_height                                      16_384
-stack_limiter_version                                      1
+max_stack_height                                     262_144
+contract_prepare_version                                   1
 initial_memory_pages                                   1_024
 max_memory_pages                                       2_048
 registers_memory_limit                         1_073_741_824

diff --git a/core/primitives/res/runtime_configs/parameters.yaml b/core/primitives/res/runtime_configs/parameters.yaml
@@ -175,7 +175,7 @@ wasm_alt_bn128_g1_sum_element: 5_000_000_000
 max_gas_burnt: 200_000_000_000_000
 max_gas_burnt_view: 200_000_000_000_000
 max_stack_height: 16_384
-stack_limiter_version: 0
+contract_prepare_version: 0
 initial_memory_pages: 1_024
 max_memory_pages: 2_048
 registers_memory_limit: 1_073_741_824

diff --git a/core/primitives/res/runtime_configs/parameters_testnet.yaml b/core/primitives/res/runtime_configs/parameters_testnet.yaml
@@ -172,7 +172,7 @@ wasm_alt_bn128_g1_sum_element: 76_218_543
 max_gas_burnt: 200_000_000_000_000
 max_gas_burnt_view: 200_000_000_000_000
 max_stack_height: 16_384
-stack_limiter_version: 0
+contract_prepare_version: 0
 initial_memory_pages: 1_024
 max_memory_pages: 2_048
 registers_memory_limit: 1_073_741_824

diff --git a/core/primitives/src/runtime/config_store.rs b/core/primitives/src/runtime/config_store.rs
@@ -30,6 +30,7 @@ static CONFIG_DIFFS: &[(ProtocolVersion, &str)] = &[
     (57, include_config!("57.yaml")),
     // Introduce Zero Balance Account and increase account creation cost to 7.7Tgas
     (59, include_config!("59.yaml")),
+    (60, include_config!("60.yaml")),
 ];
 
 /// Testnet parameters for versions <= 29, which (incorrectly) differed from mainnet parameters

diff --git a/...imitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__0.json.snap b/...imitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__0.json.snap
@@ -175,7 +175,7 @@ expression: config_view
     "limit_config": {
       "max_gas_burnt": 200000000000000,
       "max_stack_height": 16384,
-      "stack_limiter_version": 0,
+      "contract_prepare_version": 0,
       "initial_memory_pages": 1024,
       "max_memory_pages": 2048,
       "registers_memory_limit": 1073741824,

diff --git a/...mitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__42.json.snap b/...mitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__42.json.snap
@@ -175,7 +175,7 @@ expression: config_view
     "limit_config": {
       "max_gas_burnt": 200000000000000,
       "max_stack_height": 16384,
-      "stack_limiter_version": 0,
+      "contract_prepare_version": 0,
       "initial_memory_pages": 1024,
       "max_memory_pages": 2048,
       "registers_memory_limit": 1073741824,

diff --git a/...mitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__48.json.snap b/...mitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__48.json.snap
@@ -175,7 +175,7 @@ expression: config_view
     "limit_config": {
       "max_gas_burnt": 200000000000000,
       "max_stack_height": 16384,
-      "stack_limiter_version": 0,
+      "contract_prepare_version": 0,
       "initial_memory_pages": 1024,
       "max_memory_pages": 2048,
       "registers_memory_limit": 1073741824,

diff --git a/...mitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__49.json.snap b/...mitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__49.json.snap
@@ -175,7 +175,7 @@ expression: config_view
     "limit_config": {
       "max_gas_burnt": 200000000000000,
       "max_stack_height": 16384,
-      "stack_limiter_version": 0,
+      "contract_prepare_version": 0,
       "initial_memory_pages": 1024,
       "max_memory_pages": 2048,
       "registers_memory_limit": 1073741824,

diff --git a/...mitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__50.json.snap b/...mitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__50.json.snap
@@ -175,7 +175,7 @@ expression: config_view
     "limit_config": {
       "max_gas_burnt": 200000000000000,
       "max_stack_height": 16384,
-      "stack_limiter_version": 1,
+      "contract_prepare_version": 1,
       "initial_memory_pages": 1024,
       "max_memory_pages": 2048,
       "registers_memory_limit": 1073741824,

diff --git a/...mitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__52.json.snap b/...mitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__52.json.snap
@@ -175,7 +175,7 @@ expression: config_view
     "limit_config": {
       "max_gas_burnt": 300000000000000,
       "max_stack_height": 16384,
-      "stack_limiter_version": 1,
+      "contract_prepare_version": 1,
       "initial_memory_pages": 1024,
       "max_memory_pages": 2048,
       "registers_memory_limit": 1073741824,

diff --git a/...mitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__53.json.snap b/...mitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__53.json.snap
@@ -175,7 +175,7 @@ expression: config_view
     "limit_config": {
       "max_gas_burnt": 300000000000000,
       "max_stack_height": 16384,
-      "stack_limiter_version": 1,
+      "contract_prepare_version": 1,
       "initial_memory_pages": 1024,
       "max_memory_pages": 2048,
       "registers_memory_limit": 1073741824,

diff --git a/...mitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__57.json.snap b/...mitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__57.json.snap
@@ -175,7 +175,7 @@ expression: config_view
     "limit_config": {
       "max_gas_burnt": 300000000000000,
       "max_stack_height": 16384,
-      "stack_limiter_version": 1,
+      "contract_prepare_version": 1,
       "initial_memory_pages": 1024,
       "max_memory_pages": 2048,
       "registers_memory_limit": 1073741824,
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		stack_limiter_version: { old: 0, new: 1 }
		contract_prepare_version: { old: 0, new: 1 }