core/rawdb: improve PruneTransactionIndex

core/rawdb/chain_iterator.go

@@ -366,10 +366,19 @@ func unindexTransactionsForTesting(db ethdb.Database, from uint64, to uint64, in
 
 // PruneTransactionIndex removes all tx index entries below a certain block number.
 func PruneTransactionIndex(db ethdb.Database, pruneBlock uint64) {
-	db = NewTable(db, string(txLookupPrefix))
+	tail := ReadTxIndexTail(db)
-	iter := db.NewIterator(nil, nil)
+	if tail == nil {
-	defer iter.Release()
+		return // no index
+	}
+	if *tail > pruneBlock {
+		return // index ends above pruneBlock
+	}
 
+	// There are transactions below pruneBlock in the index. Iterate the entire index to
+	// remove the entries. Note if this fails, the index is messed up, but tail still
+	// points to the old tail.
+	iter := db.NewIterator(txLookupPrefix, nil)
+	defer iter.Release()
 	for iter.Next() {
 		v := iter.Value()
 		if len(v) > 8 {
@@ -383,6 +392,7 @@ func PruneTransactionIndex(db ethdb.Database, pruneBlock uint64) {
 			}
 		}
 	}
+	WriteTxIndexTail(db, pruneBlock)
 }
 
 func decodeNumber(b []byte) uint64 {

core/rawdb/chain_iterator_test.go

@@ -245,6 +245,9 @@ func TestPruneTransactionIndex(t *testing.T) {
 			if block.NumberU64() < pruneBlock && num != nil {
 				t.Fatalf("TxLookup entry not removed: %x -> %v", tx.Hash(), num)
 			}
+			if block.NumberU64() > pruneBlock && (num == nil || *num != block.NumberU64()) {
+				t.Fatalf("wrong TxLookup entry after pruning: %x -> %v", tx.Hash(), num)
+			}
 		}
 	}
 }