diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a80de32e..9f9ea2295 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 - [\#643](https://github.com/cosmos/evm/pull/643) Support for mnemonic source (file, stdin,etc) flag in key add command. - [\#645](https://github.com/cosmos/evm/pull/645) Align precise bank keeper for correct decimal conversion in evmd. - [\#656](https://github.com/cosmos/evm/pull/656) Fix race condition in concurrent usage of mempool StateAt and NotifyNewBlock methods. diff --git a/mempool/mempool.go b/mempool/mempool.go index 583b42b23..732c0bea4 100644 --- a/mempool/mempool.go +++ b/mempool/mempool.go @@ -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)