From b7d2fe968700bcea4c6dcd9c9ff77ff21f7c2609 Mon Sep 17 00:00:00 2001
From: Roman <roman@osmosis.team>
Date: Mon, 20 Nov 2023 12:03:23 -0500
Subject: [PATCH 1/2] refactor: enable eip1559 mempool by default (backport
 #6897)

---
 CHANGELOG.md              | 1 +
 cmd/osmosisd/cmd/root.go  | 2 +-
 x/txfees/types/options.go | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 089d01fb0c5..72c7e98bd03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Misc Improvements
 
 * [#6788](https://github.com/osmosis-labs/osmosis/pull/6788) Improve error message when CL LP fails due to slippage bound hit.
+* [#6891](https://github.com/osmosis-labs/osmosis/pull/6891) Enable 1559 mempool by default.
 
 ### API Breaks
 
diff --git a/cmd/osmosisd/cmd/root.go b/cmd/osmosisd/cmd/root.go
index 4528a514be0..5bf0e1e2d3d 100644
--- a/cmd/osmosisd/cmd/root.go
+++ b/cmd/osmosisd/cmd/root.go
@@ -456,7 +456,7 @@ arbitrage-min-gas-fee = ".005"
 min-gas-price-for-high-gas-tx = ".0025"
 
 # This parameter enables EIP-1559 like fee market logic in the mempool
-adaptive-fee-enabled = "false"
+adaptive-fee-enabled = "true"
 `
 
 	return OsmosisAppTemplate, OsmosisAppCfg
diff --git a/x/txfees/types/options.go b/x/txfees/types/options.go
index c08c1b73fac..e39b79d0264 100644
--- a/x/txfees/types/options.go
+++ b/x/txfees/types/options.go
@@ -23,7 +23,7 @@ var (
 	DefaultMinGasPriceForHighGasTx = osmomath.ZeroDec()
 	DefaultMaxGasWantedPerTx       = uint64(25 * 1000 * 1000)
 	DefaultHighGasTxThreshold      = uint64(1 * 1000 * 1000)
-	DefaultMempool1559Enabled      = false
+	DefaultMempool1559Enabled      = true
 )
 
 var GlobalMempool1559Enabled = false

From 9edcbf535764c498f95ffec685ea8f43a78c6f5f Mon Sep 17 00:00:00 2001
From: Roman <roman@osmosis.team>
Date: Mon, 20 Nov 2023 12:18:19 -0500
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72c7e98bd03..649fffc5eb0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,7 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Misc Improvements
 
 * [#6788](https://github.com/osmosis-labs/osmosis/pull/6788) Improve error message when CL LP fails due to slippage bound hit.
-* [#6891](https://github.com/osmosis-labs/osmosis/pull/6891) Enable 1559 mempool by default.
+* [#6898](https://github.com/osmosis-labs/osmosis/pull/6898) Enable 1559 mempool by default.
 
 ### API Breaks