switch wakuv2 to waku fleet

.github/ISSUE_TEMPLATE/prepare_release.md

@@ -12,7 +12,7 @@ Add appropriate release number to title!
 
 For detailed info on the release process refer to https://github.com/waku-org/nwaku/blob/master/docs/contributors/release-process.md
  -->
- 
+
 ### Items to complete
 - [ ] create release branch
 - [ ] assign release candidate tag
@@ -23,5 +23,5 @@ For detailed info on the release process refer to https://github.com/waku-org/nw
 - [ ] assign release tag to the cherry-picked release notes commit
 - [ ] create GitHub release
 - [ ] deploy the release to DockerHub
-- [ ] deploy release to `wakuv2.prod` fleet
+- [ ] deploy release to `waku.sandbox` fleet
 - [ ] announce the release

apps/chat2/chat2.nim

@@ -216,7 +216,7 @@ proc publish(c: Chat, line: string) =
         (waitFor c.node.publish(some(DefaultPubsubTopic), message)).isOkOr:
           error "failed to publish message", error = error
     except CatchableError:
-        error "caught error publishing message: ", error = getCurrentExceptionMsg()      
+        error "caught error publishing message: ", error = getCurrentExceptionMsg()
 
 # TODO This should read or be subscribe handler subscribe
 proc readAndPrint(c: Chat) {.async.} =
@@ -381,10 +381,10 @@ proc processInput(rfd: AsyncFD, rng: ref HmacDrbgContext) {.async.} =
     echo "Connecting to " & $conf.fleet & " fleet using DNS discovery..."
 
     if conf.fleet == Fleet.test:
-      dnsDiscoveryUrl = some("enrtree://AO47IDOLBKH72HIZZOXQP6NMRESAN7CHYWIBNXDXWRJRZWLODKII6@test.wakuv2.nodes.status.im")
+      dnsDiscoveryUrl = some("enrtree://AOGYWMBYOUIMOENHXCHILPKY3ZRFEULMFI4DOM442QSZ73TT2A7VI@test.waku.nodes.status.im")
     else:
       # Connect to prod by default
-      dnsDiscoveryUrl = some("enrtree://ANEDLO25QVUGJOUTQFRYKWX6P4Z4GKVESBMHML7DZ6YK4LGS5FC5O@prod.wakuv2.nodes.status.im")
+      dnsDiscoveryUrl = some("enrtree://AIRVQ5DDA4FFWLRBCHJWUWOO6X6S4ZTZ5B667LQ6AJU6PEYDLRD5O@sandbox.waku.nodes.status.im")
 
   elif conf.dnsDiscovery and conf.dnsDiscoveryUrl != "":
     # No pre-selected fleet. Discover nodes via DNS using user config

apps/wakucanary/README.md

@@ -30,14 +30,14 @@ $ make wakucanary
 And used as follows. A reachable node that supports both `store` and `filter` protocols.
 
 ```console
-$ ./build/wakucanary --address=/ip4/8.210.222.231/tcp/30303/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD --protocol=store --protocol=filter
+$ ./build/wakucanary --address=/dns4/node-01.ac-cn-hongkong-c.waku.sandbox.status.im/tcp/30303/p2p/16Uiu2HAmSJvSJphxRdbnigUV5bjRRZFBhTtWFTSyiKaQByCjwmpV --protocol=store --protocol=filter
 $ echo $?
 0
 ```
 
 A node that can't be reached.
 ```console
-$ ./build/wakucanary --address=/ip4/8.210.222.231/tcp/1000/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD --protocol=store --protocol=filter
+$ ./build/wakucanary --address=/dns4/node-01.ac-cn-hongkong-c.waku.sandbox.status.im/tcp/1000/p2p/16Uiu2HAmSJvSJphxRdbnigUV5bjRRZFBhTtWFTSyiKaQByCjwmpV --protocol=store --protocol=filter
 $ echo $?
 1
 ```
