From a810ead901359839962fcc5347616b70342c676e Mon Sep 17 00:00:00 2001 From: Boyu Yang Date: Fri, 23 Jul 2021 23:57:28 +0800 Subject: [PATCH] chore(hardfork): update RFC numbers and links --- docs/hashes.toml | 2 +- resource/specs/dev.toml | 12 +- rpc/README.md | 2 +- script/src/verify/tests/utils.rs | 2 +- spec/src/hardfork.rs | 70 ++++++--- test/src/specs/hardfork/v2021/cell_deps.rs | 8 +- test/src/specs/hardfork/v2021/extension.rs | 2 +- test/src/specs/hardfork/v2021/header_deps.rs | 2 +- test/src/specs/hardfork/v2021/since.rs | 4 +- test/src/specs/hardfork/v2021/vm_version.rs | 2 +- util/jsonrpc-types/src/blockchain.rs | 4 +- util/types/src/core/hardfork.rs | 146 +++++++++--------- verification/src/tests/block_verifier.rs | 4 +- .../src/tests/transaction_verifier.rs | 4 +- 14 files changed, 147 insertions(+), 117 deletions(-) diff --git a/docs/hashes.toml b/docs/hashes.toml index f1fe3733b2..4796578e5c 100644 --- a/docs/hashes.toml +++ b/docs/hashes.toml @@ -134,7 +134,7 @@ index = 1 # Spec: ckb_dev [ckb_dev] -spec_hash = "0x4df07f7ae1bbc06373bcc3487ca8011ee3f57a3d46d2357b34728cbd412d4ce6" +spec_hash = "0xcbcbe813d7c24e2560113d31b523073ad691bf2ce645db13e298a53d96e16683" genesis = "0x823b2ff5785b12da8b1363cac9a5cbe566d8b715a4311441b119c39a0367488c" cellbase = "0xa563884b3686078ec7e7677a5f86449b15cf2693f3c1241766c6996f206cc541" diff --git a/resource/specs/dev.toml b/resource/specs/dev.toml index 20f1cac756..a69c0f053d 100644 --- a/resource/specs/dev.toml +++ b/resource/specs/dev.toml @@ -96,12 +96,12 @@ genesis_epoch_length = 1000 permanent_difficulty_in_dummy = true [params.hardfork] -rfc_0221 = 0 -rfc_0222 = 0 -rfc_0223 = 0 -rfc_0224 = 0 -rfc_0232 = 0 -rfc_0240 = 0 +rfc_0028 = 0 +rfc_0029 = 0 +rfc_0030 = 0 +rfc_0031 = 0 +rfc_0032 = 0 +rfc_0036 = 0 [pow] func = "Dummy" diff --git a/rpc/README.md b/rpc/README.md index 50ca5ab289..faf4b35156 100644 --- a/rpc/README.md +++ b/rpc/README.md @@ -3562,7 +3562,7 @@ Refer to RFC [CKB Block Structure](https://github.com/nervosnetwork/rfcs/blob/ma ### Notice - This field is renamed from `uncles_hash` since 0.100.0. More details can be found in [CKB RFC 224](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0224-variable-length-header-field/0224-variable-length-header-field.md). + This field is renamed from `uncles_hash` since 0.100.0. More details can be found in [CKB RFC 0031](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0031-variable-length-header-field/0031-variable-length-header-field.md). * `dao`: [`Byte32`](#type-byte32) - DAO fields. diff --git a/script/src/verify/tests/utils.rs b/script/src/verify/tests/utils.rs index 00223e6b64..bf9a24a47a 100644 --- a/script/src/verify/tests/utils.rs +++ b/script/src/verify/tests/utils.rs @@ -84,7 +84,7 @@ impl TransactionScriptsVerifierWithEnv { let version_1_enabled_at = 10; let hardfork_switch = HardForkSwitch::new_without_any_enabled() .as_builder() - .rfc_0232(version_1_enabled_at) + .rfc_0032(version_1_enabled_at) .build() .unwrap(); let consensus = ConsensusBuilder::default() diff --git a/spec/src/hardfork.rs b/spec/src/hardfork.rs index 863dc2f790..2158569fc0 100644 --- a/spec/src/hardfork.rs +++ b/spec/src/hardfork.rs @@ -11,24 +11,46 @@ use serde::{Deserialize, Serialize}; #[derive(Default, Clone, PartialEq, Eq, Debug, Serialize, Deserialize)] #[serde(deny_unknown_fields)] pub struct HardForkConfig { - /// Ref: [CKB RFC 221](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0221-change-since-relative-timestamp/0221-change-since-relative-timestamp.md) + /// Use input cell committing block timestamp as the start time for the relative timestamp in `since`. + /// + /// Ref: [CKB RFC 0028](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0028-change-since-relative-timestamp/0028-change-since-relative-timestamp.md) #[serde(skip_serializing_if = "Option::is_none")] - pub rfc_0221: Option, - /// Ref: [CKB RFC 222](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0222-allow-script-multiple-matches-on-identical-code/0222-allow-script-multiple-matches-on-identical-code.md) + pub rfc_0028: Option, + /// Allow Multiple Cell Dep Matches When There Is No Ambiguity. + /// + /// Ref: [CKB RFC 0029](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0029-allow-script-multiple-matches-on-identical-code/0029-allow-script-multiple-matches-on-identical-code.md) #[serde(skip_serializing_if = "Option::is_none")] - pub rfc_0222: Option, - /// Ref: [CKB RFC 223](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0223-ensure-index-less-than-length-in-since/0223-ensure-index-less-than-length-in-since.md) + pub rfc_0029: Option, + /// Ensure That Index Is Less Than Length In the Input Since Field Using Epoch With Fraction. + /// + /// Ref: [CKB RFC 0030](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0030-ensure-index-less-than-length-in-since/0030-ensure-index-less-than-length-in-since.md) #[serde(skip_serializing_if = "Option::is_none")] - pub rfc_0223: Option, - /// Ref: [CKB RFC 224](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0224-variable-length-header-field/0224-variable-length-header-field.md) + pub rfc_0030: Option, + /// Add a variable length field in the block: reuse `uncles_hash` in the header as `extra_hash`. + /// + /// Ref: [CKB RFC 0031](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0031-variable-length-header-field/0031-variable-length-header-field.md) #[serde(skip_serializing_if = "Option::is_none")] - pub rfc_0224: Option, - /// Ref: [CKB RFC 232](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0232-ckb-vm-version-selection/0232-ckb-vm-version-selection.md) + pub rfc_0031: Option, + /// CKB VM Version Selection. + /// + /// This feature include 4 parts: + /// - CKB VM Version Selection. + /// - CKB VM version 1. + /// - CKB VM Syscalls 2. + /// - P2P protocol upgrade. + /// + /// Ref: + /// - [CKB RFC 0032](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0032-ckb-vm-version-selection/0032-ckb-vm-version-selection.md) + /// - [CKB RFC 0033](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0033-ckb-vm-version-1/0033-ckb-vm-version-1.md) + /// - [CKB RFC 0034](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0034-vm-syscalls-2/0034-vm-syscalls-2.md) + /// - [CKB RFC 0035](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0035-ckb2021-p2p-protocol-upgrade/0035-ckb2021-p2p-protocol-upgrade.md) #[serde(skip_serializing_if = "Option::is_none")] - pub rfc_0232: Option, - /// Ref: [CKB RFC 240](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0240-remove-header-deps-immature-rule/0240-remove-header-deps-immature-rule.md) + pub rfc_0032: Option, + /// Remove Header Deps Immature Rule. + /// + /// Ref: [CKB RFC 0036](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0036-remove-header-deps-immature-rule/0036-remove-header-deps-immature-rule.md) #[serde(skip_serializing_if = "Option::is_none")] - pub rfc_0240: Option, + pub rfc_0036: Option, } macro_rules! check_default { @@ -69,12 +91,12 @@ impl HardForkConfig { ckb2021: EpochNumber, ) -> Result { let builder = builder - .rfc_0221(check_default!(self, rfc_0221, ckb2021)) - .rfc_0222(check_default!(self, rfc_0222, ckb2021)) - .rfc_0223(check_default!(self, rfc_0223, ckb2021)) - .rfc_0224(check_default!(self, rfc_0224, ckb2021)) - .rfc_0232(check_default!(self, rfc_0232, ckb2021)) - .rfc_0240(check_default!(self, rfc_0240, ckb2021)); + .rfc_0028(check_default!(self, rfc_0028, ckb2021)) + .rfc_0029(check_default!(self, rfc_0029, ckb2021)) + .rfc_0030(check_default!(self, rfc_0030, ckb2021)) + .rfc_0031(check_default!(self, rfc_0031, ckb2021)) + .rfc_0032(check_default!(self, rfc_0032, ckb2021)) + .rfc_0036(check_default!(self, rfc_0036, ckb2021)); Ok(builder) } @@ -83,12 +105,12 @@ impl HardForkConfig { /// Enable features which are set to `None` at the user provided epoch. pub fn complete_with_default(&self, default: EpochNumber) -> Result { HardForkSwitch::new_builder() - .rfc_0221(self.rfc_0221.unwrap_or(default)) - .rfc_0222(self.rfc_0222.unwrap_or(default)) - .rfc_0223(self.rfc_0223.unwrap_or(default)) - .rfc_0224(self.rfc_0224.unwrap_or(default)) - .rfc_0232(self.rfc_0232.unwrap_or(default)) - .rfc_0240(self.rfc_0240.unwrap_or(default)) + .rfc_0028(self.rfc_0028.unwrap_or(default)) + .rfc_0029(self.rfc_0029.unwrap_or(default)) + .rfc_0030(self.rfc_0030.unwrap_or(default)) + .rfc_0031(self.rfc_0031.unwrap_or(default)) + .rfc_0032(self.rfc_0032.unwrap_or(default)) + .rfc_0036(self.rfc_0036.unwrap_or(default)) .build() } } diff --git a/test/src/specs/hardfork/v2021/cell_deps.rs b/test/src/specs/hardfork/v2021/cell_deps.rs index 8257a10b8d..422343f32c 100644 --- a/test/src/specs/hardfork/v2021/cell_deps.rs +++ b/test/src/specs/hardfork/v2021/cell_deps.rs @@ -126,7 +126,7 @@ impl Spec for DuplicateCellDepsForDataHashTypeLockScript { spec.params.hardfork = Some(Default::default()); } if let Some(mut switch) = spec.params.hardfork.as_mut() { - switch.rfc_0222 = Some(CKB2021_START_EPOCH); + switch.rfc_0029 = Some(CKB2021_START_EPOCH); } } } @@ -188,7 +188,7 @@ impl Spec for DuplicateCellDepsForDataHashTypeTypeScript { spec.params.hardfork = Some(Default::default()); } if let Some(mut switch) = spec.params.hardfork.as_mut() { - switch.rfc_0222 = Some(CKB2021_START_EPOCH); + switch.rfc_0029 = Some(CKB2021_START_EPOCH); } } } @@ -276,7 +276,7 @@ impl Spec for DuplicateCellDepsForTypeHashTypeLockScript { spec.params.hardfork = Some(Default::default()); } if let Some(mut switch) = spec.params.hardfork.as_mut() { - switch.rfc_0222 = Some(CKB2021_START_EPOCH); + switch.rfc_0029 = Some(CKB2021_START_EPOCH); } } } @@ -363,7 +363,7 @@ impl Spec for DuplicateCellDepsForTypeHashTypeTypeScript { spec.params.hardfork = Some(Default::default()); } if let Some(mut switch) = spec.params.hardfork.as_mut() { - switch.rfc_0222 = Some(CKB2021_START_EPOCH); + switch.rfc_0029 = Some(CKB2021_START_EPOCH); } } } diff --git a/test/src/specs/hardfork/v2021/extension.rs b/test/src/specs/hardfork/v2021/extension.rs index 73864f7195..01426d7baf 100644 --- a/test/src/specs/hardfork/v2021/extension.rs +++ b/test/src/specs/hardfork/v2021/extension.rs @@ -170,7 +170,7 @@ impl Spec for CheckBlockExtension { spec.params.hardfork = Some(Default::default()); } if let Some(mut switch) = spec.params.hardfork.as_mut() { - switch.rfc_0224 = Some(2); + switch.rfc_0031 = Some(2); } } } diff --git a/test/src/specs/hardfork/v2021/header_deps.rs b/test/src/specs/hardfork/v2021/header_deps.rs index e3aa5f50e2..f5a6790ece 100644 --- a/test/src/specs/hardfork/v2021/header_deps.rs +++ b/test/src/specs/hardfork/v2021/header_deps.rs @@ -121,7 +121,7 @@ impl Spec for ImmatureHeaderDeps { spec.params.hardfork = Some(Default::default()); } if let Some(mut switch) = spec.params.hardfork.as_mut() { - switch.rfc_0240 = Some(CKB2021_START_EPOCH); + switch.rfc_0036 = Some(CKB2021_START_EPOCH); } } } diff --git a/test/src/specs/hardfork/v2021/since.rs b/test/src/specs/hardfork/v2021/since.rs index 59decb901d..d7a7a24e70 100644 --- a/test/src/specs/hardfork/v2021/since.rs +++ b/test/src/specs/hardfork/v2021/since.rs @@ -135,7 +135,7 @@ impl Spec for CheckAbsoluteEpochSince { spec.params.hardfork = Some(Default::default()); } if let Some(mut switch) = spec.params.hardfork.as_mut() { - switch.rfc_0223 = Some(2); + switch.rfc_0030 = Some(2); } } } @@ -254,7 +254,7 @@ impl Spec for CheckRelativeEpochSince { spec.params.hardfork = Some(Default::default()); } if let Some(mut switch) = spec.params.hardfork.as_mut() { - switch.rfc_0223 = Some(7); + switch.rfc_0030 = Some(7); } } } diff --git a/test/src/specs/hardfork/v2021/vm_version.rs b/test/src/specs/hardfork/v2021/vm_version.rs index f63ddad4eb..bf22e1b5ea 100644 --- a/test/src/specs/hardfork/v2021/vm_version.rs +++ b/test/src/specs/hardfork/v2021/vm_version.rs @@ -100,7 +100,7 @@ impl Spec for CheckVmVersion { spec.params.hardfork = Some(Default::default()); } if let Some(mut switch) = spec.params.hardfork.as_mut() { - switch.rfc_0232 = Some(CKB2021_START_EPOCH); + switch.rfc_0032 = Some(CKB2021_START_EPOCH); } } } diff --git a/util/jsonrpc-types/src/blockchain.rs b/util/jsonrpc-types/src/blockchain.rs index 3b4f5a2355..4b0fc2a230 100644 --- a/util/jsonrpc-types/src/blockchain.rs +++ b/util/jsonrpc-types/src/blockchain.rs @@ -652,9 +652,9 @@ pub struct Header { /// # Notice /// /// This field is renamed from `uncles_hash` since 0.100.0. - /// More details can be found in [CKB RFC 224]. + /// More details can be found in [CKB RFC 0031]. /// - /// [CKB RFC 224]: https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0224-variable-length-header-field/0224-variable-length-header-field.md + /// [CKB RFC 0031]: https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0031-variable-length-header-field/0031-variable-length-header-field.md pub extra_hash: H256, /// DAO fields. /// diff --git a/util/types/src/core/hardfork.rs b/util/types/src/core/hardfork.rs index 3bb49135f2..c67db53bda 100644 --- a/util/types/src/core/hardfork.rs +++ b/util/types/src/core/hardfork.rs @@ -94,12 +94,12 @@ macro_rules! define_methods { /// [`HardForkSwitchBuilder`]: struct.HardForkSwitchBuilder.html #[derive(Debug, Clone)] pub struct HardForkSwitch { - rfc_0221: EpochNumber, - rfc_0222: EpochNumber, - rfc_0223: EpochNumber, - rfc_0224: EpochNumber, - rfc_0232: EpochNumber, - rfc_0240: EpochNumber, + rfc_0028: EpochNumber, + rfc_0029: EpochNumber, + rfc_0030: EpochNumber, + rfc_0031: EpochNumber, + rfc_0032: EpochNumber, + rfc_0036: EpochNumber, } /// Builder for [`HardForkSwitch`]. @@ -107,32 +107,40 @@ pub struct HardForkSwitch { /// [`HardForkSwitch`]: struct.HardForkSwitch.html #[derive(Debug, Clone, Default)] pub struct HardForkSwitchBuilder { - /// Use the input cell creation block timestamp as start time in the - /// "relative since timestamp". + /// Use input cell committing block timestamp as the start time for the relative timestamp in `since`. /// - /// Ref: [CKB RFC 221](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0221-change-since-relative-timestamp/0221-change-since-relative-timestamp.md) - pub rfc_0221: Option, - /// Allow script multiple matches on identical data for type hash-type scripts. + /// Ref: [CKB RFC 0028](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0028-change-since-relative-timestamp/0028-change-since-relative-timestamp.md) + pub rfc_0028: Option, + /// Allow Multiple Cell Dep Matches When There Is No Ambiguity. /// - /// Ref: [CKB RFC 222](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0222-allow-script-multiple-matches-on-identical-code/0222-allow-script-multiple-matches-on-identical-code.md) - pub rfc_0222: Option, - /// In the "since epoch", the index should be less than length and - /// the length should be greater than zero. + /// Ref: [CKB RFC 0029](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0029-allow-script-multiple-matches-on-identical-code/0029-allow-script-multiple-matches-on-identical-code.md) + pub rfc_0029: Option, + /// Ensure That Index Is Less Than Length In the Input Since Field Using Epoch With Fraction. /// - /// Ref: [CKB RFC 223](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0223-ensure-index-less-than-length-in-since/0223-ensure-index-less-than-length-in-since.md) - pub rfc_0223: Option, - /// Reuse `uncles_hash` in the header as `extra_hash`. + /// Ref: [CKB RFC 0030](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0030-ensure-index-less-than-length-in-since/0030-ensure-index-less-than-length-in-since.md) + pub rfc_0030: Option, + /// Add a variable length field in the block: reuse `uncles_hash` in the header as `extra_hash`. /// - /// Ref: [CKB RFC 224](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0224-variable-length-header-field/0224-variable-length-header-field.md) - pub rfc_0224: Option, - /// CKB VM version selection, vm version 1 and syscalls 2. + /// Ref: [CKB RFC 0031](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0031-variable-length-header-field/0031-variable-length-header-field.md) + pub rfc_0031: Option, + /// CKB VM Version Selection. /// - /// Ref: [CKB RFC 232](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0232-ckb-vm-version-selection/0232-ckb-vm-version-selection.md) - pub rfc_0232: Option, - /// Remove the header deps immature rule. + /// This feature include 4 parts: + /// - CKB VM Version Selection. + /// - CKB VM version 1. + /// - CKB VM Syscalls 2. + /// - P2P protocol upgrade. /// - /// Ref: [CKB RFC 240](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0240-remove-header-deps-immature-rule/0240-remove-header-deps-immature-rule.md) - pub rfc_0240: Option, + /// Ref: + /// - [CKB RFC 0032](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0032-ckb-vm-version-selection/0032-ckb-vm-version-selection.md) + /// - [CKB RFC 0033](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0033-ckb-vm-version-1/0033-ckb-vm-version-1.md) + /// - [CKB RFC 0034](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0034-vm-syscalls-2/0034-vm-syscalls-2.md) + /// - [CKB RFC 0035](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0035-ckb2021-p2p-protocol-upgrade/0035-ckb2021-p2p-protocol-upgrade.md) + pub rfc_0032: Option, + /// Remove Header Deps Immature Rule. + /// + /// Ref: [CKB RFC 0036](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0036-remove-header-deps-immature-rule/0036-remove-header-deps-immature-rule.md) + pub rfc_0036: Option, } impl HardForkSwitch { @@ -144,24 +152,24 @@ impl HardForkSwitch { /// Creates a new builder based on the current instance. pub fn as_builder(&self) -> HardForkSwitchBuilder { Self::new_builder() - .rfc_0221(self.rfc_0221()) - .rfc_0222(self.rfc_0222()) - .rfc_0223(self.rfc_0223()) - .rfc_0224(self.rfc_0224()) - .rfc_0232(self.rfc_0232()) - .rfc_0240(self.rfc_0240()) + .rfc_0028(self.rfc_0028()) + .rfc_0029(self.rfc_0029()) + .rfc_0030(self.rfc_0030()) + .rfc_0031(self.rfc_0031()) + .rfc_0032(self.rfc_0032()) + .rfc_0036(self.rfc_0036()) } /// Creates a new instance that all hard fork features are disabled forever. pub fn new_without_any_enabled() -> Self { // Use a builder to ensure all features are set manually. Self::new_builder() - .disable_rfc_0221() - .disable_rfc_0222() - .disable_rfc_0223() - .disable_rfc_0224() - .disable_rfc_0232() - .disable_rfc_0240() + .disable_rfc_0028() + .disable_rfc_0029() + .disable_rfc_0030() + .disable_rfc_0031() + .disable_rfc_0032() + .disable_rfc_0036() .build() .unwrap() } @@ -169,7 +177,7 @@ impl HardForkSwitch { /// Returns a vector of epoch numbers, and there are new features which /// require refrese tx-pool caches will be enabled at those epochs. pub fn script_result_changed_at(&self) -> Vec { - let mut epochs = vec![self.rfc_0232()]; + let mut epochs = vec![self.rfc_0032()]; // In future, there could be more than one epoch, // we should merge the same epochs and sort all epochs. //epochs.sort_unstable(); @@ -180,46 +188,46 @@ impl HardForkSwitch { } define_methods!( - rfc_0221, + rfc_0028, block_ts_as_relative_since_start, is_block_ts_as_relative_since_start_enabled, - disable_rfc_0221, - "RFC PR 0221" + disable_rfc_0028, + "RFC PR 0028" ); define_methods!( - rfc_0222, + rfc_0029, allow_multiple_matches_on_identical_data, is_allow_multiple_matches_on_identical_data_enabled, - disable_rfc_0222, - "RFC PR 0222" + disable_rfc_0029, + "RFC PR 0029" ); define_methods!( - rfc_0223, + rfc_0030, check_length_in_epoch_since, is_check_length_in_epoch_since_enabled, - disable_rfc_0223, - "RFC PR 0223" + disable_rfc_0030, + "RFC PR 0030" ); define_methods!( - rfc_0224, + rfc_0031, reuse_uncles_hash_as_extra_hash, is_reuse_uncles_hash_as_extra_hash_enabled, - disable_rfc_0224, - "RFC PR 0224" + disable_rfc_0031, + "RFC PR 0031" ); define_methods!( - rfc_0232, + rfc_0032, vm_version_1_and_syscalls_2, is_vm_version_1_and_syscalls_2_enabled, - disable_rfc_0232, - "RFC PR 0232" + disable_rfc_0032, + "RFC PR 0032" ); define_methods!( - rfc_0240, + rfc_0036, remove_header_deps_immature_rule, is_remove_header_deps_immature_rule_enabled, - disable_rfc_0240, - "RFC PR 0240" + disable_rfc_0036, + "RFC PR 0036" ); impl HardForkSwitchBuilder { @@ -237,20 +245,20 @@ impl HardForkSwitchBuilder { })?; }; } - let rfc_0221 = try_find!(rfc_0221); - let rfc_0222 = try_find!(rfc_0222); - let rfc_0223 = try_find!(rfc_0223); - let rfc_0224 = try_find!(rfc_0224); - let rfc_0232 = try_find!(rfc_0232); - let rfc_0240 = try_find!(rfc_0240); + let rfc_0028 = try_find!(rfc_0028); + let rfc_0029 = try_find!(rfc_0029); + let rfc_0030 = try_find!(rfc_0030); + let rfc_0031 = try_find!(rfc_0031); + let rfc_0032 = try_find!(rfc_0032); + let rfc_0036 = try_find!(rfc_0036); Ok(HardForkSwitch { - rfc_0221, - rfc_0222, - rfc_0223, - rfc_0224, - rfc_0232, - rfc_0240, + rfc_0028, + rfc_0029, + rfc_0030, + rfc_0031, + rfc_0032, + rfc_0036, }) } } diff --git a/verification/src/tests/block_verifier.rs b/verification/src/tests/block_verifier.rs index a79f19e21a..4eea481b9f 100644 --- a/verification/src/tests/block_verifier.rs +++ b/verification/src/tests/block_verifier.rs @@ -481,7 +481,7 @@ fn test_block_extension_verifier() { // Test CKB v2019 let hardfork_switch = HardForkSwitch::new_without_any_enabled() .as_builder() - .rfc_0224(fork_at + 1) + .rfc_0031(fork_at + 1) .build() .unwrap(); let consensus = ConsensusBuilder::default() @@ -516,7 +516,7 @@ fn test_block_extension_verifier() { // Test CKB v2021 let hardfork_switch = HardForkSwitch::new_without_any_enabled() .as_builder() - .rfc_0224(fork_at) + .rfc_0031(fork_at) .build() .unwrap(); let consensus = ConsensusBuilder::default() diff --git a/verification/src/tests/transaction_verifier.rs b/verification/src/tests/transaction_verifier.rs index b5099aca05..2bf9ef38ea 100644 --- a/verification/src/tests/transaction_verifier.rs +++ b/verification/src/tests/transaction_verifier.rs @@ -558,7 +558,7 @@ fn test_fraction_epoch_since_verify_v2021() { // Test CKB v2019 let hardfork_switch = HardForkSwitch::new_without_any_enabled() .as_builder() - .rfc_0223(fork_at + 1) + .rfc_0030(fork_at + 1) .build() .unwrap(); let consensus = ConsensusBuilder::default() @@ -575,7 +575,7 @@ fn test_fraction_epoch_since_verify_v2021() { // Test CKB v2021 let hardfork_switch = HardForkSwitch::new_without_any_enabled() .as_builder() - .rfc_0223(fork_at) + .rfc_0030(fork_at) .build() .unwrap(); let consensus = ConsensusBuilder::default()