Skip to content

feat(examples): Replace CustomNetworkBuilder using OpNetworkBuilder with custom generics #16551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 29, 2025
Merged

feat(examples): Replace CustomNetworkBuilder using OpNetworkBuilder with custom generics #16551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a8dee1
feat(examples): Replace `CustomNetworkBuilder` using `OpNetworkBuilde…
RomanHodulak May 29, 2025
9135432
refactor(examples): Remove unused `CustomNetworkBuilder`
RomanHodulak May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions examples/custom-node/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,27 @@

#![cfg_attr(not(test), warn(unused_crate_dependencies))]

use crate::{evm::CustomExecutorBuilder, network::CustomNetworkBuilder};
use crate::{
evm::CustomExecutorBuilder, network::CustomNetworkPrimitives,
primitives::CustomTransactionEnvelope,
};
use chainspec::CustomChainSpec;
use consensus::CustomConsensusBuilder;
use op_alloy_consensus::OpPooledTransaction;
use pool::CustomPoolBuilder;
use primitives::CustomNodePrimitives;
use reth_ethereum::node::api::{FullNodeTypes, NodeTypes};
use reth_ethereum::{
node::api::{FullNodeTypes, NodeTypes},
primitives::Extended,
};
use reth_node_builder::{
components::{BasicPayloadServiceBuilder, ComponentsBuilder},
Node,
};
use reth_op::node::{node::OpPayloadBuilder, OpNode, OpPayloadTypes};
use reth_op::node::{
node::{OpNetworkBuilder, OpPayloadBuilder},
OpNode, OpPayloadTypes,
};

pub mod chainspec;
pub mod consensus;
Expand Down Expand Up @@ -47,7 +57,10 @@ where
N,
CustomPoolBuilder,
BasicPayloadServiceBuilder<OpPayloadBuilder>,
CustomNetworkBuilder,
OpNetworkBuilder<
CustomNetworkPrimitives,
Extended<OpPooledTransaction, CustomTransactionEnvelope>,
>,
CustomExecutorBuilder,
CustomConsensusBuilder,
>;
Expand All @@ -60,7 +73,7 @@ where
.pool(CustomPoolBuilder::default())
.executor(CustomExecutorBuilder::default())
.payload(BasicPayloadServiceBuilder::new(OpPayloadBuilder::new(false)))
.network(CustomNetworkBuilder::default())
.network(OpNetworkBuilder::new(false, false))
Copy link
Member

@klkvr klkvr May 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: we should propagate those arguments from cli/node struct, but can be done in a followup

.consensus(CustomConsensusBuilder)
}

Expand Down
82 changes: 2 additions & 80 deletions examples/custom-node/src/network.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,7 @@
use crate::{
chainspec::CustomChainSpec,
primitives::{
CustomHeader, CustomNodePrimitives, CustomTransaction, CustomTransactionEnvelope,
},
};
use crate::primitives::{CustomHeader, CustomTransaction, CustomTransactionEnvelope};
use alloy_consensus::{Block, BlockBody};
use eyre::Result;
use op_alloy_consensus::OpPooledTransaction;
use reth_ethereum::{
chainspec::{EthChainSpec, Hardforks},
network::{NetworkConfig, NetworkHandle, NetworkManager, NetworkPrimitives},
node::api::{FullNodeTypes, NodeTypes, TxTy},
pool::{PoolTransaction, TransactionPool},
};
use reth_node_builder::{components::NetworkBuilder, BuilderContext};
use reth_ethereum::network::NetworkPrimitives;
use reth_op::{primitives::Extended, OpReceipt};

#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)]
Expand All @@ -28,69 +16,3 @@ impl NetworkPrimitives for CustomNetworkPrimitives {
type PooledTransaction = Extended<OpPooledTransaction, CustomTransactionEnvelope>;
type Receipt = OpReceipt;
}

#[derive(Default)]
pub struct CustomNetworkBuilder {}

impl CustomNetworkBuilder {
fn network_config<Node>(
&self,
ctx: &BuilderContext<Node>,
) -> eyre::Result<NetworkConfig<<Node as FullNodeTypes>::Provider, CustomNetworkPrimitives>>
where
Node: FullNodeTypes<Types: NodeTypes<ChainSpec: Hardforks>>,
{
let args = &ctx.config().network;
let network_builder = ctx
.network_config_builder()?
// apply discovery settings
.apply(|mut builder| {
let rlpx_socket = (args.addr, args.port).into();
if args.discovery.disable_discovery {
builder = builder.disable_discv4_discovery();
}
if !args.discovery.disable_discovery {
builder = builder.discovery_v5(
args.discovery.discovery_v5_builder(
rlpx_socket,
ctx.config()
.network
.resolved_bootnodes()
.or_else(|| ctx.chain_spec().bootnodes())
.unwrap_or_default(),
),
);
}

builder
});

let network_config = ctx.build_network_config(network_builder);

Ok(network_config)
}
}

impl<Node, Pool> NetworkBuilder<Node, Pool> for CustomNetworkBuilder
where
Node: FullNodeTypes<
Types: NodeTypes<ChainSpec = CustomChainSpec, Primitives = CustomNodePrimitives>,
>,
Pool: TransactionPool<
Transaction: PoolTransaction<
Consensus = TxTy<Node::Types>,
Pooled = Extended<OpPooledTransaction, CustomTransactionEnvelope>,
>,
> + Unpin
+ 'static,
{
type Network = NetworkHandle<CustomNetworkPrimitives>;

async fn build_network(self, ctx: &BuilderContext<Node>, pool: Pool) -> Result<Self::Network> {
let network_config = self.network_config(ctx)?;
let network = NetworkManager::builder(network_config).await?;
let handle = ctx.start_network(network, pool);

Ok(handle)
}
}
Loading