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 OptimismEngineTypes to OpEngineTypes (#12285)

Browse Source
This commit is contained in:
Steven
2024-11-03 09:26:31 -06:00
committed by GitHub
parent e167cc9b09
commit 20d3b21904
3 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/optimism/node/src/engine.rs
View File

@ -22,17 +22,17 @@ use reth_optimism_payload_builder::{
/// The types used in the optimism beacon consensus engine.
#[derive(Debug, Default, Clone, serde::Deserialize, serde::Serialize)]
#[non_exhaustive]
pub struct OptimismEngineTypes<T: PayloadTypes = OpPayloadTypes> {
pub struct OpEngineTypes<T: PayloadTypes = OpPayloadTypes> {
_marker: std::marker::PhantomData<T>,
}
impl<T: PayloadTypes> PayloadTypes for OptimismEngineTypes<T> {
impl<T: PayloadTypes> PayloadTypes for OpEngineTypes<T> {
type BuiltPayload = T::BuiltPayload;
type PayloadAttributes = T::PayloadAttributes;
type PayloadBuilderAttributes = T::PayloadBuilderAttributes;
}
impl<T: PayloadTypes> EngineTypes for OptimismEngineTypes<T>
impl<T: PayloadTypes> EngineTypes for OpEngineTypes<T>
where
T::BuiltPayload: TryInto<ExecutionPayloadV1>
+ TryInto<ExecutionPayloadEnvelopeV2>
@ -45,7 +45,7 @@ where
type ExecutionPayloadEnvelopeV4 = OpExecutionPayloadEnvelopeV4;
}
/// A default payload type for [`OptimismEngineTypes`]
/// A default payload type for [`OpEngineTypes`]
#[derive(Debug, Default, Clone, serde::Deserialize, serde::Serialize)]
#[non_exhaustive]
pub struct OpPayloadTypes;
@ -224,7 +224,7 @@ mod test {
let attributes = get_attributes(None, 1799999999);
let result = <engine::OptimismEngineValidator as reth_node_builder::EngineValidator<
OptimismEngineTypes,
OpEngineTypes,
>>::ensure_well_formed_attributes(
&validator, EngineApiMessageVersion::V3, &attributes
);
@ -237,7 +237,7 @@ mod test {
let attributes = get_attributes(None, 1800000000);
let result = <engine::OptimismEngineValidator as reth_node_builder::EngineValidator<
OptimismEngineTypes,
OpEngineTypes,
>>::ensure_well_formed_attributes(
&validator, EngineApiMessageVersion::V3, &attributes
);
@ -250,7 +250,7 @@ mod test {
let attributes = get_attributes(Some(b64!("0000000000000008")), 1800000000);
let result = <engine::OptimismEngineValidator as reth_node_builder::EngineValidator<
OptimismEngineTypes,
OpEngineTypes,
>>::ensure_well_formed_attributes(
&validator, EngineApiMessageVersion::V3, &attributes
);
@ -263,7 +263,7 @@ mod test {
let attributes = get_attributes(Some(b64!("0000000800000008")), 1800000000);
let result = <engine::OptimismEngineValidator as reth_node_builder::EngineValidator<
OptimismEngineTypes,
OpEngineTypes,
>>::ensure_well_formed_attributes(
&validator, EngineApiMessageVersion::V3, &attributes
);
@ -276,7 +276,7 @@ mod test {
let attributes = get_attributes(Some(b64!("0000000000000000")), 1800000000);
let result = <engine::OptimismEngineValidator as reth_node_builder::EngineValidator<
OptimismEngineTypes,
OpEngineTypes,
>>::ensure_well_formed_attributes(
&validator, EngineApiMessageVersion::V3, &attributes
);

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

@ -15,7 +15,7 @@ pub mod args;
/// Exports optimism-specific implementations of the [`EngineTypes`](reth_node_api::EngineTypes)
/// trait.
pub mod engine;
pub use engine::OptimismEngineTypes;
pub use engine::OpEngineTypes;
pub mod node;
pub use node::OptimismNode;

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

@ -36,7 +36,7 @@ use crate::{
args::RollupArgs,
engine::OptimismEngineValidator,
txpool::{OpTransactionPool, OpTransactionValidator},
OptimismEngineTypes,
OpEngineTypes,
};
/// Optimism primitive types.
@ -74,7 +74,7 @@ impl OptimismNode {
>
where
Node: FullNodeTypes<
Types: NodeTypesWithEngine<Engine = OptimismEngineTypes, ChainSpec = OpChainSpec>,
Types: NodeTypesWithEngine<Engine = OpEngineTypes, ChainSpec = OpChainSpec>,
>,
{
let RollupArgs { disable_txpool_gossip, compute_pending_block, discovery_v4, .. } = args;
@ -93,9 +93,7 @@ impl OptimismNode {
impl<N> Node<N> for OptimismNode
where
N: FullNodeTypes<
Types: NodeTypesWithEngine<Engine = OptimismEngineTypes, ChainSpec = OpChainSpec>,
>,
N: FullNodeTypes<Types: NodeTypesWithEngine<Engine = OpEngineTypes, ChainSpec = OpChainSpec>>,
{
type ComponentsBuilder = ComponentsBuilder<
N,
@ -127,7 +125,7 @@ impl NodeTypes for OptimismNode {
}
impl NodeTypesWithEngine for OptimismNode {
type Engine = OptimismEngineTypes;
type Engine = OpEngineTypes;
}
/// Add-ons w.r.t. optimism.
@ -312,10 +310,10 @@ impl OpPayloadBuilder {
evm_config: Evm,
ctx: &BuilderContext<Node>,
pool: Pool,
) -> eyre::Result<PayloadBuilderHandle<OptimismEngineTypes>>
) -> eyre::Result<PayloadBuilderHandle<OpEngineTypes>>
where
Node: FullNodeTypes<
Types: NodeTypesWithEngine<Engine = OptimismEngineTypes, ChainSpec = OpChainSpec>,
Types: NodeTypesWithEngine<Engine = OpEngineTypes, ChainSpec = OpChainSpec>,
>,
Pool: TransactionPool + Unpin + 'static,
Evm: ConfigureEvm<Header = Header>,
@ -349,16 +347,15 @@ impl OpPayloadBuilder {
impl<Node, Pool> PayloadServiceBuilder<Node, Pool> for OpPayloadBuilder
where
Node: FullNodeTypes<
Types: NodeTypesWithEngine<Engine = OptimismEngineTypes, ChainSpec = OpChainSpec>,
>,
Node:
FullNodeTypes<Types: NodeTypesWithEngine<Engine = OpEngineTypes, ChainSpec = OpChainSpec>>,
Pool: TransactionPool + Unpin + 'static,
{
async fn spawn_payload_service(
self,
ctx: &BuilderContext<Node>,
pool: Pool,
) -> eyre::Result<PayloadBuilderHandle<OptimismEngineTypes>> {
) -> eyre::Result<PayloadBuilderHandle<OpEngineTypes>> {
self.spawn(OpEvmConfig::new(ctx.chain_spec()), ctx, pool)
}
}