From 2fcaf522e6453f064ed77dd85a2e07d98534b9db Mon Sep 17 00:00:00 2001
From: Cosmic Vagabond <121588426+cosmic-vagabond@users.noreply.github.com>
Date: Wed, 7 Aug 2024 11:34:52 +0200
Subject: [PATCH] ci: fix gov proposals in testnet (#699)

---
 app/setup_handlers.go | 49 ++++++-------------------------------------
 1 file changed, 6 insertions(+), 43 deletions(-)

diff --git a/app/setup_handlers.go b/app/setup_handlers.go
index 2d9d13b41..6ece60a69 100644
--- a/app/setup_handlers.go
+++ b/app/setup_handlers.go
@@ -3,12 +3,11 @@ package app
 import (
 	"fmt"
 
-	wasmmodule "github.com/CosmWasm/wasmd/x/wasm"
-	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	m "github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/version"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )
 
@@ -24,50 +23,14 @@ func setUpgradeHandler(app *ElysApp) {
 		func(ctx sdk.Context, plan upgradetypes.Plan, vm m.VersionMap) (m.VersionMap, error) {
 			app.Logger().Info("Running upgrade handler for " + version.Version)
 
-			if version.Version == "v0.40.0" || version.Version == "v999.999.999" {
-				// Retrieve the wasm module store key
-				storeKey := app.keys[wasmmodule.StoreKey]
+			if version.Version == "v0.41.0" || version.Version == "v999.999.999" {
 
-				// Retrieve the wasm module store
-				store := ctx.KVStore(storeKey)
-
-				// List of prefixes to clear
-				prefixes := [][]byte{
-					wasmtypes.GetContractStorePrefix(sdk.MustAccAddressFromBech32("elys1s37xz7tzrru2cpl96juu9lfqrsd4jh73j9slyv440q5vttx2uyesetjpne")), // AH
-					wasmtypes.GetContractStorePrefix(sdk.MustAccAddressFromBech32("elys1g2xwx805epc897rwyrykskjque07yxfmc4qq2p4ef5dwd6znl30qnxje76")), // FS
-					wasmtypes.GetContractAddressKey(sdk.MustAccAddressFromBech32("elys1s37xz7tzrru2cpl96juu9lfqrsd4jh73j9slyv440q5vttx2uyesetjpne")),  // AH
-					wasmtypes.GetContractAddressKey(sdk.MustAccAddressFromBech32("elys1g2xwx805epc897rwyrykskjque07yxfmc4qq2p4ef5dwd6znl30qnxje76")),  // FS
-					wasmtypes.GetContractAddressKey(sdk.MustAccAddressFromBech32("elys1x8gwn06l85q0lyncy7zsde8zzdn588k2dck00a8j6lkprydcutwqa9tv6n")),  // old contract
-					wasmtypes.GetContractAddressKey(sdk.MustAccAddressFromBech32("elys1657pee2jhf4jk8pq6yq64e758ngvum45gl866knmjkd83w6jgn3s923j5j")),  // old contract
-					wasmtypes.GetContractAddressKey(sdk.MustAccAddressFromBech32("elys1xhcxq4fvxth2hn3msmkpftkfpw73um7s4et3lh4r8cfmumk3qsmsmgjjrc")),  // old contract
-					wasmtypes.GetContractAddressKey(sdk.MustAccAddressFromBech32("elys1wr6vc3g4caz9aclgjacxewr0pjlre9wl2uhq73rp8mawwmqaczsq3ppn83")),  // old contract
-					wasmtypes.GetContractAddressKey(sdk.MustAccAddressFromBech32("elys15m728qxvtat337jdu2f0uk6pu905kktrxclgy36c0wd822tpxcmqfzew4d")),  // old contract
-					wasmtypes.GetContractAddressKey(sdk.MustAccAddressFromBech32("elys1ul4msjc3mmaxsscdgdtjds85rg50qrepvrczp0ldgma5mm9xv8yqxhk8nu")),  // old contract
-					wasmtypes.GetContractAddressKey(sdk.MustAccAddressFromBech32("elys1mx32w9tnfxv0z5j000750h8ver7qf3xpj09w3uzvsr3hq68f4hxqte4gam")),  // old contract
-					wasmtypes.GetContractAddressKey(sdk.MustAccAddressFromBech32("elys14zykjnz94dr9nj4v2yzpvnlrw5uurk5h7d5w0wug902vxdynm6xsue684e")),  // old contract
-					wasmtypes.GetContractAddressKey(sdk.MustAccAddressFromBech32("elys175r6y463k8cdcte6dzrxydxnwfkhz9afdghzcjxxhzfmm6rgu64qdp9z37")),  // old contract
-					wasmtypes.GetContractAddressKey(sdk.MustAccAddressFromBech32("elys1jyhyqjxf3pc7vzwyqhwe53up5pj0e53zw3xu2589uqgkvqngswnqtxfw4e")),  // old contract
-					wasmtypes.GetContractAddressKey(sdk.MustAccAddressFromBech32("elys14see2dq4nu37yk9qhjn2laqxrmzzjyxwhfgnxw4nuzpm7vc6ztysxjv4p5")),  // old contract
-					wasmtypes.GetContractAddressKey(sdk.MustAccAddressFromBech32("elys15qe27v4z7j78g5g4ak2ftftky3c078zvtr9qtv5lhxwc54ccf4asggmyyp")),  // old contract
-					wasmtypes.GetContractAddressKey(sdk.MustAccAddressFromBech32("elys193dzg6ealfymax4pyrkge60swlr2tjupwegdemgalzhkkxc8kzyqh5qw9c")),  // old contract
-				}
-
-				// Add old code keys to the list of prefixes to clear
-				for i := uint64(675); i < 680; i++ {
-					codeKey := wasmtypes.GetCodeKey(i)
-					// append the code key to the prefixes
-					prefixes = append(prefixes, codeKey)
+				app.Logger().Info("Deleting proposals with ID < 258")
+				store := ctx.KVStore(app.keys[govtypes.StoreKey])
+				for i := uint64(1); i < 258; i++ {
+					store.Delete(govtypes.ProposalKey(i))
 				}
 
-				// Clear all keys in the store
-				for _, prefix := range prefixes {
-					iter := sdk.KVStorePrefixIterator(store, prefix)
-					defer iter.Close()
-
-					for ; iter.Valid(); iter.Next() {
-						store.Delete(iter.Key())
-					}
-				}
 			}
 
 			return app.mm.RunMigrations(ctx, app.configurator, vm)