From 817cc4780e09065139de99cf3513a7968b10e80e Mon Sep 17 00:00:00 2001
From: kevinssgh <79858682+kevinssgh@users.noreply.github.com>
Date: Mon, 16 Oct 2023 16:30:24 -0400
Subject: [PATCH] minor fixes to stateful upgrade (#1280)

---
 Dockerfile-versioned                           | 1 -
 Makefile                                       | 2 +-
 contrib/localnet/orchestrator/start-upgrade.sh | 4 ++--
 contrib/localnet/scripts/genesis-stateful.sh   | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Dockerfile-versioned b/Dockerfile-versioned
index 0ec85f149e..c948817829 100644
--- a/Dockerfile-versioned
+++ b/Dockerfile-versioned
@@ -29,7 +29,6 @@ RUN cp $GOPATH/bin/smoketest $GOPATH/bin/new/
 
 # Checkout and build old binary
 RUN cd node && git checkout ${old_version}
-RUN cd node && git pull
 RUN cd node && make install
 RUN cd node && make install-smoketest
 RUN cp $GOPATH/bin/zetacored $GOPATH/bin/old/
diff --git a/Makefile b/Makefile
index 575057ef70..c5662752b0 100644
--- a/Makefile
+++ b/Makefile
@@ -222,7 +222,7 @@ stop-stress-test:
 
 stateful-upgrade:
 	@echo "--> Starting stateful smoketest"
-	$(DOCKER) build --build-arg old_version=v9.0.0-rc2 --build-arg new_version=v10.0.0 -t zetanode -f ./Dockerfile-versioned .
+	$(DOCKER) build --build-arg old_version=mock-mainnet-01-5-ga66d0b77 --build-arg new_version=v10.0.0-30 -t zetanode -f ./Dockerfile-versioned .
 	$(DOCKER) build -t orchestrator -f contrib/localnet/orchestrator/Dockerfile-upgrade.fastbuild .
 	cd contrib/localnet/ && $(DOCKER) compose -f docker-compose-stateful.yml up -d
 
diff --git a/contrib/localnet/orchestrator/start-upgrade.sh b/contrib/localnet/orchestrator/start-upgrade.sh
index b787a5b0da..a9e123ad72 100644
--- a/contrib/localnet/orchestrator/start-upgrade.sh
+++ b/contrib/localnet/orchestrator/start-upgrade.sh
@@ -29,9 +29,9 @@ if [ $SMOKETEST_EXIT_CODE -ne 0 ]; then
 fi
 
 # Restart zetaclients at upgrade height
-/work/restart-zetaclientd.sh -u 330 -n 2
+/work/restart-zetaclientd.sh -u 400 -n 2
 
-smoketest-new "$SMOKETEST_CMD" --deployed --wait-for 335
+smoketest-new "$SMOKETEST_CMD" --deployed --wait-for 405
 
 if [ $SMOKETEST_EXIT_CODE -eq 0 ]; then
   echo "smoketest passed"
diff --git a/contrib/localnet/scripts/genesis-stateful.sh b/contrib/localnet/scripts/genesis-stateful.sh
index 5f9f293f1b..ff3a0b4646 100755
--- a/contrib/localnet/scripts/genesis-stateful.sh
+++ b/contrib/localnet/scripts/genesis-stateful.sh
@@ -174,7 +174,7 @@ echo
 
 if [ $HOSTNAME = "zetacore0" ]
 then
-/root/.zetacored/zetavisor/current/bin/zetacored tx gov submit-legacy-proposal software-upgrade $UpgradeName --from hotkey --deposit 100000000azeta --upgrade-height 320 --title $UpgradeName --description $UpgradeName --keyring-backend test --chain-id $CHAINID --yes --no-validate --fees=200azeta --broadcast-mode block
+/root/.zetacored/zetavisor/current/bin/zetacored tx gov submit-legacy-proposal software-upgrade $UpgradeName --from hotkey --deposit 100000000azeta --upgrade-height 400 --title $UpgradeName --description $UpgradeName --keyring-backend test --chain-id $CHAINID --yes --no-validate --fees=200azeta --broadcast-mode block
 fi
 
 sleep 8