diff --git a/bin/reth/src/commands/debug_cmd/build_block.rs b/bin/reth/src/commands/debug_cmd/build_block.rs index afaf79964..6f9abd771 100644 --- a/bin/reth/src/commands/debug_cmd/build_block.rs +++ b/bin/reth/src/commands/debug_cmd/build_block.rs @@ -248,7 +248,6 @@ impl Command { #[cfg(feature = "optimism")] let payload_builder = reth_node_optimism::OptimismPayloadBuilder::new( - provider_factory.chain_spec(), reth_node_optimism::OptimismEvmConfig::default(), ) .compute_pending_block(); diff --git a/bin/reth/src/commands/debug_cmd/replay_engine.rs b/bin/reth/src/commands/debug_cmd/replay_engine.rs index cc31c562f..4339a0f76 100644 --- a/bin/reth/src/commands/debug_cmd/replay_engine.rs +++ b/bin/reth/src/commands/debug_cmd/replay_engine.rs @@ -113,7 +113,6 @@ impl Command { // Optimism's payload builder is implemented on the OptimismPayloadBuilder type. #[cfg(feature = "optimism")] let payload_builder = reth_node_optimism::OptimismPayloadBuilder::new( - provider_factory.chain_spec(), reth_node_optimism::OptimismEvmConfig::default(), ); diff --git a/crates/optimism/node/src/node.rs b/crates/optimism/node/src/node.rs index 2ea24da67..df64d901a 100644 --- a/crates/optimism/node/src/node.rs +++ b/crates/optimism/node/src/node.rs @@ -226,11 +226,9 @@ where ctx: &BuilderContext, pool: Pool, ) -> eyre::Result> { - let payload_builder = reth_optimism_payload_builder::OptimismPayloadBuilder::new( - ctx.chain_spec(), - self.evm_config, - ) - .set_compute_pending_block(self.compute_pending_block); + let payload_builder = + reth_optimism_payload_builder::OptimismPayloadBuilder::new(self.evm_config) + .set_compute_pending_block(self.compute_pending_block); let conf = ctx.payload_builder_config(); let payload_job_config = BasicPayloadJobGeneratorConfig::default() diff --git a/crates/optimism/payload/src/builder.rs b/crates/optimism/payload/src/builder.rs index 5622bb695..93b8c9606 100644 --- a/crates/optimism/payload/src/builder.rs +++ b/crates/optimism/payload/src/builder.rs @@ -5,7 +5,7 @@ use crate::{ payload::{OptimismBuiltPayload, OptimismPayloadBuilderAttributes}, }; use reth_basic_payload_builder::*; -use reth_chainspec::{ChainSpec, EthereumHardforks, OptimismHardfork}; +use reth_chainspec::{EthereumHardforks, OptimismHardfork}; use reth_evm::{system_calls::pre_block_beacon_root_contract_call, ConfigureEvm}; use reth_execution_types::ExecutionOutcome; use reth_payload_builder::error::PayloadBuilderError; @@ -22,7 +22,6 @@ use revm::{ primitives::{EVMError, EnvWithHandlerCfg, InvalidTransaction, ResultAndState}, DatabaseCommit, State, }; -use std::sync::Arc; use tracing::{debug, trace, warn}; /// Optimism's payload builder @@ -31,16 +30,14 @@ pub struct OptimismPayloadBuilder { /// The rollup's compute pending block configuration option. // TODO(clabby): Implement this feature. compute_pending_block: bool, - /// The rollup's chain spec. - chain_spec: Arc, /// The type responsible for creating the evm. evm_config: EvmConfig, } impl OptimismPayloadBuilder { /// `OptimismPayloadBuilder` constructor. - pub const fn new(chain_spec: Arc, evm_config: EvmConfig) -> Self { - Self { compute_pending_block: true, chain_spec, evm_config } + pub const fn new(evm_config: EvmConfig) -> Self { + Self { compute_pending_block: true, evm_config } } /// Sets the rollup's compute pending block configuration option. @@ -58,12 +55,6 @@ impl OptimismPayloadBuilder { pub const fn is_compute_pending_block(&self) -> bool { self.compute_pending_block } - - /// Sets the rollup's chainspec. - pub fn set_chain_spec(mut self, chain_spec: Arc) -> Self { - self.chain_spec = chain_spec; - self - } } /// Implementation of the [`PayloadBuilder`] trait for [`OptimismPayloadBuilder`].