added zetaclient restart script

Dockerfile-versioned

@@ -17,19 +17,21 @@ RUN mkdir -p  $GOPATH/bin/new
 
 ENV NEW_VERSION=${new_version}
 
-# Checkout and build base binary
+# Checkout and build new binary
 RUN git clone https://github.com/zeta-chain/node.git
 RUN cd node && git fetch
-RUN cd node && git checkout ${old_version}
+RUN cd node && git checkout ${new_version}
 RUN cd node && go mod download
 RUN cd node && make install
-RUN cp $GOPATH/bin/zetacored $GOPATH/bin/old/
+RUN cp $GOPATH/bin/zetacored $GOPATH/bin/new/
+RUN cp $GOPATH/bin/zetaclientd $GOPATH/bin/new/
 
-# Checkout and build new binary
-RUN cd node && git checkout ${new_version}
+# Checkout and build old binary
+RUN cd node && git checkout ${old_version}
 RUN cd node && go mod download
 RUN cd node && make install
-RUN cp $GOPATH/bin/zetacored $GOPATH/bin/new/
+RUN cp $GOPATH/bin/zetacored $GOPATH/bin/old/
+RUN cp $GOPATH/bin/zetaclientd $GOPATH/bin/old/
 
 RUN cd node && git checkout stateful-upgrade
 RUN cd node && git pull

contrib/localnet/docker-compose-stateful.yml

@@ -47,7 +47,7 @@ services:
     networks:
       mynetwork:
         ipv4_address: 172.20.0.21
-    entrypoint: /root/start-zetaclientd-genesis.sh
+    entrypoint: /root/start-zetaclientd-background.sh
     environment:
       - ETHDEV_ENDPOINT=http://eth:8545
 
@@ -61,7 +61,7 @@ services:
     networks:
       mynetwork:
         ipv4_address: 172.20.0.22
-    entrypoint: /root/start-zetaclientd-genesis.sh
+    entrypoint: /root/start-zetaclientd-background.sh
     environment:
       - ETHDEV_ENDPOINT=http://eth:8545
 

contrib/localnet/orchestrator/Dockerfile

@@ -2,7 +2,7 @@ FROM zetanode:latest as zeta
 FROM ethereum/client-go:v1.10.26 as geth
 FROM golang:1.20-alpine as orchestrator
 
-RUN apk --no-cache add jq curl bash make git build-base
+RUN apk --no-cache add jq curl bash make git build-base openssh
 
 COPY --from=zeta /usr/local/bin/zetacored /usr/local/bin/
 COPY --from=zeta /usr/local/bin/zetaclientd /usr/local/bin/
@@ -13,6 +13,7 @@ COPY --from=zeta /root/.ssh/localtest.pem /root/.ssh/localtest.pem
 
 COPY contrib/localnet/orchestrator/start.sh /work/
 COPY contrib/localnet/orchestrator/start-upgrade.sh /work/
+COPY contrib/localnet/orchestrator/restart-zetaclientd.sh /work/
 RUN chmod +x /work/*.sh
 
 ENV GOPATH /go

contrib/localnet/orchestrator/Dockerfile.fastbuild

@@ -2,7 +2,7 @@ FROM zetanode:latest as zeta
 FROM ethereum/client-go:v1.10.26 as geth
 FROM golang:1.20-alpine as orchestrator
 
-RUN apk --no-cache add jq curl bash make git build-base
+RUN apk --no-cache add jq curl bash make git build-base openssh
 
 COPY --from=zeta /usr/local/bin/zetacored /usr/local/bin/
 COPY --from=zeta /usr/local/bin/zetaclientd /usr/local/bin/
@@ -13,6 +13,7 @@ COPY --from=zeta /root/.ssh/localtest.pem /root/.ssh/localtest.pem
 
 COPY contrib/localnet/orchestrator/start.sh /work/
 COPY contrib/localnet/orchestrator/start-upgrade.sh /work/
+COPY contrib/localnet/orchestrator/restart-zetaclientd.sh /work/
 RUN chmod +x /work/*.sh
 
 

contrib/localnet/scripts/restart-zetaclientd.sh → contrib/localnet/orchestrator/restart-zetaclientd.sh

@@ -18,18 +18,29 @@ do
    esac
 done
 
+# generate node list
+START=1
+END=$((NUM_OF_NODES - 1))
+
+CLIENT_LIST=()
+for i in $(eval echo "{$START..$END}")
+do
+  CLIENT_LIST+=("zetaclient$i")
+done
+
 echo "$UPGRADE_HEIGHT"
 
 CURRENT_HEIGHT=0
 
-while [ $CURRENT_HEIGHT -lt "$UPGRADE_HEIGHT" ]
+while [[ $CURRENT_HEIGHT -lt $UPGRADE_HEIGHT ]]
 do
-    CURRENT_HEIGHT=$(curl localhost:26657/status | jq '.result.sync_info.latest_block_height' )
+    CURRENT_HEIGHT=$(curl zetacore0:26657/status | jq '.result.sync_info.latest_block_height' | tr -d '"')
+    sleep 5
 done
 
-for i in {$NUM_OF_NODES}
-do
-    ssh "zetaclient$i" "killall zetaclientd; zetaclientd start > $HOME/zetaclient.log 2>&1 &"
+echo current height is "$CURRENT_HEIGHT", restarting zetaclients
+for NODE in "${NODELIST[@]}"; do
+    ssh $NODE "killall zetaclientd; $GOPATH/bin/new/zetaclientd start > $HOME/zetaclient.log 2>&1 &"
 done
 
 

contrib/localnet/orchestrator/start-upgrade.sh

@@ -28,7 +28,10 @@ if [ $SMOKETEST_EXIT_CODE -ne 0 ]; then
   exit 1
 fi
 
-smoketest "$SMOKETEST_CMD" --deployed --wait-for 325
+# Restart zetaclients at upgrade height
+/work/restart-zetaclientd.sh -u 330 -n 2
+
+smoketest "$SMOKETEST_CMD" --deployed --wait-for 335
 
 if [ $SMOKETEST_EXIT_CODE -eq 0 ]; then
   echo "smoketest passed"

contrib/localnet/scripts/genesis-stateful.sh

@@ -165,7 +165,7 @@ chmod +x $DAEMON_HOME/zetavisor/upgrades/$UpgradeName/bin/zetacored
 
 # 7 Start the nodes
 zetavisor start --pruning=nothing --minimum-gas-prices=0.0001azeta --json-rpc.api eth,txpool,personal,net,debug,web3,miner --api.enable --home /root/.zetacored >> zetanode.log 2>&1  &
-sleep 10
+sleep 20
 echo
 
 if [ $HOSTNAME = "zetacore0" ]

contrib/localnet/scripts/start-zetaclientd-background.sh

@@ -32,4 +32,5 @@ else
   zetaclientd start > $HOME/zetaclient.log 2>&1 &
 fi
 
+sleep 3
 tail -f $HOME/zetaclient.log