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

chore: remove unused chainspec field from OptimismPayloadBuilder (#9397)

Browse Source
This commit is contained in:
joshieDo
2024-07-09 18:47:38 +02:00
committed by GitHub
parent bb8ff67182
commit 0a27779375
4 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/reth/src/commands/debug_cmd/build_block.rs
View File

@ -248,7 +248,6 @@ impl Command {
#[cfg(feature = "optimism")] #[cfg(feature = "optimism")]
let payload_builder = reth_node_optimism::OptimismPayloadBuilder::new( let payload_builder = reth_node_optimism::OptimismPayloadBuilder::new(
provider_factory.chain_spec(),
reth_node_optimism::OptimismEvmConfig::default(), reth_node_optimism::OptimismEvmConfig::default(),
) )
.compute_pending_block(); .compute_pending_block();

1
bin/reth/src/commands/debug_cmd/replay_engine.rs
View File

@ -113,7 +113,6 @@ impl Command {
// Optimism's payload builder is implemented on the OptimismPayloadBuilder type. // Optimism's payload builder is implemented on the OptimismPayloadBuilder type.
#[cfg(feature = "optimism")] #[cfg(feature = "optimism")]
let payload_builder = reth_node_optimism::OptimismPayloadBuilder::new( let payload_builder = reth_node_optimism::OptimismPayloadBuilder::new(
provider_factory.chain_spec(),
reth_node_optimism::OptimismEvmConfig::default(), reth_node_optimism::OptimismEvmConfig::default(),
); );

8
crates/optimism/node/src/node.rs
View File

@ -226,11 +226,9 @@ where
ctx: &BuilderContext<Node>, ctx: &BuilderContext<Node>,
pool: Pool, pool: Pool,
) -> eyre::Result<PayloadBuilderHandle<Node::Engine>> { ) -> eyre::Result<PayloadBuilderHandle<Node::Engine>> {
let payload_builder = reth_optimism_payload_builder::OptimismPayloadBuilder::new( let payload_builder =
ctx.chain_spec(), reth_optimism_payload_builder::OptimismPayloadBuilder::new(self.evm_config)
self.evm_config, .set_compute_pending_block(self.compute_pending_block);
)
.set_compute_pending_block(self.compute_pending_block);
let conf = ctx.payload_builder_config(); let conf = ctx.payload_builder_config();
let payload_job_config = BasicPayloadJobGeneratorConfig::default() let payload_job_config = BasicPayloadJobGeneratorConfig::default()

15
crates/optimism/payload/src/builder.rs
View File

@ -5,7 +5,7 @@ use crate::{
payload::{OptimismBuiltPayload, OptimismPayloadBuilderAttributes}, payload::{OptimismBuiltPayload, OptimismPayloadBuilderAttributes},
}; };
use reth_basic_payload_builder::*; 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_evm::{system_calls::pre_block_beacon_root_contract_call, ConfigureEvm};
use reth_execution_types::ExecutionOutcome; use reth_execution_types::ExecutionOutcome;
use reth_payload_builder::error::PayloadBuilderError; use reth_payload_builder::error::PayloadBuilderError;
@ -22,7 +22,6 @@ use revm::{
primitives::{EVMError, EnvWithHandlerCfg, InvalidTransaction, ResultAndState}, primitives::{EVMError, EnvWithHandlerCfg, InvalidTransaction, ResultAndState},
DatabaseCommit, State, DatabaseCommit, State,
}; };
use std::sync::Arc;
use tracing::{debug, trace, warn}; use tracing::{debug, trace, warn};
/// Optimism's payload builder /// Optimism's payload builder
@ -31,16 +30,14 @@ pub struct OptimismPayloadBuilder<EvmConfig> {
/// The rollup's compute pending block configuration option. /// The rollup's compute pending block configuration option.
// TODO(clabby): Implement this feature. // TODO(clabby): Implement this feature.
compute_pending_block: bool, compute_pending_block: bool,
/// The rollup's chain spec.
chain_spec: Arc<ChainSpec>,
/// The type responsible for creating the evm. /// The type responsible for creating the evm.
evm_config: EvmConfig, evm_config: EvmConfig,
} }
impl<EvmConfig> OptimismPayloadBuilder<EvmConfig> { impl<EvmConfig> OptimismPayloadBuilder<EvmConfig> {
/// `OptimismPayloadBuilder` constructor. /// `OptimismPayloadBuilder` constructor.
pub const fn new(chain_spec: Arc<ChainSpec>, evm_config: EvmConfig) -> Self { pub const fn new(evm_config: EvmConfig) -> Self {
Self { compute_pending_block: true, chain_spec, evm_config } Self { compute_pending_block: true, evm_config }
} }
/// Sets the rollup's compute pending block configuration option. /// Sets the rollup's compute pending block configuration option.
@ -58,12 +55,6 @@ impl<EvmConfig> OptimismPayloadBuilder<EvmConfig> {
pub const fn is_compute_pending_block(&self) -> bool { pub const fn is_compute_pending_block(&self) -> bool {
self.compute_pending_block self.compute_pending_block
} }
/// Sets the rollup's chainspec.
pub fn set_chain_spec(mut self, chain_spec: Arc<ChainSpec>) -> Self {
self.chain_spec = chain_spec;
self
}
} }
/// Implementation of the [`PayloadBuilder`] trait for [`OptimismPayloadBuilder`]. /// Implementation of the [`PayloadBuilder`] trait for [`OptimismPayloadBuilder`].