From 5f028009ec8269819ec2a4a1b908d4601b8d8bd0 Mon Sep 17 00:00:00 2001
From: Kirill Fedoseev <k.fedoseev@innopolis.university>
Date: Wed, 4 Sep 2019 13:30:55 +0300
Subject: [PATCH] Updated demo scripts

---
 demo/clean.sh             | 23 +++++++++++++--------
 demo/start-environment.sh | 42 +++++++++++++++++++++++++++++----------
 demo/validator-demo.sh    |  9 ++++++---
 3 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/demo/clean.sh b/demo/clean.sh
index 76688e4..b6c7c54 100755
--- a/demo/clean.sh
+++ b/demo/clean.sh
@@ -4,15 +4,22 @@ set -e
 
 cd $(dirname "$0")
 
-rm -rf ganache_side_db
-rm -rf ganache_home_db
+# either development or staging
+TARGET_NETWORK=${TARGET_NETWORK:=development}
+
+echo "Cleaning $TARGET_NETWORK network"
+
+if [[ "$TARGET_NETWORK" == "development" ]]; then
+  rm -rf ganache_side_db
+  rm -rf ganache_home_db
+  mkdir ganache_side_db
+  mkdir ganache_home_db
+fi
 
 for (( I = 1; I < 4; ++I )); do
     DIRNAME="validator$I"
-    rm -rf "$DIRNAME/db"
-    rm -rf "$DIRNAME/queue"
-    rm -rf "$DIRNAME/keys"
-    mkdir "$DIRNAME/db"
-    mkdir "$DIRNAME/queue"
-    mkdir "$DIRNAME/keys"
+    rm -rf "$DIRNAME/$TARGET_NETWORK"
+    mkdir -p "$DIRNAME/$TARGET_NETWORK/db"
+    mkdir -p "$DIRNAME/$TARGET_NETWORK/queue"
+    mkdir -p "$DIRNAME/$TARGET_NETWORK/keys"
 done
