From 99fad45d6204d196d19efede03028ae2b6dd0b91 Mon Sep 17 00:00:00 2001
From: Diederik Loerakker <proto@protolambda.com>
Date: Tue, 5 Apr 2022 02:30:13 +0200
Subject: [PATCH] Merge pull request #6 from
 ethereum-optimism/no-deposit-reinject

core: do not try to reinject deposit txs
---
 core/tx_pool.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/core/tx_pool.go b/core/tx_pool.go
index 8d859cb973ec..363ec08c7387 100644
--- a/core/tx_pool.go
+++ b/core/tx_pool.go
@@ -1283,6 +1283,16 @@ func (pool *TxPool) reset(oldHead, newHead *types.Header) {
 						return
 					}
 				}
+				// Do not insert deposit txs back into the pool
+				// (validateTx would still catch it if not filtered, but no need to re-inject in the first place).
+				j := 0
+				for _, tx := range discarded {
+					if tx.Type() != types.DepositTxType {
+						discarded[j] = tx
+						j++
+					}
+				}
+				discarded = discarded[:j]
 				reinject = types.TxDifference(discarded, included)
 			}
 		}