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 OptimismAddOns to OpAddOns (#12348)

Browse Source
This commit is contained in:
Steven
2024-11-06 13:22:00 -06:00
committed by GitHub
parent dc0a6007e3
commit e084bed089
4 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/optimism/bin/src/main.rs
View File

@ -5,7 +5,7 @@
use clap::Parser; use clap::Parser;
use reth_node_builder::{engine_tree_config::TreeConfig, EngineNodeLauncher}; use reth_node_builder::{engine_tree_config::TreeConfig, EngineNodeLauncher};
use reth_optimism_cli::{chainspec::OpChainSpecParser, Cli}; use reth_optimism_cli::{chainspec::OpChainSpecParser, Cli};
use reth_optimism_node::{args::RollupArgs, node::OptimismAddOns, OpNode}; use reth_optimism_node::{args::RollupArgs, node::OpAddOns, OpNode};
use reth_provider::providers::BlockchainProvider2; use reth_provider::providers::BlockchainProvider2;
use tracing as _; use tracing as _;
@ -36,7 +36,7 @@ fn main() {
let handle = builder let handle = builder
.with_types_and_provider::<OpNode, BlockchainProvider2<_>>() .with_types_and_provider::<OpNode, BlockchainProvider2<_>>()
.with_components(OpNode::components(rollup_args)) .with_components(OpNode::components(rollup_args))
.with_add_ons(OptimismAddOns::new(sequencer_http_arg)) .with_add_ons(OpAddOns::new(sequencer_http_arg))
.launch_with_fn(|builder| { .launch_with_fn(|builder| {
let launcher = EngineNodeLauncher::new( let launcher = EngineNodeLauncher::new(
builder.task_executor().clone(), builder.task_executor().clone(),

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

@ -105,9 +105,8 @@ where
OpConsensusBuilder, OpConsensusBuilder,
>; >;
type AddOns = OptimismAddOns< type AddOns =
NodeAdapter<N, <Self::ComponentsBuilder as NodeComponentsBuilder<N>>::Components>, OpAddOns<NodeAdapter<N, <Self::ComponentsBuilder as NodeComponentsBuilder<N>>::Components>>;
>;
fn components_builder(&self) -> Self::ComponentsBuilder { fn components_builder(&self) -> Self::ComponentsBuilder {
let Self { args } = self; let Self { args } = self;
@ -115,7 +114,7 @@ where
} }
fn add_ons(&self) -> Self::AddOns { fn add_ons(&self) -> Self::AddOns {
OptimismAddOns::new(self.args.sequencer_http.clone()) OpAddOns::new(self.args.sequencer_http.clone())
} }
} }
@ -131,24 +130,24 @@ impl NodeTypesWithEngine for OpNode {
/// Add-ons w.r.t. optimism. /// Add-ons w.r.t. optimism.
#[derive(Debug)] #[derive(Debug)]
pub struct OptimismAddOns<N: FullNodeComponents>( pub struct OpAddOns<N: FullNodeComponents>(
pub RpcAddOns<N, OpEthApi<N>, OptimismEngineValidatorBuilder>, pub RpcAddOns<N, OpEthApi<N>, OptimismEngineValidatorBuilder>,
); );
impl<N: FullNodeComponents> Default for OptimismAddOns<N> { impl<N: FullNodeComponents> Default for OpAddOns<N> {
fn default() -> Self { fn default() -> Self {
Self::new(None) Self::new(None)
} }
} }
impl<N: FullNodeComponents> OptimismAddOns<N> { impl<N: FullNodeComponents> OpAddOns<N> {
/// Create a new instance with the given `sequencer_http` URL. /// Create a new instance with the given `sequencer_http` URL.
pub fn new(sequencer_http: Option<String>) -> Self { pub fn new(sequencer_http: Option<String>) -> Self {
Self(RpcAddOns::new(move |ctx| OpEthApi::new(ctx, sequencer_http), Default::default())) Self(RpcAddOns::new(move |ctx| OpEthApi::new(ctx, sequencer_http), Default::default()))
} }
} }
impl<N> NodeAddOns<N> for OptimismAddOns<N> impl<N> NodeAddOns<N> for OpAddOns<N>
where where
N: FullNodeComponents<Types: NodeTypes<ChainSpec = OpChainSpec>>, N: FullNodeComponents<Types: NodeTypes<ChainSpec = OpChainSpec>>,
OpEngineValidator: EngineValidator<<N::Types as NodeTypesWithEngine>::Engine>, OpEngineValidator: EngineValidator<<N::Types as NodeTypesWithEngine>::Engine>,
@ -163,7 +162,7 @@ where
} }
} }
impl<N> RethRpcAddOns<N> for OptimismAddOns<N> impl<N> RethRpcAddOns<N> for OpAddOns<N>
where where
N: FullNodeComponents<Types: NodeTypes<ChainSpec = OpChainSpec>>, N: FullNodeComponents<Types: NodeTypes<ChainSpec = OpChainSpec>>,
OpEngineValidator: EngineValidator<<N::Types as NodeTypesWithEngine>::Engine>, OpEngineValidator: EngineValidator<<N::Types as NodeTypesWithEngine>::Engine>,

4
crates/optimism/node/tests/e2e/utils.rs
View File

@ -6,14 +6,14 @@ use reth_e2e_test_utils::{
}; };
use reth_optimism_chainspec::OpChainSpecBuilder; use reth_optimism_chainspec::OpChainSpecBuilder;
use reth_optimism_node::{ use reth_optimism_node::{
node::OptimismAddOns, OpBuiltPayload, OpNode as OtherOpNode, OpPayloadBuilderAttributes, node::OpAddOns, OpBuiltPayload, OpNode as OtherOpNode, OpPayloadBuilderAttributes,
}; };
use reth_payload_builder::EthPayloadBuilderAttributes; use reth_payload_builder::EthPayloadBuilderAttributes;
use std::sync::Arc; use std::sync::Arc;
use tokio::sync::Mutex; use tokio::sync::Mutex;
/// Optimism Node Helper type /// Optimism Node Helper type
pub(crate) type OpNode = NodeHelperType<OtherOpNode, OptimismAddOns<Adapter<OtherOpNode>>>; pub(crate) type OpNode = NodeHelperType<OtherOpNode, OpAddOns<Adapter<OtherOpNode>>>;
pub(crate) async fn setup(num_nodes: usize) -> eyre::Result<(Vec<OpNode>, TaskManager, Wallet)> { pub(crate) async fn setup(num_nodes: usize) -> eyre::Result<(Vec<OpNode>, TaskManager, Wallet)> {
let genesis: Genesis = serde_json::from_str(include_str!("../assets/genesis.json")).unwrap(); let genesis: Genesis = serde_json::from_str(include_str!("../assets/genesis.json")).unwrap();

4
crates/optimism/node/tests/it/builder.rs
View File

@ -4,7 +4,7 @@ use reth_db::test_utils::create_test_rw_db;
use reth_node_api::FullNodeComponents; use reth_node_api::FullNodeComponents;
use reth_node_builder::{NodeBuilder, NodeConfig}; use reth_node_builder::{NodeBuilder, NodeConfig};
use reth_optimism_chainspec::BASE_MAINNET; use reth_optimism_chainspec::BASE_MAINNET;
use reth_optimism_node::{node::OptimismAddOns, OpNode}; use reth_optimism_node::{node::OpAddOns, OpNode};
#[test] #[test]
fn test_basic_setup() { fn test_basic_setup() {
@ -15,7 +15,7 @@ fn test_basic_setup() {
.with_database(db) .with_database(db)
.with_types::<OpNode>() .with_types::<OpNode>()
.with_components(OpNode::components(Default::default())) .with_components(OpNode::components(Default::default()))
.with_add_ons(OptimismAddOns::new(None)) .with_add_ons(OpAddOns::new(None))
.on_component_initialized(move |ctx| { .on_component_initialized(move |ctx| {
let _provider = ctx.provider(); let _provider = ctx.provider();
Ok(()) Ok(())