From d9dccaf9a5d093806ca0ac5661e7ce6488b33672 Mon Sep 17 00:00:00 2001 From: Cosmic Vagabond <121588426+cosmic-vagabond@users.noreply.github.com> Date: Thu, 26 Sep 2024 17:37:02 +0200 Subject: [PATCH 1/4] ci: fix gov proposals --- .github/workflows/release.yml | 2 +- app/setup_handlers.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ddeee3407..313f567af 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,7 @@ jobs: # helper functions extract_txhash() { awk -F 'txhash: ' '/txhash:/{print $2; exit}'; } extract_proposal_id() { awk -F 'key: proposal_id|value: ' '/key: proposal_id/ { getline; gsub(/"/, "", $2); print $2; exit }'; } - extract_and_calc_upgrade_height() { awk -F'"latest_block_height":"' '{ split($2,a,"\""); print a[1]+11700; exit }'; } + extract_and_calc_upgrade_height() { awk -F'"latest_block_height":"' '{ split($2,a,"\""); print a[1]+4500; exit }'; } extract_checksum() { awk "/elysd-${{ github.ref_name }}-linux-amd64.tar.gz/ {print \$1; exit}"; } # environment variables diff --git a/app/setup_handlers.go b/app/setup_handlers.go index de093db7d..1f96d2687 100644 --- a/app/setup_handlers.go +++ b/app/setup_handlers.go @@ -13,7 +13,7 @@ import ( const ( // make sure to update these when you upgrade the version - NextVersion = "v0.46.0" + NextVersion = "v0.47.0" LocalNetVersion = "v999.999.999" ) @@ -34,9 +34,9 @@ func setUpgradeHandler(app *ElysApp) { // Add any logic here to run when the chain is upgraded to the new version - app.Logger().Info("Deleting proposals with ID < 274") + app.Logger().Info("Deleting proposals with ID < 280") store := ctx.KVStore(app.keys[govtypes.StoreKey]) - for i := uint64(1); i < 274; i++ { + for i := uint64(1); i < 280; i++ { store.Delete(govtypes.ProposalKey(i)) } } From 8bfab2324315152f5bfbc4caad8a7e446dad5697 Mon Sep 17 00:00:00 2001 From: Cosmic Vagabond <121588426+cosmic-vagabond@users.noreply.github.com> Date: Thu, 26 Sep 2024 18:33:40 +0200 Subject: [PATCH 2/4] ci: bump snap gen version --- .github/workflows/delete-branch-snapshot.yml | 2 +- .github/workflows/software-upgrade-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/delete-branch-snapshot.yml b/.github/workflows/delete-branch-snapshot.yml index 30aeb8fe5..8ea28d1fa 100644 --- a/.github/workflows/delete-branch-snapshot.yml +++ b/.github/workflows/delete-branch-snapshot.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Retrieve post upgrade snapshot generator binary run: | - POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION=v0.4.0 + POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION=v0.4.1 DOWNLOAD_URL=https://github.com/elys-network/post-upgrade-snapshot-generator/releases/download/${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION}/post-upgrade-snapshot-generator-${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION}-linux-amd64 POST_UPGRADE_SNAPSHOT_GENERATOR_PATH=/tmp/post-upgrade-snapshot-generator-${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION} curl -L $DOWNLOAD_URL -o $POST_UPGRADE_SNAPSHOT_GENERATOR_PATH && chmod +x $POST_UPGRADE_SNAPSHOT_GENERATOR_PATH diff --git a/.github/workflows/software-upgrade-test.yml b/.github/workflows/software-upgrade-test.yml index c2b550710..2c8894ba7 100644 --- a/.github/workflows/software-upgrade-test.yml +++ b/.github/workflows/software-upgrade-test.yml @@ -49,7 +49,7 @@ jobs: - name: Retrieve post upgrade snapshot generator binary run: | - POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION=v0.4.0 + POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION=v0.4.1 DOWNLOAD_URL=https://github.com/elys-network/post-upgrade-snapshot-generator/releases/download/${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION}/post-upgrade-snapshot-generator-${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION}-linux-amd64 POST_UPGRADE_SNAPSHOT_GENERATOR_PATH=/tmp/post-upgrade-snapshot-generator-${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION} curl -L $DOWNLOAD_URL -o $POST_UPGRADE_SNAPSHOT_GENERATOR_PATH && chmod +x $POST_UPGRADE_SNAPSHOT_GENERATOR_PATH From 8085d26a50fa6ea70b3351dd1a2798c6d6a85a5b Mon Sep 17 00:00:00 2001 From: Cosmic Vagabond <121588426+cosmic-vagabond@users.noreply.github.com> Date: Thu, 26 Sep 2024 19:19:05 +0200 Subject: [PATCH 3/4] ci: bump snap gen version --- .github/workflows/delete-branch-snapshot.yml | 2 +- .github/workflows/software-upgrade-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/delete-branch-snapshot.yml b/.github/workflows/delete-branch-snapshot.yml index 8ea28d1fa..cde28a08f 100644 --- a/.github/workflows/delete-branch-snapshot.yml +++ b/.github/workflows/delete-branch-snapshot.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Retrieve post upgrade snapshot generator binary run: | - POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION=v0.4.1 + POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION=v0.4.2 DOWNLOAD_URL=https://github.com/elys-network/post-upgrade-snapshot-generator/releases/download/${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION}/post-upgrade-snapshot-generator-${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION}-linux-amd64 POST_UPGRADE_SNAPSHOT_GENERATOR_PATH=/tmp/post-upgrade-snapshot-generator-${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION} curl -L $DOWNLOAD_URL -o $POST_UPGRADE_SNAPSHOT_GENERATOR_PATH && chmod +x $POST_UPGRADE_SNAPSHOT_GENERATOR_PATH diff --git a/.github/workflows/software-upgrade-test.yml b/.github/workflows/software-upgrade-test.yml index 2c8894ba7..633f09667 100644 --- a/.github/workflows/software-upgrade-test.yml +++ b/.github/workflows/software-upgrade-test.yml @@ -49,7 +49,7 @@ jobs: - name: Retrieve post upgrade snapshot generator binary run: | - POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION=v0.4.1 + POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION=v0.4.2 DOWNLOAD_URL=https://github.com/elys-network/post-upgrade-snapshot-generator/releases/download/${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION}/post-upgrade-snapshot-generator-${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION}-linux-amd64 POST_UPGRADE_SNAPSHOT_GENERATOR_PATH=/tmp/post-upgrade-snapshot-generator-${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION} curl -L $DOWNLOAD_URL -o $POST_UPGRADE_SNAPSHOT_GENERATOR_PATH && chmod +x $POST_UPGRADE_SNAPSHOT_GENERATOR_PATH From 52b6d7815db02f98c07935625b09677b218faabe Mon Sep 17 00:00:00 2001 From: Cosmic Vagabond <121588426+cosmic-vagabond@users.noreply.github.com> Date: Thu, 26 Sep 2024 20:12:11 +0200 Subject: [PATCH 4/4] ci: bump snap gen version --- .github/workflows/delete-branch-snapshot.yml | 2 +- .github/workflows/software-upgrade-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/delete-branch-snapshot.yml b/.github/workflows/delete-branch-snapshot.yml index cde28a08f..88faa3216 100644 --- a/.github/workflows/delete-branch-snapshot.yml +++ b/.github/workflows/delete-branch-snapshot.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Retrieve post upgrade snapshot generator binary run: | - POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION=v0.4.2 + POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION=v0.4.3 DOWNLOAD_URL=https://github.com/elys-network/post-upgrade-snapshot-generator/releases/download/${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION}/post-upgrade-snapshot-generator-${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION}-linux-amd64 POST_UPGRADE_SNAPSHOT_GENERATOR_PATH=/tmp/post-upgrade-snapshot-generator-${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION} curl -L $DOWNLOAD_URL -o $POST_UPGRADE_SNAPSHOT_GENERATOR_PATH && chmod +x $POST_UPGRADE_SNAPSHOT_GENERATOR_PATH diff --git a/.github/workflows/software-upgrade-test.yml b/.github/workflows/software-upgrade-test.yml index 633f09667..8575ced5a 100644 --- a/.github/workflows/software-upgrade-test.yml +++ b/.github/workflows/software-upgrade-test.yml @@ -49,7 +49,7 @@ jobs: - name: Retrieve post upgrade snapshot generator binary run: | - POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION=v0.4.2 + POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION=v0.4.3 DOWNLOAD_URL=https://github.com/elys-network/post-upgrade-snapshot-generator/releases/download/${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION}/post-upgrade-snapshot-generator-${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION}-linux-amd64 POST_UPGRADE_SNAPSHOT_GENERATOR_PATH=/tmp/post-upgrade-snapshot-generator-${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION} curl -L $DOWNLOAD_URL -o $POST_UPGRADE_SNAPSHOT_GENERATOR_PATH && chmod +x $POST_UPGRADE_SNAPSHOT_GENERATOR_PATH