chore(upgrade): Prepare v16-rc4 UpgradeHandler (#2188)

* add rc3 tag preparation * fix: add upgrade height for Dec 14th 2023, 10:13 AM * fix: add RC4 changes * FORMAT AND LINT * FORMAT AND LINT * Update app/upgrades/v16/upgrades.go Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com> * Update app/forks.go Co-authored-by: stepit <48993133+0xstepit@users.noreply.github.com> * update golang version in go linter * Revert "update golang version in go linter" This reverts commit 96636fd. --------- Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com> Co-authored-by: stepit <48993133+0xstepit@users.noreply.github.com> Co-authored-by: tom <tomasguerraalda@hotmail.com>
evmos · Dec 13, 2023 · dbc8053 · dbc8053
1 parent d283072
commit dbc8053
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 12 deletions.
diff --git a/app/app.go b/app/app.go
@@ -1269,7 +1269,13 @@ func (app *Evmos) setupUpgradeHandlers() {
 	// v16-rc3 upgrade handler
 	app.UpgradeKeeper.SetUpgradeHandler(
 		v16.UpgradeNameTestnetRC3,
-		v16.CreateUpgradeHandlerRC3(app.mm, app.configurator, app.AccountKeeper),
+		v16.CreateUpgradeHandlerRC3(app.mm, app.configurator),
+	)
+
+	// v16-rc4 upgrade handler
+	app.UpgradeKeeper.SetUpgradeHandler(
+		v16.UpgradeNameTestnetRC4,
+		v16.CreateUpgradeHandlerRC4(app.mm, app.configurator, app.AccountKeeper),
 	)
 
 	// When a planned update height is reached, the old binary will panic

diff --git a/app/forks.go b/app/forks.go
@@ -6,9 +6,11 @@ package app
 import (
 	"fmt"
 
+	v16 "github.com/evmos/evmos/v16/app/upgrades/v16"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
-	v16 "github.com/evmos/evmos/v16/app/upgrades/v16"
+
 	"github.com/evmos/evmos/v16/utils"
 )
 
@@ -21,7 +23,7 @@ import (
 //  1. Release a non-breaking patch version so that the chain can set the scheduled upgrade plan at upgrade-height.
 //  2. Release the software defined in the upgrade-info
 func (app *Evmos) ScheduleForkUpgrade(ctx sdk.Context) {
-	// NOTE: there are no pending mainnet hard forks
+	// NOTE: there are no mainnet forks for the existing versions
 	if utils.IsMainnet(ctx.ChainID()) {
 		return
 	}
@@ -33,7 +35,7 @@ func (app *Evmos) ScheduleForkUpgrade(ctx sdk.Context) {
 	// handle mainnet forks with their corresponding upgrade name and info
 	switch ctx.BlockHeight() {
 	case v16.TestnetUpgradeHeight:
-		upgradePlan.Name = v16.UpgradeNameTestnetRC3
+		upgradePlan.Name = v16.UpgradeNameTestnetRC4
 		upgradePlan.Info = v16.UpgradeInfo
 	default:
 		// No-op

diff --git a/app/upgrades/v16/constants.go b/app/upgrades/v16/constants.go
@@ -8,10 +8,12 @@ const (
 	UpgradeName = "v16.0.0"
 	// UpgradeNameTestnetRC2 is the shared upgrade plan name for testnet rc2 upgrade
 	UpgradeNameTestnetRC2 = "v16.0.0-rc2"
-	// UpgradeNameTestnetRC3 is the shared upgrade plan name for testnet rc3 hard-fork upgrade
+	// UpgradeNameTestnetRC3 is the shared upgrade plan name for testnet rc3 patch upgrade
 	UpgradeNameTestnetRC3 = "v16.0.0-rc3"
+	// UpgradeNameTestnetRC4 is the shared upgrade plan name for testnet rc4 hard-fork upgrade
+	UpgradeNameTestnetRC4 = "v16.0.0-rc4"
 	// TestnetUpgradeHeight defines the Evmos testnet block height on which the rc3 upgrade will take place
-	TestnetUpgradeHeight = 19450500
+	TestnetUpgradeHeight = 19465900
 	// UpgradeInfo defines the binaries that will be used for the upgrade
-	UpgradeInfo = `'{"binaries":{"darwin/amd64":"https://github.com/evmos/evmos/releases/download/v16.0.0-rc3/evmos_16.0.0-rc3_Darwin_arm64.tar.gz","darwin/x86_64":"https://github.com/evmos/evmos/releases/download/v16.0.0-rc3/evmos_16.0.0-rc3_Darwin_x86_64.tar.gz","linux/arm64":"https://github.com/evmos/evmos/releases/download/v16.0.0-rc3/evmos_16.0.0-rc3_Linux_arm64.tar.gz","linux/amd64":"https://github.com/evmos/evmos/releases/download/v16.0.0-rc3/evmos_16.0.0-rc3_Linux_amd64.tar.gz","windows/x86_64":"https://github.com/evmos/evmos/releases/download/v16.0.0-rc3/evmos_16.0.0-rc3_Windows_x86_64.zip"}}'`
+	UpgradeInfo = `'{"binaries":{"darwin/amd64":"https://github.com/evmos/evmos/releases/download/v16.0.0-rc4/evmos_16.0.0-rc4_Darwin_arm64.tar.gz","darwin/x86_64":"https://github.com/evmos/evmos/releases/download/v16.0.0-rc4/evmos_16.0.0-rc4_Darwin_x86_64.tar.gz","linux/arm64":"https://github.com/evmos/evmos/releases/download/v16.0.0-rc4/evmos_16.0.0-rc4_Linux_arm64.tar.gz","linux/amd64":"https://github.com/evmos/evmos/releases/download/v16.0.0-rc4/evmos_16.0.0-rc4_Linux_amd64.tar.gz","windows/x86_64":"https://github.com/evmos/evmos/releases/download/v16.0.0-rc4/evmos_16.0.0-rc4_Windows_x86_64.zip"}}'`
 )
diff --git a/app/upgrades/v16/upgrades.go b/app/upgrades/v16/upgrades.go
@@ -75,13 +75,20 @@ func CreateUpgradeHandlerRC2(
 func CreateUpgradeHandlerRC3(
 	mm *module.Manager,
 	configurator module.Configurator,
-	ak authkeeper.AccountKeeper,
 ) upgradetypes.UpgradeHandler {
 	return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
-		logger := ctx.Logger().With("upgrade", UpgradeNameTestnetRC3)
+		return mm.RunMigrations(ctx, configurator, vm)
+	}
+}
 
-		// Delete all RegisterIncentiveProposal types from the store
-		// DeleteRegisterIncentivesProposals(ctx, gk, logger)
+// CreateUpgradeHandlerRC4 creates an SDK upgrade handler for v16.0.0-rc4
+func CreateUpgradeHandlerRC4(
+	mm *module.Manager,
+	configurator module.Configurator,
+	ak authkeeper.AccountKeeper,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		logger := ctx.Logger().With("upgrade", UpgradeNameTestnetRC4)
 
 		// Add Burner role to fee collector
 		if err := MigrateFeeCollector(ak, ctx); err != nil {

diff --git a/x/evm/migrations/v6/types/evm.pb.go b/x/evm/migrations/v6/types/evm.pb.go