* fix: use full gas on overflow (#10897)
## Description
Investigating missing gas consumption
---
### Author Checklist
*All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.*
I have...
- [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] added `!` to the type prefix if API or client breaking change
- [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting))
- [ ] provided a link to the relevant issue or specification
- [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules)
- [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing)
- [ ] added a changelog entry to `CHANGELOG.md`
- [ ] included comments for [documenting Go code](https://blog.golang.org/godoc)
- [ ] updated the relevant documentation or specification
- [ ] reviewed "Files changed" and left comments if necessary
- [ ] confirmed all CI checks have passed
### Reviewers Checklist
*All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.*
I have...
- [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] confirmed `!` in the type prefix if API or client breaking change
- [ ] confirmed all author checklist items have been addressed
- [ ] reviewed state machine logic
- [ ] reviewed API design and naming
- [ ] reviewed documentation is accurate
- [ ] reviewed tests and test coverage
- [ ] manually tested (if applicable)
(cherry picked from commit b0d3ef9650
)
# Conflicts:
# x/auth/middleware/fee.go
# x/auth/middleware/middleware.go
* Update CHANGELOG.md
* conflict fix
Co-authored-by: Robert Zaremba <robert@zaremba.ch>
This commit is contained in:
parent
8932338504
commit
05656a2f53
|
@ -88,6 +88,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|
||||||
* [\#10648](https://github.com/cosmos/cosmos-sdk/pull/10648) Upgrade IAVL to 0.17.3 to solve race condition bug in IAVL.
|
* [\#10648](https://github.com/cosmos/cosmos-sdk/pull/10648) Upgrade IAVL to 0.17.3 to solve race condition bug in IAVL.
|
||||||
|
* [\#10897](https://github.com/cosmos/cosmos-sdk/pull/10897) Fix: set a non-zero value on gas overflow.
|
||||||
|
|
||||||
## [v0.44.4](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.44.4) - 2021-11-25
|
## [v0.44.4](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.44.4) - 2021-11-25
|
||||||
|
|
||||||
|
|
|
@ -89,9 +89,9 @@ func addUint64Overflow(a, b uint64) (uint64, bool) {
|
||||||
|
|
||||||
func (g *basicGasMeter) ConsumeGas(amount Gas, descriptor string) {
|
func (g *basicGasMeter) ConsumeGas(amount Gas, descriptor string) {
|
||||||
var overflow bool
|
var overflow bool
|
||||||
// TODO: Should we set the consumed field after overflow checking?
|
|
||||||
g.consumed, overflow = addUint64Overflow(g.consumed, amount)
|
g.consumed, overflow = addUint64Overflow(g.consumed, amount)
|
||||||
if overflow {
|
if overflow {
|
||||||
|
g.consumed = math.MaxUint64
|
||||||
panic(ErrorGasOverflow{descriptor})
|
panic(ErrorGasOverflow{descriptor})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -79,7 +79,7 @@ func (dfd DeductFeeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bo
|
||||||
}
|
}
|
||||||
|
|
||||||
if addr := dfd.ak.GetModuleAddress(types.FeeCollectorName); addr == nil {
|
if addr := dfd.ak.GetModuleAddress(types.FeeCollectorName); addr == nil {
|
||||||
panic(fmt.Sprintf("%s module account has not been set", types.FeeCollectorName))
|
return ctx, fmt.Errorf("Fee collector module account (%s) has not been set", types.FeeCollectorName)
|
||||||
}
|
}
|
||||||
|
|
||||||
fee := feeTx.GetFee()
|
fee := feeTx.GetFee()
|
||||||
|
|
Loading…
Reference in New Issue