core/txpool/blobpool: revert part of ethereum#30437, return all reinject-addresses

holiman · holiman · commit 9274f28210f6 · 2024-09-27T08:24:23.000+02:00
diff --git a/core/txpool/blobpool/blobpool.go b/core/txpool/blobpool/blobpool.go
@@ -949,9 +949,7 @@ func (p *BlobPool) reorg(oldHead, newHead *types.Header) (map[common.Address][]*
 				lost = append(lost, tx)
 			}
 		}
-		if len(lost) > 0 {
-			reinject[addr] = lost
-		}
+		reinject[addr] = lost
 
 		// Update the set that was already reincluded to track the blocks in limbo
 		for _, tx := range types.TxDifference(included[addr], discarded[addr]) {

Original file line number	Diff line number	Diff line change
`@@ -949,9 +949,7 @@ func (p BlobPool) reorg(oldHead, newHead types.Header) (map[common.Address][]*`
`949`	`949`	`lost = append(lost, tx)`
`950`	`950`	`}`
`951`	`951`	`}`
`952`		`- if len(lost) > 0 {`
`953`		`- reinject[addr] = lost`
`954`		`- }`
	`952`	`+ reinject[addr] = lost`
`955`	`953`
`956`	`954`	`// Update the set that was already reincluded to track the blocks in limbo`
`957`	`955`	`for _, tx := range types.TxDifference(included[addr], discarded[addr]) {`