Merge branch 'master' of https://github.com/waku-org/js-waku into chore/new-store-tests

.cspell.json

@@ -39,7 +39,6 @@
     "exponentiate",
     "extip",
     "fanout",
-    "sharded",
     "floodsub",
     "fontsource",
     "globby",
@@ -93,6 +92,7 @@
     "secio",
     "seckey",
     "secp",
+    "sharded",
     "sscanf",
     "staticnode",
     "statusim",
@@ -114,6 +114,7 @@
     "waku",
     "wakuconnect",
     "wakunode",
+    "wakuorg",
     "wakuv",
     "webfonts",
     "websockets",

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ on:
   workflow_dispatch:
     inputs:
       nim_wakunode_image:
-        description: "Docker hub image name taken from https://hub.docker.com/r/statusteam/nim-waku/tags. Format: statusteam/nim-waku:v0.20.0"
+        description: "Docker hub image name taken from https://hub.docker.com/r/wakuorg/nwaku/tags. Format: wakuorg/nwaku:v0.20.0"
         required: false
         type: string
 
@@ -71,26 +71,26 @@ jobs:
   node:
     uses: ./.github/workflows/test-node.yml
     with:
-      nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'statusteam/nim-waku:v0.20.0' }}
+      nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'wakuorg/nwaku:v0.20.0' }}
       test_type: node
 
   node_optional:
     uses: ./.github/workflows/test-node.yml
     with:
-      nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'statusteam/nim-waku:v0.20.0' }}
+      nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'wakuorg/nwaku:v0.20.0' }}
       test_type: node-optional
 
   node_with_go_waku_master:
     uses: ./.github/workflows/test-node.yml
     with:
-      nim_wakunode_image: statusteam/go-waku:latest
+      nim_wakunode_image: wakuorg/go-waku:latest
       test_type: go-waku-master
       debug: waku*
 
   node_with_nwaku_master:
     uses: ./.github/workflows/test-node.yml
     with:
-      nim_wakunode_image: statusteam/nim-waku:deploy-wakuv2-test
+      nim_wakunode_image: wakuorg/nwaku:deploy-wakuv2-test
       test_type: nwaku-master
       debug: waku*
 

package-lock.json

@@ -11841,6 +11841,17 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-network-error": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.0.0.tgz",
+      "integrity": "sha512-P3fxi10Aji2FZmHTrMPSNFbNC6nnp4U5juPAIjXPHkUNubi4+qK7vvdsaNpAUwXslhYm9oyjEYTxs1xd/+Ph0w==",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-npm": {
       "version": "6.0.0",
       "license": "MIT",
@@ -19565,10 +19576,12 @@
       }
     },
     "node_modules/p-retry": {
-      "version": "6.0.0",
+      "version": "6.1.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.1.0.tgz",
+      "integrity": "sha512-fJLEQ2KqYBJRuaA/8cKMnqhulqNM+bpcjYtXNex2t3mOXKRYPitAJt9NacSf8XAFzcYahSAbKpobiWDSqHSh2g==",
       "dependencies": {
         "@types/retry": "0.12.2",
+        "is-network-error": "^1.0.0",
         "retry": "^0.13.1"
       },
       "engines": {
@@ -26119,7 +26132,7 @@
         "chai-as-promised": "^7.1.1",
         "debug": "^4.3.4",
         "dockerode": "^3.3.5",
-        "p-retry": "^6.0.0",
+        "p-retry": "^6.1.0",
         "p-timeout": "^6.1.0",
         "portfinder": "^1.0.32",
         "sinon": "^16.0.0",
@@ -29327,7 +29340,7 @@
         "libp2p": "^0.46.12",
         "mocha": "^10.2.0",
         "npm-run-all": "^4.1.5",
-        "p-retry": "^6.0.0",
+        "p-retry": "^6.1.0",
         "p-timeout": "^6.1.0",
         "portfinder": "^1.0.32",
         "sinon": "^16.0.0",
@@ -33631,6 +33644,11 @@
     "is-negative-zero": {
       "version": "2.0.2"
     },
+    "is-network-error": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.0.0.tgz",
+      "integrity": "sha512-P3fxi10Aji2FZmHTrMPSNFbNC6nnp4U5juPAIjXPHkUNubi4+qK7vvdsaNpAUwXslhYm9oyjEYTxs1xd/+Ph0w=="
+    },
     "is-npm": {
       "version": "6.0.0"
     },
@@ -38357,9 +38375,12 @@
       "version": "2.1.0"
     },
     "p-retry": {
-      "version": "6.0.0",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.1.0.tgz",
+      "integrity": "sha512-fJLEQ2KqYBJRuaA/8cKMnqhulqNM+bpcjYtXNex2t3mOXKRYPitAJt9NacSf8XAFzcYahSAbKpobiWDSqHSh2g==",
       "requires": {
         "@types/retry": "0.12.2",
+        "is-network-error": "^1.0.0",
         "retry": "^0.13.1"
       }
     },

packages/tests/package.json

@@ -60,7 +60,7 @@
     "chai-as-promised": "^7.1.1",
     "debug": "^4.3.4",
     "dockerode": "^3.3.5",
-    "p-retry": "^6.0.0",
+    "p-retry": "^6.1.0",
     "p-timeout": "^6.1.0",
     "portfinder": "^1.0.32",
     "sinon": "^16.0.0",

packages/tests/src/node/node.ts

@@ -27,8 +27,7 @@ const WAKU_SERVICE_NODE_PARAMS =
   process.env.WAKU_SERVICE_NODE_PARAMS ?? undefined;
 const NODE_READY_LOG_LINE = "Node setup complete";
 
-const DOCKER_IMAGE_NAME =
+const DOCKER_IMAGE_NAME = process.env.WAKUNODE_IMAGE || "wakuorg/nwaku:v0.20.0";
-  process.env.WAKUNODE_IMAGE || "statusteam/nim-waku:v0.20.0";
 
 const isGoWaku = DOCKER_IMAGE_NAME.includes("go-waku");
 

packages/tests/src/run-tests.js

@@ -3,8 +3,7 @@ import { promisify } from "util";
 
 const execAsync = promisify(exec);
 
-const WAKUNODE_IMAGE =
+const WAKUNODE_IMAGE = process.env.WAKUNODE_IMAGE || "wakuorg/nwaku:v0.20.0";
-  process.env.WAKUNODE_IMAGE || "statusteam/nim-waku:v0.20.0";
 
 async function main() {
   try {