From f534549a1e2d30c6834f61a6c78ee734cfca8f54 Mon Sep 17 00:00:00 2001 From: Jakub Date: Mon, 5 Aug 2024 12:57:43 +0200 Subject: [PATCH] chore: replace statusim.net instances with status.im (#2941) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use of `statusim.net` domain been deprecated since March: https://github.com/status-im/infra-shards/commit/7df38c14 Also adjust test to match enr with multiaddresses. Signed-off-by: Jakub SokoĊ‚owski --- apps/wakucanary/README.md | 2 +- docs/benchmarks/postgres-adoption.md | 4 +-- docs/faq.md | 12 ++++----- .../how-to/configure-store-v0.12.0.md | 4 +-- docs/operators/how-to/configure-store.md | 4 +-- docs/tutorial/chat2.md | 4 +-- examples/filter_subscriber.nim | 2 +- examples/lightpush_publisher.nim | 2 +- tests/test_waku_enr.nim | 27 +++++++------------ 9 files changed, 27 insertions(+), 34 deletions(-) diff --git a/apps/wakucanary/README.md b/apps/wakucanary/README.md index 6ae4ca3e9..11408234b 100644 --- a/apps/wakucanary/README.md +++ b/apps/wakucanary/README.md @@ -46,7 +46,7 @@ $ echo $? Note that a domain name can also be used. ```console -$ ./build/wakucanary --address=/dns4/node-01.do-ams3.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAkukebeXjTQ9QDBeNDWuGfbaSg79wkkhK4vPocLgR6QFDf --protocol=store --protocol=filter +$ ./build/wakucanary --address=/dns4/node-01.do-ams3.status.test.status.im/tcp/30303/p2p/16Uiu2HAkukebeXjTQ9QDBeNDWuGfbaSg79wkkhK4vPocLgR6QFDf --protocol=store --protocol=filter $ echo $? 0 ``` diff --git a/docs/benchmarks/postgres-adoption.md b/docs/benchmarks/postgres-adoption.md index 5c6147d0d..98e339652 100644 --- a/docs/benchmarks/postgres-adoption.md +++ b/docs/benchmarks/postgres-adoption.md @@ -109,7 +109,7 @@ Notice that the two `nwaku` nodes run the very same version, which is compiled l #### Comparing archive SQLite & Postgres performance in [nwaku-b6dd6899](https://github.com/waku-org/nwaku/tree/b6dd6899030ee628813dfd60ad1ad024345e7b41) -The next results were obtained by running the docker-compose-manual-binaries.yml from [test-waku-query-c078075](https://github.com/waku-org/test-waku-query/tree/c07807597faa781ae6c8c32eefdf48ecac03a7ba) in the sandbox machine (metal-01.he-eu-hel1.wakudev.misc.statusim.net.) +The next results were obtained by running the docker-compose-manual-binaries.yml from [test-waku-query-c078075](https://github.com/waku-org/test-waku-query/tree/c07807597faa781ae6c8c32eefdf48ecac03a7ba) in the sandbox machine (metal-01.he-eu-hel1.wakudev.misc.status.im.) **Scenario 1** @@ -155,7 +155,7 @@ In this case, the performance is similar regarding the timings. The store rate i This nwaku commit is after a few **Postgres** optimizations were applied. -The next results were obtained by running the docker-compose-manual-binaries.yml from [test-waku-query-c078075](https://github.com/waku-org/test-waku-query/tree/c07807597faa781ae6c8c32eefdf48ecac03a7ba) in the sandbox machine (metal-01.he-eu-hel1.wakudev.misc.statusim.net.) +The next results were obtained by running the docker-compose-manual-binaries.yml from [test-waku-query-c078075](https://github.com/waku-org/test-waku-query/tree/c07807597faa781ae6c8c32eefdf48ecac03a7ba) in the sandbox machine (metal-01.he-eu-hel1.wakudev.misc.status.im.) **Scenario 1** diff --git a/docs/faq.md b/docs/faq.md index 9ed846712..40a189cbe 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -16,9 +16,9 @@ curl -s https://fleets.status.im | jq '.fleets["waku.test"]' # Output { "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" + "node-01.do-ams3.waku.test": "/dns4/node-01.do-ams3.waku.test.status.im/tcp/30303/p2p/16Uiu2HAkykgaECHswi3YKJ5dMLbq2kPVCo89fcyTd38UcQD6ej5W", + "node-01.gc-us-central1-a.waku.test": "/dns4/node-01.gc-us-central1-a.waku.test.status.im/tcp/30303/p2p/16Uiu2HAmDCp8XJ9z1ev18zuv8NHekAsjNyezAvmMfFEJkiharitG", + "node-01.ac-cn-hongkong-c.waku.test": "/dns4/node-01.ac-cn-hongkong-c.waku.test.status.im/tcp/30303/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp" }, "enr/p2p/waku": { "node-01.do-ams3.waku.test": "enr:-QESuEC1p_s3xJzAC_XlOuuNrhVUETmfhbm1wxRGis0f7DlqGSw2FM-p2Ugl_r25UHQJ3f1rIRrpzxJXSMaJe4yk1XFSAYJpZIJ2NIJpcISygI2rim11bHRpYWRkcnO4XAArNiZub2RlLTAxLmRvLWFtczMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAZ2XwAtNiZub2RlLTAxLmRvLWFtczMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAYfQN4DgnJzkwABCAAAAAEAAgADAAQABQAGAAeJc2VjcDI1NmsxoQJATXRSRSUyTw_QLB6H_U3oziVQgNRgrXpK7wp2AMyNxYN0Y3CCdl-DdWRwgiMohXdha3UyDw", @@ -26,9 +26,9 @@ curl -s https://fleets.status.im | jq '.fleets["waku.test"]' "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" + "node-01.do-ams3.waku.test": "/dns4/node-01.do-ams3.waku.test.status.im/tcp/8000/wss/p2p/16Uiu2HAkykgaECHswi3YKJ5dMLbq2kPVCo89fcyTd38UcQD6ej5W", + "node-01.gc-us-central1-a.waku.test": "/dns4/node-01.gc-us-central1-a.waku.test.status.im/tcp/8000/wss/p2p/16Uiu2HAmDCp8XJ9z1ev18zuv8NHekAsjNyezAvmMfFEJkiharitG", + "node-01.ac-cn-hongkong-c.waku.test": "/dns4/node-01.ac-cn-hongkong-c.waku.test.status.im/tcp/8000/wss/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp" } } ``` diff --git a/docs/operators/how-to/configure-store-v0.12.0.md b/docs/operators/how-to/configure-store-v0.12.0.md index 549cd2658..237c7fc25 100644 --- a/docs/operators/how-to/configure-store-v0.12.0.md +++ b/docs/operators/how-to/configure-store-v0.12.0.md @@ -17,12 +17,12 @@ or store and serve historical messages itself. Ensure that `store` is enabled (this is `true` by default) and provide at least one store service node address with the `--storenode` CLI option. -See the following example, using the peer at `/dns4/node-01.ac-cn-hongkong-c.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp` as store service node. +See the following example, using the peer at `/dns4/node-01.ac-cn-hongkong-c.waku.test.status.im/tcp/30303/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp` as store service node. ```sh ./build/wakunode2 \ --store:true \ - --storenode:/dns4/node-01.ac-cn-hongkong-c.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp + --storenode:/dns4/node-01.ac-cn-hongkong-c.waku.test.status.im/tcp/30303/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp ``` Your node can now send queries to retrieve historical messages diff --git a/docs/operators/how-to/configure-store.md b/docs/operators/how-to/configure-store.md index cd08d54ed..ffa39cf75 100644 --- a/docs/operators/how-to/configure-store.md +++ b/docs/operators/how-to/configure-store.md @@ -15,11 +15,11 @@ This option controls the mounting of the Waku Store protocol, meaning that your Provide at least one store service node address with the `--storenode` option. This option is independent of the `--store` option i.e., one node can act as a waku store client without mounting the Waku Store protocol. -For example, to use the peer at `/dns4/node-01.ac-cn-hongkong-c.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp` as the waku store service node: +For example, to use the peer at `/dns4/node-01.ac-cn-hongkong-c.waku.test.status.im/tcp/30303/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp` as the waku store service node: ```shell wakunode2 \ - --storenode=/dns4/node-01.ac-cn-hongkong-c.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp + --storenode=/dns4/node-01.ac-cn-hongkong-c.waku.test.status.im/tcp/30303/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp ``` Your node can now send queries to retrieve historical messages diff --git a/docs/tutorial/chat2.md b/docs/tutorial/chat2.md index 32994d993..f6489f99a 100644 --- a/docs/tutorial/chat2.md +++ b/docs/tutorial/chat2.md @@ -60,7 +60,7 @@ The `chat2` application can retrieve historical chat messages from a node suppor It's possible to query a *specific* store node by configuring its `multiaddr` as `storenode` when starting the app: ``` -./build/chat2 --storenode:/dns4/node-01.do-ams3.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkykgaECHswi3YKJ5dMLbq2kPVCo89fcyTd38UcQD6ej5W +./build/chat2 --storenode:/dns4/node-01.do-ams3.waku.test.status.im/tcp/30303/p2p/16Uiu2HAkykgaECHswi3YKJ5dMLbq2kPVCo89fcyTd38UcQD6ej5W ``` Alternatively, the `chat2` application will select a random `storenode` for you from the configured fleet (`sandbox` by default) if `storenode` is left unspecified. @@ -80,7 +80,7 @@ To disable historical message retrieval, use the `--store:false` option: In order to connect to a *specific* node as [`relay`](https://rfc.vac.dev/spec/11/) peer, define that node's `multiaddr` as a `staticnode` when starting the app: ``` -./build/chat2 --staticnode:/dns4/node-01.do-ams3.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkykgaECHswi3YKJ5dMLbq2kPVCo89fcyTd38UcQD6ej5W +./build/chat2 --staticnode:/dns4/node-01.do-ams3.waku.test.status.im/tcp/30303/p2p/16Uiu2HAkykgaECHswi3YKJ5dMLbq2kPVCo89fcyTd38UcQD6ej5W ``` This will bypass the random peer selection process and connect to the specified node. diff --git a/examples/filter_subscriber.nim b/examples/filter_subscriber.nim index a18bf92db..8fb52963a 100644 --- a/examples/filter_subscriber.nim +++ b/examples/filter_subscriber.nim @@ -7,7 +7,7 @@ import waku/[common/logging, node/peer_manager, waku_core, waku_filter_v2/client const FilterPeer = "/ip4/34.16.1.67/tcp/30303/p2p/16Uiu2HAmDCp8XJ9z1ev18zuv8NHekAsjNyezAvmMfFEJkiharitG" - # node-01.gc-us-central1-a.waku.test.statusim.net on waku.test + # node-01.gc-us-central1-a.waku.test.status.im on waku.test FilterPubsubTopic = PubsubTopic("/waku/2/rs/0/0") FilterContentTopic = ContentTopic("/examples/1/light-pubsub-example/proto") diff --git a/examples/lightpush_publisher.nim b/examples/lightpush_publisher.nim index 4cc2f195d..8ef3f4446 100644 --- a/examples/lightpush_publisher.nim +++ b/examples/lightpush_publisher.nim @@ -7,7 +7,7 @@ import waku/[common/logging, node/peer_manager, waku_core, waku_lightpush/client const LightpushPeer = "/ip4/178.128.141.171/tcp/30303/p2p/16Uiu2HAkykgaECHswi3YKJ5dMLbq2kPVCo89fcyTd38UcQD6ej5W" - # node-01.do-ams3.waku.test.statusim.net on waku.test + # node-01.do-ams3.waku.test.status.im on waku.test LightpushPubsubTopic = PubsubTopic("/waku/2/rs/0/0") LightpushContentTopic = ContentTopic("/examples/1/light-pubsub-example/proto") diff --git a/tests/test_waku_enr.nim b/tests/test_waku_enr.nim index a1e22144b..fae8ae0fb 100644 --- a/tests/test_waku_enr.nim +++ b/tests/test_waku_enr.nim @@ -127,13 +127,12 @@ suite "Waku ENR - Multiaddresses": test "decode record with multiaddrs field": ## Given let enrUri = - "enr:-QEnuEBEAyErHEfhiQxAVQoWowGTCuEF9fKZtXSd7H_PymHFhGJA3rGAYDVSH" & - "KCyJDGRLBGsloNbS8AZF33IVuefjOO6BIJpZIJ2NIJpcIQS39tkim11bHRpYWRkcn" & - "O4lgAvNihub2RlLTAxLmRvLWFtczMud2FrdXYyLnRlc3Quc3RhdHVzaW0ubmV0BgG" & - "73gMAODcxbm9kZS0wMS5hYy1jbi1ob25na29uZy1jLndha3V2Mi50ZXN0LnN0YXR1" & - "c2ltLm5ldAYBu94DACm9A62t7AQL4Ef5ZYZosRpQTzFVAB8jGjf1TER2wH-0zBOe1" & - "-MDBNLeA4lzZWNwMjU2azGhAzfsxbxyCkgCqq8WwYsVWH7YkpMLnU2Bw5xJSimxKa" & - "v-g3VkcIIjKA" + "enr:-QEMuEAs8JmmyUI3b9v_ADqYtELHUYAsAMS21lA2BMtrzF86tVmyy9cCrhmzfHGH" & + "x_g3nybn7jIRybzXTGNj3C2KzrriAYJpZIJ2NIJpcISf3_Jeim11bHRpYWRkcnO4XAAr" & + "NiZzdG9yZS0wMS5kby1hbXMzLnN0YXR1cy5wcm9kLnN0YXR1cy5pbQZ2XwAtNiZzdG9y" & + "ZS0wMS5kby1hbXMzLnN0YXR1cy5wcm9kLnN0YXR1cy5pbQYBu94DgnJzjQAQBQABACAA" & + "QACAAQCJc2VjcDI1NmsxoQLfoaQH3oSYW59yxEBfeAZbltmUnC4BzYkHqer2VQMTyoN0" & + "Y3CCdl-DdWRwgiMohXdha3UyAw" var record: Record require record.fromURI(enrUri) @@ -141,15 +140,10 @@ suite "Waku ENR - Multiaddresses": # TODO: get rid of wakuv2 here too. Needt to generate a ne ENR record let expectedAddr1 = MultiAddress - .init("/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/443/wss") + .init("/dns4/store-01.do-ams3.status.prod.status.im/tcp/30303") .get() expectedAddr2 = MultiAddress - .init("/dns6/node-01.ac-cn-hongkong-c.wakuv2.test.statusim.net/tcp/443/wss") - .get() - expectedAddr3 = MultiAddress - .init( - "/onion3/vww6ybal4bd7szmgncyruucpgfkqahzddi37ktceo3ah7ngmcopnpyyd:1234/wss" - ) + .init("/dns4/store-01.do-ams3.status.prod.status.im/tcp/443/wss") .get() ## When @@ -160,13 +154,12 @@ suite "Waku ENR - Multiaddresses": ## Then check multiaddrsOpt.isSome() - let multiaddrs = multiaddrsOpt.get() + check: - multiaddrs.len == 3 + multiaddrs.len == 2 multiaddrs.contains(expectedAddr1) multiaddrs.contains(expectedAddr2) - multiaddrs.contains(expectedAddr3) test "encode and decode record with multiaddrs field (EnrBuilder ext)": ## Given