Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changelog/mild-foxes-bark.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
reth-chainspec: minor
reth-network-peers: minor
---

Removed OP stack bootnodes from default chain configurations and network peers module.
14 changes: 1 addition & 13 deletions crates/chainspec/src/spec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,7 @@ use reth_ethereum_forks::{
ChainHardforks, DisplayHardforks, EthereumHardfork, EthereumHardforks, ForkCondition,
ForkFilter, ForkFilterKey, ForkHash, ForkId, Hardfork, Hardforks, Head, DEV_HARDFORKS,
};
use reth_network_peers::{
holesky_nodes, hoodi_nodes, mainnet_nodes, op_nodes, op_testnet_nodes, sepolia_nodes,
NodeRecord,
};
use reth_network_peers::{holesky_nodes, hoodi_nodes, mainnet_nodes, sepolia_nodes, NodeRecord};
use reth_primitives_traits::{sync::LazyLock, BlockHeader, SealedHeader};

/// Helper method building a [`Header`] given [`Genesis`] and [`ChainHardforks`].
Expand Down Expand Up @@ -780,15 +777,6 @@ impl<H: BlockHeader> ChainSpec<H> {
C::Sepolia => Some(sepolia_nodes()),
C::Holesky => Some(holesky_nodes()),
C::Hoodi => Some(hoodi_nodes()),
// opstack uses the same bootnodes for all chains: <https://github.com/paradigmxyz/reth/issues/14603>
C::Base | C::Optimism | C::Unichain | C::World => Some(op_nodes()),
C::OptimismSepolia | C::BaseSepolia | C::UnichainSepolia | C::WorldSepolia => {
Some(op_testnet_nodes())
}

// fallback for optimism chains
chain if chain.is_optimism() && chain.is_testnet() => Some(op_testnet_nodes()),
chain if chain.is_optimism() => Some(op_nodes()),
_ => None,
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
//! Bootnodes for the network
//!
//! Ethereum bootnodes come from <https://github.com/ledgerwatch/erigon/blob/devel/params/bootnodes.go>

use crate::NodeRecord;
use alloc::vec::Vec;

/// Ethereum Foundation Go Bootnodes
pub static MAINNET_BOOTNODES: [&str; 4] = [
"enode://d860a01f9722d78051619d1e2351aba3f43f943f6f00718d1b9baa4101932a1f5011f16bb2b1bb35db20d6fe28fa0bf09636d26a87d31de9ec6203eeedb1f666@18.138.108.67:30303", // bootnode-aws-ap-southeast-1-001
Expand Down Expand Up @@ -30,3 +35,28 @@ pub static HOODI_BOOTNODES: [&str; 3] = [
"enode://60203fcb3524e07c5df60a14ae1c9c5b24023ea5d47463dfae051d2c9f3219f309657537576090ca0ae641f73d419f53d8e8000d7a464319d4784acd7d2abc41@209.38.124.160:30303",
"enode://8ae4a48101b2299597341263da0deb47cc38aa4d3ef4b7430b897d49bfa10eb1ccfe1655679b1ed46928ef177fbf21b86837bd724400196c508427a6f41602cd@134.199.184.23:30303",
];

/// Returns parsed mainnet nodes
pub fn mainnet_nodes() -> Vec<NodeRecord> {
parse_nodes(&MAINNET_BOOTNODES[..])
}

/// Returns parsed sepolia nodes
pub fn sepolia_nodes() -> Vec<NodeRecord> {
parse_nodes(&SEPOLIA_BOOTNODES[..])
}

/// Returns parsed holesky nodes
pub fn holesky_nodes() -> Vec<NodeRecord> {
parse_nodes(&HOLESKY_BOOTNODES[..])
}

/// Returns parsed hoodi nodes
pub fn hoodi_nodes() -> Vec<NodeRecord> {
parse_nodes(&HOODI_BOOTNODES[..])
}

/// Parses all the nodes
pub fn parse_nodes(nodes: impl IntoIterator<Item = impl AsRef<str>>) -> Vec<NodeRecord> {
nodes.into_iter().map(|s| s.as_ref().parse().unwrap()).collect()
}
55 changes: 0 additions & 55 deletions crates/net/peers/src/bootnodes/mod.rs

This file was deleted.

34 changes: 0 additions & 34 deletions crates/net/peers/src/bootnodes/optimism.rs

This file was deleted.

Loading