fix: remove txs from mempool when antehandler fails in recheck #20144
Conversation
|
Warning Rate Limit Exceeded@facundomedica has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 16 minutes and 24 seconds before requesting another review. How to resolve this issue?After the wait time has elapsed, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. WalkthroughThe recent changes aim to enhance error handling in the Changes
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (invoked as PR comments)
Additionally, you can add CodeRabbit Configration File (
|
tac0turtle
changed the title
tac0turtle
added
backport/v0.47.x
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
baseapp/baseapp.go
Outdated
| gasWanted = ctx.GasMeter().Limit() | ||
|
|
||
| if err != nil { | ||
| if mode == execModeReCheck { | ||
| // if the ante handler fails on recheck, we want to remove the tx from the mempool | ||
| if err := app.mempool.Remove(tx); err != nil { | ||
| return gInfo, nil, anteEvents, errors.Join(err, err) |
There was a problem hiding this comment.
Change potentially affects state.
Call sequence:
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).runTx (baseapp/baseapp.go:820)
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).deliverTx (baseapp/baseapp.go:750)
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).internalFinalizeBlock (baseapp/baseapp.go:713)
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).FinalizeBlock (baseapp/baseapp.go:874)
|
@tac0turtle your pull request is missing a changelog! |
tac0turtle
force-pushed
the
marko/mempool_clearing
branch
from
854cbf6
to
bd66084
Compare
baseapp/baseapp.go
Outdated
| gasWanted = ctx.GasMeter().Limit() | ||
|
|
||
| if err != nil { | ||
| if mode == execModeReCheck { | ||
| // if the ante handler fails on recheck, we want to remove the tx from the mempool | ||
| err := app.mempool.Remove(tx) | ||
| if err != nil && errors.Is(err, mempool.ErrTxNotFound) { |
There was a problem hiding this comment.
Change potentially affects state.
Call sequence:
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).runTx (baseapp/baseapp.go:820)
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).deliverTx (baseapp/baseapp.go:750)
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).internalFinalizeBlock (baseapp/baseapp.go:713)
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).FinalizeBlock (baseapp/baseapp.go:874)
tac0turtle
force-pushed
the
marko/mempool_clearing
branch
from
fe443aa
to
f5da247
Compare
baseapp/baseapp.go
Outdated
| gasWanted = ctx.GasMeter().Limit() | ||
|
|
||
| if err != nil { | ||
| if mode == execModeReCheck { | ||
| // if the ante handler fails on recheck, we want to remove the tx from the mempool | ||
| if err := app.mempool.Remove(tx); err != nil { | ||
| return gInfo, nil, anteEvents, errors.Join(err, err) |
There was a problem hiding this comment.
Change potentially affects state.
Call sequence:
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).runTx (baseapp/baseapp.go:820)
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).deliverTx (baseapp/baseapp.go:750)
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).internalFinalizeBlock (baseapp/baseapp.go:713)
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).FinalizeBlock (baseapp/baseapp.go:874)
baseapp/baseapp.go
Outdated
| gasWanted = ctx.GasMeter().Limit() | ||
|
|
||
| if err != nil { | ||
| if mode == execModeReCheck { | ||
| // if the ante handler fails on recheck, we want to remove the tx from the mempool | ||
| if err := app.mempool.Remove(tx); err != nil { | ||
| return gInfo, nil, anteEvents, errors.Join(err, err) |
There was a problem hiding this comment.
Change potentially affects state.
Call sequence:
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).runTx (baseapp/baseapp.go:820)
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).deliverTx (baseapp/baseapp.go:750)
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).internalFinalizeBlock (baseapp/baseapp.go:713)
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).FinalizeBlock (baseapp/baseapp.go:874)
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
baseapp/abci_test.go
Outdated
| // the same txs as in PrepareProposal | ||
| res, err := suite.baseApp.FinalizeBlock(&abci.RequestFinalizeBlock{ | ||
| Height: suite.baseApp.LastBlockHeight() + 1, | ||
| Txs: reqProposalTxBytes[:], |
There was a problem hiding this comment.
Simplify slice operation.
- reqProposalTxBytes[:]
+ reqProposalTxBytesCommittable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.
| Txs: reqProposalTxBytes[:], | |
| Txs: reqProposalTxBytes, |
Co-authored-by: Facundo <facundomedica@gmail.com> (cherry picked from commit 599ae55)
Co-authored-by: Facundo <facundomedica@gmail.com> (cherry picked from commit 599ae55) # Conflicts: # baseapp/baseapp.go
Description
this pr removes txs from the mempool when the antehandler fails and the mode is in recheck
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...
!in the type prefix if API or client breaking changeCHANGELOG.mdReviewers 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...
Summary by CodeRabbit