Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: minor fixes to stateful upgrade #1280

Merged
merged 5 commits into from
Oct 16, 2023
+4 −5
Merged

fix: minor fixes to stateful upgrade #1280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b511244
minor fixes to stateful upgrade
kevinssgh Oct 12, 2023
964062d
Merge branch 'develop' into upgrade-test-fixes
kevinssgh Oct 12, 2023
344c3c6
Merge branch 'develop' into upgrade-test-fixes
kevinssgh Oct 12, 2023
50487bb
Merge branch 'develop' into upgrade-test-fixes
kevinssgh Oct 13, 2023
cbff113
Merge branch 'develop' into upgrade-test-fixes
kevinssgh Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Dockerfile-versioned
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions contrib/localnet/orchestrator/start-upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion contrib/localnet/scripts/genesis-stateful.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading