Add more mainnet bootnodes (#1026)

* update mainnet bootnodes * internal/cli/server: handle nil chain case for tests
maticnetwork · Oct 5, 2023 · d639bb8 · d639bb8
1 parent 766fdc3
commit d639bb8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/builder/files/config.toml b/builder/files/config.toml
@@ -38,7 +38,7 @@ syncmode = "full"
   # nodekeyhex = ""
   [p2p.discovery]
     # v5disc = false
-    bootnodes = ["enode://b8f1cc9c5d4403703fbf377116469667d2b1823c0daf16b7250aa576bacf399e42c3930ccfcb02c5df6879565a2b8931335565f0e8d3f8e72385ecf4a4bf160a@3.36.224.80:30303", "enode://8729e0c825f3d9cad382555f3e46dcff21af323e89025a0e6312df541f4a9e73abfa562d64906f5e59c51fe6f0501b3e61b07979606c56329c020ed739910759@54.194.245.5:30303"]
+    bootnodes = ["enode://76316d1cb93c8ed407d3332d595233401250d48f8fbb1d9c65bd18c0495eca1b43ec38ee0ea1c257c0abb7d1f25d649d359cdfe5a805842159cfe36c5f66b7e8@52.78.36.216:30303", "enode://b8f1cc9c5d4403703fbf377116469667d2b1823c0daf16b7250aa576bacf399e42c3930ccfcb02c5df6879565a2b8931335565f0e8d3f8e72385ecf4a4bf160a@3.36.224.80:30303", "enode://8729e0c825f3d9cad382555f3e46dcff21af323e89025a0e6312df541f4a9e73abfa562d64906f5e59c51fe6f0501b3e61b07979606c56329c020ed739910759@54.194.245.5:30303", "enode://681ebac58d8dd2d8a6eef15329dfbad0ab960561524cf2dfde40ad646736fe5c244020f20b87e7c1520820bc625cfb487dd71d63a3a3bf0baea2dbb8ec7c79f1@34.240.245.39:30303"]
     # Uncomment below `bootnodes` field for Mumbai bootnode
     # bootnodes = ["enode://bdcd4786a616a853b8a041f53496d853c68d99d54ff305615cd91c03cd56895e0a7f6e9f35dbf89131044e2114a9a782b792b5661e3aff07faf125a98606a071@43.200.206.40:30303", "enode://209aaf7ed549cf4a5700fd833da25413f80a1248bd3aa7fe2a87203e3f7b236dd729579e5c8df61c97bf508281bae4969d6de76a7393bcbd04a0af70270333b3@54.216.248.9:30303"]
     # bootnodesv4 = []

diff --git a/internal/cli/server/chains/mainnet.go b/internal/cli/server/chains/mainnet.go
@@ -87,5 +87,7 @@ var mainnetBor = &Chain{
 	Bootnodes: []string{
 		"enode://b8f1cc9c5d4403703fbf377116469667d2b1823c0daf16b7250aa576bacf399e42c3930ccfcb02c5df6879565a2b8931335565f0e8d3f8e72385ecf4a4bf160a@3.36.224.80:30303",
 		"enode://8729e0c825f3d9cad382555f3e46dcff21af323e89025a0e6312df541f4a9e73abfa562d64906f5e59c51fe6f0501b3e61b07979606c56329c020ed739910759@54.194.245.5:30303",
+		"enode://76316d1cb93c8ed407d3332d595233401250d48f8fbb1d9c65bd18c0495eca1b43ec38ee0ea1c257c0abb7d1f25d649d359cdfe5a805842159cfe36c5f66b7e8@52.78.36.216:30303",
+		"enode://681ebac58d8dd2d8a6eef15329dfbad0ab960561524cf2dfde40ad646736fe5c244020f20b87e7c1520820bc625cfb487dd71d63a3a3bf0baea2dbb8ec7c79f1@34.240.245.39:30303",
 	},
 }
diff --git a/internal/cli/server/config.go b/internal/cli/server/config.go
@@ -1399,10 +1399,10 @@ func (c *Config) buildNode() (*node.Config, error) {
 	// only check for non-developer modes
 	if !c.Developer.Enabled {
 		// Discovery
-		// if no bootnodes are defined, use the ones from the chain file.
+		// Append the bootnodes defined with those hardcoded in the config file
 		bootnodes := c.P2P.Discovery.Bootnodes
-		if len(bootnodes) == 0 {
-			bootnodes = c.chain.Bootnodes
+		if c.chain != nil {
+			bootnodes = append(bootnodes, c.chain.Bootnodes...)
 		}
 
 		if cfg.P2P.BootstrapNodes, err = parseBootnodes(bootnodes); err != nil {

diff --git a/params/bootnodes.go b/params/bootnodes.go
@@ -79,6 +79,8 @@ var MumbaiBootnodes = []string{
 var BorMainnetBootnodes = []string{
 	"enode://b8f1cc9c5d4403703fbf377116469667d2b1823c0daf16b7250aa576bacf399e42c3930ccfcb02c5df6879565a2b8931335565f0e8d3f8e72385ecf4a4bf160a@3.36.224.80:30303",
 	"enode://8729e0c825f3d9cad382555f3e46dcff21af323e89025a0e6312df541f4a9e73abfa562d64906f5e59c51fe6f0501b3e61b07979606c56329c020ed739910759@54.194.245.5:30303",
+	"enode://76316d1cb93c8ed407d3332d595233401250d48f8fbb1d9c65bd18c0495eca1b43ec38ee0ea1c257c0abb7d1f25d649d359cdfe5a805842159cfe36c5f66b7e8@52.78.36.216:30303",
+	"enode://681ebac58d8dd2d8a6eef15329dfbad0ab960561524cf2dfde40ad646736fe5c244020f20b87e7c1520820bc625cfb487dd71d63a3a3bf0baea2dbb8ec7c79f1@34.240.245.39:30303",
 }
 
 var KilnBootnodes = []string{