Merge 8ade7f7 into 1d27a58

ethereumjs · Mar 31, 2020 · b28821d · b28821d
2 parents 1d27a58 + 8ade7f7
commit b28821d
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 22 deletions.
diff --git a/src/chains/mainnet.json b/src/chains/mainnet.json
@@ -77,32 +77,60 @@
   ],
   "bootstrapNodes": [
     {
-      "ip": "13.93.211.84",
-      "port": 30303,
-      "id": "3f1d12044546b76342d59d4a05532c14b85aa669704bfe1f864fe079415aa2c02d743e03218e57a33fb94523adb54032871a6c51b2cc5514cb7c7e35b3ed0a99",
-      "location": "US-WEST",
-      "comment": "Go Bootnode"
+      "ip": "18.138.108.67",
+      "port": "30303",
+      "id": "d860a01f9722d78051619d1e2351aba3f43f943f6f00718d1b9baa4101932a1f5011f16bb2b1bb35db20d6fe28fa0bf09636d26a87d31de9ec6203eeedb1f666",
+      "location": "ap-southeast-1-001",
+      "comment": "bootnode-aws-ap-southeast-1-001"
     },
     {
-      "ip": "191.235.84.50",
-      "port": 30303,
-      "id": "78de8a0916848093c73790ead81d1928bec737d565119932b98c6b100d944b7a95e94f847f689fc723399d2e31129d182f7ef3863f2b4c820abbf3ab2722344d",
-      "location": "BR",
-      "comment": "Go Bootnode"
+      "ip": "3.209.45.79",
+      "port": "30303",
+      "id": "22a8232c3abc76a16ae9d6c3b164f98775fe226f0917b0ca871128a74a8e9630b458460865bab457221f1d448dd9791d24c4e5d88786180ac185df813a68d4de",
+      "location": "us-east-1-001",
+      "comment": "bootnode-aws-us-east-1-001"
     },
     {
-      "ip": "13.75.154.138",
-      "port": 30303,
-      "id": "158f8aab45f6d19c6cbf4a089c2670541a8da11978a2f90dbf6a502a4a3bab80d288afdbeb7ec0ef6d92de563767f3b1ea9e8e334ca711e9f8e2df5a0385e8e6",
-      "location": "AU",
-      "comment": "Go Bootnode"
+      "ip": "34.255.23.113",
+      "port": "30303",
+      "id": "ca6de62fce278f96aea6ec5a2daadb877e51651247cb96ee310a318def462913b653963c155a0ef6c7d50048bba6e6cea881130857413d9f50a621546b590758",
+      "location": "eu-west-1-001",
+      "comment": "bootnode-aws-eu-west-1-001"
     },
     {
-      "ip": "52.74.57.123",
-      "port": 30303,
-      "id": "1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082",
-      "location": "SG",
-      "comment": "Go Bootnode"
+      "ip": "35.158.244.151",
+      "port": "30303",
+      "id": "279944d8dcd428dffaa7436f25ca0ca43ae19e7bcf94a8fb7d1641651f92d121e972ac2e8f381414b80cc8e5555811c2ec6e1a99bb009b3f53c4c69923e11bd8",
+      "location": "eu-central-1-001",
+      "comment": "bootnode-aws-eu-central-1-001"
+    },
+    {
+      "ip": "52.187.207.27",
+      "port": "30303",
+      "id": "8499da03c47d637b20eee24eec3c356c9a2e6148d6fe25ca195c7949ab8ec2c03e3556126b0d7ed644675e78c4318b08691b7b57de10e5f0d40d05b09238fa0a",
+      "location": "australiaeast-001",
+      "comment": "bootnode-azure-australiaeast-001"
+    },
+    {
+      "ip": "191.234.162.198",
+      "port": "30303",
+      "id": "103858bdb88756c71f15e9b5e09b56dc1be52f0a5021d46301dbbfb7e130029cc9d0d6f73f693bc29b665770fff7da4d34f3c6379fe12721b5d7a0bcb5ca1fc1",
+      "location": "brazilsouth-001",
+      "comment": "bootnode-azure-brazilsouth-001"
+    },
+    {
+      "ip": "52.231.165.108",
+      "port": "30303",
+      "id": "715171f50508aba88aecd1250af392a45a330af91d7b90701c436b618c86aaa1589c9184561907bebbb56439b8f8787bc01f49a7c77276c58c1b09822d75e8e8",
+      "location": "koreasouth-001",
+      "comment": "bootnode-azure-koreasouth-001"
+    },
+    {
+      "ip": "104.42.217.25",
+      "port": "30303",
+      "id": "5d6d7cd20d6da4bb83a1d28cadb5d409b64edf314c0335df658c1a54e32c7c4a7ab7823d57c39b6a757556e68ff1df17c748b698544a55cb488b52479a92b60f",
+      "location": "westus-001",
+      "comment": "bootnode-azure-westus-001"
     }
   ]
 }
diff --git a/tests/chains.ts b/tests/chains.ts
@@ -59,8 +59,7 @@ tape('[Common]: Initialization / Chain params', function(t: tape.Test) {
     const hash = '0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3'
     st.equal(c.genesis().hash, hash, 'should return correct genesis hash')
     st.equal(c.hardforks()[3]['block'], 2463000, 'should return correct hardfork data')
-    st.equal(c.bootstrapNodes()[0].port, 30303, 'should return a bootstrap node array')
-
+    st.true('port' in c.bootstrapNodes()[0], 'should return a bootstrap node array')
     st.end()
   })