Merge pull request #18 from Kava-Labs/v0.21.1-kava

Fix evm migration issues & rewrite feemarket migration

x/evm/keeper/migrations.go

@@ -35,7 +35,7 @@ func NewMigrator(keeper Keeper, legacySubspace types.Subspace) Migrator {
 	}
 }
 
-// Migrate3to4 migrates the store from consensus version 2 to 3
+// Migrate2to3 migrates the store from consensus version 2 to 3
 func (m Migrator) Migrate2to3(ctx sdk.Context) error {
 	return v3.MigrateStore(
 		ctx,

x/evm/migrations/v3/store.go

@@ -17,6 +17,11 @@ func MigrateStore(
 	cdc codec.BinaryCodec,
 ) error {
 	var legacyParams v2types.V2Params
+	if !paramstore.HasKeyTable() {
+		ps := paramstore.WithKeyTable(v2types.ParamKeyTable())
+		paramstore = ps
+	}
+
 	paramstore.GetParamSetIfExists(ctx, &legacyParams)
 
 	// -------------------------------------------------------------------------

x/evm/module.go

@@ -62,7 +62,7 @@ func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
 
 // ConsensusVersion returns the consensus state-breaking version for the module.
 func (AppModuleBasic) ConsensusVersion() uint64 {
-	return 5
+	return ConsensusVersion
 }
 
 // DefaultGenesis returns default genesis state as raw bytes for the evm
@@ -148,7 +148,7 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
 
 	// This migration is a Kava specific migration that also includes the
 	// upstream migrations from 3 to 5.
-	err := cfg.RegisterMigration(types.ModuleName, 3, m.Migrate2to3)
+	err := cfg.RegisterMigration(types.ModuleName, 2, m.Migrate2to3)
 	if err != nil {
 		panic(err)
 	}

x/evm/types/interfaces.go

@@ -79,5 +79,7 @@ type (
 	// NOTE: This is used solely for migration of the Cosmos SDK x/params managed parameters.
 	Subspace interface {
 		GetParamSetIfExists(ctx sdk.Context, ps LegacyParams)
+		HasKeyTable() bool
+		WithKeyTable(table paramtypes.KeyTable) paramtypes.Subspace
 	}
 )

x/feemarket/keeper/migrations.go

@@ -17,7 +17,7 @@ package keeper
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	v4 "github.com/evmos/ethermint/x/feemarket/migrations/v4"
+	v3 "github.com/evmos/ethermint/x/feemarket/migrations/v3"
 	"github.com/evmos/ethermint/x/feemarket/types"
 )
 
@@ -35,7 +35,7 @@ func NewMigrator(keeper Keeper, legacySubspace types.Subspace) Migrator {
 	}
 }
 
-// Migrate3to4 migrates the store from consensus version 3 to 4
-func (m Migrator) Migrate3to4(ctx sdk.Context) error {
-	return v4.MigrateStore(ctx, m.keeper.storeKey, m.legacySubspace, m.keeper.cdc)
+// Migrate2to3 migrates the store from consensus version 2 to 3
+func (m Migrator) Migrate2to3(ctx sdk.Context) error {
+	return v3.MigrateStore(ctx, m.keeper.storeKey, m.keeper.cdc)
 }

x/feemarket/keeper/migrations_test.go

@@ -27,8 +27,8 @@ func (suite *KeeperTestSuite) TestMigrations() {
 		migrateFunc func(ctx sdk.Context) error
 	}{
 		{
-			"Run Migrate3to4",
-			migrator.Migrate3to4,
+			"Run Migrate2to3",
+			migrator.Migrate2to3,
 		},
 	}
 

x/feemarket/migrations/v4/migrate.go → x/feemarket/migrations/v3/migrate.go

@@ -7,21 +7,17 @@ import (
 	"github.com/evmos/ethermint/x/feemarket/types"
 )
 
-// MigrateStore migrates the x/evm module state from the consensus version 3 to
-// version 4. Specifically, it takes the parameters that are currently stored
-// and managed by the Cosmos SDK params module and stores them directly into the x/evm module state.
+// MigrateStore migrates the x/feemarket module state from the consensus version 2 to version 3
 func MigrateStore(
 	ctx sdk.Context,
 	storeKey storetypes.StoreKey,
-	legacySubspace types.Subspace,
 	cdc codec.BinaryCodec,
 ) error {
 	var (
 		store  = ctx.KVStore(storeKey)
-		params types.Params
+		params = types.DefaultParams()
 	)
-
-	legacySubspace.GetParamSetIfExists(ctx, &params)
+	params.NoBaseFee = true
 
 	if err := params.Validate(); err != nil {
 		return err