From 115cdd28fe81c957f2aaa235241c0e2a6e23e63f Mon Sep 17 00:00:00 2001 From: Arseniy Klempner Date: Mon, 27 Oct 2025 17:02:48 -0700 Subject: [PATCH] chore: update hardcoded version of nwaku to 0.36.0, remove unused ci job (#2710) * fix: update hardcoded version of nwaku to 0.36.0 * fix: remove unused/outdated rln-sync-tree job --- .github/workflows/ci.yml | 51 +------------------ package.json | 3 +- packages/reliability-tests/src/run-tests.js | 2 +- packages/tests/src/lib/service_node.ts | 2 +- packages/tests/src/run-tests.js | 2 +- packages/tests/src/sync-rln-tree.js | 56 --------------------- 6 files changed, 6 insertions(+), 110 deletions(-) delete mode 100644 packages/tests/src/sync-rln-tree.js diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8fa6efcb79..07654a4a3b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,65 +71,18 @@ jobs: - run: npm run build:esm - run: npm run test:browser - build_rln_tree: - if: false # This condition disables the job - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - repository: waku-org/js-waku - - uses: actions/setup-node@v3 - with: - node-version: ${{ env.NODE_JS }} - - name: Check for existing RLN tree artifact - id: check-artifact - uses: actions/github-script@v6 - with: - script: | - const artifact = await github.rest.actions.listWorkflowRunArtifacts({ - owner: context.repo.owner, - repo: context.repo.repo, - run_id: context.runId - }); - console.log(artifact); - const foundArtifact = artifact.data.artifacts.find(art => art.name === 'rln_tree.tar.gz'); - if (foundArtifact) { - core.setOutput('artifact_id', foundArtifact.id); - core.setOutput('artifact_found', 'true'); - } else { - core.setOutput('artifact_found', 'false'); - } - - name: Download RLN tree artifact - if: steps.check-artifact.outputs.artifact_found == 'true' - uses: actions/download-artifact@v4 - with: - name: rln_tree.tar.gz - path: /tmp - - uses: ./.github/actions/npm - - name: Sync rln tree and save artifact - run: | - mkdir -p /tmp/rln_tree.db - npm run build:esm - npm run sync-rln-tree - tar -czf rln_tree.tar.gz -C /tmp/rln_tree.db . - - name: Upload artifact - uses: actions/upload-artifact@v4 - with: - name: rln_tree.tar.gz - path: rln_tree.tar.gz - node: uses: ./.github/workflows/test-node.yml secrets: inherit with: - nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'wakuorg/nwaku:v0.35.1' }} + nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'wakuorg/nwaku:v0.36.0' }} test_type: node allure_reports: true node_optional: uses: ./.github/workflows/test-node.yml with: - nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'wakuorg/nwaku:v0.35.1' }} + nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'wakuorg/nwaku:v0.36.0' }} test_type: node-optional node_with_nwaku_master: diff --git a/package.json b/package.json index 02a8034760..feb7dad361 100644 --- a/package.json +++ b/package.json @@ -45,8 +45,7 @@ "doc": "run-s doc:*", "doc:html": "typedoc --options typedoc.cjs", "doc:cname": "echo 'js.waku.org' > docs/CNAME", - "publish": "node ./ci/publish.js", - "sync-rln-tree": "node ./packages/tests/src/sync-rln-tree.js" + "publish": "node ./ci/publish.js" }, "devDependencies": { "@size-limit/preset-big-lib": "^11.0.2", diff --git a/packages/reliability-tests/src/run-tests.js b/packages/reliability-tests/src/run-tests.js index 7de7da2253..4086255552 100644 --- a/packages/reliability-tests/src/run-tests.js +++ b/packages/reliability-tests/src/run-tests.js @@ -3,7 +3,7 @@ import { promisify } from "util"; const execAsync = promisify(exec); -const WAKUNODE_IMAGE = process.env.WAKUNODE_IMAGE || "wakuorg/nwaku:v0.35.1"; +const WAKUNODE_IMAGE = process.env.WAKUNODE_IMAGE || "wakuorg/nwaku:v0.36.0"; async function main() { try { diff --git a/packages/tests/src/lib/service_node.ts b/packages/tests/src/lib/service_node.ts index f16fad2a19..7e089c804d 100644 --- a/packages/tests/src/lib/service_node.ts +++ b/packages/tests/src/lib/service_node.ts @@ -34,7 +34,7 @@ const WAKU_SERVICE_NODE_PARAMS = const NODE_READY_LOG_LINE = "Node setup complete"; export const DOCKER_IMAGE_NAME = - process.env.WAKUNODE_IMAGE || "wakuorg/nwaku:v0.35.1"; + process.env.WAKUNODE_IMAGE || "wakuorg/nwaku:v0.36.0"; const LOG_DIR = "./log"; diff --git a/packages/tests/src/run-tests.js b/packages/tests/src/run-tests.js index 91ec65dc7b..dd97dd36e9 100644 --- a/packages/tests/src/run-tests.js +++ b/packages/tests/src/run-tests.js @@ -3,7 +3,7 @@ import { promisify } from "util"; const execAsync = promisify(exec); -const WAKUNODE_IMAGE = process.env.WAKUNODE_IMAGE || "wakuorg/nwaku:v0.35.1"; +const WAKUNODE_IMAGE = process.env.WAKUNODE_IMAGE || "wakuorg/nwaku:v0.36.0"; async function main() { try { diff --git a/packages/tests/src/sync-rln-tree.js b/packages/tests/src/sync-rln-tree.js deleted file mode 100644 index 6939c1141e..0000000000 --- a/packages/tests/src/sync-rln-tree.js +++ /dev/null @@ -1,56 +0,0 @@ -import { exec } from "child_process"; -import { setTimeout } from "timers"; -import { promisify } from "util"; - -import { SEPOLIA_RPC_URL } from "./constants.js"; -import { ServiceNode } from "./lib/index.js"; - -const execAsync = promisify(exec); - -const WAKUNODE_IMAGE = process.env.WAKUNODE_IMAGE || "wakuorg/nwaku:v0.35.1"; -const containerName = "rln_tree"; - -async function syncRlnTree() { - try { - await execAsync(`docker inspect ${WAKUNODE_IMAGE}`); - console.log(`Using local image ${WAKUNODE_IMAGE}`); - } catch (error) { - console.log(`Pulling image ${WAKUNODE_IMAGE}`); - await execAsync(`docker pull ${WAKUNODE_IMAGE}`); - console.log("Image pulled"); - } - - const nwaku = new ServiceNode(containerName); - await nwaku.start( - { - store: false, - lightpush: false, - relay: true, - filter: false, - rest: true, - clusterId: 1, - rlnRelayEthClientAddress: SEPOLIA_RPC_URL - }, - { retries: 3 } - ); - let healthy = false; - while (!healthy) { - healthy = await nwaku.healthy(); - await new Promise((resolve) => setTimeout(resolve, 500)); - } - - await execAsync( - `docker cp ${nwaku.containerName}:/rln_tree.db /tmp/rln_tree.db` - ); - await nwaku.stop(); -} - -syncRlnTree() - .then(() => { - console.log("Synced RLN tree"); - process.exit(0); - }) - .catch((err) => { - console.error(`Error syncing RLN tree: ${err}`); - process.exit(1); - });