From 51d4021e03b51f54f55635b3a9f6b9520c2dbfcb Mon Sep 17 00:00:00 2001
From: Liam <liam.icheng.lai@gmail.com>
Date: Mon, 19 Feb 2024 23:01:19 +1100
Subject: [PATCH] consistent with xinfin node repo (#435)

---
 cicd/devnet/start.sh  | 22 +++++-----------------
 cicd/mainnet/start.sh | 17 +++++------------
 cicd/testnet/start.sh | 16 +++++-----------
 3 files changed, 15 insertions(+), 40 deletions(-)

diff --git a/cicd/devnet/start.sh b/cicd/devnet/start.sh
index bd13986d32..8899d16fa2 100755
--- a/cicd/devnet/start.sh
+++ b/cicd/devnet/start.sh
@@ -1,28 +1,16 @@
 #!/bin/bash
-
-# Update AWS Max Health can resolve below issue, and it's already addressed
-# echo "Preparing to start the XDC chain, it's likely to take up to 1 minute"
-# Sleep for > 30 as we need to wait for the ECS tasks container being killed by fargate. Otherwise it will ended up with two same nodes running on a single /work/xdcchain directory
-# sleep 60
-
 if [ ! -d /work/xdcchain/XDC/chaindata ]
 then
-  # Randomly select a key from environment variable, seperated by ','
-  if test -z "$PRIVATE_KEYS" 
+  if test -z "$PRIVATE_KEY"
   then
-        echo "PRIVATE_KEYS environment variable has not been set. You need to pass at least one PK, or you can pass multiple PK seperated by ',', we will randomly choose one for you"
+        echo "PRIVATE_KEY environment variable has not been set."
         exit 1
   fi
-  IFS=', ' read -r -a private_keys <<< "$PRIVATE_KEYS"
-  private_key=${private_keys[ $RANDOM % ${#private_keys[@]} ]}
-
-  echo "${private_key}" >> /tmp/key
-  echo "Creating a new wallet"
-  wallet=$(XDC account import --password .pwd --datadir /work/xdcchain /tmp/key |  awk -F '[{}]' '{print $2}')
+  echo $PRIVATE_KEY >> /tmp/key
+  wallet=$(XDC account import --password .pwd --datadir /work/xdcchain /tmp/key | awk -v FS="({|})" '{print $2}')
   XDC --datadir /work/xdcchain init /work/genesis.json
 else
-  echo "Wallet already exist, re-use the same one"
-  wallet=$(XDC account list --datadir /work/xdcchain | head -n 1 |  awk -F '[{}]' '{print $2}')
+  wallet=$(XDC account list --datadir /work/xdcchain | head -n 1 | awk -v FS="({|})" '{print $2}')
 fi
 
 input="/work/bootnodes.list"
diff --git a/cicd/mainnet/start.sh b/cicd/mainnet/start.sh
index f6d2938a99..c9512a804c 100755
--- a/cicd/mainnet/start.sh
+++ b/cicd/mainnet/start.sh
@@ -1,23 +1,16 @@
 #!/bin/bash
-
 if [ ! -d /work/xdcchain/XDC/chaindata ]
 then
-  # Randomly select a key from environment variable, seperated by ','
-  if test -z "$PRIVATE_KEYS"
+  if test -z "$PRIVATE_KEY"
   then
-        echo "PRIVATE_KEYS environment variable has not been set. You need to pass at least one PK, or you can pass multiple PK seperated by ',', we will randomly choose one for you"
+        echo "PRIVATE_KEY environment variable has not been set."
         exit 1
   fi
-  IFS=', ' read -r -a private_keys <<< "$PRIVATE_KEYS"
-  private_key=${private_keys[ $RANDOM % ${#private_keys[@]} ]}
-
-  echo "${private_key}" >> /tmp/key
-  echo "Creating a new wallet"
-  wallet=$(XDC account import --password .pwd --datadir /work/xdcchain /tmp/key | awk -F '[{}]' '{print $2}')
+  echo $PRIVATE_KEY >> /tmp/key
+  wallet=$(XDC account import --password .pwd --datadir /work/xdcchain /tmp/key | awk -v FS="({|})" '{print $2}')
   XDC --datadir /work/xdcchain init /work/genesis.json
 else
-  echo "Wallet already exist, re-use the same one"
-  wallet=$(XDC account list --datadir /work/xdcchain | head -n 1 | awk -F '[{}]' '{print $2}')
+  wallet=$(XDC account list --datadir /work/xdcchain | head -n 1 | awk -v FS="({|})" '{print $2}')
 fi
 
 input="/work/bootnodes.list"
diff --git a/cicd/testnet/start.sh b/cicd/testnet/start.sh
index 392b55cfb0..6050ac990c 100755
--- a/cicd/testnet/start.sh
+++ b/cicd/testnet/start.sh
@@ -2,22 +2,16 @@
 
 if [ ! -d /work/xdcchain/XDC/chaindata ]
 then
-  # Randomly select a key from environment variable, seperated by ','
-  if test -z "$PRIVATE_KEYS"
+  if test -z "$PRIVATE_KEY"
   then
-        echo "PRIVATE_KEYS environment variable has not been set. You need to pass at least one PK, or you can pass multiple PK seperated by ',', we will randomly choose one for you"
+        echo "PRIVATE_KEY environment variable has not been set."
         exit 1
   fi
-  IFS=', ' read -r -a private_keys <<< "$PRIVATE_KEYS"
-  private_key=${private_keys[ $RANDOM % ${#private_keys[@]} ]}
-
-  echo "${private_key}" >> /tmp/key
-  echo "Creating a new wallet"
-  wallet=$(XDC account import --password .pwd --datadir /work/xdcchain /tmp/key | awk -F '[{}]' '{print $2}')
+  echo $PRIVATE_KEY >> /tmp/key
+  wallet=$(XDC account import --password .pwd --datadir /work/xdcchain /tmp/key | awk -v FS="({|})" '{print $2}')
   XDC --datadir /work/xdcchain init /work/genesis.json
 else
-  echo "Wallet already exist, re-use the same one"
-  wallet=$(XDC account list --datadir /work/xdcchain | head -n 1 | awk -F '[{}]' '{print $2}')
+  wallet=$(XDC account list --datadir /work/xdcchain | head -n 1 | awk -v FS="({|})" '{print $2}')
 fi
 
 input="/work/bootnodes.list"