Revert "(chore): move feemarket update BaseFee to EndBlock (cosmos#190)" (cosmos#255)

Author: mmsqe

testutil/integration/common/factory/helper.go

@@ -87,7 +87,7 @@ func (tf *baseTxFactory) calculateFees(gasPrice *sdkmath.Int, gasLimit uint64) (
 			return sdktypes.Coins{}, errorsmod.Wrap(err, "failed to get base fee")
 		}
 		price := resp.BaseFee
-		fees = sdktypes.Coins{{Denom: denom, Amount: price.MulInt64(int64(gasLimit)).Ceil().RoundInt()}} //#nosec G115
+		fees = sdktypes.Coins{{Denom: denom, Amount: price.MulInt64(int64(gasLimit)).TruncateInt()}} //#nosec G115
 	}
 	return fees, nil
 }

x/feemarket/keeper/abci.go

@@ -12,7 +12,41 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-// EndBlock handles both gas tracking and base fee calculation for the next block
+// BeginBlock updates base fee
+func (k *Keeper) BeginBlock(ctx sdk.Context) error {
+	baseFee := k.CalculateBaseFee(ctx)
+
+	// return immediately if base fee is nil
+	if baseFee.IsNil() {
+		return nil
+	}
+
+	k.SetBaseFee(ctx, baseFee)
+
+	defer func() {
+		floatBaseFee, err := baseFee.Float64()
+		if err != nil {
+			ctx.Logger().Error("error converting base fee to float64", "error", err.Error())
+			return
+		}
+		// there'll be no panic if fails to convert to float32. Will only loose precision
+		telemetry.SetGauge(float32(floatBaseFee), "feemarket", "base_fee")
+	}()
+
+	// Store current base fee in event
+	ctx.EventManager().EmitEvents(sdk.Events{
+		sdk.NewEvent(
+			types.EventTypeFeeMarket,
+			sdk.NewAttribute(types.AttributeKeyBaseFee, baseFee.String()),
+		),
+	})
+
+	return nil
+}
+
+// EndBlock update block gas wanted.
+// The EVM end block logic doesn't update the validator set, thus it returns
+// an empty slice.
 func (k *Keeper) EndBlock(ctx sdk.Context) error {
 	if ctx.BlockGasMeter() == nil {
 		err := errors.New("block gas meter is nil when setting block gas wanted")
@@ -44,32 +78,8 @@ func (k *Keeper) EndBlock(ctx sdk.Context) error {
 	updatedGasWanted := math.LegacyMaxDec(limitedGasWanted, math.LegacyNewDec(gasUsed.Int64())).TruncateInt().Uint64()
 	k.SetBlockGasWanted(ctx, updatedGasWanted)
 
-	nextBaseFee := k.CalculateBaseFee(ctx)
-
-	// Set the calculated base fee for use in the next block
-	if !nextBaseFee.IsNil() {
-		k.SetBaseFee(ctx, nextBaseFee)
-
-		ctx.EventManager().EmitEvents(sdk.Events{
-			sdk.NewEvent(
-				types.EventTypeFeeMarket,
-				sdk.NewAttribute(types.AttributeKeyBaseFee, nextBaseFee.String()),
-				sdk.NewAttribute("calculated_at_block", fmt.Sprintf("%d", ctx.BlockHeight())),
-			),
-		})
-	}
-
 	defer func() {
 		telemetry.SetGauge(float32(updatedGasWanted), "feemarket", "block_gas")
-
-		if !nextBaseFee.IsNil() {
-			floatBaseFee, err := nextBaseFee.Float64()
-			if err != nil {
-				ctx.Logger().Error("error converting next base fee to float64", "error", err.Error())
-				return
-			}
-			telemetry.SetGauge(float32(floatBaseFee), "feemarket", "next_base_fee")
-		}
 	}()
 
 	ctx.EventManager().EmitEvent(sdk.NewEvent(

x/feemarket/module.go

@@ -32,8 +32,9 @@ var (
 	_ module.AppModule      = AppModule{}
 	_ module.AppModuleBasic = AppModuleBasic{}
 
-	_ appmodule.HasEndBlocker = AppModule{}
-	_ module.HasABCIGenesis   = AppModule{}
+	_ appmodule.HasEndBlocker   = AppModule{}
+	_ appmodule.HasBeginBlocker = AppModule{}
+	_ module.HasABCIGenesis     = AppModule{}
 )
 
 // AppModuleBasic defines the basic application module used by the fee market module.
@@ -119,6 +120,12 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
 	types.RegisterMsgServer(cfg.MsgServer(), &am.keeper)
 }
 
+// BeginBlock returns the begin block for the fee market module.
+func (am AppModule) BeginBlock(ctx context.Context) error {
+	c := sdk.UnwrapSDKContext(ctx)
+	return am.keeper.BeginBlock(c)
+}
+
 // EndBlock returns the end blocker for the fee market module. It returns no validator
 // updates.
 func (am AppModule) EndBlock(ctx context.Context) error {