diff --git a/demo/start-environment.sh b/demo/start-environment.sh
index 65182cb..a018ad6 100755
--- a/demo/start-environment.sh
+++ b/demo/start-environment.sh
@@ -41,11 +41,19 @@ deploy_token() {
   docker build -t deploy_test "$DEPLOY_DIR/deploy-test" > /dev/null 2>&1
 
   echo "Deploying"
-  TOKEN_ADDRESS=$(docker run --network blockchain_home --rm --env-file "$DEPLOY_DIR/deploy-test/.env" -e "PRIVATE_KEY=$PRIVATE_KEY_KOVAN" \
+  if [[ "$TARGET_NETWORK" == "development" ]]; then
+    TOKEN_ADDRESS=$(docker run --network blockchain_home --rm --env-file "$DEPLOY_DIR/deploy-test/.env.$TARGET_NETWORK" \
     deploy_test \
-    --network "$TARGET_NETWORK" 2>&1 \
+    --network home 2>&1 \
     | grep "contract address" \
     | awk '{print $4}')
+  else
+    TOKEN_ADDRESS=$(docker run --rm --env-file "$DEPLOY_DIR/deploy-test/.env.$TARGET_NETWORK" --env-file "$DEPLOY_DIR/.keys.$TARGET_NETWORK" \
+    deploy_test \
+    --network home 2>&1 \
+    | grep "contract address" \
+    | awk '{print $4}')
+  fi
 }
 
 deploy_bridge() {
@@ -55,11 +63,19 @@ deploy_bridge() {
   docker build -t deploy_home "$DEPLOY_DIR/deploy-home" > /dev/null 2>&1
 
   echo "Deploying"
-  BRIDGE_ADDRESS=$(docker run --network blockchain_home --rm --env-file "$DEPLOY_DIR/deploy-home/.env" -e "PRIVATE_KEY=$PRIVATE_KEY_KOVAN" \
+  if [[ "$TARGET_NETWORK" == "development" ]]; then
+    BRIDGE_ADDRESS=$(docker run --network blockchain_home --rm --env-file "$DEPLOY_DIR/deploy-home/.env.$TARGET_NETWORK" \
     deploy_home \
-    --network "$TARGET_NETWORK" 2>&1 \
+    --network home 2>&1 \
     | grep "contract address" \
     | awk '{print $4}')
+  else
+    BRIDGE_ADDRESS=$(docker run --rm --env-file "$DEPLOY_DIR/deploy-home/.env.$TARGET_NETWORK" --env-file "$DEPLOY_DIR/.keys.$TARGET_NETWORK" \
+    deploy_home \
+    --network home 2>&1 \
+    | grep "contract address" \
+    | awk '{print $4}')
+  fi
 }
 
 deploy_db() {
@@ -69,23 +85,29 @@ deploy_db() {
   docker build -t deploy_side "$DEPLOY_DIR/deploy-side" > /dev/null 2>&1
 
   echo "Deploying"
-  SHARED_DB_ADDRESS=$(docker run --network blockchain_side --rm --env-file "$DEPLOY_DIR/deploy-side/.env" -e "PRIVATE_KEY=$PRIVATE_KEY_SOKOL" \
+  if [[ "$TARGET_NETWORK" == "development" ]]; then
+    SHARED_DB_ADDRESS=$(docker run --network blockchain_side --rm --env-file "$DEPLOY_DIR/deploy-side/.env.$TARGET_NETWORK" \
     deploy_side \
-    --network "$TARGET_NETWORK" 2>&1 \
+    --network side 2>&1 \
     | grep "contract address" \
     | awk '{print $4}')
+  else
+    SHARED_DB_ADDRESS=$(docker run --rm --env-file "$DEPLOY_DIR/deploy-side/.env.$TARGET_NETWORK" --env-file "$DEPLOY_DIR/.keys.$TARGET_NETWORK" \
+    deploy_side \
+    --network side 2>&1 \
+    | grep "contract address" \
+    | awk '{print $4}')
+  fi
 }
 
 deploy_all() {
   cd "$DEPLOY_DIR"
 
-  source "$DEPLOY_DIR/.keys"
-
-  TOKEN_ADDRESS=$(source "$DEPLOY_DIR/deploy-home/.env"; echo "$TOKEN_ADDRESS")
+  TOKEN_ADDRESS=$(source "$DEPLOY_DIR/deploy-home/.env.$TARGET_NETWORK"; echo "$TOKEN_ADDRESS")
 
   if [[ "$TARGET_NETWORK" == "development" ]] || [[ "$TOKEN_ADDRESS" == "0x" ]]; then
     deploy_token
-    sed -i 's/TOKEN_ADDRESS=0x$/TOKEN_ADDRESS='"$TOKEN_ADDRESS"'/' "$DEPLOY_DIR/deploy-home/.env"
+    sed -i 's/TOKEN_ADDRESS=0x$/TOKEN_ADDRESS='"$TOKEN_ADDRESS"'/' "$DEPLOY_DIR/deploy-home/.env.$TARGET_NETWORK"
   fi
 
   deploy_bridge
diff --git a/demo/validator-demo.sh b/demo/validator-demo.sh
index c1c5d61..52e0592 100755
--- a/demo/validator-demo.sh
+++ b/demo/validator-demo.sh
@@ -3,19 +3,22 @@
 set -e
 set -o allexport
 
+# either development or staging
+TARGET_NETWORK=${TARGET_NETWORK:=development}
+
 DCU_FLAGS="--build --force-recreate"
 NAME="validator$N"
 
 cd $(dirname "$0")
 
-echo "Starting $NAME"
+echo "Starting $NAME in $TARGET_NETWORK network"
 
 mkdir -p "$NAME"
 cd "$NAME"
 
 # load private key form git ignored .keys file
-if [[ -e .keys ]]; then
-    source .keys
+if [[ "$TARGET_NETWORK" == "staging" ]]; then
+    source ".keys.$TARGET_NETWORK"
 fi
 # load env for particular environment
 source ".env.$TARGET_NETWORK"