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

renamed OptimismPayloadBuilder to OpPayloadBuilder (#12234)

Browse Source
This commit is contained in:
Steven
2024-10-31 13:21:38 -06:00
committed by GitHub
parent d555f9ef3a
commit 998b3b3d3a
4 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/optimism/node/src/lib.rs
View File

@ -23,7 +23,7 @@ pub use node::OptimismNode;
pub mod txpool; pub mod txpool;
pub use reth_optimism_payload_builder::{ pub use reth_optimism_payload_builder::{
OpBuiltPayload, OpPayloadBuilderAttributes, OptimismPayloadBuilder, OpBuiltPayload, OpPayloadBuilder, OpPayloadBuilderAttributes,
}; };
pub use reth_optimism_evm::*; pub use reth_optimism_evm::*;

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

@ -67,7 +67,7 @@ impl OptimismNode {
) -> ComponentsBuilder< ) -> ComponentsBuilder<
Node, Node,
OptimismPoolBuilder, OptimismPoolBuilder,
OptimismPayloadBuilder, OpPayloadBuilder,
OptimismNetworkBuilder, OptimismNetworkBuilder,
OptimismExecutorBuilder, OptimismExecutorBuilder,
OptimismConsensusBuilder, OptimismConsensusBuilder,
@ -81,7 +81,7 @@ impl OptimismNode {
ComponentsBuilder::default() ComponentsBuilder::default()
.node_types::<Node>() .node_types::<Node>()
.pool(OptimismPoolBuilder::default()) .pool(OptimismPoolBuilder::default())
.payload(OptimismPayloadBuilder::new(compute_pending_block)) .payload(OpPayloadBuilder::new(compute_pending_block))
.network(OptimismNetworkBuilder { .network(OptimismNetworkBuilder {
disable_txpool_gossip, disable_txpool_gossip,
disable_discovery_v4: !discovery_v4, disable_discovery_v4: !discovery_v4,
@ -100,7 +100,7 @@ where
type ComponentsBuilder = ComponentsBuilder< type ComponentsBuilder = ComponentsBuilder<
N, N,
OptimismPoolBuilder, OptimismPoolBuilder,
OptimismPayloadBuilder, OpPayloadBuilder,
OptimismNetworkBuilder, OptimismNetworkBuilder,
OptimismExecutorBuilder, OptimismExecutorBuilder,
OptimismConsensusBuilder, OptimismConsensusBuilder,
@ -288,7 +288,7 @@ where
/// A basic optimism payload service builder /// A basic optimism payload service builder
#[derive(Debug, Default, Clone)] #[derive(Debug, Default, Clone)]
pub struct OptimismPayloadBuilder { pub struct OpPayloadBuilder {
/// By default the pending block equals the latest block /// By default the pending block equals the latest block
/// to save resources and not leak txs from the tx-pool, /// to save resources and not leak txs from the tx-pool,
/// this flag enables computing of the pending block /// this flag enables computing of the pending block
@ -300,7 +300,7 @@ pub struct OptimismPayloadBuilder {
pub compute_pending_block: bool, pub compute_pending_block: bool,
} }
impl OptimismPayloadBuilder { impl OpPayloadBuilder {
/// Create a new instance with the given `compute_pending_block` flag. /// Create a new instance with the given `compute_pending_block` flag.
pub const fn new(compute_pending_block: bool) -> Self { pub const fn new(compute_pending_block: bool) -> Self {
Self { compute_pending_block } Self { compute_pending_block }
@ -320,9 +320,8 @@ impl OptimismPayloadBuilder {
Pool: TransactionPool + Unpin + 'static, Pool: TransactionPool + Unpin + 'static,
Evm: ConfigureEvm<Header = Header>, Evm: ConfigureEvm<Header = Header>,
{ {
let payload_builder = let payload_builder = reth_optimism_payload_builder::OpPayloadBuilder::new(evm_config)
reth_optimism_payload_builder::OptimismPayloadBuilder::new(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()
@ -348,7 +347,7 @@ impl OptimismPayloadBuilder {
} }
} }
impl<Node, Pool> PayloadServiceBuilder<Node, Pool> for OptimismPayloadBuilder impl<Node, Pool> PayloadServiceBuilder<Node, Pool> for OpPayloadBuilder
where where
Node: FullNodeTypes< Node: FullNodeTypes<
Types: NodeTypesWithEngine<Engine = OptimismEngineTypes, ChainSpec = OpChainSpec>, Types: NodeTypesWithEngine<Engine = OptimismEngineTypes, ChainSpec = OpChainSpec>,

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

@ -39,7 +39,7 @@ use op_alloy_consensus::DepositTransaction;
/// Optimism's payload builder /// Optimism's payload builder
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
pub struct OptimismPayloadBuilder<EvmConfig> { pub struct OpPayloadBuilder<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.
pub compute_pending_block: bool, pub compute_pending_block: bool,
@ -47,8 +47,8 @@ pub struct OptimismPayloadBuilder<EvmConfig> {
pub evm_config: EvmConfig, pub evm_config: EvmConfig,
} }
impl<EvmConfig> OptimismPayloadBuilder<EvmConfig> { impl<EvmConfig> OpPayloadBuilder<EvmConfig> {
/// `OptimismPayloadBuilder` constructor. /// `OpPayloadBuilder` constructor.
pub const fn new(evm_config: EvmConfig) -> Self { pub const fn new(evm_config: EvmConfig) -> Self {
Self { compute_pending_block: true, evm_config } Self { compute_pending_block: true, evm_config }
} }
@ -69,7 +69,7 @@ impl<EvmConfig> OptimismPayloadBuilder<EvmConfig> {
self.compute_pending_block self.compute_pending_block
} }
} }
impl<EvmConfig> OptimismPayloadBuilder<EvmConfig> impl<EvmConfig> OpPayloadBuilder<EvmConfig>
where where
EvmConfig: ConfigureEvmEnv<Header = Header>, EvmConfig: ConfigureEvmEnv<Header = Header>,
{ {
@ -89,8 +89,8 @@ where
} }
} }
/// Implementation of the [`PayloadBuilder`] trait for [`OptimismPayloadBuilder`]. /// Implementation of the [`PayloadBuilder`] trait for [`OpPayloadBuilder`].
impl<Pool, Client, EvmConfig> PayloadBuilder<Pool, Client> for OptimismPayloadBuilder<EvmConfig> impl<Pool, Client, EvmConfig> PayloadBuilder<Pool, Client> for OpPayloadBuilder<EvmConfig>
where where
Client: StateProviderFactory + ChainSpecProvider<ChainSpec = OpChainSpec>, Client: StateProviderFactory + ChainSpecProvider<ChainSpec = OpChainSpec>,
Pool: TransactionPool, Pool: TransactionPool,

2
crates/optimism/payload/src/lib.rs
View File

@ -12,7 +12,7 @@
#![cfg(feature = "optimism")] #![cfg(feature = "optimism")]
pub mod builder; pub mod builder;
pub use builder::OptimismPayloadBuilder; pub use builder::OpPayloadBuilder;
pub mod error; pub mod error;
pub mod payload; pub mod payload;
pub use payload::{OpBuiltPayload, OpPayloadAttributes, OpPayloadBuilderAttributes}; pub use payload::{OpBuiltPayload, OpPayloadAttributes, OpPayloadBuilderAttributes};