Merge pull request #22995 from karalabe/enforce-miner-tip

core, eth, miner: enforce configured mining reward post 1559 too
2021-06-04 10:57:22 +03:00
parent 71ff65b188 7e915ee379
commit 92b8f28df3
9 changed files with 39 additions and 12 deletions
--- a/miner/worker.go
+++ b/miner/worker.go
@ -963,7 +963,7 @@ func (w *worker) commitNewWork(interrupt *int32, noempty bool, timestamp int64)
 	}

 	// Fill the block with all available pending transactions.
-	pending, err := w.eth.TxPool().Pending()
+	pending, err := w.eth.TxPool().Pending(true)
 	if err != nil {
 		log.Error("Failed to fetch pending transactions", "err", err)
 		return