From 372bebab87009f93a1c86cbbc9e8c543d4487407 Mon Sep 17 00:00:00 2001
From: stubbsta <tanya.steyn22@gmail.com>
Date: Thu, 30 May 2024 14:52:09 +0200
Subject: [PATCH] deployment rln contract script updated for
 waku-rlnv2-contract repo

---
 deploy_rln_contract.sh   | 38 ++++++++++++++++++++------------------
 deploy_rlnv2_contract.sh | 40 ----------------------------------------
 docker-compose.yml       |  8 +++++---
 3 files changed, 25 insertions(+), 61 deletions(-)
 delete mode 100644 deploy_rlnv2_contract.sh

diff --git a/deploy_rln_contract.sh b/deploy_rln_contract.sh
index 850443e..0207a41 100644
--- a/deploy_rln_contract.sh
+++ b/deploy_rln_contract.sh
@@ -2,29 +2,31 @@
 
 set -e
 
-# 1. Install foundry
+# 1. Install foundry and pnpm
 curl -L https://foundry.paradigm.xyz | bash && . /root/.bashrc && foundryup && export PATH=$PATH:$HOME/.foundry/bin
 
-#. 2. Clone and build waku-rln-contract repo
-if [ -d "/waku-rln-contract" ]; then
-    echo "waku-rln-contract directory already exists."
-else
-    git clone https://github.com/waku-org/waku-rln-contract.git
+echo "installing pnpm..."
+npm install -g pnpm
+
+# 2. Clone and build the repository
+if [ ! -d "waku-rlnv2-contract" ]; then
+    git clone https://github.com/waku-org/waku-rlnv2-contract.git
 fi
 
-cd /waku-rln-contract
-git checkout rln-v2
+cd /waku-rlnv2-contract
 
+# 3. Compile
 echo "forge install..."
-forge install 
-echo "yarn install..."
-yarn install
-echo "yarn compile..."
-yarn compile
+forge install
+echo "pnpm install..."
+pnpm install
+echo "forge build..."
+forge build
 
-# 3. Create .env file with RPC_PROVIDER variable
-echo "creating .env file with RPC_PROVIDER=$RPC_URL"
-echo "RPC_PROVIDER=$RPC_URL" > .env
+# 4. Export environment variables
+export API_KEY_ETHERSCAN=123
+export RCL_URL=$RCL_URL
+export PRIVATE_KEY=$PRIVATE_KEY
 
-# 4. Deploy the contracts
-yarn deploy localhost_integration
\ No newline at end of file
+# 5. Deploy the contract
+forge script script/Deploy.s.sol:Deploy --broadcast --fork-url $RPC_URL --private-key $PRIVATE_KEY
\ No newline at end of file
diff --git a/deploy_rlnv2_contract.sh b/deploy_rlnv2_contract.sh
deleted file mode 100644
index 7c69986..0000000
--- a/deploy_rlnv2_contract.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-set -e
-
-
-
-# 2. Install pnpm
-echo "installing pnpm..."
-npm install -g -d pnpm
-# curl -L -o /usr/local/bin/pnpm https://github.com/pnpm/pnpm/releases/download/v9.1.3/pnpm-linux-x64
-# PNPM_HOME=/usr/local/bin/
-# chmod +x /usr/local/bin/pnpm
-
-# 1. Install foundry
-echo "installing foundry..."
-curl -L https://foundry.paradigm.xyz | bash && . /root/.bashrc && foundryup && export PATH=$PATH:$HOME/.foundry/bin
-
-# 3. Clone and build waku-rln-contract repo
-if [ -d "/waku-rln-contract" ]; then
-    echo "waku-rln-contract directory already exists."
-else
-    git clone https://github.com/waku-org/waku-rlnv2-contract.git
-    
-fi
-
-cd /waku-rlnv2-contract
-
-echo "forge install..."
-forge install 
-echo "pnpm install..."
-pnpm install
-echo "forge build..."
-forge build
-
-# 4. Create .env file with RPC_PROVIDER variable
-echo "creating .env file with RPC_PROVIDER=$RPC_URL"
-echo "RPC_PROVIDER=$RPC_URL" > .env
-
-# 5. Deploy the contracts
-forge script script/Deploy.s.sol --broadcast --fork-url $RPC_URL
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index af09fb8..171ad27 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,10 +20,10 @@ services:
       - anvil
         --port=8545
         --host=0.0.0.0
-        --chain-id=1337
         --accounts=${NUM_NWAKU_NODES:-5}
         --allow-origin=*
         --block-time=12
+        --chain-id=1234
         --silent
         --config-out=/shared/anvil-config.txt
     volumes:
@@ -36,12 +36,14 @@ services:
     labels:
       com.centurylinklabs.watchtower.enable: '${WATCHTOWER_ENABLED:-false}'
     environment:
+      - PRIVATE_KEY=${PRIVATE_KEY}
+      - RLNV2=${RLNV2}
       - RPC_URL=${RPC_URL:-http://foundry:8545}
     entrypoint: sh
     command:
-      - '/opt/deploy_rlnv2_contract.sh'
+      - '/opt/deploy_rln_contract.sh'
     volumes:
-      - ./deploy_rlnv2_contract.sh:/opt/deploy_rlnv2_contract.sh
+      - ./deploy_rln_contract.sh:/opt/deploy_rln_contract.sh
     depends_on:
       - foundry
     networks: