add MercuryHeight

app/app.go

@@ -736,6 +736,9 @@ func (app *OKBChainApp) InitUpgrade(ctx sdk.Context) {
 	app.ParamsKeeper.ClaimReadyForUpgrade(tmtypes.MILESTONE_EARTH, func(info paramstypes.UpgradeInfo) {
 		tmtypes.InitMilestoneEarthHeight(int64(info.EffectiveHeight))
 	})
+	app.ParamsKeeper.ClaimReadyForUpgrade(tmtypes.MILESTONE_MERCURY, func(info paramstypes.UpgradeInfo) {
+		tmtypes.InitMilestoneMercuryHeight(int64(info.EffectiveHeight))
+	})
 	if err := app.ParamsKeeper.ApplyEffectiveUpgrade(ctx); err != nil {
 		tmos.Exit(fmt.Sprintf("failed apply effective upgrade height info: %s", err))
 	}

app/refund/refund.go

@@ -63,7 +63,7 @@ func gasRefund(ik innertx.InnerTxKeeper, ak accountKeeperInterface, sk types.Sup
 		return nil, nil
 	}
 
-	if tmtypes.HigherThanEarth(ctx.BlockHeight()) {
+	if tmtypes.HigherThanMercury(ctx.BlockHeight()) {
 		if ctx.GetOutOfGas() {
 			ctx.GasMeter().SetGas(ctx.GasMeter().Limit())
 			currentGasMeter.SetGas(gasLimit)

libs/cosmos-sdk/baseapp/baseapp_runtx.go

@@ -152,7 +152,7 @@ func (app *BaseApp) runtxWithInfo(info *runTxInfo, mode runTxMode, txBytes []byt
 			tx.GetType() == sdk.EvmTxType {
 			handler.handleDeferRefund(info)
 		} else {
-			if tmtypes.HigherThanEarth(info.ctx.BlockHeight()) {
+			if tmtypes.HigherThanMercury(info.ctx.BlockHeight()) {
 				info.ctx.GasMeter().SetGas(info.ctx.GasMeter().Limit())
 			}
 		}

libs/tendermint/types/milestone.go

@@ -11,8 +11,9 @@ import (
 // 4. ibc
 
 var (
-	milestoneEarthHeight  int64
-	milestoneVenus4Height int64
+	milestoneEarthHeight   int64
+	milestoneVenus4Height  int64
+	milestoneMercuryHeight int64
 
 	// note: it stores the earlies height of the node,and it is used by cli
 	nodePruneHeight int64
@@ -22,8 +23,9 @@ const (
 	MainNet = system.Chain + "-196"
 	TestNet = system.TestnetPrefix + "-195"
 
-	MILESTONE_EARTH  = "earth"
-	MILESTONE_Venus4 = "venus4"
+	MILESTONE_EARTH   = "earth"
+	MILESTONE_Venus4  = "venus4"
+	MILESTONE_MERCURY = "mercury"
 )
 
 func SetupMainNetEnvironment(pruneH int64) {
@@ -109,3 +111,31 @@ func GetVenus4Height() int64 {
 
 // =========== Venus4 ===============
 // ==================================
+
+// ==================================
+// =========== Mercury ===============
+func UnittestOnlySetMilestoneMercuryHeight(h int64) {
+	milestoneEarthHeight = h
+}
+
+func SetMilestoneMercuryHeight(h int64) {
+	milestoneMercuryHeight = h
+}
+
+func HigherThanMercury(h int64) bool {
+	if milestoneMercuryHeight == 0 {
+		return false
+	}
+	return h >= milestoneMercuryHeight
+}
+
+func GetMercuryHeight() int64 {
+	return milestoneMercuryHeight
+}
+
+func InitMilestoneMercuryHeight(h int64) {
+	milestoneMercuryHeight = h
+}
+
+// =========== Mercury ===============
+// ==================================