Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: remove txs from mempool when antehandler fails in recheck #20144

Merged
merged 12 commits into from
May 2, 2024
Merged

fix: remove txs from mempool when antehandler fails in recheck #20144

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
605b996
remove txs from mempool when antehandler fails in recheck
tac0turtle Apr 22, 2024
bd66084
random
tac0turtle Apr 23, 2024
70bffb8
avoid joining error when mempooltx is not found
tac0turtle Apr 23, 2024
f5da247
remove error is not found
tac0turtle Apr 23, 2024
0b802b1
address comment
tac0turtle Apr 24, 2024
9f8e928
Merge branch 'main' into marko/mempool_clearing
tac0turtle Apr 24, 2024
3d56c95
fix
tac0turtle Apr 24, 2024
54ef009
add rechecktx test
facundomedica May 2, 2024
03732a3
remove debug print
facundomedica May 2, 2024
f30f863
fix: shadowing of err
facundomedica May 2, 2024
cb3d39c
remove comment
facundomedica May 2, 2024
7c5b671
lint
facundomedica May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions baseapp/baseapp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,6 +911,13 @@ func (app *BaseApp) runTx(mode execMode, txBytes []byte) (gInfo sdk.GasInfo, res
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) {
Copy link
Contributor

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 marked this conversation as resolved.
Show resolved Hide resolved
return gInfo, nil, anteEvents, errors.Join(err, err)
facundomedica marked this conversation as resolved.
Show resolved Hide resolved
}
}
tac0turtle marked this conversation as resolved.
Show resolved Hide resolved
return gInfo, nil, nil, err
}

Expand Down
7 changes: 7 additions & 0 deletions baseapp/baseapp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
"github.com/cosmos/cosmos-sdk/testutil"
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/mempool"
)

var (
Expand Down Expand Up @@ -80,6 +81,12 @@ func NewBaseAppSuite(t *testing.T, opts ...func(*baseapp.BaseApp)) *BaseAppSuite
app.SetParamStore(paramStore{db: dbm.NewMemDB()})
app.SetTxDecoder(txConfig.TxDecoder())
app.SetTxEncoder(txConfig.TxEncoder())
mem := mempool.NewPriorityMempool[int64](mempool.PriorityNonceMempoolConfig[int64]{
TxPriority: mempool.NewDefaultTxPriority(),
MaxTx: 0,
SignerExtractor: mempool.NewDefaultSignerExtractionAdapter(),
})
app.SetMempool(mem)

// mount stores and seal
require.Nil(t, app.LoadLatestVersion())
Expand Down