chore: Add 23.2.0 upgrade (backport #3716) (#3717)

* chore: Add 23.2.0 upgrade (#3716)

* Add 23.2.0 upgrade

* Update previous version in upgrade test

* add ibc wasm migrate functionality

* Add test, fix b64 decoding

* Fix lints

---------

Co-authored-by: Gjermund Garaba <[email protected]>
(cherry picked from commit f24974d)

# Conflicts:
#	app/app.go

* Fix merge conflicts

---------

Co-authored-by: Eric Warehime <[email protected]>

Author: mergify[bot]

.github/workflows/test.yml

@@ -163,10 +163,10 @@ jobs:
       # the old gaiad binary version is hardcoded, need to be updated each major release.
       - name: Install Old Gaiad
         run: |
-          curl -LO https://github.com/cosmos/gaia/releases/download/v22.2.0/gaiad-v22.2.0-linux-amd64
-          chmod a+x gaiad-v22.2.0-linux-amd64
+          curl -LO https://github.com/cosmos/gaia/releases/download/v23.1.1/gaiad-v23.1.1-linux-amd64
+          chmod a+x gaiad-v23.1.1-linux-amd64
           mkdir build
-          mv ./gaiad-v22.2.0-linux-amd64 ./build/gaiadold
+          mv ./gaiad-v23.1.1-linux-amd64 ./build/gaiadold
         if: env.GIT_DIFF
       - name: Install New Gaiad
         run: |

app/app.go

@@ -74,14 +74,14 @@ import (
 	"github.com/cosmos/gaia/v23/app/keepers"
 	"github.com/cosmos/gaia/v23/app/upgrades"
 	v23 "github.com/cosmos/gaia/v23/app/upgrades/v23"
-	upgrade "github.com/cosmos/gaia/v23/app/upgrades/v23_1_1"
+	"github.com/cosmos/gaia/v23/app/upgrades/v23_2_0"
 )
 
 var (
 	// DefaultNodeHome default home directories for the application daemon
 	DefaultNodeHome string
 
-	Upgrades = []upgrades.Upgrade{v23.Upgrade, v23.RCUpgrade}
+	Upgrades = []upgrades.Upgrade{v23.Upgrade, v23.RCUpgrade, v23_2_0.Upgrade}
 )
 
 var (
@@ -377,13 +377,6 @@ func (app *GaiaApp) Name() string { return app.BaseApp.Name() }
 
 // PreBlocker application updates every pre block
 func (app *GaiaApp) PreBlocker(ctx sdk.Context, _ *abci.RequestFinalizeBlock) (*sdk.ResponsePreBlock, error) {
-	var upgradeHeight int64 = 25283301
-	if ctx.BlockHeight() == upgradeHeight {
-		err := upgrade.AuthzGrantWasmMigrate(ctx, app.AuthzKeeper, *app.GovKeeper)
-		if err != nil {
-			return nil, err
-		}
-	}
 	return app.mm.PreBlock(ctx)
 }
 

app/upgrades/v23_2_0/constants.go

@@ -0,0 +1,19 @@
+package v23_2_0 //nolint:revive
+
+import (
+	"github.com/cosmos/gaia/v23/app/upgrades"
+)
+
+const (
+	// UpgradeName defines the on-chain upgrade name.
+	UpgradeName      = "v23.2.0"
+	HexChecksum      = "b92e9904aab2292916507f0db04b7ab6d024c2fdb57a9d52e6725f69b2e684c1"
+	MigrateMsgBase64 = "eyJtaWdyYXRpb24iOnsidXBkYXRlX2ZvcmtfcGFyYW1ldGVycyI6eyJnZW5lc2lzX2ZvcmtfdmVyc2lvbiI6IjB4MDAwMDAwMDAiLCJnZW5lc2lzX3Nsb3QiOjAsImFsdGFpciI6eyJ2ZXJzaW9uIjoiMHgwMTAwMDAwMCIsImVwb2NoIjo3NDI0MH0sImJlbGxhdHJpeCI6eyJ2ZXJzaW9uIjoiMHgwMjAwMDAwMCIsImVwb2NoIjoxNDQ4OTZ9LCJjYXBlbGxhIjp7InZlcnNpb24iOiIweDAzMDAwMDAwIiwiZXBvY2giOjE5NDA0OH0sImRlbmViIjp7InZlcnNpb24iOiIweDA0MDAwMDAwIiwiZXBvY2giOjI2OTU2OH0sImVsZWN0cmEiOnsidmVyc2lvbiI6IjB4MDUwMDAwMDAiLCJlcG9jaCI6MzY0MDMyfX19fQ"
+	SignerAccount    = "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn"
+	ClientID         = "08-wasm-1369"
+)
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:          UpgradeName,
+	CreateUpgradeHandler: CreateUpgradeHandler,
+}

app/upgrades/v23_2_0/cw_ics08_wasm_eth-1.1.0.wasm.gz

@@ -0,0 +1,64 @@
+package v23_2_0 //nolint:revive
+
+import (
+	"context"
+	"encoding/base64"
+	"encoding/hex"
+
+	ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/keeper"
+	ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/types"
+
+	upgradetypes "cosmossdk.io/x/upgrade/types"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+
+	"github.com/cosmos/gaia/v23/app/keepers"
+)
+
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+	keepers *keepers.AppKeepers,
+) upgradetypes.UpgradeHandler {
+	return func(c context.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		ctx := sdk.UnwrapSDKContext(c)
+		ctx.Logger().Info("Starting module migrations...")
+
+		vm, err := mm.RunMigrations(ctx, configurator, vm)
+		if err != nil {
+			return vm, err
+		}
+
+		ctx.Logger().Info("Starting Migrate IBC Wasm...")
+		if err = MigrateIBCWasm(ctx, keepers.WasmClientKeeper, HexChecksum, MigrateMsgBase64, ClientID,
+			SignerAccount); err != nil {
+			ctx.Logger().Info("Error running migrate for IBC Wasm client", "message", err.Error())
+		}
+
+		ctx.Logger().Info("Upgrade v23.2.0 complete")
+		return vm, nil
+	}
+}
+
+func MigrateIBCWasm(ctx sdk.Context, wasmClientKeeper ibcwasmkeeper.Keeper, hexChecksum string,
+	migrateMsgB64 string, clientID string, signerAcc string,
+) error {
+	checksumBz, err := hex.DecodeString(hexChecksum)
+	if err != nil {
+		return err
+	}
+
+	migrateMsgBz, err := base64.RawStdEncoding.DecodeString(migrateMsgB64)
+	if err != nil {
+		return err
+	}
+
+	_, err = wasmClientKeeper.MigrateContract(ctx, &ibcwasmtypes.MsgMigrateContract{
+		Signer:   signerAcc,
+		ClientId: clientID,
+		Checksum: checksumBz,
+		Msg:      migrateMsgBz,
+	})
+	return err
+}

app/upgrades/v23_2_0/cw_ics08_wasm_eth-1.2.0.wasm.gz

@@ -0,0 +1,70 @@
+package v23_2_0_test
+
+import (
+	"encoding/hex"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+
+	_ "embed"
+
+	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
+
+	"github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/types"
+	clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types"
+	ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
+
+	"github.com/cosmos/gaia/v23/app/helpers"
+	"github.com/cosmos/gaia/v23/app/upgrades/v23_2_0"
+)
+
+const (
+	clientStateJSON    = `{"@type":"/ibc.lightclients.wasm.v1.ClientState","data":"eyJjaGFpbl9pZCI6MzE1MTkwOCwiZXBvY2hzX3Blcl9zeW5jX2NvbW1pdHRlZV9wZXJpb2QiOjgsImZvcmtfcGFyYW1ldGVycyI6eyJhbHRhaXIiOnsiZXBvY2giOjAsInZlcnNpb24iOiIweDIwMDAwMDM4In0sImJlbGxhdHJpeCI6eyJlcG9jaCI6MCwidmVyc2lvbiI6IjB4MzAwMDAwMzgifSwiY2FwZWxsYSI6eyJlcG9jaCI6MCwidmVyc2lvbiI6IjB4NDAwMDAwMzgifSwiZGVuZWIiOnsiZXBvY2giOjAsInZlcnNpb24iOiIweDUwMDAwMDM4In0sImVsZWN0cmEiOnsiZXBvY2giOjEsInZlcnNpb24iOiIweDYwMDAwMDM4In0sImdlbmVzaXNfZm9ya192ZXJzaW9uIjoiMHgxMDAwMDAzOCIsImdlbmVzaXNfc2xvdCI6MH0sImdlbmVzaXNfc2xvdCI6MCwiZ2VuZXNpc190aW1lIjoxNzQ0MjI4NzE4LCJnZW5lc2lzX3ZhbGlkYXRvcnNfcm9vdCI6IjB4ZDYxZWE0ODRmZWJhY2ZhZTUyOThkNTJhMmI1ODFmM2UzMDVhNTFmMzExMmE5MjQxYjk2OGRjY2YwMTlmN2IxMSIsImliY19jb21taXRtZW50X3Nsb3QiOiIweDEyNjA5NDQ0ODkyNzI5ODhkOWRmMjg1MTQ5YjVhYTFiMGY0OGYyMTM2ZDZmNDE2MTU5Zjg0MGEzZTA3NDc2MDAiLCJpYmNfY29udHJhY3RfYWRkcmVzcyI6IjB4ODk4MTRmYWU3NjBlYjViNzM5MmNiZGNiYTc1YzM1NWM0NjdiMjFkOSIsImlzX2Zyb3plbiI6ZmFsc2UsImxhdGVzdF9leGVjdXRpb25fYmxvY2tfbnVtYmVyIjozMiwibGF0ZXN0X3Nsb3QiOjMyLCJtaW5fc3luY19jb21taXR0ZWVfcGFydGljaXBhbnRzIjoxLCJzZWNvbmRzX3Blcl9zbG90Ijo2LCJzbG90c19wZXJfZXBvY2giOjgsInN5bmNfY29tbWl0dGVlX3NpemUiOjMyfQ==","checksum":"O+U+9qV98BMWnk+WmX42xg+vqqMv9jH7Brxvh7fZCW8=","latest_height":{"revision_number":"0","revision_height":"32"}}`
+	consensusStateJSON = `{"@type":"/ibc.lightclients.wasm.v1.ConsensusState","data":"eyJjdXJyZW50X3N5bmNfY29tbWl0dGVlIjp7ImFnZ3JlZ2F0ZV9wdWJrZXkiOiIweDg2MTMzNzg1Y2M1ZDIzOGFkN2I4YmI1Y2M1M2ViZmJlMzQ2NGNiYTliNjBlNGRhMTBkZTIwN2U4OGQzOTUwNTQ5ZGFkYTFjMzRmZTA1ZmVhMDI2MzFkOWM2ZGEyMTI2OSIsInB1YmtleXNfaGFzaCI6IjB4OTVhZTQyZmZlNzI5NGVlYTYxMDE1NzA2YzIzN2Q4NzAxNWVhOWE2NTZmYTUzZTk0NDJlZTBiM2Q1N2Q4NzczNiJ9LCJuZXh0X3N5bmNfY29tbWl0dGVlIjp7ImFnZ3JlZ2F0ZV9wdWJrZXkiOiIweDg2MTMzNzg1Y2M1ZDIzOGFkN2I4YmI1Y2M1M2ViZmJlMzQ2NGNiYTliNjBlNGRhMTBkZTIwN2U4OGQzOTUwNTQ5ZGFkYTFjMzRmZTA1ZmVhMDI2MzFkOWM2ZGEyMTI2OSIsInB1YmtleXNfaGFzaCI6IjB4OTVhZTQyZmZlNzI5NGVlYTYxMDE1NzA2YzIzN2Q4NzAxNWVhOWE2NTZmYTUzZTk0NDJlZTBiM2Q1N2Q4NzczNiJ9LCJzbG90IjozMiwic3RhdGVfcm9vdCI6IjB4YjgwNGMzMzkzNDJlY2FjYTAzMDQ1ZmM3YjgyYTBjNTE0ZTQ1ZWY5M2YyNjlkOThkZmUxMTZkZjhlODFiMTI3NCIsInN0b3JhZ2Vfcm9vdCI6IjB4MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMCIsInRpbWVzdGFtcCI6MTc0NDIzMDUxMH0="}`
+)
+
+var (
+	//go:embed cw_ics08_wasm_eth-1.1.0.wasm.gz
+	codeV1 []byte
+	//go:embed cw_ics08_wasm_eth-1.2.0.wasm.gz
+	codeV2 []byte
+)
+
+func TestMigrateIBCWasm(t *testing.T) {
+	gaiaApp := helpers.Setup(t)
+	ctx := gaiaApp.NewUncachedContext(true, tmproto.Header{
+		Time: time.Unix(1740829624, 0),
+	})
+
+	// Setup IBC Client
+	checksumV1, err := gaiaApp.WasmClientKeeper.StoreCode(ctx, types.NewMsgStoreCode(v23_2_0.SignerAccount, codeV1))
+	require.NoError(t, err)
+	require.NotNil(t, checksumV1)
+	hexV1Checksum := hex.EncodeToString(checksumV1.Checksum)
+
+	queryChecksumsResp, err := gaiaApp.WasmClientKeeper.Checksums(ctx, &types.QueryChecksumsRequest{})
+	require.NoError(t, err)
+	require.Len(t, queryChecksumsResp.Checksums, 1)
+	require.Equal(t, hexV1Checksum, queryChecksumsResp.Checksums[0])
+	_, err = gaiaApp.WasmClientKeeper.StoreCode(ctx, types.NewMsgStoreCode(v23_2_0.SignerAccount, codeV2))
+	require.NoError(t, err)
+
+	var clientState ibcexported.ClientState
+	err = gaiaApp.AppCodec().UnmarshalInterfaceJSON([]byte(clientStateJSON), &clientState)
+	require.NoError(t, err)
+
+	var consensusState ibcexported.ConsensusState
+	err = gaiaApp.AppCodec().UnmarshalInterfaceJSON([]byte(consensusStateJSON), &consensusState)
+	require.NoError(t, err)
+
+	createMsg, err := clienttypes.NewMsgCreateClient(clientState, consensusState, v23_2_0.SignerAccount)
+	require.NoError(t, err)
+	createClientResp, err := gaiaApp.IBCKeeper.CreateClient(ctx, createMsg)
+	require.NoError(t, err)
+	require.Equal(t, "08-wasm-0", createClientResp.ClientId)
+
+	err = v23_2_0.MigrateIBCWasm(ctx, gaiaApp.WasmClientKeeper, v23_2_0.HexChecksum, v23_2_0.MigrateMsgBase64,
+		"08-wasm-0", v23_2_0.SignerAccount)
+	require.NoError(t, err)
+}