From 0428cefcd147d9ec2f7dc2cc84d52123d0bd80f1 Mon Sep 17 00:00:00 2001
From: stubbsta <tanya.steyn22@gmail.com>
Date: Wed, 5 Jun 2024 11:03:45 +0200
Subject: [PATCH] Update contract addrs, add env fields, update deployment
 command

---
 deploy_rln_contract.sh | 7 +++++--
 docker-compose.yml     | 3 ++-
 wakusim.env            | 5 ++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/deploy_rln_contract.sh b/deploy_rln_contract.sh
index 0207a41..c741b4a 100644
--- a/deploy_rln_contract.sh
+++ b/deploy_rln_contract.sh
@@ -24,9 +24,12 @@ echo "forge build..."
 forge build
 
 # 4. Export environment variables
-export API_KEY_ETHERSCAN=123
 export RCL_URL=$RCL_URL
 export PRIVATE_KEY=$PRIVATE_KEY
+export ETH_FROM=$ETH_FROM
+# Dummy values
+export API_KEY_ETHERSCAN=123
+export API_KEY_CARDONA=123
 
 # 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
+forge script script/Deploy.s.sol:Deploy --rpc-url $RPC_URL --broadcast -vv --private-key $PRIVATE_KEY --sender $ETH_FROM
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index e0df7f7..cf7b217 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -38,6 +38,7 @@ services:
     environment:
       - PRIVATE_KEY=${PRIVATE_KEY}
       - RPC_URL=${RPC_URL:-http://foundry:8545}
+      - ETH_FROM=${CONTRACT_ADDRESS}
     entrypoint: sh
     command:
       - '/opt/deploy_rln_contract.sh'
@@ -77,7 +78,7 @@ services:
     entrypoint: sh
     environment:
       - RPC_URL=${RPC_URL:-http://foundry:8545}
-      - RLN_CONTRACT_ADDRESS=0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0
+      - RLN_CONTRACT_ADDRESS=0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9
       - RLN_CREDENTIAL_PATH=/keystore.json
       - RLN_CREDENTIAL_PASSWORD=passw123
       - RLN_RELAY_MSG_LIMIT=${RLN_RELAY_MSG_LIMIT:-10}
diff --git a/wakusim.env b/wakusim.env
index f9fed4c..66450f2 100644
--- a/wakusim.env
+++ b/wakusim.env
@@ -1,5 +1,5 @@
 # Env variables for metal-01.he-eu-hel1.wakusim.misc host.
-NWAKU_IMAGE=quay.io/wakuorg/nwaku-pr:2607-rln-v2
+NWAKU_IMAGE=harbor.status.im/wakuorg/nwaku:latest
 # Network scaling.
 NUM_NWAKU_NODES=50
 # Simulation traffic.
@@ -10,6 +10,9 @@ TRAFFIC_DELAY_SECONDS=15
 WATCHTOWER_ENABLED=true
 # Anvil RPC Node external IP and port
 RPC_URL=http://foundry:8545
+# Contract-deployment
+PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
+CONTRACT_ADDRESS=0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266
 # RLNv2 limits
 RLN_RELAY_MSG_LIMIT=10
 RLN_RELAY_EPOCH_SEC=60
\ No newline at end of file