From c92dc5fb3b15e8a62a3fcf8b7c53cfb3ce940119 Mon Sep 17 00:00:00 2001
From: Philip Su <philip.su.522@gmail.com>
Date: Mon, 20 May 2024 10:48:27 -0700
Subject: [PATCH] v5.5.1 & v5.5.2 release (#1685)

* Add v5.5.0 release

* add evm migration

* Add v5.5.2
---
 CHANGELOG.md         | 3 +++
 app/app.go           | 2 +-
 app/upgrades.go      | 3 +++
 x/evm/module.go      | 6 +++++-
 x/evm/module_test.go | 2 +-
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8bf79f596..133e04a12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,9 @@ Ref: https://keepachangelog.com/en/1.0.0/
 -->
 
 # Changelog
+## v5.5.2
+sei-chain
+* [#1685](https://github.com/sei-protocol/sei-chain/pull/1685) Add EVM support to v5.5.2
 ## v5.4.0
 sei-chain
 * [#1671](https://github.com/sei-protocol/sei-chain/pull/1671) Update and fixes to ERC721 contract
diff --git a/app/app.go b/app/app.go
index dc635a318..8315f2317 100644
--- a/app/app.go
+++ b/app/app.go
@@ -1006,7 +1006,7 @@ func (app *App) SetStoreUpgradeHandlers() {
 		app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades))
 	}
 
-	if upgradeInfo.Name == "v5.1.0" && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
+	if (upgradeInfo.Name == "v5.1.0" || upgradeInfo.Name == "v5.5.2") && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
 		storeUpgrades := storetypes.StoreUpgrades{
 			Added: []string{evmtypes.StoreKey},
 		}
diff --git a/app/upgrades.go b/app/upgrades.go
index af543e5e4..2a49f9acd 100644
--- a/app/upgrades.go
+++ b/app/upgrades.go
@@ -98,6 +98,9 @@ var upgradesList = []string{
 	"v5.2.2",
 	"v5.3.0",
 	"v5.4.0",
+	"v5.5.0",
+	"v5.5.1",
+	"v5.5.2",
 }
 
 // if there is an override list, use that instead, for integration tests
diff --git a/x/evm/module.go b/x/evm/module.go
index aca99e0c9..ac787ca5b 100644
--- a/x/evm/module.go
+++ b/x/evm/module.go
@@ -151,6 +151,10 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
 	_ = cfg.RegisterMigration(types.ModuleName, 6, func(ctx sdk.Context) error {
 		return migrations.StoreCWPointerCode(ctx, am.keeper, false, true)
 	})
+
+	_ = cfg.RegisterMigration(types.ModuleName, 7, func(ctx sdk.Context) error {
+		return migrations.StoreCWPointerCode(ctx, am.keeper, false, true)
+	})
 }
 
 // RegisterInvariants registers the capability module's invariants.
@@ -175,7 +179,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw
 }
 
 // ConsensusVersion implements ConsensusVersion.
-func (AppModule) ConsensusVersion() uint64 { return 7 }
+func (AppModule) ConsensusVersion() uint64 { return 8 }
 
 // BeginBlock executes all ABCI BeginBlock logic respective to the capability module.
 func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) {
diff --git a/x/evm/module_test.go b/x/evm/module_test.go
index d63463838..02e2509ab 100644
--- a/x/evm/module_test.go
+++ b/x/evm/module_test.go
@@ -51,7 +51,7 @@ func TestModuleExportGenesis(t *testing.T) {
 func TestConsensusVersion(t *testing.T) {
 	k, _ := testkeeper.MockEVMKeeper()
 	module := evm.NewAppModule(nil, k)
-	assert.Equal(t, uint64(7), module.ConsensusVersion())
+	assert.Equal(t, uint64(8), module.ConsensusVersion())
 }
 
 func TestABCI(t *testing.T) {