From 62a635829621e8943da619adef6e130e20687001 Mon Sep 17 00:00:00 2001
From: swelf <golishkin@gmail.com>
Date: Tue, 25 Jun 2024 17:41:06 +0300
Subject: [PATCH 1/3] switched oracle and marketmap order

---
 app/app.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/app.go b/app/app.go
index 8091d9426..27cd4dcde 100644
--- a/app/app.go
+++ b/app/app.go
@@ -1094,8 +1094,8 @@ func New(
 		crontypes.ModuleName,
 		globalfee.ModuleName,
 		feemarkettypes.ModuleName,
-		marketmaptypes.ModuleName,
 		oracletypes.ModuleName,
+		marketmaptypes.ModuleName,
 		ibcswaptypes.ModuleName,
 		dextypes.ModuleName,
 		dynamicfeestypes.ModuleName,

From 83b8cb73d84c57128efff7cdaead250195878390 Mon Sep 17 00:00:00 2001
From: swelf <golishkin@gmail.com>
Date: Tue, 25 Jun 2024 19:17:17 +0300
Subject: [PATCH 2/3] updated consensus version of dex module

---
 x/dex/types/constants.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x/dex/types/constants.go b/x/dex/types/constants.go
index fef80f236..119d6c47e 100644
--- a/x/dex/types/constants.go
+++ b/x/dex/types/constants.go
@@ -1,3 +1,3 @@
 package types
 
-const ConsensusVersion = 3
+const ConsensusVersion = 4

From dd22e4f93d3607cac30242a6b2da248a1da129e1 Mon Sep 17 00:00:00 2001
From: pr0n00gler <programmer10110@gmail.com>
Date: Tue, 25 Jun 2024 19:48:46 +0300
Subject: [PATCH 3/3] remove testnet upgrade condition

---
 app/upgrades/v4.0.1/upgrades.go | 58 +++++++++++++++------------------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/app/upgrades/v4.0.1/upgrades.go b/app/upgrades/v4.0.1/upgrades.go
index 86b053127..2897e2fb0 100644
--- a/app/upgrades/v4.0.1/upgrades.go
+++ b/app/upgrades/v4.0.1/upgrades.go
@@ -49,37 +49,33 @@ func CreateUpgradeHandler(
 			return vm, err
 		}
 
-		if ctx.ChainID() != "pion-1" {
-			// skip the migration set since
-			// the following changes already were applied on `pion-1` chain during `v4.0.0-rc3` release
-			ctx.Logger().Info("Setting consensus params...")
-			err = enableVoteExtensions(ctx, keepers.ConsensusKeeper)
-			if err != nil {
-				return nil, err
-			}
-
-			ctx.Logger().Info("Setting marketmap params...")
-			err = setMarketMapParams(ctx, keepers.MarketmapKeeper)
-			if err != nil {
-				return nil, err
-			}
-
-			ctx.Logger().Info("Setting dynamicfees/feemarket params...")
-			err = setFeeMarketParams(ctx, keepers.FeeMarketKeeper)
-			if err != nil {
-				return nil, err
-			}
-
-			err = setDynamicFeesParams(ctx, keepers.DynamicfeesKeeper)
-			if err != nil {
-				return nil, err
-			}
-
-			ctx.Logger().Info("Setting marketmap and oracle state...")
-			err = setMarketState(ctx, keepers.MarketmapKeeper)
-			if err != nil {
-				return nil, err
-			}
+		ctx.Logger().Info("Setting consensus params...")
+		err = enableVoteExtensions(ctx, keepers.ConsensusKeeper)
+		if err != nil {
+			return nil, err
+		}
+
+		ctx.Logger().Info("Setting marketmap params...")
+		err = setMarketMapParams(ctx, keepers.MarketmapKeeper)
+		if err != nil {
+			return nil, err
+		}
+
+		ctx.Logger().Info("Setting dynamicfees/feemarket params...")
+		err = setFeeMarketParams(ctx, keepers.FeeMarketKeeper)
+		if err != nil {
+			return nil, err
+		}
+
+		err = setDynamicFeesParams(ctx, keepers.DynamicfeesKeeper)
+		if err != nil {
+			return nil, err
+		}
+
+		ctx.Logger().Info("Setting marketmap and oracle state...")
+		err = setMarketState(ctx, keepers.MarketmapKeeper)
+		if err != nil {
+			return nil, err
 		}
 
 		ctx.Logger().Info(fmt.Sprintf("Migration {%s} applied", UpgradeName))