From 0b31dfcb7d16992b5f171ffae48f91494abac03e Mon Sep 17 00:00:00 2001 From: clabby Date: Thu, 23 Nov 2023 18:34:32 -0500 Subject: [PATCH] @rkasiuk review --- crates/consensus/common/src/validation.rs | 2 +- crates/primitives/src/chain/spec.rs | 4 ++-- crates/primitives/src/constants/mod.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/consensus/common/src/validation.rs b/crates/consensus/common/src/validation.rs index 2ce536f2b823d..a2fce109efc04 100644 --- a/crates/consensus/common/src/validation.rs +++ b/crates/consensus/common/src/validation.rs @@ -337,7 +337,7 @@ pub fn validate_header_regarding_parent( } else { // This BaseFeeMissing will not happen as previous blocks are checked to have them. parent - .next_block_base_fee(chain_spec.base_fee_params(parent.timestamp + 12)) + .next_block_base_fee(chain_spec.base_fee_params(child.timestamp)) .ok_or(ConsensusError::BaseFeeMissing)? }; if expected_base_fee != base_fee { diff --git a/crates/primitives/src/chain/spec.rs b/crates/primitives/src/chain/spec.rs index 62b8604704b19..14425179e3f8a 100644 --- a/crates/primitives/src/chain/spec.rs +++ b/crates/primitives/src/chain/spec.rs @@ -412,7 +412,7 @@ impl BaseFeeParams { pub const fn optimism_goerli_canyon() -> BaseFeeParams { BaseFeeParams { max_change_denominator: - crate::constants::OP_GOERLI_EIP1559_DEFAULT_BASE_FEE_MAX_CHANGE_DENOMINATOR_CANYON, + crate::constants::OP_GOERLI_EIP1559_BASE_FEE_MAX_CHANGE_DENOMINATOR_CANYON, elasticity_multiplier: crate::constants::OP_GOERLI_EIP1559_DEFAULT_ELASTICITY_MULTIPLIER, } @@ -434,7 +434,7 @@ impl BaseFeeParams { pub const fn optimism_canyon() -> BaseFeeParams { BaseFeeParams { max_change_denominator: - crate::constants::OP_MAINNET_EIP1559_DEFAULT_BASE_FEE_MAX_CHANGE_DENOMINATOR_CANYON, + crate::constants::OP_MAINNET_EIP1559_BASE_FEE_MAX_CHANGE_DENOMINATOR_CANYON, elasticity_multiplier: crate::constants::OP_MAINNET_EIP1559_DEFAULT_ELASTICITY_MULTIPLIER, } diff --git a/crates/primitives/src/constants/mod.rs b/crates/primitives/src/constants/mod.rs index 1e6697c973aca..9d2b3185571af 100644 --- a/crates/primitives/src/constants/mod.rs +++ b/crates/primitives/src/constants/mod.rs @@ -70,7 +70,7 @@ pub const OP_MAINNET_EIP1559_DEFAULT_BASE_FEE_MAX_CHANGE_DENOMINATOR: u64 = 50; /// Base fee max change denominator for Optimism Mainnet as defined in the Optimism Canyon /// hardfork. #[cfg(feature = "optimism")] -pub const OP_MAINNET_EIP1559_DEFAULT_BASE_FEE_MAX_CHANGE_DENOMINATOR_CANYON: u64 = 250; +pub const OP_MAINNET_EIP1559_BASE_FEE_MAX_CHANGE_DENOMINATOR_CANYON: u64 = 250; /// Base fee max change denominator for Optimism Mainnet as defined in the Optimism /// [transaction costs](https://community.optimism.io/docs/developers/build/differences/#transaction-costs) doc. @@ -85,7 +85,7 @@ pub const OP_GOERLI_EIP1559_DEFAULT_BASE_FEE_MAX_CHANGE_DENOMINATOR: u64 = 50; /// Base fee max change denominator for Optimism Goerli as defined in the Optimism Canyon /// hardfork. #[cfg(feature = "optimism")] -pub const OP_GOERLI_EIP1559_DEFAULT_BASE_FEE_MAX_CHANGE_DENOMINATOR_CANYON: u64 = 250; +pub const OP_GOERLI_EIP1559_BASE_FEE_MAX_CHANGE_DENOMINATOR_CANYON: u64 = 250; /// Base fee max change denominator for Optimism Goerli as defined in the Optimism /// [transaction costs](https://community.optimism.io/docs/developers/build/differences/#transaction-costs) doc.