Revert "add a protocol version running near-vm (#8912)"

This reverts commit e270fb1.
near · May 4, 2023 · 570aac2 · 570aac2
1 parent 1dc38bf
commit 570aac2
Show file tree

Hide file tree

Showing 23 changed files with 94 additions and 718 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,7 +20,6 @@
 * undo-block tool to reset the chain head from current head to its prev block. Use the tool by running: `./target/release/neard undo-block`. [#8681](https://github.com/near/nearcore/pull/8681)
 * Add prometheus metrics for expected number of blocks/chunks at the end of the epoch. [#8759](https://github.com/near/nearcore/pull/8759)
 * Node can sync State from S3. [#8789](https://github.com/near/nearcore/pull/8789)
-* The contract runtime switched to using our fork of wasmer, with various improvements. [#8912](https://github.com/near/nearcore/pull/8912)
 * Node can sync State from local filesystem. [#8913](https://github.com/near/nearcore/pull/8913)
 * Add per shard granularity for chunks in validator info metric. [#8934](https://github.com/near/nearcore/pull/8934)
 
@@ -67,14 +66,14 @@ to pay for the storage of their accounts.
 [Stabilization #8601](https://github.com/near/nearcore/pull/8601)
 
 ### Non-protocol Changes
-* Config validation can be done by following command: 
-  `./target/debug/neard --home {path_to_config_files} validate-config`. 
-  This will show error if there are file issues or semantic issues in `config.json`, `genesis.json`, `records.json`, `node_key.json` and `validator_key.json`. 
+* Config validation can be done by following command:
+  `./target/debug/neard --home {path_to_config_files} validate-config`.
+  This will show error if there are file issues or semantic issues in `config.json`, `genesis.json`, `records.json`, `node_key.json` and `validator_key.json`.
   [#8485](https://github.com/near/nearcore/pull/8485)
 * Comments are allowed in configs. This includes
   `config.json`, `genesis.json`, `node_key.json` and `validator_key.json`. You can use `//`, `#` and `/*...*/` for comments.
   [#8423](https://github.com/near/nearcore/pull/8423)
-* `/debug` page now has client_config linked. 
+* `/debug` page now has client_config linked.
   You can also check your client_config directly at /debug/client_config
   [#8400](https://github.com/near/nearcore/pull/8400)
 * Added cold store loop - a background thread that copies data from hot to cold storage and a new json rpc endpoing - split_storage_info - that

diff --git a/core/primitives-core/src/config.rs b/core/primitives-core/src/config.rs
@@ -210,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: 256 * 1024, // 256kiB of stack.
-            contract_prepare_version: ContractPrepareVersion::V2,
+            max_stack_height: 16 * 1024, // 16Kib of stack.
+            contract_prepare_version: ContractPrepareVersion::V1,
             initial_memory_pages: 2u32.pow(10), // 64Mib of memory.
             max_memory_pages: 2u32.pow(11),     // 128Mib of memory.
 

diff --git a/core/primitives/res/runtime_configs/parameters.snap b/core/primitives/res/runtime_configs/parameters.snap
@@ -103,17 +103,17 @@ wasm_ed25519_verify_base                     210_000_000_000
 wasm_ed25519_verify_byte                           9_000_000
 wasm_log_base                                  3_543_313_050
 wasm_log_byte                                     13_198_791
-wasm_storage_write_base                       64_196_736_000, compute:      200_000_000_000
+wasm_storage_write_base                       64_196_736_000
 wasm_storage_write_key_byte                       70_482_867
 wasm_storage_write_value_byte                     31_018_539
 wasm_storage_write_evicted_byte                   32_117_307
-wasm_storage_read_base                        56_356_845_750, compute:      200_000_000_000
+wasm_storage_read_base                        56_356_845_750
 wasm_storage_read_key_byte                        30_952_533
 wasm_storage_read_value_byte                       5_611_005
-wasm_storage_remove_base                      53_473_030_500, compute:      200_000_000_000
+wasm_storage_remove_base                      53_473_030_500
 wasm_storage_remove_key_byte                      38_220_384
 wasm_storage_remove_ret_value_byte                11_531_556
-wasm_storage_has_key_base                     54_039_896_625, compute:      200_000_000_000
+wasm_storage_has_key_base                     54_039_896_625
 wasm_storage_has_key_byte                         30_790_845
 wasm_storage_iter_create_prefix_base                       0
 wasm_storage_iter_create_prefix_byte                       0
@@ -123,7 +123,7 @@ wasm_storage_iter_create_to_byte                           0
 wasm_storage_iter_next_base                                0
 wasm_storage_iter_next_key_byte                            0
 wasm_storage_iter_next_value_byte                          0
-wasm_touching_trie_node                       16_101_955_926, compute:      110_000_000_000
+wasm_touching_trie_node                       16_101_955_926
 wasm_read_cached_trie_node                     2_280_000_000
 wasm_promise_and_base                          1_465_013_400
 wasm_promise_and_per_promise                       5_452_176
@@ -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                                     262_144
-contract_prepare_version                                   2
+max_stack_height                                      16_384
+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/src/runtime/config_store.rs b/core/primitives/src/runtime/config_store.rs
@@ -30,7 +30,6 @@ 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")),
-    (61, include_config!("61.yaml")),
 ];
 
 /// Testnet parameters for versions <= 29, which (incorrectly) differed from mainnet parameters

diff --git a/...mitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__61.json.snap b/...mitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__61.json.snap