From 29be4072cb9a0e8d8a3999ca6d5b9e3efa96983e Mon Sep 17 00:00:00 2001 From: Emilia Hane Date: Thu, 2 May 2024 19:24:19 +0200 Subject: [PATCH] fix(op): bootnodes (#7990) --- crates/primitives/src/lib.rs | 4 ++-- crates/primitives/src/net.rs | 36 +++++++++++++++--------------------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/crates/primitives/src/lib.rs b/crates/primitives/src/lib.rs index ae20cf6b2c..3473ef82e0 100644 --- a/crates/primitives/src/lib.rs +++ b/crates/primitives/src/lib.rs @@ -144,8 +144,8 @@ mod optimism { pub use crate::{ chain::{BASE_MAINNET, BASE_SEPOLIA, OP_MAINNET, OP_SEPOLIA}, net::{ - base_nodes, base_testnet_nodes, op_nodes, op_testnet_nodes, BASE_BOOTNODES, - BASE_TESTNET_BOOTNODES, OP_BOOTNODES, OP_TESTNET_BOOTNODES, + base_nodes, base_testnet_nodes, op_nodes, op_testnet_nodes, OP_BOOTNODES, + OP_TESTNET_BOOTNODES, }, transaction::{TxDeposit, DEPOSIT_TX_TYPE_ID}, }; diff --git a/crates/primitives/src/net.rs b/crates/primitives/src/net.rs index c8ff2a3ccf..068e47e5b2 100644 --- a/crates/primitives/src/net.rs +++ b/crates/primitives/src/net.rs @@ -43,24 +43,13 @@ pub static HOLESKY_BOOTNODES : [&str; 2] = [ ]; #[cfg(feature = "optimism")] -/// OP Mainnet Bootnodes -pub static OP_BOOTNODES: [&str; 3] = [ +/// OP stack mainnet boot nodes. +pub static OP_BOOTNODES: &[&str] = &[ + // OP Labs "enode://ca2774c3c401325850b2477fd7d0f27911efbf79b1e8b335066516e2bd8c4c9e0ba9696a94b1cb030a88eac582305ff55e905e64fb77fe0edcd70a4e5296d3ec@34.65.175.185:30305", "enode://dd751a9ef8912be1bfa7a5e34e2c3785cc5253110bd929f385e07ba7ac19929fb0e0c5d93f77827291f4da02b2232240fbc47ea7ce04c46e333e452f8656b667@34.65.107.0:30305", "enode://c5d289b56a77b6a2342ca29956dfd07aadf45364dde8ab20d1dc4efd4d1bc6b4655d902501daea308f4d8950737a4e93a4dfedd17b49cd5760ffd127837ca965@34.65.202.239:30305", -]; - -#[cfg(feature = "optimism")] -/// OP Testnet Bootnodes -pub static OP_TESTNET_BOOTNODES: [&str; 3] = [ - "enode://2bd2e657bb3c8efffb8ff6db9071d9eb7be70d7c6d7d980ff80fc93b2629675c5f750bc0a5ef27cd788c2e491b8795a7e9a4a6e72178c14acc6753c0e5d77ae4@34.65.205.244:30305", - "enode://db8e1cab24624cc62fc35dbb9e481b88a9ef0116114cd6e41034c55b5b4f18755983819252333509bd8e25f6b12aadd6465710cd2e956558faf17672cce7551f@34.65.173.88:30305", - "enode://bfda2e0110cfd0f4c9f7aa5bf5ec66e6bd18f71a2db028d36b8bf8b0d6fdb03125c1606a6017b31311d96a36f5ef7e1ad11604d7a166745e6075a715dfa67f8a@34.65.229.245:30305", -]; - -#[cfg(feature = "optimism")] -/// Base Mainnet Bootnodes -pub static BASE_BOOTNODES: [&str; 5] = [ + // Base "enode://87a32fd13bd596b2ffca97020e31aef4ddcc1bbd4b95bb633d16c1329f654f34049ed240a36b449fda5e5225d70fe40bc667f53c304b71f8e68fc9d448690b51@3.231.138.188:30301", "enode://ca21ea8f176adb2e229ce2d700830c844af0ea941a1d8152a9513b966fe525e809c3a6c73a2c18a12b74ed6ec4380edf91662778fe0b79f6a591236e49e176f9@184.72.129.189:30301", "enode://acf4507a211ba7c1e52cdf4eef62cdc3c32e7c9c47998954f7ba024026f9a6b2150cd3f0b734d9c78e507ab70d59ba61dfe5c45e1078c7ad0775fb251d7735a2@3.220.145.177:30301", @@ -69,8 +58,13 @@ pub static BASE_BOOTNODES: [&str; 5] = [ ]; #[cfg(feature = "optimism")] -/// Base Testnet Bootnodes -pub static BASE_TESTNET_BOOTNODES: [&str; 2] = [ +/// OP stack testnet boot nodes. +pub static OP_TESTNET_BOOTNODES: &[&str] = &[ + // OP Labs + "enode://2bd2e657bb3c8efffb8ff6db9071d9eb7be70d7c6d7d980ff80fc93b2629675c5f750bc0a5ef27cd788c2e491b8795a7e9a4a6e72178c14acc6753c0e5d77ae4@34.65.205.244:30305", + "enode://db8e1cab24624cc62fc35dbb9e481b88a9ef0116114cd6e41034c55b5b4f18755983819252333509bd8e25f6b12aadd6465710cd2e956558faf17672cce7551f@34.65.173.88:30305", + "enode://bfda2e0110cfd0f4c9f7aa5bf5ec66e6bd18f71a2db028d36b8bf8b0d6fdb03125c1606a6017b31311d96a36f5ef7e1ad11604d7a166745e6075a715dfa67f8a@34.65.229.245:30305", + // Base "enode://548f715f3fc388a7c917ba644a2f16270f1ede48a5d88a4d14ea287cc916068363f3092e39936f1a3e7885198bef0e5af951f1d7b1041ce8ba4010917777e71f@18.210.176.114:30301", "enode://6f10052847a966a725c9f4adf6716f9141155b99a0fb487fea3f51498f4c2a2cb8d534e680ee678f9447db85b93ff7c74562762c3714783a7233ac448603b25f@107.21.251.55:30301", ]; @@ -98,25 +92,25 @@ pub fn holesky_nodes() -> Vec { #[cfg(feature = "optimism")] /// Returns parsed op-stack mainnet nodes pub fn op_nodes() -> Vec { - parse_nodes(&OP_BOOTNODES[..]) + parse_nodes(OP_BOOTNODES) } #[cfg(feature = "optimism")] /// Returns parsed op-stack testnet nodes pub fn op_testnet_nodes() -> Vec { - parse_nodes(&OP_TESTNET_BOOTNODES[..]) + parse_nodes(OP_TESTNET_BOOTNODES) } #[cfg(feature = "optimism")] /// Returns parsed op-stack base mainnet nodes pub fn base_nodes() -> Vec { - parse_nodes(&BASE_BOOTNODES[..]) + parse_nodes(OP_BOOTNODES) } #[cfg(feature = "optimism")] /// Returns parsed op-stack base testnet nodes pub fn base_testnet_nodes() -> Vec { - parse_nodes(&BASE_TESTNET_BOOTNODES[..]) + parse_nodes(OP_TESTNET_BOOTNODES) } /// Parses all the nodes