revert tx when block gas limit exceeded (backport: cosmos#10770)

- used a different solution.

changelog

CHANGELOG.md

@@ -44,6 +44,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (store) [#10218](https://github.com/cosmos/cosmos-sdk/pull/10218) Charge gas even when there are no entries while seeking.
 * (store) [#10247](https://github.com/cosmos/cosmos-sdk/pull/10247) Charge gas for the key length in gas meter.
 * (x/gov) [\#10740](https://github.com/cosmos/cosmos-sdk/pull/10740) Increase maximum proposal description size from 5k characters to 10k characters.
+* [#10814](https://github.com/cosmos/cosmos-sdk/pull/10814) revert tx when block gas limit exceeded.
 
 ### API Breaking Changes
 

baseapp/baseapp.go

@@ -586,11 +586,6 @@ func (app *BaseApp) runTx(mode runTxMode, txBytes []byte) (gInfo sdk.GasInfo, re
  return gInfo, nil, nil, sdkerrors.Wrap(sdkerrors.ErrOutOfGas, "no block gas left to run tx")
  }
 
- var startingGas uint64
- if mode == runTxModeDeliver {
- startingGas = ctx.BlockGasMeter().GasConsumed()
- }
-
  defer func() {
  if r := recover(); r != nil {
  recoveryMW := newOutOfGasRecoveryMiddleware(gasWanted, ctx, app.runTxRecoveryMiddleware)
@@ -600,20 +595,25 @@ func (app *BaseApp) runTx(mode runTxMode, txBytes []byte) (gInfo sdk.GasInfo, re
  gInfo = sdk.GasInfo{GasWanted: gasWanted, GasUsed: ctx.GasMeter().GasConsumed()}
  }()
 
+ blockGasConsumed := false
+ // consumeBlockGas makes sure block gas is consumed at most once.
+ consumeBlockGas := func() {
+ if !blockGasConsumed {
+ blockGasConsumed = true
+ ctx.BlockGasMeter().ConsumeGas(
+ ctx.GasMeter().GasConsumedToLimit(), "block gas meter",
+ )
+ }
+ }
+
  // If BlockGasMeter() panics it will be caught by the above recover and will
  // return an error - in any case BlockGasMeter will consume gas past the limit.
  //
  // NOTE: This must exist in a separate defer function for the above recovery
  // to recover from this one.
  defer func() {
  if mode == runTxModeDeliver {
- ctx.BlockGasMeter().ConsumeGas(
- ctx.GasMeter().GasConsumedToLimit(), "block gas meter",
- )
-
- if ctx.BlockGasMeter().GasConsumed() < startingGas {
- panic(sdk.ErrorGasOverflow{Descriptor: "tx gas summation"})
- }
+ consumeBlockGas()
  }
  }()
 
@@ -677,6 +677,9 @@ func (app *BaseApp) runTx(mode runTxMode, txBytes []byte) (gInfo sdk.GasInfo, re
  // Result if any single message fails or does not have a registered Handler.
  result, err = app.runMsgs(runMsgCtx, msgs, mode)
  if err == nil && mode == runTxModeDeliver {
+ // When block gas exceeds, it'll panic and won't commit the cached store.
+ consumeBlockGas()
+
  msCache.Write()
 
  if len(anteEvents) > 0 {