From 6b3718586ca90ee1011dcbc1c6d0deea5fc6737b Mon Sep 17 00:00:00 2001
From: Alvaro Revuelta <alvrevuelta@gmail.com>
Date: Thu, 14 Mar 2024 11:28:47 +0100
Subject: [PATCH] Cleanup flags (#76)

---
 .env.example |  3 +--
 ADVANCED.md  |  1 -
 run_node.sh  | 14 --------------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/.env.example b/.env.example
index afb6987..b670433 100644
--- a/.env.example
+++ b/.env.example
@@ -15,5 +15,4 @@ NWAKU_IMAGE=
 NODEKEY=
 DOMAIN=
 EXTRA_ARGS=
-RLN_RELAY_CONTRACT_ADDRESS=
-STORAGE_SIZE=
\ No newline at end of file
+STORAGE_SIZE=
diff --git a/ADVANCED.md b/ADVANCED.md
index ffa1ed4..21faf2c 100644
--- a/ADVANCED.md
+++ b/ADVANCED.md
@@ -9,7 +9,6 @@ There are multiple environment variables you can configure to modify behaviour o
 * `NWAKU_IMAGE` - the image you want to use for the nwaku container (e.g. `NWAKU_IMAGE=statusteam/nim-waku:v0.19.0-rc.0`). You can see the available tags in [docker hub](https://hub.docker.com/r/waku-org/nwaku).
 * `DOMAIN` - domain name pointing to the IP address of your node, when configured the run script will request SSL certs from Let's Encrypt and run Waku node with WebSockets Secure (WSS) options enabled (e.g. `DOMAIN=waku.example.com`)
 * `NODEKEY` - this env variable allows you to provide a node key as described in [operators documentation](https://github.com/waku-org/nwaku/blob/master/docs/operators/how-to/configure-key.md) (e.g. `NODEKEY=9f439983aa4851346cfe6e17585e426f482871a43626812e23490895cd602c11`)
-* `RLN_RELAY_CONTRACT_ADDRESS` - address of the RLN Relay Contract. It defaults to a Sepolia testnet address
 * `ETH_CLIENT_ADDRESS` (**mandatory**) - URL to an HTTP Ethereum node URL on the same network as the contract address. If you're not running your own node, you can get the URL at Infura with the following [instructions](https://docs.infura.io/networks/ethereum/how-to/choose-a-network)
 * `RLN_RELAY_CRED_PATH` - path for peristing rln-relay credential
 * `RLN_RELAY_CRED_PASSWORD` - password for encrypting RLN credentials
diff --git a/run_node.sh b/run_node.sh
index 0bebe2d..4a3c5a0 100644
--- a/run_node.sh
+++ b/run_node.sh
@@ -61,22 +61,11 @@ fi
 
 exec /usr/bin/wakunode\
   --relay=true\
-  --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\
   --filter=true\
   --lightpush=true\
   --keep-alive=true\
   --max-connections=150\
   --cluster-id=1\
-  --discv5-bootstrap-node="enr:-QESuEC1p_s3xJzAC_XlOuuNrhVUETmfhbm1wxRGis0f7DlqGSw2FM-p2Ugl_r25UHQJ3f1rIRrpzxJXSMaJe4yk1XFSAYJpZIJ2NIJpcISygI2rim11bHRpYWRkcnO4XAArNiZub2RlLTAxLmRvLWFtczMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAZ2XwAtNiZub2RlLTAxLmRvLWFtczMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAYfQN4DgnJzkwABCAAAAAEAAgADAAQABQAGAAeJc2VjcDI1NmsxoQJATXRSRSUyTw_QLB6H_U3oziVQgNRgrXpK7wp2AMyNxYN0Y3CCdl-DdWRwgiMohXdha3UyDw"\
-  --discv5-bootstrap-node="enr:-QEkuECnZ3IbVAgkOzv-QLnKC4dRKAPRY80m1-R7G8jZ7yfT3ipEfBrhKN7ARcQgQ-vg-h40AQzyvAkPYlHPaFKk6u9uAYJpZIJ2NIJpcIQiEAFDim11bHRpYWRkcnO4bgA0Ni9ub2RlLTAxLmdjLXVzLWNlbnRyYWwxLWEud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAZ2XwA2Ni9ub2RlLTAxLmdjLXVzLWNlbnRyYWwxLWEud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAYfQN4DgnJzkwABCAAAAAEAAgADAAQABQAGAAeJc2VjcDI1NmsxoQMIJwesBVgUiBCi8yiXGx7RWylBQkYm1U9dvEy-neLG2YN0Y3CCdl-DdWRwgiMohXdha3UyDw"\
-  --discv5-bootstrap-node="enr:-QEkuEDzQyIAhs-CgBHIrJqtBv3EY1uP1Psrc-y8yJKsmxW7dh3DNcq2ergMUWSFVcJNlfcgBeVsFPkgd_QopRIiCV2pAYJpZIJ2NIJpcIQI2ttrim11bHRpYWRkcnO4bgA0Ni9ub2RlLTAxLmFjLWNuLWhvbmdrb25nLWMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAZ2XwA2Ni9ub2RlLTAxLmFjLWNuLWhvbmdrb25nLWMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAYfQN4DgnJzkwABCAAAAAEAAgADAAQABQAGAAeJc2VjcDI1NmsxoQJIN4qwz3v4r2Q8Bv8zZD0eqBcKw6bdLvdkV7-JLjqIj4N0Y3CCdl-DdWRwgiMohXdha3UyDw"\
   --discv5-discovery=true\
   --discv5-udp-port=9005\
   --discv5-enr-auto-update=True\
@@ -93,9 +82,6 @@ exec /usr/bin/wakunode\
   --nat=extip:"${MY_EXT_IP}"\
   --store=true\
   --store-message-db-url="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/postgres"\
-  --rln-relay=true\
-  --rln-relay-dynamic=true\
-  --rln-relay-eth-contract-address="${RLN_RELAY_CONTRACT_ADDRESS}"\
   --rln-relay-eth-client-address="${ETH_CLIENT_ADDRESS}"\
   --rln-relay-tree-path="/etc/rln_tree"\
   ${RLN_RELAY_CRED_PATH}\