chore: prepare v4.0.0-rc0 (#255)

app/app.go

@@ -95,6 +95,7 @@ import (
 	"github.com/strangelove-ventures/noble/app/upgrades/neon"
 	"github.com/strangelove-ventures/noble/app/upgrades/radon"
 	v3m1p0 "github.com/strangelove-ventures/noble/app/upgrades/v3.1.0"
+	v4m0p0rc0 "github.com/strangelove-ventures/noble/app/upgrades/v4.0.0-rc0"
 	"github.com/strangelove-ventures/noble/cmd"
 	"github.com/strangelove-ventures/noble/docs"
 	"github.com/strangelove-ventures/noble/x/blockibc"
@@ -906,6 +907,15 @@ func (app *App) setupUpgradeHandlers() {
 		),
 	)
 
+	// v4.0.0-rc0 upgrade
+	app.UpgradeKeeper.SetUpgradeHandler(
+		v4m0p0rc0.UpgradeName,
+		v4m0p0rc0.CreateUpgradeHandler(
+			app.mm,
+			app.configurator,
+		),
+	)
+
 	upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
 	if err != nil {
 		panic(fmt.Errorf("failed to read upgrade info from disk: %w", err))
@@ -927,6 +937,8 @@ func (app *App) setupUpgradeHandlers() {
 		storeLoader = argon.CreateStoreLoader(upgradeInfo.Height)
 	case argon4.UpgradeName:
 		storeLoader = argon4.CreateStoreLoader(upgradeInfo.Height)
+	case v4m0p0rc0.UpgradeName:
+		storeLoader = v4m0p0rc0.CreateStoreLoader(upgradeInfo.Height)
 	}
 
 	if storeLoader != nil {

app/upgrades/argon/store.go

@@ -3,16 +3,14 @@ package argon
 import (
 	cctptypes "github.com/circlefin/noble-cctp/x/cctp/types"
 	"github.com/cosmos/cosmos-sdk/baseapp"
-	storeTypes "github.com/cosmos/cosmos-sdk/store/types"
-	upgradeTypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )
 
 func CreateStoreLoader(upgradeHeight int64) baseapp.StoreLoader {
-	storeUpgrades := storeTypes.StoreUpgrades{
-		Added: []string{
-			cctptypes.ModuleName,
-		},
+	storeUpgrades := storetypes.StoreUpgrades{
+		Added: []string{cctptypes.ModuleName},
 	}
 
-	return upgradeTypes.UpgradeStoreLoader(upgradeHeight, &storeUpgrades)
+	return upgradetypes.UpgradeStoreLoader(upgradeHeight, &storeUpgrades)
 }

app/upgrades/v4.0.0-rc0/constants.go

@@ -0,0 +1,7 @@
+package v4m0p0rc0
+
+// UpgradeName is the name of this specific software upgrade used on-chain.
+const UpgradeName = "v4.0.0-rc0"
+
+// TestnetChainID is the Chain ID of the Noble testnet (Grand).
+const TestnetChainID = "grand-1"

app/upgrades/v4.0.0-rc0/store.go

@@ -0,0 +1,15 @@
+package v4m0p0rc0
+
+import (
+	"github.com/cosmos/cosmos-sdk/baseapp"
+	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+)
+
+func CreateStoreLoader(upgradeHeight int64) baseapp.StoreLoader {
+	storeUpgrades := storetypes.StoreUpgrades{
+		Deleted: []string{"router"},
+	}
+
+	return upgradetypes.UpgradeStoreLoader(upgradeHeight, &storeUpgrades)
+}

app/upgrades/v4.0.0-rc0/upgrade.go

@@ -0,0 +1,24 @@
+package v4m0p0rc0
+
+import (
+	"errors"
+	"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,
+	cfg module.Configurator,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		// Ensure that this upgrade is only run on Noble's testnet.
+		if ctx.ChainID() != TestnetChainID {
+			return vm, errors.New(fmt.Sprintf("%s upgrade not allowed to execute on %s chain", UpgradeName, ctx.ChainID()))
+		}
+
+		return mm.RunMigrations(ctx, cfg, vm)
+	}
+}

interchaintest/go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/ethereum/go-ethereum v1.12.2
 	github.com/gogo/protobuf v1.3.3
 	github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845
-	github.com/strangelove-ventures/interchaintest/v4 v4.0.0-20231020192006-848acaeab959
+	github.com/strangelove-ventures/interchaintest/v4 v4.0.0-20231026153934-334934f17a68
 	github.com/strangelove-ventures/noble v1.0.1-0.20230717234609-400609f26a31
 	github.com/strangelove-ventures/paramauthority v1.1.0
 	github.com/stretchr/testify v1.8.4

interchaintest/go.sum

@@ -1003,6 +1003,8 @@ github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jH
 github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q=
 github.com/strangelove-ventures/interchaintest/v4 v4.0.0-20231020192006-848acaeab959 h1:GuprrfXjcoHpwM7avAL5AmxzDc/4/t1lPtSOKtKdAOk=
 github.com/strangelove-ventures/interchaintest/v4 v4.0.0-20231020192006-848acaeab959/go.mod h1:j7cgQsflU8OWa0GNM0ZtNANlT20oQeYw2PS/gfZrN3Y=
+github.com/strangelove-ventures/interchaintest/v4 v4.0.0-20231026153934-334934f17a68 h1:f16Xo7gvZ/g3YyXsmUQBwvUcq0orQeBrIcdsyVrMrjU=
+github.com/strangelove-ventures/interchaintest/v4 v4.0.0-20231026153934-334934f17a68/go.mod h1:oEYorKX6XBoQOrkVv9uhq4X0azZbEf5Jq6h3GN8jJ2w=
 github.com/strangelove-ventures/paramauthority v1.1.0 h1:SMeG2NvoWC1sP09ouszukck7ufSu+3gv98Apd+ytQHQ=
 github.com/strangelove-ventures/paramauthority v1.1.0/go.mod h1:WZltb3MpbQo40z4eQD6oNZRpCXtxr5/7j8lbMleDFIY=
 github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=

interchaintest/upgrade_grand-1_test.go

@@ -55,6 +55,10 @@ func TestGrand1ChainUpgrade(t *testing.T) {
 		{
 			// This upgrade is only relevant to the grand-1 testnet
 			upgradeName: "v4.0.0-beta2",
+			image:       ghcrImage("v4.0.0-beta2"),
+		},
+		{
+			upgradeName: "v4.0.0-rc0",
 			image:       nobleImageInfo[0],
 			postUpgrade: testPostArgonUpgradeTestnet,
 		},

interchaintest/upgrade_noble-1_test.go

@@ -27,16 +27,16 @@ func TestNoble1ChainUpgrade(t *testing.T) {
 		{
 			upgradeName: "radon",
 			image:       ghcrImage("v3.0.0"),
+			postUpgrade: testPostRadonUpgrade,
 		},
 		{
 			upgradeName: "v3.1.0",
 			image:       ghcrImage("v3.1.0"),
-			postUpgrade: testPostRadonUpgrade,
 		},
 		{
 			upgradeName: "argon",
 			image:       nobleImageInfo[0],
-			// postUpgrade: testPostArgonUpgradeMainnet,
+			// NOTE: Add postUpgrade task once Neon mock image is created.
 		},
 	}