Skip to content

feat(optimism): Remove bounds on EthChainSpec and Hardforks for OpEngineValidator #16574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 30, 2025
Merged

feat(optimism): Remove bounds on EthChainSpec and Hardforks for OpEngineValidator #16574

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11b88f5
feat(optimism): Remove bounds on `EthChainSpec` and `Hardforks` for `…
RomanHodulak May 30, 2025
e47384d
feat(optimism): Remove chainspec reference as `OpHardforks` is implem…
RomanHodulak May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions crates/optimism/node/src/engine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use op_alloy_rpc_types_engine::{
OpExecutionData, OpExecutionPayloadEnvelopeV3, OpExecutionPayloadEnvelopeV4,
OpPayloadAttributes,
};
use reth_chainspec::{EthChainSpec, Hardforks};
use reth_consensus::ConsensusError;
use reth_node_api::{
payload::{
Expand All @@ -17,7 +16,7 @@ use reth_node_api::{
PayloadValidator,
};
use reth_optimism_consensus::isthmus;
use reth_optimism_forks::{OpHardfork, OpHardforks};
use reth_optimism_forks::OpHardforks;
use reth_optimism_payload_builder::{OpExecutionPayloadValidator, OpPayloadTypes};
use reth_optimism_primitives::{OpBlock, ADDRESS_L2_TO_L1_MESSAGE_PASSER};
use reth_primitives_traits::{Block, RecoveredBlock, SealedBlock, SignedTransaction};
Expand Down Expand Up @@ -67,16 +66,16 @@ where

/// Validator for Optimism engine API.
#[derive(Debug, Clone)]
pub struct OpEngineValidator<P, Tx, Chain> {
inner: OpExecutionPayloadValidator<Chain>,
pub struct OpEngineValidator<P, Tx, ChainSpec> {
inner: OpExecutionPayloadValidator<ChainSpec>,
provider: P,
hashed_addr_l2tol1_msg_passer: B256,
phantom: PhantomData<Tx>,
}

impl<P, Tx, Chain> OpEngineValidator<P, Tx, Chain> {
impl<P, Tx, ChainSpec> OpEngineValidator<P, Tx, ChainSpec> {
/// Instantiates a new validator.
pub fn new<KH: KeyHasher>(chain_spec: Arc<Chain>, provider: P) -> Self {
pub fn new<KH: KeyHasher>(chain_spec: Arc<ChainSpec>, provider: P) -> Self {
let hashed_addr_l2tol1_msg_passer = KH::hash_key(ADDRESS_L2_TO_L1_MESSAGE_PASSER);
Self {
inner: OpExecutionPayloadValidator::new(chain_spec),
Expand All @@ -87,22 +86,22 @@ impl<P, Tx, Chain> OpEngineValidator<P, Tx, Chain> {
}
}

impl<P, Tx, Chain> OpEngineValidator<P, Tx, Chain>
impl<P, Tx, ChainSpec> OpEngineValidator<P, Tx, ChainSpec>
where
Chain: OpHardforks,
ChainSpec: OpHardforks,
{
/// Returns the chain spec used by the validator.
#[inline]
fn chain_spec(&self) -> &Chain {
fn chain_spec(&self) -> &ChainSpec {
self.inner.chain_spec()
}
}

impl<P, Tx, Chain> PayloadValidator for OpEngineValidator<P, Tx, Chain>
impl<P, Tx, ChainSpec> PayloadValidator for OpEngineValidator<P, Tx, ChainSpec>
where
P: StateProviderFactory + Unpin + 'static,
Tx: SignedTransaction + Unpin + 'static,
Chain: EthChainSpec + OpHardforks + Hardforks + 'static,
ChainSpec: OpHardforks + Send + Sync + 'static,
{
type Block = alloy_consensus::Block<Tx>;
type ExecutionData = OpExecutionData;
Expand Down Expand Up @@ -147,16 +146,16 @@ where
}
}

impl<Types, P, Tx, Chain> EngineValidator<Types> for OpEngineValidator<P, Tx, Chain>
impl<Types, P, Tx, ChainSpec> EngineValidator<Types> for OpEngineValidator<P, Tx, ChainSpec>
where
Types: PayloadTypes<
PayloadAttributes = OpPayloadAttributes,
ExecutionData = <Self as PayloadValidator>::ExecutionData,
BuiltPayload: BuiltPayload<Primitives: NodePrimitives<SignedTx = Tx>>,
>,
P: StateProviderFactory + Unpin + 'static,
Tx: SignedTransaction + Unpin + 'static + Send + Sync,
Chain: EthChainSpec + OpHardforks + Hardforks + 'static,
Tx: SignedTransaction + Unpin + 'static,
ChainSpec: OpHardforks + Send + Sync + 'static,
{
fn validate_version_specific_fields(
&self,
Expand Down Expand Up @@ -231,13 +230,13 @@ where
/// Canyon activates the Shanghai EIPs, see the Canyon specs for more details:
/// <https://github.com/ethereum-optimism/optimism/blob/ab926c5fd1e55b5c864341c44842d6d1ca679d99/specs/superchain-upgrades.md#canyon>
pub fn validate_withdrawals_presence(
chain_spec: &(impl EthChainSpec + OpHardforks + Hardforks),
chain_spec: impl OpHardforks,
version: EngineApiMessageVersion,
message_validation_kind: MessageValidationKind,
timestamp: u64,
has_withdrawals: bool,
) -> Result<(), EngineObjectValidationError> {
let is_shanghai = chain_spec.fork(OpHardfork::Canyon).active_at_timestamp(timestamp);
let is_shanghai = chain_spec.is_canyon_active_at_timestamp(timestamp);

match version {
EngineApiMessageVersion::V1 => {
Expand Down
Loading