From 6f4588902f2c040d06af1a298f8e21f0ca3b1f2c Mon Sep 17 00:00:00 2001
From: stubbsta <tanya.steyn22@gmail.com>
Date: Thu, 30 May 2024 15:16:51 +0200
Subject: [PATCH] resolve conflicts after rebase

---
 docker-compose.yml | 5 ++---
 run_nwaku.sh       | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 171ad27..e0df7f7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,7 +37,6 @@ services:
       com.centurylinklabs.watchtower.enable: '${WATCHTOWER_ENABLED:-false}'
     environment:
       - PRIVATE_KEY=${PRIVATE_KEY}
-      - RLNV2=${RLNV2}
       - RPC_URL=${RPC_URL:-http://foundry:8545}
     entrypoint: sh
     command:
@@ -89,8 +88,8 @@ services:
       - ./run_nwaku.sh:/opt/run_nwaku.sh:Z
       - privatekeys-volume:/shared
     depends_on:
-      - bootstrap
-      - contract-repo-deployer
+      contract-repo-deployer:
+        condition: service_completed_successfully
     networks:
       - simulation
       
diff --git a/run_nwaku.sh b/run_nwaku.sh
index 3b5feb2..84f4bcb 100755
--- a/run_nwaku.sh
+++ b/run_nwaku.sh
@@ -102,7 +102,6 @@ else
   echo "Private key: $private_key"
 
   echo "Generating RLN keystore"
-
   /usr/bin/wakunode generateRlnKeystore \
     --rln-relay-eth-client-address="$RPC_URL" \
     --rln-relay-eth-private-key=$private_key  \