-
Notifications
You must be signed in to change notification settings - Fork 3.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
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 (
|
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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! |
854cbf6
to
bd66084
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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)
fe443aa
to
f5da247
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This feature make a lot of sense. Good start, just tests and some minor changes would be great.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 1
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Simplify slice operation.
- reqProposalTxBytes[:]
+ reqProposalTxBytes
Committable 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
* fix(server): consensus failure while restart node with wrong `chainId` in genesis (cosmos#18920) * test: add NodeURI for clientCtx (backport cosmos#18930) (cosmos#18988) Co-authored-by: mmsqe <tqd0800210105@gmail.com> Co-authored-by: Julien Robert <julien@rbrt.fr> * chore: clean-up buf workspace (backport cosmos#18993) (cosmos#18998) * build(deps): Bump cosmossdk.io/log from 1.2.1 to 1.3.0 (cosmos#19024) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> * build(deps): Bump cosmossdk.io/errors from 1.0.0 to 1.0.1 (cosmos#19025) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> * fix: allow empty public keys when setting signatures (backport cosmos#19106) (cosmos#19108) Co-authored-by: Callum Waters <cmwaters19@gmail.com> Co-authored-by: Julien Robert <julien@rbrt.fr> * chore: prepare v0.47.8 (cosmos#19162) * docs: fix typo in 06-grpc_rest.md (backport cosmos#19192) (cosmos#19194) Co-authored-by: Yoksirod <103229163+taramakage@users.noreply.github.com> Co-authored-by: Julien Robert <julien@rbrt.fr> * fix: skip same-sender non-sequential sequence and then add others txs new solution (backport cosmos#19177) (cosmos#19250) Co-authored-by: Brann Bronzebeard <90186866+ZiHengLee@users.noreply.github.com> Co-authored-by: Facundo <facundomedica@gmail.com> Co-authored-by: Facundo Medica <14063057+facundomedica@users.noreply.github.com> Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com> * test(baseapp): Refactor tx selector tests + better comments (backport cosmos#19284) (cosmos#19288) Co-authored-by: Facundo Medica <14063057+facundomedica@users.noreply.github.com> Co-authored-by: Facundo <facundomedica@gmail.com> * build(deps): Bump cosmossdk.io/log from 1.3.0 to 1.3.1 (cosmos#19359) * chore: prepare v0.47.9 (cosmos#19451) * build(deps): Bump github.com/cosmos/cosmos-proto from 1.0.0-beta.2 to 1.0.0-beta.4 (cosmos#19472) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julien Robert <julien@rbrt.fr> * Merge pull request from GHSA-4j93-fm92-rp4m * fix(x/auth/vesting): Add `BlockedAddr` check in `CreatePeriodicVestingAccount` * updates * build(deps): Bump cosmossdk.io/math from 1.2.0 to 1.3.0 (cosmos#19564) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julien Robert <julien@rbrt.fr> * fix: use proper `db_backend` type when reading chain-id (cosmos#19573) * Merge pull request from GHSA-86h5-xcpx-cfqc * fix slashing logic * add test * changelog + release notes * word --------- Co-authored-by: Julien Robert <julien@rbrt.fr> * build(deps): Bump deps (backport cosmos#19655) (cosmos#19712) Co-authored-by: Julien Robert <julien@rbrt.fr> * fix(x/gov): grpc query tally for failed proposal (backport cosmos#19725) (cosmos#19728) Co-authored-by: David Tumcharoen <david@alleslabs.com> Co-authored-by: Julien Robert <julien@rbrt.fr> * fix(crypto): error if incorrect ledger public key (backport cosmos#19691) (cosmos#19746) Co-authored-by: Rootul P <rootulp@gmail.com> Co-authored-by: sontrinh16 <trinhleson2000@gmail.com> * build(deps): Bump github.com/cometbft/cometbft from 0.37.4 to 0.37.5 (cosmos#19752) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julien Robert <julien@rbrt.fr> * fix: Implement gogoproto customtype to secp256r1 keys (backport cosmos#20027) (cosmos#20032) Co-authored-by: Facundo Medica <14063057+facundomedica@users.noreply.github.com> Co-authored-by: marbar3778 <marbar3778@yahoo.com> Co-authored-by: Marko <marko@baricevic.me> * fix: secp256r1 json missing quotes (backport cosmos#20060) (cosmos#20070) Co-authored-by: Facundo Medica <14063057+facundomedica@users.noreply.github.com> * build(deps): Bump github.com/cosmos/cosmos-proto from 1.0.0-beta.4 to 1.0.0-beta.5 (cosmos#20094) * chore: prepare v0.47.11 (cosmos#20088) * fix: use timestamp for sim log file name (backport cosmos#20108) (cosmos#20112) Co-authored-by: mmsqe <mavis@crypto.com> * fix(x/authz,x/feegrant): check blocked address (backport cosmos#20102) (cosmos#20114) Co-authored-by: Julien Robert <julien@rbrt.fr> * fix(testsuite/sims): set all signatures (backport cosmos#20151) (cosmos#20186) Co-authored-by: Leon <156270887+leonz789@users.noreply.github.com> * build(deps): Bump github.com/cometbft/cometbft from 0.37.5 to 0.37.6 (cosmos#20205) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> * go mod tidy * chore: downgrade to go 1.19 (cosmos#20211) * chore: tidy with go 1.19 (cosmos#20220) * chore: revert comet 0.37.6 upgrade due to go version bump (cosmos#20247) * fix: remove txs from mempool when antehandler fails in recheck (backport cosmos#20144) (cosmos#20252) Co-authored-by: Marko <marko@baricevic.me> Co-authored-by: marbar3778 <marbar3778@yahoo.com> * Revert "chore: downgrade to go 1.19 (cosmos#20211)" This reverts commit aba4e40. * Revert "chore: revert comet 0.37.6 upgrade due to go version bump (cosmos#20247)" This reverts commit 00e4273. * bump go in ci * update docker file --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: atheeshp <59333759+atheeshp@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: mmsqe <tqd0800210105@gmail.com> Co-authored-by: Julien Robert <julien@rbrt.fr> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Callum Waters <cmwaters19@gmail.com> Co-authored-by: Yoksirod <103229163+taramakage@users.noreply.github.com> Co-authored-by: Brann Bronzebeard <90186866+ZiHengLee@users.noreply.github.com> Co-authored-by: Facundo <facundomedica@gmail.com> Co-authored-by: Facundo Medica <14063057+facundomedica@users.noreply.github.com> Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com> Co-authored-by: Kevin Yang <5478483+k-yang@users.noreply.github.com> Co-authored-by: khanh <50263489+catShaark@users.noreply.github.com> Co-authored-by: David Tumcharoen <david@alleslabs.com> Co-authored-by: Rootul P <rootulp@gmail.com> Co-authored-by: sontrinh16 <trinhleson2000@gmail.com> Co-authored-by: marbar3778 <marbar3778@yahoo.com> Co-authored-by: Marko <marko@baricevic.me> Co-authored-by: mmsqe <mavis@crypto.com> Co-authored-by: Leon <156270887+leonz789@users.noreply.github.com>
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.md
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...
Summary by CodeRabbit