@@ -53,4 +53,4 @@ Websockets are also supported. The websocket port openned by waku canary is calc
 ```console
 $ ./build/wakucanary --address=/ip4/127.0.0.1/tcp/7777/ws/p2p/16Uiu2HAm4ng2DaLPniRoZtMQbLdjYYWnXjrrJkGoXWCoBWAdn1tu --protocol=store --protocol=filter
 $ ./build/wakucanary --address=/ip4/127.0.0.1/tcp/7777/wss/p2p/16Uiu2HAmB6JQpewXScGoQ2syqmimbe4GviLxRwfsR8dCpwaGBPSE --protocol=store --websocket-secure-key-path=MyKey.key --websocket-secure-cert-path=MyCertificate.crt
-```
+```

docs/contributors/continuous-integration.md

@@ -11,9 +11,8 @@ https://ci.infra.status.im/job/nim-waku/
 It currently consists of four jobs:
 
 * [manual](https://ci.infra.status.im/job/nim-waku/job/manual/) - For manually executing builds using parameters.
-* [deploy-wakuv1-test](https://ci.infra.status.im/job/nim-waku/job/deploy-wakuv1-test/) - Builds every new commit in `master` and deploys to `wakuv1.test` fleet.
-* [deploy-wakuv2-test](https://ci.infra.status.im/job/nim-waku/job/deploy-wakuv2-test/) - Builds every new commit in `master` and deploys to `wakuv2.test` fleet.
-* [deploy-wakuv2-prod](https://ci.infra.status.im/job/nim-waku/job/deploy-wakuv2-prod/) - Currently has no automatic trigger, and deploys to `wakuv2.prod` fleet.
+* [deploy-waku-test](https://ci.infra.status.im/job/nim-waku/job/deploy-waku-test/) - Builds every new commit in `master` and deploys to `waku.test` fleet.
+* [deploy-waku-sandbox](https://ci.infra.status.im/job/nim-waku/job/deploy-waku-sandbox/) - Currently has no automatic trigger, and deploys to `waku.sandbox` fleet.
 
 # Configuration
 
@@ -29,5 +28,5 @@ Key part is the definition of five `parameters`:
 
 The use of `?:` [Elvis operator](http://groovy-lang.org/operators.html#_elvis_operator) plays a key role in allowing parameters to be changed for each defined job in Jenkins without it being overridden by the `Jenkinsfile` defaults after every job run.
 ```groovy
