Prepare for v16.0.4

app/app.go

@@ -893,9 +893,8 @@
 // BeginBlocker will schedule the upgrade plan and perform the state migration (if any).
 func (app *Evmos) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock {
 	// Perform any scheduled forks before executing the modules logic
-	//
-	// NOTE: there are no scheduled forks currently, uncomment when needed
-	// app.ScheduleForkUpgrade(ctx)
+
+	app.ScheduleForkUpgrade(ctx)
 
 	return app.mm.BeginBlock(ctx, req)
 }

app/forks.go

@@ -4,7 +4,12 @@
 package app
 
 import (
+	"fmt"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+	v17 "github.com/evmos/evmos/v16/app/upgrades/v17"
+	"github.com/evmos/evmos/v16/utils"
 )
 
 // ScheduleForkUpgrade executes any necessary fork logic for based upon the current
@@ -15,31 +20,33 @@
 //
 //  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(_ sdk.Context) {
-	// NOTE: there are no scheduled forks at the moment
+func (app *Evmos) ScheduleForkUpgrade(ctx sdk.Context) {
+	// Only fork on Mainnet
+	if !utils.IsMainnet(ctx.ChainID()) {
+		return
+	}
+	upgradePlan := upgradetypes.Plan{
+		Height: ctx.BlockHeight(),
+	}
+
+	// handle mainnet forks with their corresponding upgrade name and info
+	switch ctx.BlockHeight() {
+	case v17.MainnetUpgradeHeight:
+		upgradePlan.Name = v17.UpgradeName
+		upgradePlan.Info = v17.UpgradeInfo
+	default:
+		// No-op
+		return
+	}
 
-	// upgradePlan := upgradetypes.Plan{
-	//	Height: ctx.BlockHeight(),
-	// }
-	//
-	// // handle mainnet forks with their corresponding upgrade name and info
-	// switch ctx.BlockHeight() {
-	// case v16.TestnetUpgradeHeight:
-	//	upgradePlan.Name = v16.UpgradeNameTestnetRC4
-	//	upgradePlan.Info = v16.UpgradeInfo
-	// default:
-	//	// No-op
-	//	return
-	// }
-	//
-	// // schedule the upgrade plan to the current block hight, effectively performing
-	// // a hard fork that uses the upgrade handler to manage the migration.
-	// if err := app.UpgradeKeeper.ScheduleUpgrade(ctx, upgradePlan); err != nil {
-	//	panic(
-	//		fmt.Errorf(
-	//			"failed to schedule upgrade %s during BeginBlock at height %d: %w",
-	//			upgradePlan.Name, ctx.BlockHeight(), err,
-	//		),
-	//	)
-	// }
+	// schedule the upgrade plan to the current block height, effectively performing
+	// a hard fork that uses the upgrade handler to manage the migration.
+	if err := app.UpgradeKeeper.ScheduleUpgrade(ctx, upgradePlan); err != nil {
+		panic(
+			fmt.Errorf(
+				"failed to schedule upgrade %s during BeginBlock at height %d: %w",
+				upgradePlan.Name, ctx.BlockHeight(), err,
+			),
+		)
+	}
 }

app/upgrades/v17/constants.go

@@ -0,0 +1,13 @@
+// Copyright Tharsis Labs Ltd.(Evmos)
+// SPDX-License-Identifier:ENCL-1.0(https://github.com/evmos/evmos/blob/main/LICENSE)
+
+package v17
+
+const (
+	// UpgradeName is the shared upgrade plan name for mainnet
+	UpgradeName = "v17.0.0"
+	// MainnetUpgradeHeight defines the Evmos mainnet block height on which the upgrade will take place
+	MainnetUpgradeHeight = 20_101_000
+	// UpgradeInfo defines the binaries that will be used for the upgrade
+	UpgradeInfo = `'{"binaries":{"darwin/amd64":"https://github.com/evmos/evmos/releases/download/v17.0.0/evmos_17.0.0_Darwin_arm64.tar.gz","darwin/x86_64":"https://github.com/evmos/evmos/releases/download/v17.0.0/evmos_17.0.0_Darwin_x86_64.tar.gz","linux/arm64":"https://github.com/evmos/evmos/releases/download/v17.0.0/evmos_17.0.0_Linux_arm64.tar.gz","linux/amd64":"https://github.com/evmos/evmos/releases/download/v17.0.0/evmos_17.0.0_Linux_amd64.tar.gz","windows/x86_64":"https://github.com/evmos/evmos/releases/download/v17.0.0/evmos_17.0.0_Windows_x86_64.zip"}}'`
+)

app/upgrades/v17/upgrades.go

@@ -0,0 +1,21 @@
+// Copyright Tharsis Labs Ltd.(Evmos)
+// SPDX-License-Identifier:ENCL-1.0(https://github.com/evmos/evmos/blob/main/LICENSE)
+
+package v17
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+)
+
+// CreateUpgradeHandler creates an SDK upgrade handler for v17
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		// Leave modules as-is to avoid running InitGenesis.
+		return mm.RunMigrations(ctx, configurator, vm)
+	}
+}