chore(upgrade): port v14.2 handler, utils and tests to v15 handler (#…

…1860)

port v14.2 handler, utils and tests to v15 handler

app/app.go

@@ -127,7 +127,6 @@ import (
 	v12 "github.com/evmos/evmos/v14/app/upgrades/v12"
 	v13 "github.com/evmos/evmos/v14/app/upgrades/v13"
 	v14 "github.com/evmos/evmos/v14/app/upgrades/v14"
-	v142 "github.com/evmos/evmos/v14/app/upgrades/v14_2"
 	v15 "github.com/evmos/evmos/v14/app/upgrades/v15"
 	v8 "github.com/evmos/evmos/v14/app/upgrades/v8"
 	v81 "github.com/evmos/evmos/v14/app/upgrades/v8_1"
@@ -1305,10 +1304,10 @@ func (app *Evmos) setupUpgradeHandlers() {
 		),
 	)
 
-	// v14.2 upgrade handler
+	// v15 upgrade handler
 	app.UpgradeKeeper.SetUpgradeHandler(
-		v142.UpgradeName,
-		v142.CreateUpgradeHandler(
+		v15.UpgradeName,
+		v15.CreateUpgradeHandler(
 			app.mm, app.configurator,
 			app.BankKeeper,
 			app.EvmKeeper,

app/upgrades/v14_2/setup_test.go → app/upgrades/v15/setup_test.go

@@ -1,6 +1,6 @@
 // Copyright Tharsis Labs Ltd.(Evmos)
 // SPDX-License-Identifier:ENCL-1.0(https://github.com/evmos/evmos/blob/main/LICENSE)
-package v142_test
+package v15_test
 
 import (
 	"testing"

app/upgrades/v15/upgrades.go

@@ -5,23 +5,58 @@ package v15
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
+	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
+	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+	v14 "github.com/evmos/evmos/v14/app/upgrades/v14"
+	"github.com/evmos/evmos/v14/utils"
+	evmkeeper "github.com/evmos/evmos/v14/x/evm/keeper"
 )
 
 // CreateUpgradeHandler creates an SDK upgrade handler for v15.0.0
 func CreateUpgradeHandler(
 	mm *module.Manager,
 	configurator module.Configurator,
+	bk bankkeeper.Keeper,
+	ek *evmkeeper.Keeper,
+	sk stakingkeeper.Keeper,
 ) upgradetypes.UpgradeHandler {
 	return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
 		logger := ctx.Logger().With("upgrade", UpgradeName)
 
-		// we are depecrating crisis module since it is not being used
-		logger.Debug("deleting feesplit module from version map...")
+		if utils.IsMainnet(ctx.ChainID()) {
+			logger.Info("migrating strategic reserves")
+			if err := v14.MigrateNativeMultisigs(
+				ctx, bk, sk, v14.NewTeamStrategicReserveAcc, v14.OldStrategicReserves...,
+			); err != nil {
+				// NOTE: log error instead of aborting the upgrade
+				logger.Error("error while migrating native multisigs", "error", err)
+			}
+		}
+
+		// Add EIP contained in Shanghai hard fork to the extra EIPs
+		// in the EVM parameters. This enables using the PUSH0 opcode and
+		// thus supports Solidity v0.8.20.
+		logger.Info("adding EIP 3855 to EVM parameters")
+		err := EnableEIPs(ctx, ek, 3855)
+		if err != nil {
+			logger.Error("error while enabling EIPs", "error", err)
+		}
+
+		// we are deprecating the crisis module since it is not being used
+		logger.Debug("deleting crisis module from version map...")
 		delete(vm, "crisis")
 
 		// Leave modules are as-is to avoid running InitGenesis.
 		logger.Debug("running module migrations ...")
 		return mm.RunMigrations(ctx, configurator, vm)
 	}
 }
+
+// EnableEIPs enables the given EIPs in the EVM parameters.
+func EnableEIPs(ctx sdk.Context, ek *evmkeeper.Keeper, eips ...int64) error {
+	evmParams := ek.GetParams(ctx)
+	evmParams.ExtraEIPs = append(evmParams.ExtraEIPs, eips...)
+
+	return ek.SetParams(ctx, evmParams)
+}

app/upgrades/v14_2/upgrades_test.go → app/upgrades/v15/upgrades_test.go

@@ -1,8 +1,8 @@
-package v142_test
+package v15_test
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	v142 "github.com/evmos/evmos/v14/app/upgrades/v14_2"
+	v15 "github.com/evmos/evmos/v14/app/upgrades/v15"
 	evmkeeper "github.com/evmos/evmos/v14/x/evm/keeper"
 	evmtypes "github.com/evmos/evmos/v14/x/evm/types"
 )
@@ -65,7 +65,7 @@ func (s *UpgradesTestSuite) TestEnableEIPs() {
 				tc.malleate(s.ctx, s.app.EvmKeeper)
 			}
 
-			err := v142.EnableEIPs(s.ctx, s.app.EvmKeeper, tc.extraEIPs...)
+			err := v15.EnableEIPs(s.ctx, s.app.EvmKeeper, tc.extraEIPs...)
 
 			if tc.expPass {
 				s.Require().NoError(err, "expected no error enabling EIPs")

app/upgrades/v14_2/utils_test.go → app/upgrades/v15/utils_test.go

@@ -1,6 +1,6 @@
 // Copyright Tharsis Labs Ltd.(Evmos)
 // SPDX-License-Identifier:ENCL-1.0(https://github.com/evmos/evmos/blob/main/LICENSE)
-package v142_test
+package v15_test
 
 import (
 	"encoding/json"