Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
- [\#545](https://github.com/cosmos/evm/pull/545) Check if mempool is not nil before accepting nonce gap error tx.
- [\#585](https://github.com/cosmos/evm/pull/585) Use zero constructor to avoid nil pointer panic when BaseFee is 0d
- [\#591](https://github.com/cosmos/evm/pull/591) CheckTxHandler should handle "invalid nonce" tx
- [\#642](https://github.com/cosmos/evm/pull/642) "tx not found in mempool" error on chain startup

### IMPROVEMENTS

Expand Down
4 changes: 4 additions & 0 deletions mempool/mempool.go
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,10 @@ func (m *ExperimentalEVMMempool) Remove(tx sdk.Tx) error {
m.mtx.Lock()
defer m.mtx.Unlock()

if m.blockchain.latestCtx.BlockHeight() == 0 {
return nil
}

m.logger.Debug("removing transaction from mempool")

msg, err := m.getEVMMessage(tx)
Expand Down
Loading