From 9f2c0ed6b57262c04ec6e090e283dff4c428f2ba Mon Sep 17 00:00:00 2001 From: Anton Iakimov Date: Sun, 7 Apr 2024 14:21:00 +0200 Subject: [PATCH] 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 --- package-lock.json | 41 +++++++++++++++-- .../src/lib/predefined_bootstrap_nodes.ts | 44 +++++++++---------- packages/discovery/src/dns/constants.ts | 5 ++- packages/discovery/src/dns/dns.spec.ts | 4 +- .../discovery/src/dns/fetch_nodes.spec.ts | 4 +- packages/enr/src/enr.spec.ts | 12 ++--- packages/enr/src/multiaddrs_codec.spec.ts | 8 ++-- packages/sdk/src/utils/discovery.ts | 11 +++-- .../tests/tests/dns-peer-discovery.spec.ts | 10 +++-- .../tests/peer-exchange/pe.optional.spec.ts | 2 +- .../tests/tests/waku.node.optional.spec.ts | 2 +- 11 files changed, 92 insertions(+), 51 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6d07b2cf3b..841077cbe0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4743,7 +4743,8 @@ "node_modules/@gar/promisify": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", - "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==" + "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", + "dev": true }, "node_modules/@graphql-typed-document-node/core": { "version": "3.2.0", @@ -5689,6 +5690,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz", "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==", + "dev": true, "dependencies": { "@gar/promisify": "^1.0.1", "semver": "^7.3.5" @@ -5699,6 +5701,7 @@ "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==", "deprecated": "This functionality has been moved to @npmcli/fs", + "dev": true, "dependencies": { "mkdirp": "^1.0.4", "rimraf": "^3.0.2" @@ -5711,6 +5714,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true, "bin": { "mkdirp": "bin/cmd.js" }, @@ -11781,6 +11785,7 @@ "version": "15.3.0", "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz", "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==", + "dev": true, "dependencies": { "@npmcli/fs": "^1.0.0", "@npmcli/move-file": "^1.0.1", @@ -11809,6 +11814,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, "dependencies": { "yallist": "^4.0.0" }, @@ -11820,6 +11826,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true, "bin": { "mkdirp": "bin/cmd.js" }, @@ -11831,6 +11838,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "dev": true, "dependencies": { "aggregate-error": "^3.0.0" }, @@ -12218,6 +12226,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "dev": true, "engines": { "node": ">=10" } @@ -17476,6 +17485,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dev": true, "dependencies": { "minipass": "^3.0.0" }, @@ -18292,6 +18302,7 @@ "version": "3.0.8", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz", "integrity": "sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==", + "dev": true, "dependencies": { "lru-cache": "^6.0.0" }, @@ -18303,6 +18314,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, "dependencies": { "yallist": "^4.0.0" }, @@ -18542,7 +18554,8 @@ "node_modules/infer-owner": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==" + "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", + "dev": true }, "node_modules/inflight": { "version": "1.0.6", @@ -18562,6 +18575,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz", "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==", + "dev": true, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } @@ -23587,6 +23601,7 @@ "version": "3.3.6", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dev": true, "dependencies": { "yallist": "^4.0.0" }, @@ -23598,6 +23613,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", + "dev": true, "dependencies": { "minipass": "^3.0.0" }, @@ -23609,6 +23625,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", + "dev": true, "dependencies": { "minipass": "^3.0.0" }, @@ -23620,6 +23637,7 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", + "dev": true, "dependencies": { "minipass": "^3.0.0" }, @@ -23631,6 +23649,7 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dev": true, "dependencies": { "minipass": "^3.0.0", "yallist": "^4.0.0" @@ -24545,6 +24564,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-7.0.0.tgz", "integrity": "sha512-xXxr8y5U0kl8dVkz2oK7yZjPBvqM2fwaO5l3Yg13p03v8+E3qQcD0JNhHzjL1vyGgxcKkD0cco+NLR72iuPk3g==", + "dev": true, "dependencies": { "hosted-git-info": "^3.0.2", "osenv": "^0.1.5", @@ -24555,12 +24575,14 @@ "node_modules/npm-package-arg/node_modules/builtins": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz", - "integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==" + "integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==", + "dev": true }, "node_modules/npm-package-arg/node_modules/semver": { "version": "5.7.2", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, "bin": { "semver": "bin/semver" } @@ -24569,6 +24591,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", "integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==", + "dev": true, "dependencies": { "builtins": "^1.0.3" } @@ -28148,6 +28171,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -28164,6 +28188,7 @@ "version": "0.1.5", "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "dev": true, "dependencies": { "os-homedir": "^1.0.0", "os-tmpdir": "^1.0.0" @@ -30062,7 +30087,8 @@ "node_modules/promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==" + "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", + "dev": true }, "node_modules/prompt": { "version": "1.3.0", @@ -30484,6 +30510,7 @@ "version": "0.11.0", "resolved": "https://registry.npmjs.org/qrcode-terminal/-/qrcode-terminal-0.11.0.tgz", "integrity": "sha512-Uu7ii+FQy4Qf82G4xu7ShHhjhGahEpCWc3x8UavY3CTcWV+ufmmCtwkr7ZKsX42jdL0kr1B5FKUeqJvAn51jzQ==", + "dev": true, "bin": { "qrcode-terminal": "bin/qrcode-terminal.js" } @@ -33538,6 +33565,7 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", + "dev": true, "dependencies": { "minipass": "^3.1.1" }, @@ -34227,6 +34255,7 @@ "version": "6.2.1", "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", + "dev": true, "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", @@ -34268,6 +34297,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "dev": true, "engines": { "node": ">=8" } @@ -34276,6 +34306,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true, "bin": { "mkdirp": "bin/cmd.js" }, @@ -35381,6 +35412,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", + "dev": true, "dependencies": { "unique-slug": "^2.0.0" } @@ -35389,6 +35421,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", + "dev": true, "dependencies": { "imurmurhash": "^0.1.4" } diff --git a/packages/core/src/lib/predefined_bootstrap_nodes.ts b/packages/core/src/lib/predefined_bootstrap_nodes.ts index 9f4eb5bec9..304876e654 100644 --- 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 index 651ecd2f4d..b7a5a77a1e 100644 --- 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 index 6a5626d64d..a818c6d40d 100644 --- 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 index 51ac47e260..15b22b9b59 100644 --- 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 { 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" ) diff --git a/packages/enr/src/enr.spec.ts b/packages/enr/src/enr.spec.ts index 5aa2894a9c..14e5c1f197 100644 --- a/packages/enr/src/enr.spec.ts +++ b/packages/enr/src/enr.spec.ts @@ -26,8 +26,10 @@ describe("ENR", function () { const privateKey = await getPrivateKeyFromPeerId(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" ) @@ -53,10 +55,10 @@ describe("ENR", function () { expect(enr2.multiaddrs!.length).to.be.equal(3); const multiaddrsAsStr = enr2.multiaddrs!.map((ma) => ma.toString()); expect(multiaddrsAsStr).to.include( - "/dns4/node1.do-ams.wakuv2.test.statusim.net/tcp/443/wss" + "/dns4/node-01.do-ams3.waku.test.status.im/tcp/443/wss" ); expect(multiaddrsAsStr).to.include( - "/dns6/node2.ac-chi.wakuv2.test.statusim.net/tcp/443/wss" + "/dns6/node-01.ac-cn-hongkong-c.waku.test.status.im/tcp/443/wss" ); expect(multiaddrsAsStr).to.include( "/onion3/vww6ybal4bd7szmgncyruucpgfkqahzddi37ktceo3ah7ngmcopnpyyd:1234/wss" @@ -312,7 +314,7 @@ describe("ENR", function () { const tcp = 8080; const udp = 8080; const wsMultiaddr = multiaddr( - "/dns4/node-01.do-ams3.wakuv2.prod.statusim.net/tcp/8000/wss" + "/dns4/node-01.do-ams3.waku.sandbox.status.im/tcp/8000/wss" ); let peerId: PeerId; let enr: ENR; diff --git a/packages/enr/src/multiaddrs_codec.spec.ts b/packages/enr/src/multiaddrs_codec.spec.ts index 0dc0bed46f..cd49120ce5 100644 --- a/packages/enr/src/multiaddrs_codec.spec.ts +++ b/packages/enr/src/multiaddrs_codec.spec.ts @@ -6,9 +6,9 @@ import { decodeMultiaddrs, encodeMultiaddrs } from "./multiaddrs_codec.js"; describe("ENR multiaddrs codec", function () { it("Sample", async () => { const multiaddrs = [ - multiaddr("/dns4/node-01.do-ams3.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.wakuv2.test.statusim.net/tcp/443/wss" + "/dns6/node-01.ac-cn-hongkong-c.waku.test.status.im/tcp/443/wss" ), multiaddr( "/onion3/vww6ybal4bd7szmgncyruucpgfkqahzddi37ktceo3ah7ngmcopnpyyd:1234/wss" @@ -20,10 +20,10 @@ describe("ENR multiaddrs codec", function () { const multiaddrsAsStr = result.map((ma) => ma.toString()); expect(multiaddrsAsStr).to.include( - "/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/443/wss" + "/dns4/node-01.do-ams3.waku.test.status.im/tcp/443/wss" ); expect(multiaddrsAsStr).to.include( - "/dns6/node-01.ac-cn-hongkong-c.wakuv2.test.statusim.net/tcp/443/wss" + "/dns6/node-01.ac-cn-hongkong-c.waku.test.status.im/tcp/443/wss" ); expect(multiaddrsAsStr).to.include( "/onion3/vww6ybal4bd7szmgncyruucpgfkqahzddi37ktceo3ah7ngmcopnpyyd:1234/wss" diff --git a/packages/sdk/src/utils/discovery.ts b/packages/sdk/src/utils/discovery.ts index f8f4b97081..979ab18380 100644 --- a/packages/sdk/src/utils/discovery.ts +++ b/packages/sdk/src/utils/discovery.ts @@ -1,7 +1,10 @@ import type { PeerDiscovery } from "@libp2p/interface"; -import { enrTree, wakuDnsDiscovery } from "@waku/discovery"; -import { wakuLocalPeerCacheDiscovery } from "@waku/discovery"; -import { wakuPeerExchangeDiscovery } from "@waku/discovery"; +import { + enrTree, + wakuDnsDiscovery, + wakuLocalPeerCacheDiscovery, + wakuPeerExchangeDiscovery +} from "@waku/discovery"; import { type Libp2pComponents, PubsubTopic } from "@waku/interfaces"; const DEFAULT_NODE_REQUIREMENTS = { @@ -14,7 +17,7 @@ export function defaultPeerDiscoveries( pubsubTopics: PubsubTopic[] ): ((components: Libp2pComponents) => PeerDiscovery)[] { const discoveries = [ - wakuDnsDiscovery([enrTree["PROD"]], DEFAULT_NODE_REQUIREMENTS), + wakuDnsDiscovery([enrTree["SANDBOX"]], DEFAULT_NODE_REQUIREMENTS), wakuLocalPeerCacheDiscovery(), wakuPeerExchangeDiscovery(pubsubTopics) ]; diff --git a/packages/tests/tests/dns-peer-discovery.spec.ts b/packages/tests/tests/dns-peer-discovery.spec.ts index 87c09df893..14139dcba8 100644 --- a/packages/tests/tests/dns-peer-discovery.spec.ts +++ b/packages/tests/tests/dns-peer-discovery.spec.ts @@ -33,7 +33,7 @@ describe("DNS Discovery: Compliance Test", function () { } as unknown as Libp2pComponents; return new PeerDiscoveryDns(components, { - enrUrls: [enrTree["PROD"]], + enrUrls: [enrTree["SANDBOX"]], wantedNodeCapabilityCount: { filter: 1 } @@ -65,7 +65,9 @@ describe("DNS Node Discovery [live data]", function () { const waku = await createLightNode({ libp2p: { - peerDiscovery: [wakuDnsDiscovery([enrTree["PROD"]], nodeRequirements)] + peerDiscovery: [ + wakuDnsDiscovery([enrTree["SANDBOX"]], nodeRequirements) + ] } }); @@ -91,7 +93,7 @@ describe("DNS Node Discovery [live data]", function () { // 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, @@ -118,7 +120,7 @@ describe("DNS Node Discovery [live data]", function () { const waku = await createLightNode({ libp2p: { peerDiscovery: [ - wakuDnsDiscovery([enrTree["PROD"], enrTree["TEST"]], { + wakuDnsDiscovery([enrTree["SANDBOX"], enrTree["TEST"]], { filter: nodesToConnect }) ] diff --git a/packages/tests/tests/peer-exchange/pe.optional.spec.ts b/packages/tests/tests/peer-exchange/pe.optional.spec.ts index fa1f1af647..3042dbe848 100644 --- a/packages/tests/tests/peer-exchange/pe.optional.spec.ts +++ b/packages/tests/tests/peer-exchange/pe.optional.spec.ts @@ -20,7 +20,7 @@ describe("Peer Exchange", () => { const testCases: [Fleet, number][] = [ [Fleet.Test, 2], // on test fleet there are only 3 peers - [Fleet.Prod, 3] + [Fleet.Sandbox, 3] ]; testCases.map(([name, nodes]) => { diff --git a/packages/tests/tests/waku.node.optional.spec.ts b/packages/tests/tests/waku.node.optional.spec.ts index 80299b9530..fb81951c12 100644 --- a/packages/tests/tests/waku.node.optional.spec.ts +++ b/packages/tests/tests/waku.node.optional.spec.ts @@ -37,7 +37,7 @@ describe("Use static and several ENR trees for bootstrap", function () { peerDiscovery: [ bootstrap({ list: [multiAddrWithId.toString()] }), wakuDnsDiscovery( - [enrTree["PROD"], enrTree["TEST"]], + [enrTree["SANDBOX"], enrTree["TEST"]], NODE_REQUIREMENTS ) ]