Software Upgrade v8.0.0 (#222)

* Add empty upgrade to v8.0.0

* Test xiond upgrade with IBC conformance

* Change upgrade log message

* make format && make lint

* update alpine version in dockerfile

---------

Co-authored-by: 2xburnt <[email protected]>
Co-authored-by: ash-burnt <[email protected]>

Author: 3 people

Dockerfile

@@ -1,10 +1,15 @@
 # syntax=docker/dockerfile:1
 
+ARG GO_VERSION="1.22"
+ARG ALPINE_VERSION="3.19"
+ARG BUILDPLATFORM=linux/amd64
+ARG BASE_IMAGE="golang:${GO_VERSION}-alpine${ALPINE_VERSION}"
+
 # --------------------------------------------------------
 # Builder
 # --------------------------------------------------------
 
-FROM golang:1.21-alpine3.18 AS builder
+FROM --platform=${BUILDPLATFORM} ${BASE_IMAGE} AS builder
 
 RUN apk add --no-cache \
     ca-certificates \
@@ -38,7 +43,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
 # Runner
 # --------------------------------------------------------
 
-FROM alpine:3.19.1 AS xion-base
+FROM alpine:3.19 AS xion-base
 COPY --from=builder /xion/build/xiond /usr/bin/xiond
 
 # api

app/app.go

@@ -143,7 +143,7 @@ import (
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
 	"github.com/burnt-labs/xion/app/upgrades"
-	v7 "github.com/burnt-labs/xion/app/upgrades/v7"
+	v8 "github.com/burnt-labs/xion/app/upgrades/v8"
 	owasm "github.com/burnt-labs/xion/wasmbindings"
 	"github.com/burnt-labs/xion/x/globalfee"
 	"github.com/burnt-labs/xion/x/jwk"
@@ -171,7 +171,7 @@ var (
 	// of "EnableAllProposals" (takes precedence over ProposalsEnabled)
 	// https://github.com/CosmWasm/wasmd/blob/02a54d33ff2c064f3539ae12d75d027d9c665f05/x/wasm/internal/types/proposal.go#L28-L34
 	EnableSpecificProposals = ""
-	Upgrades                = []upgrades.Upgrade{v7.Upgrade}
+	Upgrades                = []upgrades.Upgrade{v8.Upgrade}
 )
 
 // These constants are derived from the above variables.

app/upgrades/v8/constants.go

@@ -0,0 +1,18 @@
+package v8
+
+import (
+	store "github.com/cosmos/cosmos-sdk/store/types"
+
+	"github.com/burnt-labs/xion/app/upgrades"
+)
+
+const (
+	// UpgradeName defines the on-chain upgrade name.
+	UpgradeName = "v8.0.0"
+)
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:          UpgradeName,
+	CreateUpgradeHandler: CreateUpgradeHandler,
+	StoreUpgrades:        store.StoreUpgrades{},
+}

app/upgrades/v8/upgrades.go

@@ -0,0 +1,26 @@
+package v8
+
+import (
+	"fmt"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+)
+
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		ctx.Logger().Info("Starting module migrations...")
+
+		vm, err := mm.RunMigrations(ctx, configurator, vm)
+		if err != nil {
+			return vm, err
+		}
+
+		ctx.Logger().Info(fmt.Sprintf("Software Upgrade %s complete", UpgradeName))
+		return vm, err
+	}
+}

integration_tests/account_migration_test.go

@@ -7,14 +7,15 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	jwktypes "github.com/burnt-labs/xion/x/jwk/types"
-	"github.com/cosmos/cosmos-sdk/types/tx/signing"
-	authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
 	"os"
 	"path"
 	"testing"
 	"time"
 
+	jwktypes "github.com/burnt-labs/xion/x/jwk/types"
+	"github.com/cosmos/cosmos-sdk/types/tx/signing"
+	authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
+
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	xionapp "github.com/burnt-labs/xion/app"
@@ -350,7 +351,7 @@ func TestSingleAbstractAccountMigration(t *testing.T) {
 	authenticatorDetails := map[string]interface{}{}
 	authenticatorDetails["sub"] = sub
 	authenticatorDetails["aud"] = aud
-	//authenticatorDetails["id"] = 0
+	// authenticatorDetails["id"] = 0
 
 	authenticator := map[string]interface{}{}
 	authenticator["Jwt"] = authenticatorDetails

integration_tests/upgrade_ibc_test.go

@@ -22,6 +22,14 @@ import (
 	"go.uber.org/zap/zaptest"
 )
 
+const (
+	xionVersionFrom = "v7.0.0"
+	xionVersionTo   = "sha-78a78a1"
+	xionUpgradeName = "v8.0.0"
+	osmosisVersion  = "v25.1.3"
+	axelarVersion   = "v0.35.3"
+)
+
 // TestXionUpgradeIBC tests a Xion software upgrade, ensuring IBC conformance prior-to and after the upgrade.
 func TestXionUpgradeIBC(t *testing.T) {
 	t.Parallel()
@@ -59,8 +67,8 @@ func TestXionUpgradeIBC(t *testing.T) {
 			},
 			conformance:         conformance.TestChainPair,
 			upgrade:             SoftwareUpgrade,
-			upgradeName:         "v6",
-			upgradeImageVersion: "sha-f7f7132",
+			upgradeName:         xionUpgradeName,
+			upgradeImageVersion: xionVersionTo,
 		},
 		//{
 		//	name: "xion-axelar",
@@ -99,12 +107,12 @@ func ConfigureChains(t *testing.T, numFullNodes, numValidators int) []ibc.Chain
 	cf := interchaintest.NewBuiltinChainFactory(zaptest.NewLogger(t), []*interchaintest.ChainSpec{
 		{
 			Name:    "xion",
-			Version: "v0.3.8",
+			Version: xionVersionFrom,
 			ChainConfig: ibc.ChainConfig{
 				Images: []ibc.DockerImage{
 					{
 						Repository: "ghcr.io/burnt-labs/xion/xion",
-						Version:    "v0.3.8",
+						Version:    xionVersionFrom,
 						UidGid:     "1025:1025",
 					},
 				},
@@ -125,12 +133,12 @@ func ConfigureChains(t *testing.T, numFullNodes, numValidators int) []ibc.Chain
 		},
 		{
 			Name:    "osmosis",
-			Version: "v24.0.0-rc0",
+			Version: osmosisVersion,
 			ChainConfig: ibc.ChainConfig{
 				Images: []ibc.DockerImage{
 					{
 						Repository: "ghcr.io/strangelove-ventures/heighliner/osmosis",
-						Version:    "v24.0.0-rc0",
+						Version:    osmosisVersion,
 						UidGid:     "1025:1025",
 					},
 				},
@@ -148,12 +156,12 @@ func ConfigureChains(t *testing.T, numFullNodes, numValidators int) []ibc.Chain
 		},
 		{
 			Name:    "axelar",
-			Version: "v0.35.3",
+			Version: axelarVersion,
 			ChainConfig: ibc.ChainConfig{
 				Images: []ibc.DockerImage{
 					{
 						Repository: "ghcr.io/strangelove-ventures/heighliner/axelar",
-						Version:    "v0.35.3",
+						Version:    axelarVersion,
 						UidGid:     "1025:1025",
 					},
 				},

x/mint/common_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/testutil"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
+
 	// banktestutil "github.com/cosmos/cosmos-sdk/x/bank/testutil"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"