jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(op): add missing op consensus validation check (#13122)

Browse Source
This commit is contained in:
Matthias Seitz
2024-12-04 15:27:49 +01:00
committed by GitHub
parent 24af0a83a0
commit d298fb1b81
12 changed files with 75 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/optimism/consensus/Cargo.toml
View File

@ -22,7 +22,8 @@ reth-trie-common.workspace = true
# op-reth
reth-optimism-forks.workspace = true
reth-optimism-chainspec.workspace = true
reth-optimism-primitives.workspace = true
# TODO: remove this after feature cleanup
reth-optimism-primitives = { workspace = true, features = ["serde"] }
# ethereum
alloy-primitives.workspace = true
@ -36,4 +37,4 @@ alloy-primitives.workspace = true
reth-optimism-chainspec.workspace = true
[features]
optimism = ["reth-primitives/optimism"]
optimism = ["reth-primitives/optimism", "reth-optimism-primitives/optimism"]

31
crates/optimism/consensus/src/lib.rs
View File

@ -9,7 +9,7 @@
// The `optimism` feature must be enabled to use this crate.
#![cfg(feature = "optimism")]
use alloy_consensus::{Header, EMPTY_OMMER_ROOT_HASH};
use alloy_consensus::{BlockHeader, Header, EMPTY_OMMER_ROOT_HASH};
use alloy_primitives::{B64, U256};
use reth_chainspec::EthereumHardforks;
use reth_consensus::{
@ -112,11 +112,30 @@ impl HeaderValidator for OpBeaconConsensus {
validate_against_parent_timestamp(header.header(), parent.header())?;
}
validate_against_parent_eip1559_base_fee(
header.header(),
parent.header(),
&self.chain_spec,
)?;
// EIP1559 base fee validation
// <https://github.com/ethereum-optimism/specs/blob/main/specs/protocol/holocene/exec-engine.md#base-fee-computation>
// > if Holocene is active in parent_header.timestamp, then the parameters from
// > parent_header.extraData are used.
if self.chain_spec.is_holocene_active_at_timestamp(parent.timestamp) {
let header_base_fee =
header.base_fee_per_gas().ok_or(ConsensusError::BaseFeeMissing)?;
let expected_base_fee = self
.chain_spec
.decode_holocene_base_fee(parent, header.timestamp)
.map_err(|_| ConsensusError::BaseFeeMissing)?;
if expected_base_fee != header_base_fee {
return Err(ConsensusError::BaseFeeDiff(GotExpected {
expected: expected_base_fee,
got: header_base_fee,
}))
}
} else {
validate_against_parent_eip1559_base_fee(
header.header(),
parent.header(),
&self.chain_spec,
)?;
}
// ensure that the blob gas fields for this block
if self.chain_spec.is_cancun_active_at_timestamp(header.timestamp) {