rollup: do not add reorganized txs to mempool (ethereum#92)

* rollup: do not add reorganized txs to mempool

* txpool: fix build

* txpool: hide behind usingovm

core/tx_pool.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"math"
 	"math/big"
+	"os"
 	"sort"
 	"sync"
 	"time"
@@ -1168,10 +1169,14 @@ func (pool *TxPool) reset(oldHead, newHead *types.Header) {
 	pool.pendingNonces = newTxNoncer(statedb)
 	pool.currentMaxGas = newHead.GasLimit
 
-	// Inject any transactions discarded due to reorgs
-	log.Debug("Reinjecting stale transactions", "count", len(reinject))
-	senderCacher.recover(pool.signer, reinject)
-	pool.addTxsLocked(reinject, false)
+	// OVM Change. Do not reinject reorganized transactions
+	// into the mempool.
+	if os.Getenv("USING_OVM") != "true" {
+		// Inject any transactions discarded due to reorgs
+		log.Debug("Reinjecting stale transactions", "count", len(reinject))
+		senderCacher.recover(pool.signer, reinject)
+		pool.addTxsLocked(reinject, false)
+	}
 
 	// Update all fork indicator by next pending block number.
 	next := new(big.Int).Add(newHead.Number, big.NewInt(1))

rollup/sync_service.go

@@ -998,7 +998,7 @@ func (s *SyncService) maybeReorg(index uint64, tx *types.Transaction) error {
 		// due to nonces coming from the god key. Do an equality check using
 		// `to`, `data`, `l1TxOrigin` and `gasLimit`
 		if !isCtcTxEqual(tx, prev) {
-			log.Info("Different transaction detected, reorganizing", "new", tx.Hash().Hex(), "previous", prev.Hash().Hex())
+			log.Info("Different transaction detected, reorganizing", "new", tx.Hash().Hex(), "previous", prev.Hash().Hex(), "index", index)
 			// Set the sync status to true. This will grab a lock around
 			// the mempool such that transactions will no longer be able to come
 			// via RPC.