From f5f7c3a2a90e71dab3bf4a416d4dd426ccae8a5f Mon Sep 17 00:00:00 2001
From: "dang.vh" <dang.vh2@orai.io>
Date: Thu, 27 Feb 2025 11:21:33 +0700
Subject: [PATCH 1/3] set application mempool

---
 app/app.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/app.go b/app/app.go
index 8172a6bab..eb2204e8d 100644
--- a/app/app.go
+++ b/app/app.go
@@ -53,6 +53,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/server/config"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/mempool"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/types/msgservice"
 	"github.com/cosmos/cosmos-sdk/version"
@@ -405,6 +406,11 @@ func NewWasmApp(
 	// uncomment the below line to enable optimistic execution
 	baseAppOptions = append(baseAppOptions, baseapp.SetOptimisticExecution())
 	bApp := baseapp.NewBaseApp(appName, logger, db, txConfig.TxDecoder(), baseAppOptions...)
+
+	// we force to using no-op mempool because
+	// currently evm tx can only execute with NoOpMempool.
+	bApp.SetMempool(mempool.NoOpMempool{})
+
 	bApp.SetCommitMultiStoreTracer(traceStore)
 	bApp.SetVersion(version.Version)
 	bApp.SetInterfaceRegistry(interfaceRegistry)

From 7fa364e67e7c0a832eda8f2e3b4948eb0b545fc6 Mon Sep 17 00:00:00 2001
From: "dang.vh" <dang.vh2@orai.io>
Date: Thu, 27 Feb 2025 13:43:55 +0700
Subject: [PATCH 2/3] add upgrade handler

---
 app/upgrades.go                |  3 ++-
 app/upgrades/v0506/upgrades.go | 36 ++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 app/upgrades/v0506/upgrades.go

diff --git a/app/upgrades.go b/app/upgrades.go
index 13aff87fa..2e88b2517 100644
--- a/app/upgrades.go
+++ b/app/upgrades.go
@@ -33,12 +33,13 @@ import (
 	v0503 "github.com/CosmWasm/wasmd/app/upgrades/v0503"
 	v0504 "github.com/CosmWasm/wasmd/app/upgrades/v0504"
 	v0505 "github.com/CosmWasm/wasmd/app/upgrades/v0505"
+	v0506 "github.com/CosmWasm/wasmd/app/upgrades/v0506"
 	v2 "github.com/CosmWasm/wasmd/x/wasm/migrations/v2"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 )
 
 // Upgrades list of chain upgrades
-var Upgrades = []upgrades.Upgrade{v050.Upgrade, v0501.Upgrade, v0502.Upgrade, v0503.Upgrade, v0504.Upgrade, v0505.Upgrade}
+var Upgrades = []upgrades.Upgrade{v050.Upgrade, v0501.Upgrade, v0502.Upgrade, v0503.Upgrade, v0504.Upgrade, v0505.Upgrade, v0506.Upgrade}
 
 // RegisterUpgradeHandlers registers the chain upgrade handlers
 func (app *WasmApp) RegisterUpgradeHandlers() {
diff --git a/app/upgrades/v0506/upgrades.go b/app/upgrades/v0506/upgrades.go
new file mode 100644
index 000000000..b913b2fe4
--- /dev/null
+++ b/app/upgrades/v0506/upgrades.go
@@ -0,0 +1,36 @@
+package v0506
+
+import (
+	"context"
+
+	storetypes "cosmossdk.io/store/types"
+	upgradetypes "cosmossdk.io/x/upgrade/types"
+
+	"github.com/CosmWasm/wasmd/app/upgrades"
+	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/types/module"
+)
+
+// UpgradeName defines the on-chain upgrade name
+const UpgradeName = "v0.50.6"
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:          UpgradeName,
+	CreateUpgradeHandler: CreateUpgradeHandler,
+	StoreUpgrades: storetypes.StoreUpgrades{
+		Added:   []string{},
+		Deleted: []string{},
+	},
+}
+
+func CreateUpgradeHandler(
+	mm upgrades.ModuleManager,
+	configurator module.Configurator,
+	ak *upgrades.AppKeepers,
+	keys map[string]*storetypes.KVStoreKey,
+	cdc codec.BinaryCodec,
+) upgradetypes.UpgradeHandler {
+	return func(ctx context.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		return mm.RunMigrations(ctx, configurator, fromVM)
+	}
+}

From 3eb1a1069de28b2be12d08b0de9e4825df6d78f4 Mon Sep 17 00:00:00 2001
From: "dang.vh" <dang.vh2@orai.io>
Date: Thu, 27 Feb 2025 13:46:27 +0700
Subject: [PATCH 3/3] add changelog

---
 CHANGELOG_ORAI.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG_ORAI.md b/CHANGELOG_ORAI.md
index 12661a16e..36245174e 100644
--- a/CHANGELOG_ORAI.md
+++ b/CHANGELOG_ORAI.md
@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## v0.50.6
+
+<!--
+    Add a summary for the release here.
+
+    If you don't change this message, or if this file is empty, the release
+    will not be created. -->
+Upgrade Oraichain mainnet to v0.50.6 to fix apphash and aorai token issue
+
+
 ## v0.50.5
 
 <!--