Skip to content

Commit 9237098

Browse files
committed
fix mempool update issue
1 parent da692b5 commit 9237098

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

app/ante/evm/eth.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -372,18 +372,18 @@ func (issd EthIncrementSenderSequenceDecorator) AnteHandle(ctx sdk.Context, tx s
372372
"account %s is nil", common.BytesToAddress(msgEthTx.GetFrom().Bytes()),
373373
)
374374
}
375-
nonce := acc.GetSequence()
376-
377-
// we merged the nonce verification to nonce increment, so when tx includes multiple messages
378-
// with same sender, they'll be accepted.
379-
if txData.GetNonce() != nonce {
380-
return ctx, errorsmod.Wrapf(
381-
errortypes.ErrInvalidSequence,
382-
"invalid nonce; got %d, expected %d", txData.GetNonce(), nonce,
383-
)
384-
}
385-
386-
if err := acc.SetSequence(nonce + 1); err != nil {
375+
// nonce := acc.GetSequence()
376+
377+
// // we merged the nonce verification to nonce increment, so when tx includes multiple messages
378+
// // with same sender, they'll be accepted.
379+
// if txData.GetNonce() != nonce {
380+
// return ctx, errorsmod.Wrapf(
381+
// errortypes.ErrInvalidSequence,
382+
// "invalid nonce; got %d, expected %d", txData.GetNonce(), nonce,
383+
// )
384+
// }
385+
386+
if err := acc.SetSequence(txData.GetNonce() + 1); err != nil {
387387
return ctx, errorsmod.Wrapf(err, "failed to set sequence to %d", acc.GetSequence()+1)
388388
}
389389

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ replace (
268268
cosmossdk.io/store => github.com/hetu-project/cosmos-sdk/store v0.0.0-20240718141609-414cbd051fbe
269269
// use cosmos keyring
270270
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
271-
github.com/cometbft/cometbft => github.com/hetu-project/hetu-parallel-engine/hetu-cometbft v0.0.0-20250127071645-b3f53d769924
271+
github.com/cometbft/cometbft => github.com/hetu-project/hetu-parallel-engine/hetu-cometbft v0.0.0-20250214085430-cbcce0a00bb2
272272
github.com/cosmos/cosmos-sdk => github.com/hetu-project/cosmos-sdk v0.50.9-hetu
273273

274274
// use geth fork

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -769,8 +769,8 @@ github.com/hetu-project/cosmos-sdk/store v0.0.0-20240718141609-414cbd051fbe h1:e
769769
github.com/hetu-project/cosmos-sdk/store v0.0.0-20240718141609-414cbd051fbe/go.mod h1:Bm6h8ZkYgVTytHK5vhHOMKw9OHyiumm3b1UbkYIJ/Ug=
770770
github.com/hetu-project/go-ethereum v1.10.26-hetu h1:YgzTOXOs1jCuBslUifM0KfrImNIPxt1pEhLPuOu2aEI=
771771
github.com/hetu-project/go-ethereum v1.10.26-hetu/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo=
772-
github.com/hetu-project/hetu-parallel-engine/hetu-cometbft v0.0.0-20250127071645-b3f53d769924 h1:vxeVKyee4/Te5uJkFdX+IRNcUIaRldnKkFCm/t+QKUM=
773-
github.com/hetu-project/hetu-parallel-engine/hetu-cometbft v0.0.0-20250127071645-b3f53d769924/go.mod h1:+wh6ap6xctVG+JOHwbl8pPKZ0GeqdPYqISu7F4b43cQ=
772+
github.com/hetu-project/hetu-parallel-engine/hetu-cometbft v0.0.0-20250214085430-cbcce0a00bb2 h1:0n+4tBjtbLkXiqHORD/gWSAxmH6TdiWASMlL1oMGsRw=
773+
github.com/hetu-project/hetu-parallel-engine/hetu-cometbft v0.0.0-20250214085430-cbcce0a00bb2/go.mod h1:+wh6ap6xctVG+JOHwbl8pPKZ0GeqdPYqISu7F4b43cQ=
774774
github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
775775
github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA=
776776
github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c h1:DZfsyhDK1hnSS5lH8l+JggqzEleHteTYfutAiVlSUM8=

0 commit comments

Comments
 (0)