diff --git a/core/parameters/res/runtime_configs/139.yaml b/core/parameters/res/runtime_configs/139.yaml deleted file mode 100644 index 6d27cda6089..00000000000 --- a/core/parameters/res/runtime_configs/139.yaml +++ /dev/null @@ -1,5 +0,0 @@ -yield_resume: { old: false, new: true } -wasm_yield_create_base: { old: 300_000_000_000_000, new: 153_411_779_276 } -wasm_yield_create_byte: { old: 300_000_000_000_000, new: 15_643_988 } -wasm_yield_resume_base: { old: 300_000_000_000_000, new: 1_195_627_285_210 } -wasm_yield_resume_byte: { old: 300_000_000_000_000, new: 17_212_011 } diff --git a/core/parameters/res/runtime_configs/66.yaml b/core/parameters/res/runtime_configs/66.yaml index f6ed018a86a..ef75aa29efc 100644 --- a/core/parameters/res/runtime_configs/66.yaml +++ b/core/parameters/res/runtime_configs/66.yaml @@ -16,3 +16,8 @@ wasm_contract_loading_bytes: { old: 216_750, new: 1_089_295, } +yield_resume: { old: false, new: true } +wasm_yield_create_base: { old: 300_000_000_000_000, new: 153_411_779_276 } +wasm_yield_create_byte: { old: 300_000_000_000_000, new: 15_643_988 } +wasm_yield_resume_base: { old: 300_000_000_000_000, new: 1_195_627_285_210 } +wasm_yield_resume_byte: { old: 300_000_000_000_000, new: 17_212_011 } 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..44234f83158 100644 --- a/core/parameters/src/config_store.rs +++ b/core/parameters/src/config_store.rs @@ -43,7 +43,6 @@ static CONFIG_DIFFS: &[(ProtocolVersion, &str)] = &[ (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__66.json.snap b/core/parameters/src/snapshots/near_parameters__config_store__tests__66.json.snap index 48550a4faae..1663a04f129 100644 --- a/core/parameters/src/snapshots/near_parameters__config_store__tests__66.json.snap +++ b/core/parameters/src/snapshots/near_parameters__config_store__tests__66.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__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_66.json.snap b/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_66.json.snap index 48550a4faae..1663a04f129 100644 --- a/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_66.json.snap +++ b/core/parameters/src/snapshots/near_parameters__config_store__tests__testnet_66.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_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 45b8961518c..8d9bf089e75 100644 --- a/core/primitives-core/src/version.rs +++ b/core/primitives-core/src/version.rs @@ -207,10 +207,7 @@ impl ProtocolFeature { | ProtocolFeature::TestnetFewerBlockProducers | ProtocolFeature::SimpleNightshadeV2 => 64, ProtocolFeature::SimpleNightshadeV3 => 65, - ProtocolFeature::DecreaseFunctionCallBaseCost => 66, - - // Nightly features which should be tested for compatibility with resharding - ProtocolFeature::YieldExecution => 78, + ProtocolFeature::DecreaseFunctionCallBaseCost | ProtocolFeature::YieldExecution => 66, // 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..7cf231e054c 100644 --- a/core/primitives/src/receipt.rs +++ b/core/primitives/src/receipt.rs @@ -131,9 +131,7 @@ impl BorshDeserialize for ReceiptEnum { 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)), } 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/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",