chore: switch wakuv2 fleet to waku

See status-im/infra-nim-waku#91 for details Mostly done automatically. Some parts manually.
status-im · Mar 15, 2024 · be17e84 · be17e84
1 parent 38183ab
commit be17e84
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 45 deletions.
diff --git a/_assets/scripts/update-fleet-config.sh b/_assets/scripts/update-fleet-config.sh
@@ -12,8 +12,8 @@ fleets=(
 wakufleets=(
     'status.prod'
     'status.test'
-    'wakuv2.prod'
-    'wakuv2.test'
+    'waku.sandbox'
+    'waku.test'
 )
 
 # Notify fleet is configured for all fleets.

diff --git a/_examples/waku.json b/_examples/waku.json
@@ -11,16 +11,16 @@
   "NoDiscovery": true,
   "ClusterConfig": {
     "Enabled": true,
-    "Fleet": "wakuv2.prod",
+    "Fleet": "waku.sandbox",
     "BootNodes": [],
     "TrustedMailServers": [],
     "PushNotificationsServers": [],
     "StaticNodes": [],
     "RendezvousNodes": [],
     "WakuNodes": [
-      "/ip4/8.210.222.231/tcp/30303/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
-      "/ip4/188.166.135.145/tcp/30303/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
-      "/ip4/34.121.100.108/tcp/30303/p2p/16Uiu2HAmVkKntsECaYfefR1V2yCR79CegLATuTPE6B9TxgxBiiiA"
+      "/dns4/node-01.ac-cn-hongkong-c.waku.sandbox.status.im/tcp/30303/p2p/16Uiu2HAmSJvSJphxRdbnigUV5bjRRZFBhTtWFTSyiKaQByCjwmpV",
+      "/dns4/node-01.do-ams3.waku.sandbox.status.im/tcp/30303/p2p/16Uiu2HAmQSMNExfUYUqfuXWkD5DaNZnMYnigRxFKbk3tcEFQeQeE",
+      "/dns4/node-01.gc-us-central1-a.waku.sandbox.status.im/tcp/30303/p2p/16Uiu2HAm6fyqE1jB5MonzvoMdU8v76bWV8ZeNpncDamY1MQXfjdB"
     ],
     "WakuStoreNodes": [
       "/ip4/134.209.113.86/tcp/9000/p2p/16Uiu2HAmVVi6Q4j7MAKVibquW8aA27UNrA4Q8Wkz9EetGViu8ZF1"

diff --git a/cmd/statusd/main.go b/cmd/statusd/main.go
@@ -68,7 +68,7 @@ var (
 		params.FleetProd,
 		fmt.Sprintf(
 			"Select fleet: %s (default %s)",
-			[]string{params.FleetProd, params.FleetStaging, params.FleetTest, params.FleetWakuV2Prod, params.FleetWakuV2Test, params.FleetStatusTest, params.FleetStatusProd}, params.FleetProd,
+			[]string{params.FleetProd, params.FleetStaging, params.FleetTest, params.FleetWakuSandbox, params.FleetWakuTest, params.FleetStatusTest, params.FleetStatusProd}, params.FleetProd,
 		),
 	)
 	listenAddr = flag.String("addr", "", "address to bind listener to")

diff --git a/config/cli/fleet-wakuv2.prod.json → config/cli/fleet-waku.sandbox.json b/config/cli/fleet-wakuv2.prod.json → config/cli/fleet-waku.sandbox.json
@@ -3,7 +3,7 @@
   "NoDiscovery": true,
   "ClusterConfig": {
     "Enabled": true,
-    "Fleet": "wakuv2.prod",
+    "Fleet": "waku.sandbox",
     "BootNodes": [],
     "TrustedMailServers": [],
     "PushNotificationsServers": [
@@ -14,9 +14,9 @@
     "StaticNodes": [],
     "RendezvousNodes": [],
     "WakuNodes": [
-      "/dns4/node-01.do-ams3.wakuv2.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
-      "/dns4/node-01.gc-us-central1-a.wakuv2.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmVkKntsECaYfefR1V2yCR79CegLATuTPE6B9TxgxBiiiA",
-      "/dns4/node-01.ac-cn-hongkong-c.wakuv2.prod.statusim.net/tcp/30303/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD"
+      "/dns4/node-01.do-ams3.waku.sandbox.status.im/tcp/30303/p2p/16Uiu2HAmQSMNExfUYUqfuXWkD5DaNZnMYnigRxFKbk3tcEFQeQeE",
+      "/dns4/node-01.gc-us-central1-a.waku.sandbox.status.im/tcp/30303/p2p/16Uiu2HAm6fyqE1jB5MonzvoMdU8v76bWV8ZeNpncDamY1MQXfjdB",
+      "/dns4/node-01.ac-cn-hongkong-c.waku.sandbox.status.im/tcp/30303/p2p/16Uiu2HAmSJvSJphxRdbnigUV5bjRRZFBhTtWFTSyiKaQByCjwmpV"
     ]
   },
   "WakuV2Config": {

diff --git a/config/cli/fleet-wakuv2.test.json → config/cli/fleet-waku.test.json b/config/cli/fleet-wakuv2.test.json → config/cli/fleet-waku.test.json
@@ -3,7 +3,7 @@
   "NoDiscovery": true,
   "ClusterConfig": {
     "Enabled": true,
-    "Fleet": "wakuv2.test",
+    "Fleet": "waku.test",
     "BootNodes": [],
     "TrustedMailServers": [],
     "PushNotificationsServers": [
@@ -14,9 +14,9 @@
     "StaticNodes": [],
     "RendezvousNodes": [],
     "WakuNodes": [
-      "/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/30303/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
-      "/dns4/node-01.gc-us-central1-a.wakuv2.test.statusim.net/tcp/30303/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS",
-      "/dns4/node-01.ac-cn-hongkong-c.wakuv2.test.statusim.net/tcp/30303/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm"
+      "/dns4/node-01.do-ams3.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkykgaECHswi3YKJ5dMLbq2kPVCo89fcyTd38UcQD6ej5W",
+      "/dns4/node-01.gc-us-central1-a.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAmDCp8XJ9z1ev18zuv8NHekAsjNyezAvmMfFEJkiharitG",
+      "/dns4/node-01.ac-cn-hongkong-c.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp"
     ]
   },
   "WakuV2Config": {

diff --git a/params/cluster.go b/params/cluster.go
@@ -2,15 +2,15 @@ package params
 
 // Define available fleets.
 const (
-	FleetUndefined  = ""
-	FleetProd       = "eth.prod"
-	FleetStaging    = "eth.staging"
-	FleetTest       = "eth.test"
-	FleetWakuV2Prod = "wakuv2.prod"
-	FleetWakuV2Test = "wakuv2.test"
-	FleetStatusTest = "status.test"
-	FleetStatusProd = "status.prod"
-	FleetShardsTest = "shards.test"
+	FleetUndefined    = ""
+	FleetProd         = "eth.prod"
+	FleetStaging      = "eth.staging"
+	FleetTest         = "eth.test"
+	FleetWakuSandbox  = "waku.sandbox"
+	FleetWakuTest     = "waku.test"
+	FleetStatusTest   = "status.test"
+	FleetStatusProd   = "status.prod"
+	FleetShardsTest   = "shards.test"
 )
 
 // Cluster defines a list of Ethereum nodes.
@@ -23,9 +23,9 @@ type Cluster struct {
 
 // DefaultWakuNodes is a list of "supported" fleets. This list is populated to clients UI settings.
 var supportedFleets = map[string][]string{
-	FleetWakuV2Prod: {"enrtree://ANEDLO25QVUGJOUTQFRYKWX6P4Z4GKVESBMHML7DZ6YK4LGS5FC5O@prod.wakuv2.nodes.status.im"},
-	FleetWakuV2Test: {"enrtree://AO47IDOLBKH72HIZZOXQP6NMRESAN7CHYWIBNXDXWRJRZWLODKII6@test.wakuv2.nodes.status.im"},
-	FleetShardsTest: {"enrtree://AMOJVZX4V6EXP7NTJPMAYJYST2QP6AJXYW76IU6VGJS7UVSNDYZG4@boot.test.shards.nodes.status.im"},
+	FleetWakuSandbox: {"enrtree://AIRVQ5DDA4FFWLRBCHJWUWOO6X6S4ZTZ5B667LQ6AJU6PEYDLRD5O@sandbox.waku.nodes.status.im"},
+	FleetWakuTest:    {"enrtree://AOGYWMBYOUIMOENHXCHILPKY3ZRFEULMFI4DOM442QSZ73TT2A7VI@test.waku.nodes.status.im"},
+	FleetShardsTest:  {"enrtree://AMOJVZX4V6EXP7NTJPMAYJYST2QP6AJXYW76IU6VGJS7UVSNDYZG4@boot.test.shards.nodes.status.im"},
 }
 
 func DefaultWakuNodes(fleet string) []string {

diff --git a/services/mailservers/fleet.go b/services/mailservers/fleet.go
@@ -106,39 +106,39 @@ func DefaultMailservers() []Mailserver {
 			Version: 1,
 		},
 		Mailserver{
-			ID:      "node-01.ac-cn-hongkong-c.wakuv2.prod",
-			Address: "/ip4/8.210.222.231/tcp/30303/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD",
-			Fleet:   params.FleetWakuV2Prod,
+			ID:      "node-01.ac-cn-hongkong-c.waku.sandbox",
+			Address: "/dns4/node-01.ac-cn-hongkong-c.waku.sandbox.status.im/tcp/30303/p2p/16Uiu2HAmSJvSJphxRdbnigUV5bjRRZFBhTtWFTSyiKaQByCjwmpV",
+			Fleet:   params.FleetWakuSandbox,
 			Version: 2,
 		},
 		Mailserver{
-			ID:      "node-01.do-ams3.wakuv2.prod",
-			Address: "/ip4/188.166.135.145/tcp/30303/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
-			Fleet:   params.FleetWakuV2Prod,
+			ID:      "node-01.do-ams3.waku.sandbox",
+			Address: "/dns4/node-01.do-ams3.waku.sandbox.status.im/tcp/30303/p2p/16Uiu2HAmQSMNExfUYUqfuXWkD5DaNZnMYnigRxFKbk3tcEFQeQeE",
+			Fleet:   params.FleetWakuSandbox,
 			Version: 2,
 		},
 		Mailserver{
-			ID:      "node-01.gc-us-central1-a.wakuv2.prod",
-			Address: "/ip4/34.121.100.108/tcp/30303/p2p/16Uiu2HAmVkKntsECaYfefR1V2yCR79CegLATuTPE6B9TxgxBiiiA",
-			Fleet:   params.FleetWakuV2Prod,
+			ID:      "node-01.gc-us-central1-a.waku.sandbox",
+			Address: "/dns4/node-01.gc-us-central1-a.waku.sandbox.status.im/tcp/30303/p2p/16Uiu2HAm6fyqE1jB5MonzvoMdU8v76bWV8ZeNpncDamY1MQXfjdB",
+			Fleet:   params.FleetWakuSandbox,
 			Version: 2,
 		},
 		Mailserver{
-			ID:      "node-01.ac-cn-hongkong-c.wakuv2.test",
-			Address: "/ip4/47.242.210.73/tcp/30303/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm",
-			Fleet:   params.FleetWakuV2Test,
+			ID:      "node-01.ac-cn-hongkong-c.waku.test",
+			Address: "/dns4/node-01.ac-cn-hongkong-c.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp",
+			Fleet:   params.FleetWakuTest,
 			Version: 2,
 		},
 		Mailserver{
-			ID:      "node-01.do-ams3.wakuv2.test",
-			Address: "/ip4/134.209.139.210/tcp/30303/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
-			Fleet:   params.FleetWakuV2Test,
+			ID:      "node-01.do-ams3.waku.test",
+			Address: "/dns4/node-01.do-ams3.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkykgaECHswi3YKJ5dMLbq2kPVCo89fcyTd38UcQD6ej5W",
+			Fleet:   params.FleetWakuTest,
 			Version: 2,
 		},
 		Mailserver{
-			ID:      "node-01.gc-us-central1-a.wakuv2.test",
-			Address: "/ip4/104.154.239.128/tcp/30303/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS",
-			Fleet:   params.FleetWakuV2Test,
+			ID:      "node-01.gc-us-central1-a.waku.test",
+			Address: "/dns4/node-01.gc-us-central1-a.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAmDCp8XJ9z1ev18zuv8NHekAsjNyezAvmMfFEJkiharitG",
+			Fleet:   params.FleetWakuTest,
 			Version: 2,
 		},
 		Mailserver{

diff --git a/static/bindata.go b/static/bindata.go