From 5c1c64bfae95e62dd71960465e54ce05552110a1 Mon Sep 17 00:00:00 2001 From: Alexander Bezobchuk Date: Fri, 28 Feb 2020 09:51:00 -0800 Subject: [PATCH] Merge PR #5718: Return Empty GasInfo on Failed Msg Validation --- CHANGELOG.md | 2 ++ baseapp/baseapp.go | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 138724a6cb..be120952fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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` diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index 4fe7d0ba80..0373a199cf 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -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 {