From e2ce4d55a70bb65a03e6f4ecbddb448884c8be4f Mon Sep 17 00:00:00 2001
From: NagyZoltanPeter <113987313+NagyZoltanPeter@users.noreply.github.com>
Date: Thu, 7 Mar 2024 18:09:09 +0100
Subject: [PATCH] Update for rc test v0.26.0-rc.0

---
 docker-compose.yml |  3 +--
 register_rln.sh    |  2 +-
 run_node.sh        | 23 +++++++++++++++--------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 1b0829a..80527af 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -31,12 +31,11 @@ x-pg-exporter-env: &pg_exp_env
 # Services definitions
 services:
   nwaku:
-    image: ${NWAKU_IMAGE:-harbor.status.im/wakuorg/nwaku:v0.25.0-rc.0}
+    image: ${NWAKU_IMAGE:-harbor.status.im/wakuorg/nwaku:v0.26.0-rc.0}
     restart: on-failure
     ports:
       - 30304:30304/tcp
       - 30304:30304/udp
-      - 127.0.0.1:8545:8545/tcp
       - 9005:9005/udp
       - 127.0.0.1:8003:8003
       - 80:80 #Let's Encrypt
diff --git a/register_rln.sh b/register_rln.sh
index 870dc64..7a53b59 100755
--- a/register_rln.sh
+++ b/register_rln.sh
@@ -17,7 +17,7 @@ fi
 
 
 
-docker run -v $(pwd)/keystore:/keystore/:Z wakuorg/nwaku:v0.25.0-rc.0 generateRlnKeystore \
+docker run -v $(pwd)/keystore:/keystore/:Z wakuorg/nwaku:v0.26.0-rc.0 generateRlnKeystore \
 --rln-relay-eth-client-address=${ETH_CLIENT_ADDRESS} \
 --rln-relay-eth-private-key=${ETH_TESTNET_KEY} \
 --rln-relay-eth-contract-address=0xF471d71E9b1455bBF4b85d475afb9BB0954A29c4 \
diff --git a/run_node.sh b/run_node.sh
index 8135832..d4aa496 100644
--- a/run_node.sh
+++ b/run_node.sh
@@ -58,21 +58,27 @@ fi
 exec /usr/bin/wakunode\
   --relay=true\
   --filter=true\
+  --filternode="/dns4/node-01.do-ams3.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkykgaECHswi3YKJ5dMLbq2kPVCo89fcyTd38UcQD6ej5W"\
   --lightpush=true\
-  --rpc-admin=true\
+  --lightpushnode="/dns4/node-01.do-ams3.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkykgaECHswi3YKJ5dMLbq2kPVCo89fcyTd38UcQD6ej5W"\
   --keep-alive=true\
-  --pubsub-topic='/waku/2/default-waku/proto'\
-  --pubsub-topic='/waku/2/dev-waku/proto'\
+  --pubsub-topic=/waku/2/rs/1/0\
+  --pubsub-topic=/waku/2/rs/1/1\
+  --pubsub-topic=/waku/2/rs/1/2\
+  --pubsub-topic=/waku/2/rs/1/3\
+  --pubsub-topic=/waku/2/rs/1/4\
+  --pubsub-topic=/waku/2/rs/1/5\
+  --pubsub-topic=/waku/2/rs/1/6\
+  --pubsub-topic=/waku/2/rs/1/7\
   --max-connections=150\
-  --staticnode="/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/30303/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ"\
-  --staticnode="/dns4/node-01.gc-us-central1-a.wakuv2.test.statusim.net/tcp/30303/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS"\
-  --staticnode="/dns4/node-01.ac-cn-hongkong-c.wakuv2.test.statusim.net/tcp/30303/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm"\
+  --cluster-id=1\
+  --staticnode="/dns4/node-01.do-ams3.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkykgaECHswi3YKJ5dMLbq2kPVCo89fcyTd38UcQD6ej5W"\
+  --staticnode="/dns4/node-01.gc-us-central1-a.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAmDCp8XJ9z1ev18zuv8NHekAsjNyezAvmMfFEJkiharitG"\
+  --staticnode="/dns4/node-01.ac-cn-hongkong-c.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp"\
   --discv5-discovery=true\
   --discv5-udp-port=9005\
   --discv5-enr-auto-update=True\
   --log-level=DEBUG\
-  --rpc-port=8545\
-  --rpc-address=0.0.0.0\
   --tcp-port=30304\
   --metrics-server=True\
   --metrics-server-port=8003\
@@ -81,6 +87,7 @@ exec /usr/bin/wakunode\
   --rest-admin=true\
   --rest-address=0.0.0.0\
   --rest-port=8645\
+  --rest-allow-origin="waku-org.github.io"\
   --nat=extip:"${MY_EXT_IP}"\
   --store=true\
   --store-message-db-url="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/postgres"\