Skip to content

Commit

Permalink
Merge pull request #1340 from HaoyangLiu/develop-fix-unexpected-coin
Browse files Browse the repository at this point in the history
R4R: Fix unexpect coin flow if tx is out of gas
  • Loading branch information
wukongcheng authored Mar 5, 2019
2 parents 60b668f + 68adcc4 commit 9b53fcd
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions app/baseapp.go
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ func (app *BaseApp) runTx(mode RunTxMode, txBytes []byte, tx sdk.Tx) (result sdk
result = sdk.ErrInternal(log).Result()
}
}

ctx.CoinFlowTags().TagClean()
result.GasWanted = gasWanted
result.GasUsed = ctx.GasMeter().GasConsumed()
}()
Expand Down Expand Up @@ -836,8 +836,6 @@ func (app *BaseApp) runTx(mode RunTxMode, txBytes []byte, tx sdk.Tx) (result sdk
if result.IsOK() {
msCache.Write()
ctx.CoinFlowTags().TagWrite()
} else {
ctx.CoinFlowTags().TagClean()
}

return
Expand Down

0 comments on commit 9b53fcd

Please # to comment.