diff --git a/core/parameters/res/runtime_configs/139.yaml b/core/parameters/res/runtime_configs/67.yaml similarity index 100% rename from core/parameters/res/runtime_configs/139.yaml rename to core/parameters/res/runtime_configs/67.yaml diff --git a/core/parameters/res/runtime_configs/parameters.snap b/core/parameters/res/runtime_configs/parameters.snap index fe11fafc432..dd04d53dccb 100644 --- a/core/parameters/res/runtime_configs/parameters.snap +++ b/core/parameters/res/runtime_configs/parameters.snap @@ -138,10 +138,10 @@ wasm_alt_bn128_pairing_check_base 9_686_000_000_000 wasm_alt_bn128_pairing_check_element 5_102_000_000_000 wasm_alt_bn128_g1_sum_base 3_000_000_000 wasm_alt_bn128_g1_sum_element 5_000_000_000 -wasm_yield_create_base 300_000_000_000_000 -wasm_yield_create_byte 300_000_000_000_000 -wasm_yield_resume_base 300_000_000_000_000 -wasm_yield_resume_byte 300_000_000_000_000 +wasm_yield_create_base 153_411_779_276 +wasm_yield_create_byte 15_643_988 +wasm_yield_resume_base 1_195_627_285_210 +wasm_yield_resume_byte 17_212_011 max_gas_burnt 300_000_000_000_000 max_gas_burnt_view 300_000_000_000_000 max_stack_height 262_144 @@ -181,4 +181,4 @@ alt_bn128 true function_call_weight true vm_kind NearVm eth_implicit_accounts false -yield_resume false +yield_resume true diff --git a/core/parameters/src/config_store.rs b/core/parameters/src/config_store.rs index 022362c5720..0c9dc1fc128 100644 --- a/core/parameters/src/config_store.rs +++ b/core/parameters/src/config_store.rs @@ -38,12 +38,12 @@ static CONFIG_DIFFS: &[(ProtocolVersion, &str)] = &[ (63, include_config!("63.yaml")), (64, include_config!("64.yaml")), (66, include_config!("66.yaml")), + (67, include_config!("67.yaml")), (83, include_config!("83.yaml")), (85, include_config!("85.yaml")), (129, include_config!("129.yaml")), // Introduce ETH-implicit accounts. (138, include_config!("138.yaml")), - (139, include_config!("139.yaml")), ]; /// Testnet parameters for versions <= 29, which (incorrectly) differed from mainnet parameters diff --git a/core/parameters/src/snapshots/near_parameters__config_store__tests__129.json.snap b/core/parameters/src/snapshots/near_parameters__config_store__tests__129.json.snap index 31bb9bf0247..ac0ec16da8b 100644 --- a/core/parameters/src/snapshots/near_parameters__config_store__tests__129.json.snap +++ b/core/parameters/src/snapshots/near_parameters__config_store__tests__129.json.snap @@ -170,10 +170,10 @@ expression: config_view "alt_bn128_g1_sum_element": 5000000000, "alt_bn128_pairing_check_base": 9686000000000, "alt_bn128_pairing_check_element": 5102000000000, - "yield_create_base": 300000000000000, - "yield_create_byte": 300000000000000, - "yield_resume_base": 300000000000000, - "yield_resume_byte": 300000000000000 + "yield_create_base": 153411779276, + "yield_create_byte": 15643988, + "yield_resume_base": 1195627285210, + "yield_resume_byte": 1195627285210 }, "grow_mem_cost": 1, "regular_op_cost": 822756, @@ -187,7 +187,7 @@ expression: config_view "alt_bn128": true, "function_call_weight": true, "eth_implicit_accounts": false, - "yield_resume_host_functions": false, + "yield_resume_host_functions": true, "limit_config": { "max_gas_burnt": 300000000000000, "max_stack_height": 262144, diff --git a/core/parameters/src/snapshots/near_parameters__config_store__tests__138.json.snap b/core/parameters/src/snapshots/near_parameters__config_store__tests__138.json.snap index 8c0cb9c1841..bb5d7b8ea62 100644 --- a/core/parameters/src/snapshots/near_parameters__config_store__tests__138.json.snap +++ b/core/parameters/src/snapshots/near_parameters__config_store__tests__138.json.snap @@ -170,10 +170,10 @@ expression: config_view "alt_bn128_g1_sum_element": 5000000000, "alt_bn128_pairing_check_base": 9686000000000, "alt_bn128_pairing_check_element": 5102000000000, - "yield_create_base": 300000000000000, - "yield_create_byte": 300000000000000, - "yield_resume_base": 300000000000000, - "yield_resume_byte": 300000000000000 + "yield_create_base": 153411779276, + "yield_create_byte": 15643988, + "yield_resume_base": 1195627285210, + "yield_resume_byte": 1195627285210 }, "grow_mem_cost": 1, "regular_op_cost": 822756, @@ -187,7 +187,7 @@ expression: config_view "alt_bn128": true, "function_call_weight": true, "eth_implicit_accounts": true, - "yield_resume_host_functions": false, + "yield_resume_host_functions": true, "limit_config": { "max_gas_burnt": 300000000000000, "max_stack_height": 262144, diff --git a/core/parameters/src/snapshots/near_parameters__config_store__tests__67.json.snap b/core/parameters/src/snapshots/near_parameters__config_store__tests__67.json.snap new file mode 100644 index 00000000000..1663a04f129 --- /dev/null +++ b/core/parameters/src/snapshots/near_parameters__config_store__tests__67.json.snap @@ -0,0 +1,227 @@ +--- +source: core/parameters/src/config_store.rs +expression: config_view +--- +{ + "storage_amount_per_byte": "10000000000000000000", + "transaction_costs": { + "action_receipt_creation_config": { + "send_sir": 108059500000, + "send_not_sir": 108059500000, + "execution": 108059500000 + }, + "data_receipt_creation_config": { + "base_cost": { + "send_sir": 36486732312, + "send_not_sir": 36486732312, + "execution": 36486732312 + }, + "cost_per_byte": { + "send_sir": 17212011, + "send_not_sir": 17212011, + "execution": 17212011 + } + }, + "action_creation_config": { + "create_account_cost": { + "send_sir": 3850000000000, + "send_not_sir": 3850000000000, + "execution": 3850000000000 + }, + "deploy_contract_cost": { + "send_sir": 184765750000, + "send_not_sir": 184765750000, + "execution": 184765750000 + }, + "deploy_contract_cost_per_byte": { + "send_sir": 6812999, + "send_not_sir": 6812999, + "execution": 64572944 + }, + "function_call_cost": { + "send_sir": 200000000000, + "send_not_sir": 200000000000, + "execution": 780000000000 + }, + "function_call_cost_per_byte": { + "send_sir": 2235934, + "send_not_sir": 2235934, + "execution": 2235934 + }, + "transfer_cost": { + "send_sir": 115123062500, + "send_not_sir": 115123062500, + "execution": 115123062500 + }, + "stake_cost": { + "send_sir": 141715687500, + "send_not_sir": 141715687500, + "execution": 102217625000 + }, + "add_key_cost": { + "full_access_cost": { + "send_sir": 101765125000, + "send_not_sir": 101765125000, + "execution": 101765125000 + }, + "function_call_cost": { + "send_sir": 102217625000, + "send_not_sir": 102217625000, + "execution": 102217625000 + }, + "function_call_cost_per_byte": { + "send_sir": 1925331, + "send_not_sir": 1925331, + "execution": 1925331 + } + }, + "delete_key_cost": { + "send_sir": 94946625000, + "send_not_sir": 94946625000, + "execution": 94946625000 + }, + "delete_account_cost": { + "send_sir": 147489000000, + "send_not_sir": 147489000000, + "execution": 147489000000 + }, + "delegate_cost": { + "send_sir": 200000000000, + "send_not_sir": 200000000000, + "execution": 200000000000 + } + }, + "storage_usage_config": { + "num_bytes_account": 100, + "num_extra_bytes_record": 40 + }, + "burnt_gas_reward": [ + 3, + 10 + ], + "pessimistic_gas_price_inflation_ratio": [ + 103, + 100 + ], + "storage_proof_size_soft_limit": 999999999999999 + }, + "wasm_config": { + "ext_costs": { + "base": 264768111, + "contract_loading_base": 35445963, + "contract_loading_bytes": 1089295, + "read_memory_base": 2609863200, + "read_memory_byte": 3801333, + "write_memory_base": 2803794861, + "write_memory_byte": 2723772, + "read_register_base": 2517165186, + "read_register_byte": 98562, + "write_register_base": 2865522486, + "write_register_byte": 3801564, + "utf8_decoding_base": 3111779061, + "utf8_decoding_byte": 291580479, + "utf16_decoding_base": 3543313050, + "utf16_decoding_byte": 163577493, + "sha256_base": 4540970250, + "sha256_byte": 24117351, + "keccak256_base": 5879491275, + "keccak256_byte": 21471105, + "keccak512_base": 5811388236, + "keccak512_byte": 36649701, + "ripemd160_base": 853675086, + "ripemd160_block": 680107584, + "ed25519_verify_base": 210000000000, + "ed25519_verify_byte": 9000000, + "ecrecover_base": 278821988457, + "log_base": 3543313050, + "log_byte": 13198791, + "storage_write_base": 64196736000, + "storage_write_key_byte": 70482867, + "storage_write_value_byte": 31018539, + "storage_write_evicted_byte": 32117307, + "storage_read_base": 56356845750, + "storage_read_key_byte": 30952533, + "storage_read_value_byte": 5611005, + "storage_remove_base": 53473030500, + "storage_remove_key_byte": 38220384, + "storage_remove_ret_value_byte": 11531556, + "storage_has_key_base": 54039896625, + "storage_has_key_byte": 30790845, + "storage_iter_create_prefix_base": 0, + "storage_iter_create_prefix_byte": 0, + "storage_iter_create_range_base": 0, + "storage_iter_create_from_byte": 0, + "storage_iter_create_to_byte": 0, + "storage_iter_next_base": 0, + "storage_iter_next_key_byte": 0, + "storage_iter_next_value_byte": 0, + "touching_trie_node": 16101955926, + "read_cached_trie_node": 2280000000, + "promise_and_base": 1465013400, + "promise_and_per_promise": 5452176, + "promise_return": 560152386, + "validator_stake_base": 911834726400, + "validator_total_stake_base": 911834726400, + "contract_compile_base": 0, + "contract_compile_bytes": 0, + "alt_bn128_g1_multiexp_base": 713000000000, + "alt_bn128_g1_multiexp_element": 320000000000, + "alt_bn128_g1_sum_base": 3000000000, + "alt_bn128_g1_sum_element": 5000000000, + "alt_bn128_pairing_check_base": 9686000000000, + "alt_bn128_pairing_check_element": 5102000000000, + "yield_create_base": 153411779276, + "yield_create_byte": 15643988, + "yield_resume_base": 1195627285210, + "yield_resume_byte": 1195627285210 + }, + "grow_mem_cost": 1, + "regular_op_cost": 822756, + "vm_kind": "", + "disable_9393_fix": false, + "storage_get_mode": "FlatStorage", + "fix_contract_loading_cost": false, + "implicit_account_creation": true, + "math_extension": true, + "ed25519_verify": true, + "alt_bn128": true, + "function_call_weight": true, + "eth_implicit_accounts": false, + "yield_resume_host_functions": true, + "limit_config": { + "max_gas_burnt": 300000000000000, + "max_stack_height": 262144, + "contract_prepare_version": 2, + "initial_memory_pages": 1024, + "max_memory_pages": 2048, + "registers_memory_limit": 1073741824, + "max_register_size": 104857600, + "max_number_registers": 100, + "max_number_logs": 100, + "max_total_log_length": 16384, + "max_total_prepaid_gas": 300000000000000, + "max_actions_per_receipt": 100, + "max_number_bytes_method_names": 2000, + "max_length_method_name": 256, + "max_arguments_length": 4194304, + "max_length_returned_data": 4194304, + "max_contract_size": 4194304, + "max_transaction_size": 4194304, + "max_length_storage_key": 2048, + "max_length_storage_value": 4194304, + "max_promises_per_function_call_action": 1024, + "max_number_input_data_dependencies": 128, + "max_functions_number_per_contract": 10000, + "wasmer2_stack_limit": 204800, + "max_locals_per_contract": 1000000, + "account_id_validity_rules_version": 1, + "yield_timeout_length_in_blocks": 200, + "max_yield_payload_size": 1024, + "storage_proof_size_receipt_limit": 999999999999999 + } + }, + "account_creation_config": { + "min_allowed_top_level_account_length": 65, + "registrar_account_id": "registrar" + } +} diff --git a/core/parameters/src/snapshots/near_parameters__config_store__tests__83.json.snap b/core/parameters/src/snapshots/near_parameters__config_store__tests__83.json.snap index 796d4276a88..750af8c5be3 100644 --- a/core/parameters/src/snapshots/near_parameters__config_store__tests__83.json.snap +++ b/core/parameters/src/snapshots/near_parameters__config_store__tests__83.json.snap @@ -170,10 +170,10 @@ expression: config_view "alt_bn128_g1_sum_element": 5000000000, "alt_bn128_pairing_check_base": 9686000000000, "alt_bn128_pairing_check_element": 5102000000000, - "yield_create_base": 300000000000000, - "yield_create_byte": 300000000000000, - "yield_resume_base": 300000000000000, - "yield_resume_byte": 300000000000000 + "yield_create_base": 153411779276, + "yield_create_byte": 15643988, + "yield_resume_base": 1195627285210, + "yield_resume_byte": 1195627285210 }, "grow_mem_cost": 1, "regular_op_cost": 822756, @@ -187,7 +187,7 @@ expression: config_view "alt_bn128": true, "function_call_weight": true, "eth_implicit_accounts": false, - "yield_resume_host_functions": false, + "yield_resume_host_functions": true, "limit_config": { "max_gas_burnt": 300000000000000, "max_stack_height": 262144, diff --git a/core/parameters/src/snapshots/near_parameters__config_store__tests__85.json.snap b/core/parameters/src/snapshots/near_parameters__config_store__tests__85.json.snap index 5d1dfcd66fc..60349cb7759 100644 --- a/core/parameters/src/snapshots/near_parameters__config_store__tests__85.json.snap +++ b/core/parameters/src/snapshots/near_parameters__config_store__tests__85.json.snap @@ -170,10 +170,10 @@ expression: config_view "alt_bn128_g1_sum_element": 5000000000, "alt_bn128_pairing_check_base": 9686000000000, "alt_bn128_pairing_check_element": 5102000000000, - "yield_create_base": 300000000000000, - "yield_create_byte": 300000000000000, - "yield_resume_base": 300000000000000, - "yield_resume_byte": 300000000000000 + "yield_create_base": 153411779276, + "yield_create_byte": 15643988, + "yield_resume_base": 1195627285210, + "yield_resume_byte": 1195627285210 }, "grow_mem_cost": 1, "regular_op_cost": 822756, @@ -187,7 +187,7 @@ expression: config_view "alt_bn128": true, "function_call_weight": true, "eth_implicit_accounts": false, - "yield_resume_host_functions": false, + "yield_resume_host_functions": true, "limit_config": { "max_gas_burnt": 300000000000000, "max_stack_height": 262144, diff --git a/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_129.json.snap b/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_129.json.snap index 31bb9bf0247..ac0ec16da8b 100644 --- a/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_129.json.snap +++ b/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_129.json.snap @@ -170,10 +170,10 @@ expression: config_view "alt_bn128_g1_sum_element": 5000000000, "alt_bn128_pairing_check_base": 9686000000000, "alt_bn128_pairing_check_element": 5102000000000, - "yield_create_base": 300000000000000, - "yield_create_byte": 300000000000000, - "yield_resume_base": 300000000000000, - "yield_resume_byte": 300000000000000 + "yield_create_base": 153411779276, + "yield_create_byte": 15643988, + "yield_resume_base": 1195627285210, + "yield_resume_byte": 1195627285210 }, "grow_mem_cost": 1, "regular_op_cost": 822756, @@ -187,7 +187,7 @@ expression: config_view "alt_bn128": true, "function_call_weight": true, "eth_implicit_accounts": false, - "yield_resume_host_functions": false, + "yield_resume_host_functions": true, "limit_config": { "max_gas_burnt": 300000000000000, "max_stack_height": 262144, diff --git a/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_138.json.snap b/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_138.json.snap index 8c0cb9c1841..bb5d7b8ea62 100644 --- a/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_138.json.snap +++ b/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_138.json.snap @@ -170,10 +170,10 @@ expression: config_view "alt_bn128_g1_sum_element": 5000000000, "alt_bn128_pairing_check_base": 9686000000000, "alt_bn128_pairing_check_element": 5102000000000, - "yield_create_base": 300000000000000, - "yield_create_byte": 300000000000000, - "yield_resume_base": 300000000000000, - "yield_resume_byte": 300000000000000 + "yield_create_base": 153411779276, + "yield_create_byte": 15643988, + "yield_resume_base": 1195627285210, + "yield_resume_byte": 1195627285210 }, "grow_mem_cost": 1, "regular_op_cost": 822756, @@ -187,7 +187,7 @@ expression: config_view "alt_bn128": true, "function_call_weight": true, "eth_implicit_accounts": true, - "yield_resume_host_functions": false, + "yield_resume_host_functions": true, "limit_config": { "max_gas_burnt": 300000000000000, "max_stack_height": 262144, diff --git a/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_67.json.snap b/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_67.json.snap new file mode 100644 index 00000000000..1663a04f129 --- /dev/null +++ b/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_67.json.snap @@ -0,0 +1,227 @@ +--- +source: core/parameters/src/config_store.rs +expression: config_view +--- +{ + "storage_amount_per_byte": "10000000000000000000", + "transaction_costs": { + "action_receipt_creation_config": { + "send_sir": 108059500000, + "send_not_sir": 108059500000, + "execution": 108059500000 + }, + "data_receipt_creation_config": { + "base_cost": { + "send_sir": 36486732312, + "send_not_sir": 36486732312, + "execution": 36486732312 + }, + "cost_per_byte": { + "send_sir": 17212011, + "send_not_sir": 17212011, + "execution": 17212011 + } + }, + "action_creation_config": { + "create_account_cost": { + "send_sir": 3850000000000, + "send_not_sir": 3850000000000, + "execution": 3850000000000 + }, + "deploy_contract_cost": { + "send_sir": 184765750000, + "send_not_sir": 184765750000, + "execution": 184765750000 + }, + "deploy_contract_cost_per_byte": { + "send_sir": 6812999, + "send_not_sir": 6812999, + "execution": 64572944 + }, + "function_call_cost": { + "send_sir": 200000000000, + "send_not_sir": 200000000000, + "execution": 780000000000 + }, + "function_call_cost_per_byte": { + "send_sir": 2235934, + "send_not_sir": 2235934, + "execution": 2235934 + }, + "transfer_cost": { + "send_sir": 115123062500, + "send_not_sir": 115123062500, + "execution": 115123062500 + }, + "stake_cost": { + "send_sir": 141715687500, + "send_not_sir": 141715687500, + "execution": 102217625000 + }, + "add_key_cost": { + "full_access_cost": { + "send_sir": 101765125000, + "send_not_sir": 101765125000, + "execution": 101765125000 + }, + "function_call_cost": { + "send_sir": 102217625000, + "send_not_sir": 102217625000, + "execution": 102217625000 + }, + "function_call_cost_per_byte": { + "send_sir": 1925331, + "send_not_sir": 1925331, + "execution": 1925331 + } + }, + "delete_key_cost": { + "send_sir": 94946625000, + "send_not_sir": 94946625000, + "execution": 94946625000 + }, + "delete_account_cost": { + "send_sir": 147489000000, + "send_not_sir": 147489000000, + "execution": 147489000000 + }, + "delegate_cost": { + "send_sir": 200000000000, + "send_not_sir": 200000000000, + "execution": 200000000000 + } + }, + "storage_usage_config": { + "num_bytes_account": 100, + "num_extra_bytes_record": 40 + }, + "burnt_gas_reward": [ + 3, + 10 + ], + "pessimistic_gas_price_inflation_ratio": [ + 103, + 100 + ], + "storage_proof_size_soft_limit": 999999999999999 + }, + "wasm_config": { + "ext_costs": { + "base": 264768111, + "contract_loading_base": 35445963, + "contract_loading_bytes": 1089295, + "read_memory_base": 2609863200, + "read_memory_byte": 3801333, + "write_memory_base": 2803794861, + "write_memory_byte": 2723772, + "read_register_base": 2517165186, + "read_register_byte": 98562, + "write_register_base": 2865522486, + "write_register_byte": 3801564, + "utf8_decoding_base": 3111779061, + "utf8_decoding_byte": 291580479, + "utf16_decoding_base": 3543313050, + "utf16_decoding_byte": 163577493, + "sha256_base": 4540970250, + "sha256_byte": 24117351, + "keccak256_base": 5879491275, + "keccak256_byte": 21471105, + "keccak512_base": 5811388236, + "keccak512_byte": 36649701, + "ripemd160_base": 853675086, + "ripemd160_block": 680107584, + "ed25519_verify_base": 210000000000, + "ed25519_verify_byte": 9000000, + "ecrecover_base": 278821988457, + "log_base": 3543313050, + "log_byte": 13198791, + "storage_write_base": 64196736000, + "storage_write_key_byte": 70482867, + "storage_write_value_byte": 31018539, + "storage_write_evicted_byte": 32117307, + "storage_read_base": 56356845750, + "storage_read_key_byte": 30952533, + "storage_read_value_byte": 5611005, + "storage_remove_base": 53473030500, + "storage_remove_key_byte": 38220384, + "storage_remove_ret_value_byte": 11531556, + "storage_has_key_base": 54039896625, + "storage_has_key_byte": 30790845, + "storage_iter_create_prefix_base": 0, + "storage_iter_create_prefix_byte": 0, + "storage_iter_create_range_base": 0, + "storage_iter_create_from_byte": 0, + "storage_iter_create_to_byte": 0, + "storage_iter_next_base": 0, + "storage_iter_next_key_byte": 0, + "storage_iter_next_value_byte": 0, + "touching_trie_node": 16101955926, + "read_cached_trie_node": 2280000000, + "promise_and_base": 1465013400, + "promise_and_per_promise": 5452176, + "promise_return": 560152386, + "validator_stake_base": 911834726400, + "validator_total_stake_base": 911834726400, + "contract_compile_base": 0, + "contract_compile_bytes": 0, + "alt_bn128_g1_multiexp_base": 713000000000, + "alt_bn128_g1_multiexp_element": 320000000000, + "alt_bn128_g1_sum_base": 3000000000, + "alt_bn128_g1_sum_element": 5000000000, + "alt_bn128_pairing_check_base": 9686000000000, + "alt_bn128_pairing_check_element": 5102000000000, + "yield_create_base": 153411779276, + "yield_create_byte": 15643988, + "yield_resume_base": 1195627285210, + "yield_resume_byte": 1195627285210 + }, + "grow_mem_cost": 1, + "regular_op_cost": 822756, + "vm_kind": "", + "disable_9393_fix": false, + "storage_get_mode": "FlatStorage", + "fix_contract_loading_cost": false, + "implicit_account_creation": true, + "math_extension": true, + "ed25519_verify": true, + "alt_bn128": true, + "function_call_weight": true, + "eth_implicit_accounts": false, + "yield_resume_host_functions": true, + "limit_config": { + "max_gas_burnt": 300000000000000, + "max_stack_height": 262144, + "contract_prepare_version": 2, + "initial_memory_pages": 1024, + "max_memory_pages": 2048, + "registers_memory_limit": 1073741824, + "max_register_size": 104857600, + "max_number_registers": 100, + "max_number_logs": 100, + "max_total_log_length": 16384, + "max_total_prepaid_gas": 300000000000000, + "max_actions_per_receipt": 100, + "max_number_bytes_method_names": 2000, + "max_length_method_name": 256, + "max_arguments_length": 4194304, + "max_length_returned_data": 4194304, + "max_contract_size": 4194304, + "max_transaction_size": 4194304, + "max_length_storage_key": 2048, + "max_length_storage_value": 4194304, + "max_promises_per_function_call_action": 1024, + "max_number_input_data_dependencies": 128, + "max_functions_number_per_contract": 10000, + "wasmer2_stack_limit": 204800, + "max_locals_per_contract": 1000000, + "account_id_validity_rules_version": 1, + "yield_timeout_length_in_blocks": 200, + "max_yield_payload_size": 1024, + "storage_proof_size_receipt_limit": 999999999999999 + } + }, + "account_creation_config": { + "min_allowed_top_level_account_length": 65, + "registrar_account_id": "registrar" + } +} diff --git a/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_83.json.snap b/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_83.json.snap index 796d4276a88..750af8c5be3 100644 --- a/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_83.json.snap +++ b/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_83.json.snap @@ -170,10 +170,10 @@ expression: config_view "alt_bn128_g1_sum_element": 5000000000, "alt_bn128_pairing_check_base": 9686000000000, "alt_bn128_pairing_check_element": 5102000000000, - "yield_create_base": 300000000000000, - "yield_create_byte": 300000000000000, - "yield_resume_base": 300000000000000, - "yield_resume_byte": 300000000000000 + "yield_create_base": 153411779276, + "yield_create_byte": 15643988, + "yield_resume_base": 1195627285210, + "yield_resume_byte": 1195627285210 }, "grow_mem_cost": 1, "regular_op_cost": 822756, @@ -187,7 +187,7 @@ expression: config_view "alt_bn128": true, "function_call_weight": true, "eth_implicit_accounts": false, - "yield_resume_host_functions": false, + "yield_resume_host_functions": true, "limit_config": { "max_gas_burnt": 300000000000000, "max_stack_height": 262144, diff --git a/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_85.json.snap b/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_85.json.snap index 5d1dfcd66fc..60349cb7759 100644 --- a/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_85.json.snap +++ b/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_85.json.snap @@ -170,10 +170,10 @@ expression: config_view "alt_bn128_g1_sum_element": 5000000000, "alt_bn128_pairing_check_base": 9686000000000, "alt_bn128_pairing_check_element": 5102000000000, - "yield_create_base": 300000000000000, - "yield_create_byte": 300000000000000, - "yield_resume_base": 300000000000000, - "yield_resume_byte": 300000000000000 + "yield_create_base": 153411779276, + "yield_create_byte": 15643988, + "yield_resume_base": 1195627285210, + "yield_resume_byte": 1195627285210 }, "grow_mem_cost": 1, "regular_op_cost": 822756, @@ -187,7 +187,7 @@ expression: config_view "alt_bn128": true, "function_call_weight": true, "eth_implicit_accounts": false, - "yield_resume_host_functions": false, + "yield_resume_host_functions": true, "limit_config": { "max_gas_burnt": 300000000000000, "max_stack_height": 262144, diff --git a/core/parameters/src/snapshots/near_parameters__view__tests__runtime_config_view.snap b/core/parameters/src/snapshots/near_parameters__view__tests__runtime_config_view.snap index ca74704d1e4..5951499fd93 100644 --- a/core/parameters/src/snapshots/near_parameters__view__tests__runtime_config_view.snap +++ b/core/parameters/src/snapshots/near_parameters__view__tests__runtime_config_view.snap @@ -170,10 +170,10 @@ expression: "&view" "alt_bn128_g1_sum_element": 5000000000, "alt_bn128_pairing_check_base": 9686000000000, "alt_bn128_pairing_check_element": 5102000000000, - "yield_create_base": 300000000000000, - "yield_create_byte": 300000000000000, - "yield_resume_base": 300000000000000, - "yield_resume_byte": 300000000000000 + "yield_create_base": 153411779276, + "yield_create_byte": 15643988, + "yield_resume_base": 1195627285210, + "yield_resume_byte": 1195627285210 }, "grow_mem_cost": 1, "regular_op_cost": 822756, @@ -187,7 +187,7 @@ expression: "&view" "alt_bn128": true, "function_call_weight": true, "eth_implicit_accounts": false, - "yield_resume_host_functions": false, + "yield_resume_host_functions": true, "limit_config": { "max_gas_burnt": 300000000000000, "max_stack_height": 262144, diff --git a/core/primitives-core/Cargo.toml b/core/primitives-core/Cargo.toml index 689d7af4abb..2d15499b5d0 100644 --- a/core/primitives-core/Cargo.toml +++ b/core/primitives-core/Cargo.toml @@ -37,7 +37,6 @@ protocol_feature_fix_staking_threshold = [] protocol_feature_fix_contract_loading_cost = [] protocol_feature_reject_blocks_with_outdated_protocol_version = [] protocol_feature_nonrefundable_transfer_nep491 = [] -yield_resume = [] nightly = [ "nightly_protocol", @@ -45,7 +44,6 @@ nightly = [ "protocol_feature_fix_staking_threshold", "protocol_feature_nonrefundable_transfer_nep491", "protocol_feature_reject_blocks_with_outdated_protocol_version", - "yield_resume", ] nightly_protocol = [ diff --git a/core/primitives-core/src/version.rs b/core/primitives-core/src/version.rs index 36d18036e47..1e0ac19e996 100644 --- a/core/primitives-core/src/version.rs +++ b/core/primitives-core/src/version.rs @@ -207,9 +207,7 @@ impl ProtocolFeature { | ProtocolFeature::SimpleNightshadeV2 => 64, ProtocolFeature::SimpleNightshadeV3 => 65, ProtocolFeature::DecreaseFunctionCallBaseCost => 66, - - // Nightly features which should be tested for compatibility with resharding - ProtocolFeature::YieldExecution => 78, + ProtocolFeature::YieldExecution => 67, // This protocol version is reserved for use in resharding tests. An extra resharding // is simulated on top of the latest shard layout in production. Note that later diff --git a/core/primitives/Cargo.toml b/core/primitives/Cargo.toml index 10edbbe4a37..bd91078bc17 100644 --- a/core/primitives/Cargo.toml +++ b/core/primitives/Cargo.toml @@ -57,7 +57,6 @@ protocol_feature_fix_staking_threshold = ["near-primitives-core/protocol_feature protocol_feature_fix_contract_loading_cost = ["near-primitives-core/protocol_feature_fix_contract_loading_cost"] protocol_feature_reject_blocks_with_outdated_protocol_version = ["near-primitives-core/protocol_feature_reject_blocks_with_outdated_protocol_version"] protocol_feature_nonrefundable_transfer_nep491 = ["near-primitives-core/protocol_feature_nonrefundable_transfer_nep491"] -yield_resume = ["near-primitives-core/yield_resume"] nightly = [ "near-async/nightly", @@ -70,7 +69,6 @@ nightly = [ "protocol_feature_fix_staking_threshold", "protocol_feature_nonrefundable_transfer_nep491", "protocol_feature_reject_blocks_with_outdated_protocol_version", - "yield_resume", ] nightly_protocol = [ diff --git a/core/primitives/src/receipt.rs b/core/primitives/src/receipt.rs index 9c76dd454d2..a6230d45e73 100644 --- a/core/primitives/src/receipt.rs +++ b/core/primitives/src/receipt.rs @@ -10,8 +10,6 @@ use serde_with::serde_as; use std::borrow::Borrow; use std::collections::{BTreeMap, HashMap}; use std::fmt; -use std::io; -use std::io::{Error, ErrorKind}; /// The outgoing (egress) data which will be transformed /// to a `DataReceipt` to be sent to a `receipt.receiver` @@ -116,7 +114,16 @@ impl Receipt { } /// Receipt could be either ActionReceipt or DataReceipt -#[derive(BorshSerialize, Clone, Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)] +#[derive( + BorshSerialize, + BorshDeserialize, + Clone, + Debug, + PartialEq, + Eq, + serde::Serialize, + serde::Deserialize, +)] pub enum ReceiptEnum { Action(ActionReceipt), Data(DataReceipt), @@ -124,22 +131,6 @@ pub enum ReceiptEnum { PromiseResume(DataReceipt), } -impl BorshDeserialize for ReceiptEnum { - fn deserialize_reader(rd: &mut R) -> io::Result { - // after we stabilize yield_resume we can simply derive BorshDeserialize trait again - let ordinal = u8::deserialize_reader(rd)?; - match ordinal { - 0u8 => Ok(ReceiptEnum::Action(ActionReceipt::deserialize_reader(rd)?)), - 1u8 => Ok(ReceiptEnum::Data(DataReceipt::deserialize_reader(rd)?)), - #[cfg(feature = "yield_resume")] - 2u8 => Ok(ReceiptEnum::PromiseYield(ActionReceipt::deserialize_reader(rd)?)), - #[cfg(feature = "yield_resume")] - 3u8 => Ok(ReceiptEnum::PromiseResume(DataReceipt::deserialize_reader(rd)?)), - _ => Err(Error::from(ErrorKind::InvalidData)), - } - } -} - /// ActionReceipt is derived from an Action from `Transaction or from Receipt` #[derive( BorshSerialize, diff --git a/core/primitives/src/snapshots/near_primitives__views__tests__runtime_config_view.snap b/core/primitives/src/snapshots/near_primitives__views__tests__runtime_config_view.snap index dfdb0287c2a..e7df3feb636 100644 --- a/core/primitives/src/snapshots/near_primitives__views__tests__runtime_config_view.snap +++ b/core/primitives/src/snapshots/near_primitives__views__tests__runtime_config_view.snap @@ -170,10 +170,10 @@ expression: "&view" "alt_bn128_g1_sum_element": 5000000000, "alt_bn128_pairing_check_base": 9686000000000, "alt_bn128_pairing_check_element": 5102000000000, - "yield_create_base": 300000000000000, - "yield_create_byte": 300000000000000, - "yield_resume_base": 300000000000000, - "yield_resume_byte": 300000000000000 + "yield_create_base": 153411779276, + "yield_create_byte": 15643988, + "yield_resume_base": 1195627285210, + "yield_resume_byte": 1195627285210 }, "grow_mem_cost": 1, "regular_op_cost": 822756, @@ -187,7 +187,7 @@ expression: "&view" "alt_bn128": true, "function_call_weight": true, "eth_implicit_accounts": false, - "yield_resume_host_functions": false, + "yield_resume_host_functions": true, "limit_config": { "max_gas_burnt": 300000000000000, "max_stack_height": 262144, diff --git a/core/store/Cargo.toml b/core/store/Cargo.toml index c6aa9721c86..80a09c794a1 100644 --- a/core/store/Cargo.toml +++ b/core/store/Cargo.toml @@ -78,7 +78,6 @@ no_cache = [] single_thread_rocksdb = [] # Deactivate RocksDB IO background threads test_features = [] new_epoch_sync = [] -yield_resume = [] nightly_protocol = [ "near-async/nightly_protocol", @@ -102,5 +101,4 @@ nightly = [ "near-primitives/nightly", "near-vm-runner/nightly", "nightly_protocol", - "yield_resume", ] diff --git a/core/store/src/lib.rs b/core/store/src/lib.rs index a19fe484946..a0c6613a532 100644 --- a/core/store/src/lib.rs +++ b/core/store/src/lib.rs @@ -839,7 +839,6 @@ pub fn set_promise_yield_indices( state_update: &mut TrieUpdate, promise_yield_indices: &PromiseYieldIndices, ) { - assert!(cfg!(feature = "yield_resume")); set(state_update, TrieKey::PromiseYieldIndices, promise_yield_indices); } @@ -851,7 +850,6 @@ pub fn enqueue_promise_yield_timeout( data_id: CryptoHash, expires_at: BlockHeight, ) { - assert!(cfg!(feature = "yield_resume")); set( state_update, TrieKey::PromiseYieldTimeout { index: promise_yield_indices.next_available_index }, @@ -864,7 +862,6 @@ pub fn enqueue_promise_yield_timeout( } pub fn set_promise_yield_receipt(state_update: &mut TrieUpdate, receipt: &Receipt) { - assert!(cfg!(feature = "yield_resume")); match &receipt.receipt { ReceiptEnum::PromiseYield(ref action_receipt) => { assert!(action_receipt.input_data_ids.len() == 1); diff --git a/core/store/src/trie/resharding.rs b/core/store/src/trie/resharding.rs index 9bd445f57a7..ca29c451a4f 100644 --- a/core/store/src/trie/resharding.rs +++ b/core/store/src/trie/resharding.rs @@ -340,13 +340,6 @@ fn apply_promise_yield_timeouts_to_children_states_impl( delete_timeouts: &[PromiseYieldTimeout], account_id_to_shard_uid: &dyn Fn(&AccountId) -> ShardUId, ) -> Result<(), StorageError> { - // TODO: we can remove this check once yield execution is stabilized. - // For now it prevents populating promise yield indices for the child shards with default - // values if the feature has not been enabled. - if insert_timeouts.is_empty() && delete_timeouts.is_empty() { - return Ok(()); - } - let mut promise_yield_indices_by_shard = HashMap::new(); for (shard_uid, update) in trie_updates.iter() { promise_yield_indices_by_shard.insert(*shard_uid, get_promise_yield_indices(update)?); diff --git a/integration-tests/src/tests/runtime/mod.rs b/integration-tests/src/tests/runtime/mod.rs index 3fcac2b8ac8..5284203e650 100644 --- a/integration-tests/src/tests/runtime/mod.rs +++ b/integration-tests/src/tests/runtime/mod.rs @@ -2,5 +2,4 @@ mod deployment; mod sanity_checks; mod state_viewer; mod test_evil_contracts; -#[cfg(feature = "nightly")] mod test_yield_resume; diff --git a/nearcore/Cargo.toml b/nearcore/Cargo.toml index cdb5d9f8e25..35d3a8f31c7 100644 --- a/nearcore/Cargo.toml +++ b/nearcore/Cargo.toml @@ -123,10 +123,6 @@ protocol_feature_nonrefundable_transfer_nep491 = [ new_epoch_sync = [ "near-client/new_epoch_sync" ] -yield_resume = [ - "near-store/yield_resume", - "near-primitives/yield_resume", -] nightly = [ "near-actix-test-utils/nightly", @@ -156,7 +152,6 @@ nightly = [ "protocol_feature_fix_staking_threshold", "protocol_feature_nonrefundable_transfer_nep491", "testlib/nightly", - "yield_resume", ] nightly_protocol = [ "near-actix-test-utils/nightly_protocol", diff --git a/neard/Cargo.toml b/neard/Cargo.toml index bd702ff15d8..6b62110709c 100644 --- a/neard/Cargo.toml +++ b/neard/Cargo.toml @@ -75,7 +75,6 @@ json_rpc = ["nearcore/json_rpc"] protocol_feature_fix_staking_threshold = ["nearcore/protocol_feature_fix_staking_threshold"] protocol_feature_nonrefundable_transfer_nep491 = ["near-state-viewer/protocol_feature_nonrefundable_transfer_nep491"] new_epoch_sync = ["nearcore/new_epoch_sync", "near-epoch-sync-tool/new_epoch_sync"] -yield_resume = ["nearcore/yield_resume"] nightly = [ "near-chain-configs/nightly", @@ -97,7 +96,6 @@ nightly = [ "nightly_protocol", "protocol_feature_fix_staking_threshold", "protocol_feature_nonrefundable_transfer_nep491", - "yield_resume", ] nightly_protocol = [ "near-chain-configs/nightly_protocol",