E35: Fixed transaction pool (Again) (#10382)

erigontech · May 17, 2024 · cf9fc56 · cf9fc56
1 parent 3e93af6
commit cf9fc56
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/core/state/rw_v3.go b/core/state/rw_v3.go
@@ -471,7 +471,8 @@ type StateWriterV3 struct {
 
 func NewStateWriterV3(rs *StateV3, accumulator *shards.Accumulator) *StateWriterV3 {
 	return &StateWriterV3{
-		rs: rs,
+		rs:          rs,
+		accumulator: accumulator,
 		//trace: true,
 	}
 }
@@ -535,9 +536,9 @@ func (w *StateWriterV3) DeleteAccount(address common.Address, original *accounts
 	if err := w.rs.domains.DomainDel(kv.AccountsDomain, address[:], nil, nil, 0); err != nil {
 		return err
 	}
-	if w.accumulator != nil {
-		w.accumulator.DeleteAccount(address)
-	}
+	// if w.accumulator != nil { TODO: investigate later. basically this will always panic. keeping this out should be fine anyway.
+	// 	w.accumulator.DeleteAccount(address)
+	// }
 	return nil
 }
 

diff --git a/erigon-lib/kv/membatchwithdb/memory_mutation_cursor.go b/erigon-lib/kv/membatchwithdb/memory_mutation_cursor.go
@@ -345,8 +345,9 @@ func (m *memoryMutationCursor) DeleteCurrent() error {
 	return nil
 }
 
-func (m *memoryMutationCursor) DeleteExact(_, _ []byte) error {
-	panic("DeleteExact Not implemented")
+func (m *memoryMutationCursor) DeleteExact(k, v []byte) error {
+	m.mutation.deleteDup(m.table, k, v)
+	return nil
 }
 
 func (m *memoryMutationCursor) DeleteCurrentDuplicates() error {

diff --git a/eth/stagedsync/exec3.go b/eth/stagedsync/exec3.go
@@ -595,8 +595,6 @@ func ExecV3(ctx context.Context,
 	slowDownLimit := time.NewTicker(time.Second)
 	defer slowDownLimit.Stop()
 
-	stateStream := !initialCycle && cfg.stateStream && maxBlockNum-blockNum < stateStreamLimit
-
 	var readAhead chan uint64
 	if !parallel {
 		// snapshots are often stored on chaper drives. don't expect low-read-latency and manually read-ahead.
@@ -673,14 +671,12 @@ Loop:
 					}
 				}
 			}()
-		} else {
-			if !initialCycle && stateStream {
-				txs, err := blockReader.RawTransactions(context.Background(), applyTx, b.NumberU64(), b.NumberU64())
-				if err != nil {
-					return err
-				}
-				cfg.accumulator.StartChange(b.NumberU64(), b.Hash(), txs, false)
+		} else if shouldReportToTxPool {
+			txs, err := blockReader.RawTransactions(context.Background(), applyTx, b.NumberU64(), b.NumberU64())
+			if err != nil {
+				return err
 			}
+			cfg.accumulator.StartChange(b.NumberU64(), b.Hash(), txs, false)
 		}
 
 		rules := chainConfig.Rules(blockNum, b.Time())