9.6 Upgrade (backport #3299) (#3304)

Co-authored-by: Kefan Cao <76069770+Kefancao@users.noreply.github.com>

Author: mergify[bot]

protocol/app/upgrades.go

@@ -3,7 +3,7 @@ package app
 import (
 	"fmt"
 
-	v_9_5 "github.com/dydxprotocol/v4-chain/protocol/app/upgrades/v9.5"
+	v_9_6 "github.com/dydxprotocol/v4-chain/protocol/app/upgrades/v9.6"
 
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -14,24 +14,22 @@ var (
 	// `Upgrades` defines the upgrade handlers and store loaders for the application.
 	// New upgrades should be added to this slice after they are implemented.
 	Upgrades = []upgrades.Upgrade{
-		v_9_5.Upgrade,
+		v_9_6.Upgrade,
 	}
 	Forks = []upgrades.Fork{}
 )
 
 // setupUpgradeHandlers registers the upgrade handlers to perform custom upgrade
 // logic and state migrations for software upgrades.
 func (app *App) setupUpgradeHandlers() {
-	if app.UpgradeKeeper.HasHandler(v_9_5.UpgradeName) {
-		panic(fmt.Sprintf("Cannot register duplicate upgrade handler '%s'", v_9_5.UpgradeName))
+	if app.UpgradeKeeper.HasHandler(v_9_6.UpgradeName) {
+		panic(fmt.Sprintf("Cannot register duplicate upgrade handler '%s'", v_9_6.UpgradeName))
 	}
 	app.UpgradeKeeper.SetUpgradeHandler(
-		v_9_5.UpgradeName,
-		v_9_5.CreateUpgradeHandler(
+		v_9_6.UpgradeName,
+		v_9_6.CreateUpgradeHandler(
 			app.ModuleManager,
 			app.configurator,
-			app.StatsKeeper,
-			app.EpochsKeeper,
 		),
 	)
 }

protocol/app/upgrades/v9.5/upgrade_container_test.go

@@ -0,0 +1,15 @@
+package v_9_6
+
+import (
+	store "cosmossdk.io/store/types"
+	"github.com/dydxprotocol/v4-chain/protocol/app/upgrades"
+)
+
+const (
+	UpgradeName = "v9.6"
+)
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:   UpgradeName,
+	StoreUpgrades: store.StoreUpgrades{},
+}

protocol/app/upgrades/v9.6/constants.go

@@ -0,0 +1,22 @@
+package v_9_6
+
+import (
+	"context"
+	"fmt"
+
+	upgradetypes "cosmossdk.io/x/upgrade/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	"github.com/dydxprotocol/v4-chain/protocol/lib"
+)
+
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+) upgradetypes.UpgradeHandler {
+	return func(ctx context.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		sdkCtx := lib.UnwrapSDKContext(ctx, "app/upgrades")
+		sdkCtx.Logger().Info(fmt.Sprintf("Running %s Upgrade...", UpgradeName))
+
+		return mm.RunMigrations(ctx, configurator, vm)
+	}
+}

protocol/app/upgrades/v9.6/upgrade.go

@@ -0,0 +1,34 @@
+package v_9_6_test
+
+import (
+	"testing"
+
+	v_9_6 "github.com/dydxprotocol/v4-chain/protocol/app/upgrades/v9.6"
+	"github.com/dydxprotocol/v4-chain/protocol/testing/containertest"
+	"github.com/dydxprotocol/v4-chain/protocol/testutil/constants"
+	"github.com/stretchr/testify/require"
+)
+
+func TestStateUpgrade(t *testing.T) {
+	testnet, err := containertest.NewTestnetWithPreupgradeGenesis()
+	require.NoError(t, err, "failed to create testnet - is docker daemon running?")
+	err = testnet.Start()
+	require.NoError(t, err)
+	defer testnet.MustCleanUp()
+	node := testnet.Nodes["alice"]
+	nodeAddress := constants.AliceAccAddress.String()
+
+	preUpgradeSetups(node, t)
+	preUpgradeChecks(node, t)
+
+	err = containertest.UpgradeTestnet(nodeAddress, t, node, v_9_6.UpgradeName)
+	require.NoError(t, err)
+
+	postUpgradeChecks(node, t)
+}
+
+func preUpgradeSetups(node *containertest.Node, t *testing.T) {}
+
+func preUpgradeChecks(node *containertest.Node, t *testing.T) {}
+
+func postUpgradeChecks(node *containertest.Node, t *testing.T) {}

protocol/app/upgrades/v9.6/upgrade_container_test.go

@@ -1 +1 @@
-v9.5
+v9.6

protocol/testing/version/VERSION_CURRENT

@@ -1 +1 @@
-v9.4.0
+v9.5.0

protocol/testing/version/VERSION_FULL_NAME_PREUPGRADE

@@ -1 +1 @@
-v9.4
+v9.5