-defaultValue: params.IMAGE_TAG ?: 'deploy-wakuv2-test',
+defaultValue: params.IMAGE_TAG ?: 'deploy-waku-test',
 ```

docs/contributors/release-process.md

@@ -86,13 +86,13 @@ Ensure all items in this list are ticked:
    > It should be enough to inform clients on the `#nwaku` and `#announce` channels on Discord.
    > Informal conversations with specific repo maintainers are often part of this process.
    - Check if nwaku configuration parameters changed. If so [update fleet configuration](https://www.notion.so/Fleet-Ownership-7532aad8896d46599abac3c274189741?pvs=4#d2d2f0fe4b3c429fbd860a1d64f89a64) in [infra-nim-waku](https://github.com/status-im/infra-nim-waku)
-   - Deploy release to the `wakuv2.prod` fleet from [Jenkins](https://ci.infra.status.im/job/nim-waku/job/deploy-wakuv2-prod/).
+   - Deploy release to the `waku.sandbox` fleet from [Jenkins](https://ci.infra.status.im/job/nim-waku/job/deploy-waku-sandbox/).
    - Ensure that nodes successfully start up and monitor health using [Grafana](https://grafana.infra.status.im/d/qrp_ZCTGz/nim-waku-v2?orgId=1) and [Kibana](https://kibana.infra.status.im/goto/a7728e70-eb26-11ec-81d1-210eb3022c76).
    - If necessary, revert by deploying the previous release. Download logs and open a bug report issue.
 
 ### Performing a patch release
 
-1. Cherry-pick the relevant commits from master to the release branch 
+1. Cherry-pick the relevant commits from master to the release branch
 
     ```
     git cherry-pick <commit-hash>

docs/contributors/waku-fleets.md

@@ -3,8 +3,8 @@
 ## Background
 
 Status currently maintains two fleets for `nwaku` v2 nodes,
-the `wakuv2.test` fleet and the `wakuv2.prod` (production) fleet.
-They'll be referred to as `test` and `prod` in this document.
+the `waku.test` fleet and the `waku.sandbox` (sandbox) fleet.
+They'll be referred to as `test` and `sandbox` in this document.
 Status fleet nodes and addresses can be viewed [here](https://fleets.status.im/).
 
 ### Fleet overview
@@ -13,24 +13,24 @@ At the time of writing this, each fleet consists of three waku v2 nodes,
 with a [websockify](https://github.com/novnc/websockify) WebSocket-to-TCP bridge for each node.
 Waku v2 peers can choose to connect either directly to a node's TCP endpoint
 or the bridged WebSocket depending on their own supported transports.
-The `prod` fleet also has a deployed [`chat2bridge`](https://github.com/waku-org/nwaku/blob/master/docs/tutorial/chat2.md#bridge-messages-between-chat2-and-matterbridge),
+The `sandbox` fleet also has a deployed [`chat2bridge`](https://github.com/waku-org/nwaku/blob/master/docs/tutorial/chat2.md#bridge-messages-between-chat2-and-matterbridge),
 which serves as a bridge between the [Waku v2 toy-chat](https://rfc.vac.dev/spec/22/) and Matterbridge.
 The `chat2bridge` is currently deployed to the `node-01.do-ams3` datacentre
 and configured to bridge toy-chat messages to the `#waku channel` on the Vac Discord Server.
 
 ### Fleet deployment rationale
 
 The `test` fleet is automatically updated after every commit to the `nwaku` repository `master` branch and is therefore the most up to date representation of Waku v2 development.
-It is suitable for testing new features before they're rolled out to the (more) stable `prod` fleet.
+It is suitable for testing new features before they're rolled out to the (more) stable `sandbox` fleet.
 
-In general only the latest release of `nwaku` is deployed to the `prod` fleet.
+In general only the latest release of `nwaku` is deployed to the `sandbox` fleet.
 It requires manual updating and should therefore be more stable than `test`.
 See the [section on Jenkins](#jenkins-for-deployment) below for more on the deployment process.
 
 ### Related repos
 
 The [`infra-docs` repo](https://github.com/status-im/infra-docs) contains the most comprehensive overview of Status infrastructure.
-This is a private repository. 
+This is a private repository.
 Feel free to contact someone in the team to request access.
 
 The [`infra-nim-waku` repo](https://github.com/status-im/infra-nim-waku) contains the infrastructure definitions for Waku nodes implemented in Nim.
@@ -55,8 +55,8 @@ The datacentre can be changed in the upper left-hand corner.
 
 Kibana is a powerful visualisation tool for Elasticsearch data.
 For Waku v2 fleets it can be used to retrieve, filter and view the logs for all deployed services.
-For example, to view the latest logs for `prod`,
-Kibana can be opened in "Discover" mode with an [active filter for `fleet: wakuv2.prod`](https://kibana.infra.status.im/goto/87fde8e4bba7246ce3780a0c8344f4f0).
+For example, to view the latest logs for `sandbox`,
+Kibana can be opened in "Discover" mode with an [active filter for `fleet: waku.sandbox`](https://kibana.infra.status.im/goto/c0434f60-ca82-11ee-aaa4-85391103106b).
 
 ### 3. [Grafana](https://grafana.infra.status.im/d/qrp_ZCTGz/nim-waku-v2?orgId=1&refresh=5m) for metrics
 
@@ -79,8 +79,8 @@ Please report any broken panels via our Discord channels or by [creating an issu
 ### 4. [Jenkins](https://ci.status.im/job/nim-waku/) for deployment
 
 The [`nim-waku` jobs](https://ci.infra.status.im/job/nim-waku/) on Jenkins are configured to deploy `nwaku` builds to the fleets.
-1. [`deploy-wakuv2-test`](https://ci.infra.status.im/job/nim-waku/job/deploy-wakuv2-test/) is triggered automatically after every commit to the `nwaku` `master` branch.
-2. [`deploy-wakuv2-prod`](https://ci.infra.status.im/job/nim-waku/job/deploy-wakuv2-prod/) must be triggered manually. Usually this job is only built after a tagged release in `nwaku`.
+1. [`deploy-waku-test`](https://ci.infra.status.im/job/nim-waku/job/deploy-waku-test/) is triggered automatically after every commit to the `nwaku` `master` branch.
+2. [`deploy-waku-sandbox`](https://ci.infra.status.im/job/nim-waku/job/deploy-waku-sandbox/) must be triggered manually. Usually this job is only built after a tagged release in `nwaku`.
 
 Each job can be manually triggered using the _"Build with Parameters"_ option.
 Options under _"Configure"_ include the build triggers, build target and branches to build.
@@ -96,11 +96,11 @@ See [Continuous Integration docs](https://github.com/waku-org/nwaku/blob/master/
  4. [Consul for gc-us-central1-a](https://consul.infra.status.im/ui/gc-us-central1-a/services?filter=nim-waku)
  5. [Grafana Nim-Waku V2 dashboard](https://grafana.infra.status.im/d/qrp_ZCTGz/nim-waku-v2?orgId=1&refresh=5m)
  6. [`infra-docs` repo](https://github.com/status-im/infra-docs)
- 7. [`infra-nim-waku` repo](https://github.com/status-im/infra-nim-waku)
+ 7. [`infra-waku` repo](https://github.com/status-im/infra-waku)
  8. [Jenkins jobs for `nim-waku`](https://ci.infra.status.im/job/nim-waku/)
- 9. [Jenkins deploy-wakuv2-prod manual trigger](https://ci.infra.status.im/job/nim-waku/job/deploy-wakuv2-prod/build)
- 10. [Jenkins deploy-wakuv2-test manual trigger](https://ci.infra.status.im/job/nim-waku/job/deploy-wakuv2-test/build)
- 11. [Kibana logs for `prod`](https://kibana.infra.status.im/goto/87fde8e4bba7246ce3780a0c8344f4f0)
- 12. [Kibana logs for `test`](https://kibana.infra.status.im/goto/fc23759670fd08e9d32e81bb4e58733d)
+ 9. [Jenkins deploy-waku-sandbox manual trigger](https://ci.infra.status.im/job/nim-waku/job/deploy-waku-sandbox/build)
+ 10. [Jenkins deploy-waku-test manual trigger](https://ci.infra.status.im/job/nim-waku/job/deploy-waku-test/build)
+ 11. [Kibana logs for `sandbox`](https://kibana.infra.status.im/goto/c0434f60-ca82-11ee-aaa4-85391103106b)
+ 12. [Kibana logs for `test`](https://kibana.infra.status.im/goto/7cd22f20-ca83-11ee-aaa4-85391103106b)
  13. [Status fleets](https://fleets.status.im/)
  14. [Websockify](https://github.com/novnc/websockify)

docs/faq.md

@@ -4,21 +4,31 @@
 
 Grep for "Listening on". It should be printed at INFO level at the beginning. E.g. from Kibana:
 
-`Oct 7, 2020 @ 23:17:00.383INF 2020-10-07 23:17:00.375+00:00 Listening on                               topics="wakunode" tid=1 file=wakunode2.nim:140 full=/ip4/0.0.0.0/tcp/60000/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS`
+`Oct 7, 2020 @ 23:17:00.383INF 2020-10-07 23:17:00.375+00:00 Listening on                               topics="wakunode" tid=1 file=wakunode2.nim:140 full=/ip4/0.0.0.0/tcp/60000/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp`
 
 ## How do I find out node addresses at the test cluster?
 
 The easiest way is to use `jq` and query the fleets registry that Status operates:
 
 ```
-curl -s https://fleets.status.im | jq '.fleets["wakuv2.test"]'
+curl -s https://fleets.status.im | jq '.fleets["waku.test"]'
 
 # Output
 {
-  "waku": {
-    "node-01.ac-cn-hongkong-c.wakuv2.test": "/ip4/0.0.0.0/tcp/30303/p2p/16Uiu2HAmSyrYVycqBCWcHyNVQS6zYQcdQbwyov1CDijboVRsQS37",
-    "node-01.do-ams3.wakuv2.test": "/ip4/0.0.0.0/tcp/30303/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
-    "node-01.gc-us-central1-a.wakuv2.test": "/ip4/0.0.0.0/tcp/30303/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ"
+  "tcp/p2p/waku": {
+    "node-01.do-ams3.waku.test": "/dns4/node-01.do-ams3.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkykgaECHswi3YKJ5dMLbq2kPVCo89fcyTd38UcQD6ej5W",
+    "node-01.gc-us-central1-a.waku.test": "/dns4/node-01.gc-us-central1-a.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAmDCp8XJ9z1ev18zuv8NHekAsjNyezAvmMfFEJkiharitG",
+    "node-01.ac-cn-hongkong-c.waku.test": "/dns4/node-01.ac-cn-hongkong-c.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp"
+  },
+  "enr/p2p/waku": {
+    "node-01.do-ams3.waku.test": "enr:-QESuEC1p_s3xJzAC_XlOuuNrhVUETmfhbm1wxRGis0f7DlqGSw2FM-p2Ugl_r25UHQJ3f1rIRrpzxJXSMaJe4yk1XFSAYJpZIJ2NIJpcISygI2rim11bHRpYWRkcnO4XAArNiZub2RlLTAxLmRvLWFtczMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAZ2XwAtNiZub2RlLTAxLmRvLWFtczMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAYfQN4DgnJzkwABCAAAAAEAAgADAAQABQAGAAeJc2VjcDI1NmsxoQJATXRSRSUyTw_QLB6H_U3oziVQgNRgrXpK7wp2AMyNxYN0Y3CCdl-DdWRwgiMohXdha3UyDw",
+    "node-01.gc-us-central1-a.waku.test": "enr:-QEkuECnZ3IbVAgkOzv-QLnKC4dRKAPRY80m1-R7G8jZ7yfT3ipEfBrhKN7ARcQgQ-vg-h40AQzyvAkPYlHPaFKk6u9uAYJpZIJ2NIJpcIQiEAFDim11bHRpYWRkcnO4bgA0Ni9ub2RlLTAxLmdjLXVzLWNlbnRyYWwxLWEud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAZ2XwA2Ni9ub2RlLTAxLmdjLXVzLWNlbnRyYWwxLWEud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAYfQN4DgnJzkwABCAAAAAEAAgADAAQABQAGAAeJc2VjcDI1NmsxoQMIJwesBVgUiBCi8yiXGx7RWylBQkYm1U9dvEy-neLG2YN0Y3CCdl-DdWRwgiMohXdha3UyDw",
+    "node-01.ac-cn-hongkong-c.waku.test": "enr:-QEkuEDzQyIAhs-CgBHIrJqtBv3EY1uP1Psrc-y8yJKsmxW7dh3DNcq2ergMUWSFVcJNlfcgBeVsFPkgd_QopRIiCV2pAYJpZIJ2NIJpcIQI2ttrim11bHRpYWRkcnO4bgA0Ni9ub2RlLTAxLmFjLWNuLWhvbmdrb25nLWMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAZ2XwA2Ni9ub2RlLTAxLmFjLWNuLWhvbmdrb25nLWMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAYfQN4DgnJzkwABCAAAAAEAAgADAAQABQAGAAeJc2VjcDI1NmsxoQJIN4qwz3v4r2Q8Bv8zZD0eqBcKw6bdLvdkV7-JLjqIj4N0Y3CCdl-DdWRwgiMohXdha3UyDw"
+  },
+  "wss/p2p/waku": {
+    "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",
+    "node-01.ac-cn-hongkong-c.waku.test": "/dns4/node-01.ac-cn-hongkong-c.waku.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp"
   }
 }
 ```

docs/operators/docker-quickstart.md

@@ -58,13 +58,13 @@ As an example, consider the following command to run nwaku in a Docker container
 ```bash
 docker run -i -t -p 60000:60000 -p 9000:9000/udp wakuorg/nwaku:v0.20.0 \
   --dns-discovery:true \
-  --dns-discovery-url:enrtree://ANEDLO25QVUGJOUTQFRYKWX6P4Z4GKVESBMHML7DZ6YK4LGS5FC5O@prod.wakuv2.nodes.status.im \
+  --dns-discovery-url:enrtree://AIRVQ5DDA4FFWLRBCHJWUWOO6X6S4ZTZ5B667LQ6AJU6PEYDLRD5O@sandbox.waku.nodes.status.im \
   --discv5-discovery \
   --nat:extip:[yourpublicip] # or, if you are behind a nat: --nat=any
 ```
 
 This runs nwaku in a new container from the `wakuorg/nwaku:v0.20.0` image,
-connects to `wakuv2.prod` as bootstrap fleet and
+connects to `wakuv.sandbox` as bootstrap fleet and
 enables [Waku Discovery v5](https://rfc.vac.dev/spec/33/) for ambient peer discovery,
 while mapping the default libp2p listening port (`60000`)
 and default discv5 UDP port (`9000`) to the host.

docs/operators/droplet-quickstart.md

@@ -1,6 +1,6 @@
 # Quickstart for running nwaku on a DigitalOcean Droplet
 
-This guide explains how to run a nwaku node on a 
+This guide explains how to run a nwaku node on a
 DigitalOcean Droplet. We enable the following protocols -
 
 1. Relay
@@ -10,9 +10,9 @@ DigitalOcean Droplet. We enable the following protocols -
 
 A Droplet is a simple virtual machine that runs in DigitalOcean's datacenters.
 
-Note that Droplets do cost money, the size described in the guide costs approximately $12 a month. 
+Note that Droplets do cost money, the size described in the guide costs approximately $12 a month.
 
-The guide makes heavy use of the `doctl` cli to make it as UI agnostic as possible. 
+The guide makes heavy use of the `doctl` cli to make it as UI agnostic as possible.
 There are similar steps to accomplish the same through DigitalOcean's cloud console, accessible [here](https://cloud.digitalocean.com/)
 
 ## Prerequisites
@@ -238,7 +238,7 @@ Run the following command to run `nwaku` -
 
 *Note the path to the wakunode2 binary*
 
-a. Add the parent directory of the wakunode2 binary to your environment: 
+a. Add the parent directory of the wakunode2 binary to your environment:
 
   If you built it locally and copied it via scp -
 
@@ -255,8 +255,8 @@ a. Add the parent directory of the wakunode2 binary to your environment:
   ```
 
 b. Choose the fleet you wish to connect your node to:
-  - waku prod: enrtree://ANEDLO25QVUGJOUTQFRYKWX6P4Z4GKVESBMHML7DZ6YK4LGS5FC5O@prod.wakuv2.nodes.status.im
-  - waku test: enrtree://AO47IDOLBKH72HIZZOXQP6NMRESAN7CHYWIBNXDXWRJRZWLODKII6@test.wakuv2.nodes.status.im
+  - waku sandbox: enrtree://AIRVQ5DDA4FFWLRBCHJWUWOO6X6S4ZTZ5B667LQ6AJU6PEYDLRD5O@sandbox.waku.nodes.status.im
+  - waku test: enrtree://AOGYWMBYOUIMOENHXCHILPKY3ZRFEULMFI4DOM442QSZ73TT2A7VI@test.waku.nodes.status.im
 
   ```bash
   export WAKU_FLEET=<fleet>
@@ -293,7 +293,7 @@ c. Run `nwaku`:
 
 You now have nwaku running! You can verify this by observing the logs. The logs should show that the node completed 7 steps of setup, and is actively discovering other nodes.
 
-You may now detach from stdout, by following instructions according to the terminal multiplexer chosen previously - 
+You may now detach from stdout, by following instructions according to the terminal multiplexer chosen previously -
 1. [screen](https://linuxize.com/post/how-to-use-linux-screen/#detach-from-linux-screen-session)
 2. [tmux](https://linuxize.com/post/getting-started-with-tmux/#starting-your-first-tmux-session)
 

docs/operators/how-to/configure-dns-disc.md

@@ -24,7 +24,7 @@ A node will attempt connection to all discovered nodes.
 
 This can be used, for example, to connect to one of the existing fleets.
 Current URLs for the published fleet lists:
-- production fleet: `enrtree://ANEDLO25QVUGJOUTQFRYKWX6P4Z4GKVESBMHML7DZ6YK4LGS5FC5O@prod.wakuv2.nodes.status.im`
-- test fleet: `enrtree://AO47IDOLBKH72HIZZOXQP6NMRESAN7CHYWIBNXDXWRJRZWLODKII6@test.wakuv2.nodes.status.im`
+- production fleet: `enrtree://AIRVQ5DDA4FFWLRBCHJWUWOO6X6S4ZTZ5B667LQ6AJU6PEYDLRD5O@sandbox.waku.nodes.status.im`
+- test fleet: `enrtree://AOGYWMBYOUIMOENHXCHILPKY3ZRFEULMFI4DOM442QSZ73TT2A7VI@test.waku.nodes.status.im`
 
-See the [separate tutorial](../../tutorial/dns-disc.md) for a complete guide to DNS discovery.
+See the [separate tutorial](../../tutorial/dns-disc.md) for a complete guide to DNS discovery.