Skip to content

Commit

Permalink
Merge PR #5718: Return Empty GasInfo on Failed Msg Validation
Browse files Browse the repository at this point in the history
  • Loading branch information
alexanderbez authored Feb 28, 2020
1 parent a5fd470 commit 5c1c64b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ to now accept a `codec.JSONMarshaler` for modular serialization of genesis state

### Bug Fixes

* (baseapp) [\#5718](https://github.com/cosmos/cosmos-sdk/pull/5718) Remove call to `ctx.BlockGasMeter` during failed message validation which
resulted in a panic when the tx execution mode was `CheckTx`.
* (client) [\#5618](https://github.com/cosmos/cosmos-sdk/pull/5618) Fix crash on the client when the verifier is not set.
* (x/distribution) [\#5620](https://github.com/cosmos/cosmos-sdk/pull/5620) Fix nil pointer deref in distribution tax/rewward validation helpers.
* (genesis) [\#5086](https://github.com/cosmos/cosmos-sdk/issues/5086) Ensure `gentxs` are always an empty array instead of `nil`
Expand Down
3 changes: 1 addition & 2 deletions baseapp/baseapp.go
Original file line number Diff line number Diff line change
Expand Up @@ -521,8 +521,7 @@ func (app *BaseApp) runTx(mode runTxMode, txBytes []byte, tx sdk.Tx) (gInfo sdk.

msgs := tx.GetMsgs()
if err := validateBasicTxMsgs(msgs); err != nil {
gInfo = sdk.GasInfo{GasUsed: ctx.BlockGasMeter().GasConsumed()}
return gInfo, nil, err
return sdk.GasInfo{}, nil, err
}

if app.anteHandler != nil {
Expand Down

0 comments on commit 5c1c64b

Please sign in to comment.