fix: update DefaultBaseFee and cap CurBaseFee when loaded (backport #9476) (#9483)

* fix: update DefaultBaseFee and cap CurBaseFee when loaded (#9476)

* increase default base fee according to updated min base fee

* add test for tryLoad cap

* update changelog

* Trigger CI

(cherry picked from commit 8036802)

# Conflicts:
#	CHANGELOG.md

* fix merge conflict

---------

Co-authored-by: Supanat <supanat.ptk@gmail.com>

Author: mergify[bot]

CHANGELOG.md

@@ -42,6 +42,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### State Compatible
+* [#9467](https://github.com/osmosis-labs/osmosis/pull/9467) fix: protorev returns incorrect values in posthandler
+* [#9476](https://github.com/osmosis-labs/osmosis/pull/9476) fix: update DefaultBaseFee and cap CurBaseFee when loaded
+
 ## v30.0.1
 
 ### State Compatible

x/txfees/keeper/mempool-1559/code.go

@@ -46,7 +46,7 @@ import (
 var (
 	// We expect wallet multiplier * DefaultBaseFee < MinBaseFee * RecheckFeeConstant
 	// conservatively assume a wallet multiplier of at least 7%.
-	DefaultBaseFee = osmomath.MustNewDecFromStr("0.0060")
+	DefaultBaseFee = osmomath.MustNewDecFromStr("0.0250")
 	MinBaseFee     = types.ConsensusMinFee
 	MaxBaseFee     = osmomath.MustNewDecFromStr("5")
 	ResetInterval  = int64(6000)
@@ -242,5 +242,13 @@ func (e *EipState) tryLoad(logger log.Logger) osmomath.Dec {
 	}
 
 	logger.Info("Loaded eip1559 state", "CurBaseFee", loaded.CurBaseFee)
+	if loaded.CurBaseFee.LT(MinBaseFee) {
+		logger.Debug("CurBaseFee is less than MinBaseFee, setting to MinBaseFee", "CurBaseFee", loaded.CurBaseFee, "MinBaseFee", MinBaseFee)
+		return MinBaseFee.Clone()
+	}
+	if loaded.CurBaseFee.GT(MaxBaseFee) {
+		logger.Debug("CurBaseFee is greater than MaxBaseFee, setting to MaxBaseFee", "CurBaseFee", loaded.CurBaseFee, "MaxBaseFee", MaxBaseFee)
+		return MaxBaseFee.Clone()
+	}
 	return loaded.CurBaseFee.Clone()
 }

x/txfees/keeper/mempool-1559/code_test.go

@@ -1,6 +1,7 @@
 package mempool1559
 
 import (
+	"os"
 	"testing"
 
 	"cosmossdk.io/log"
@@ -25,6 +26,7 @@ func TestUpdateBaseFee(t *testing.T) {
 	eip := &EipState{
 		currentBlockHeight:      0,
 		totalGasWantedThisBlock: 0,
+		BackupFilePath:          os.TempDir() + "/eip1559_update_test.json",
 		CurBaseFee:              DefaultBaseFee.Clone(),
 	}
 
@@ -56,6 +58,34 @@ func TestUpdateBaseFee(t *testing.T) {
 	}
 }
 
+func TestPersistAndLoad(t *testing.T) {
+	baseEipState := CurEipState.Clone()
+	baseEipState.BackupFilePath = os.TempDir() + "/eip1559_test.json"
+
+	// CurBaseFee lower than MinBaseFee should be set to MinBaseFee
+	eip := baseEipState.Clone()
+	eip.CurBaseFee = MinBaseFee.Clone().Sub(osmomath.NewDec(1))
+
+	// Persist the state to the backup file
+	eip.tryPersist()
+
+	// Simulate node reset, load the eipState on startBlock
+	eip = baseEipState.Clone()
+	eip.startBlock(1, log.NewTestLogger(t))
+	assert.DeepEqual(t, eip.CurBaseFee, MinBaseFee.Clone())
+
+	// CurBaseFee greater than MaxBaseFee should be set to MaxBaseFee
+	eip = baseEipState.Clone()
+	eip.CurBaseFee = MaxBaseFee.Clone().Add(osmomath.NewDec(1))
+
+	eip.tryPersist()
+
+	// Simulate node reset, load the eipState on startBlock
+	eip = baseEipState.Clone()
+	eip.startBlock(1, log.NewTestLogger(t))
+	assert.DeepEqual(t, eip.CurBaseFee, MaxBaseFee.Clone())
+}
+
 // calculateBaseFee is the same as in is defined on the eip1559 code
 func calculateBaseFee(totalGasWantedThisBlock int64, eipStateCurBaseFee osmomath.Dec) (expectedBaseFee osmomath.Dec) {
 	gasUsed := totalGasWantedThisBlock