chore: switch wakuv2 fleet to waku (#1910)

* chore: switch from decomissioned wakuv2 fleet * chore: minor fixes + CI * chore: fix eslint * fix: eslint * chore: fix test --------- Co-authored-by: danisharora099 <danisharora099@gmail.com>
waku-org · Apr 7, 2024 · 9f2c0ed · 9f2c0ed
1 parent 86058c5
commit 9f2c0ed
Show file tree

Hide file tree

Showing 11 changed files with 92 additions and 51 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/src/lib/predefined_bootstrap_nodes.ts b/packages/core/src/lib/predefined_bootstrap_nodes.ts
@@ -3,22 +3,22 @@ import { getPseudoRandomSubset } from "@waku/utils";
 export const DefaultWantedNumber = 1;
 
 export enum Fleet {
-  Prod = "prod",
+  Sandbox = "sandbox",
   Test = "test"
 }
 
 /**
  * Return list of pre-defined (hardcoded) bootstrap nodes.
  *
- * Default behavior is to return nodes of the nwaku Status Prod fleet.
+ * Default behavior is to return nodes of the nwaku Status Sandbox fleet.
  *
- * @param fleet The fleet to be returned. Defaults to production fleet.
+ * @param fleet The fleet to be returned. Defaults to sandbox fleet.
  * @param wantedNumber The number of connections desired. Defaults to {@link DefaultWantedNumber}.
  *
  * @returns An array of multiaddresses.
  */
 export function getPredefinedBootstrapNodes(
-  fleet: Fleet = Fleet.Prod,
+  fleet: Fleet = Fleet.Sandbox,
   wantedNumber: number = DefaultWantedNumber
 ): string[] {
   if (wantedNumber <= 0) {
@@ -27,14 +27,14 @@ export function getPredefinedBootstrapNodes(
 
   let nodes;
   switch (fleet) {
-    case Fleet.Prod:
-      nodes = fleets.fleets["wakuv2.prod"]["waku-websocket"];
+    case Fleet.Sandbox:
+      nodes = fleets.fleets["waku.sandbox"]["waku-websocket"];
       break;
     case Fleet.Test:
-      nodes = fleets.fleets["wakuv2.test"]["waku-websocket"];
+      nodes = fleets.fleets["waku.test"]["waku-websocket"];
       break;
     default:
-      nodes = fleets.fleets["wakuv2.prod"]["waku-websocket"];
+      nodes = fleets.fleets["waku.sandbox"]["waku-websocket"];
   }
 
   nodes = Object.values(nodes) as string[];
@@ -44,24 +44,24 @@ export function getPredefinedBootstrapNodes(
 
 export const fleets = {
   fleets: {
-    "wakuv2.prod": {
+    "waku.sandbox": {
       "waku-websocket": {
-        "node-01.ac-cn-hongkong-c.wakuv2.prod":
-          "/dns4/node-01.ac-cn-hongkong-c.wakuv2.prod.statusim.net/tcp/8000/wss/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD",
-        "node-01.do-ams3.wakuv2.prod":
-          "/dns4/node-01.do-ams3.wakuv2.prod.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
-        "node-01.gc-us-central1-a.wakuv2.prod":
-          "/dns4/node-01.gc-us-central1-a.wakuv2.prod.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmVkKntsECaYfefR1V2yCR79CegLATuTPE6B9TxgxBiiiA"
+        "node-01.ac-cn-hongkong-c.waku.sandbox":
+          "/dns4/node-01.ac-cn-hongkong-c.waku.sandbox.status.im/tcp/8000/wss/p2p/16Uiu2HAmSJvSJphxRdbnigUV5bjRRZFBhTtWFTSyiKaQByCjwmpV",
+        "node-01.do-ams3.waku.sandbox":
+          "/dns4/node-01.do-ams3.waku.sandbox.status.im/tcp/8000/wss/p2p/16Uiu2HAmQSMNExfUYUqfuXWkD5DaNZnMYnigRxFKbk3tcEFQeQeE",
+        "node-01.gc-us-central1-a.waku.sandbox":
+          "/dns4/node-01.gc-us-central1-a.waku.sandbox.status.im/tcp/8000/wss/p2p/16Uiu2HAm6fyqE1jB5MonzvoMdU8v76bWV8ZeNpncDamY1MQXfjdB"
       }
     },
-    "wakuv2.test": {
+    "waku.test": {
       "waku-websocket": {
-        "node-01.ac-cn-hongkong-c.wakuv2.test":
-          "/dns4/node-01.ac-cn-hongkong-c.wakuv2.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm",
-        "node-01.do-ams3.wakuv2.test":
-          "/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
-        "node-01.gc-us-central1-a.wakuv2.test":
-          "/dns4/node-01.gc-us-central1-a.wakuv2.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS"
+        "node-01.ac-cn-hongkong-c.waku.test":
+          "/dns4/node-01.ac-cn-hongkong-c.waku.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp",
+        "node-01.do-ams3.waku.test":
+          "/dns4/node-01.do-ams3.waku.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAkykgaECHswi3YKJ5dMLbq2kPVCo89fcyTd38UcQD6ej5W",
+        "node-01.gc-us-central1-a.waku.test":
+          "/dns4/node-01.gc-us-central1-a.waku.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmDCp8XJ9z1ev18zuv8NHekAsjNyezAvmMfFEJkiharitG"
       }
     }
   }

diff --git a/packages/discovery/src/dns/constants.ts b/packages/discovery/src/dns/constants.ts
@@ -1,8 +1,9 @@
 import type { NodeCapabilityCount } from "@waku/interfaces";
 
 export const enrTree = {
-  TEST: "enrtree://AO47IDOLBKH72HIZZOXQP6NMRESAN7CHYWIBNXDXWRJRZWLODKII6@test.wakuv2.nodes.status.im",
-  PROD: "enrtree://ANEDLO25QVUGJOUTQFRYKWX6P4Z4GKVESBMHML7DZ6YK4LGS5FC5O@prod.wakuv2.nodes.status.im"
+  TEST: "enrtree://AOGYWMBYOUIMOENHXCHILPKY3ZRFEULMFI4DOM442QSZ73TT2A7VI@test.waku.nodes.status.im",
+  SANDBOX:
+    "enrtree://AIRVQ5DDA4FFWLRBCHJWUWOO6X6S4ZTZ5B667LQ6AJU6PEYDLRD5O@sandbox.waku.nodes.status.im"
 };
 
 export const DEFAULT_BOOTSTRAP_TAG_NAME = "bootstrap";

diff --git a/packages/discovery/src/dns/dns.spec.ts b/packages/discovery/src/dns/dns.spec.ts
@@ -294,11 +294,11 @@ describe("DNS Node Discovery [live data]", function () {
     }
   });
 
-  it(`should retrieve ${maxQuantity} multiaddrs for prod.waku.nodes.status.im`, async function () {
+  it(`should retrieve ${maxQuantity} multiaddrs for sandbox.waku.nodes.status.im`, async function () {
     this.timeout(10000);
     // Google's dns server address. Needs to be set explicitly to run in CI
     const dnsNodeDiscovery = await DnsNodeDiscovery.dnsOverHttp();
-    const peers = await dnsNodeDiscovery.getPeers([enrTree.PROD], {
+    const peers = await dnsNodeDiscovery.getPeers([enrTree.SANDBOX], {
       relay: maxQuantity,
       store: maxQuantity,
       filter: maxQuantity,

diff --git a/packages/discovery/src/dns/fetch_nodes.spec.ts b/packages/discovery/src/dns/fetch_nodes.spec.ts
@@ -12,8 +12,8 @@ async function createEnr(waku2: Waku2): Promise<ENR> {
   const enr = await EnrCreator.fromPeerId(peerId);
   enr.setLocationMultiaddr(multiaddr("/ip4/18.223.219.100/udp/9000"));
   enr.multiaddrs = [
-    multiaddr("/dns4/node1.do-ams.wakuv2.test.statusim.net/tcp/443/wss"),
-    multiaddr("/dns6/node2.ac-chi.wakuv2.test.statusim.net/tcp/443/wss"),
+    multiaddr("/dns4/node-01.do-ams3.waku.test.status.im/tcp/443/wss"),
+    multiaddr("/dns6/node-01.ac-cn-hongkong-c.waku.test.status.im/tcp/443/wss"),
     multiaddr(
       "/onion3/vww6ybal4bd7szmgncyruucpgfkqahzddi37ktceo3ah7ngmcopnpyyd:1234/wss"
     )