From 526baf20fdec6e2a2641e7a6e03222c2d2c375e9 Mon Sep 17 00:00:00 2001
From: Jihoon Song <jihoonsong@users.noreply.github.com>
Date: Sat, 30 Nov 2024 17:54:25 +0900
Subject: [PATCH] miner: include inclusion list transactions when building a
 payload

---
 miner/worker.go | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/miner/worker.go b/miner/worker.go
index 11ce984e38..58db05a35b 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -526,6 +526,49 @@ func (miner *Miner) fillTransactions(interrupt *atomic.Int32, env *environment)
 			return err
 		}
 	}
+
+	// Filter out inclusion list transactions that are not included in the block.
+	isIncludedTx := make(map[common.Hash]bool)
+	for _, tx := range env.txs {
+		isIncludedTx[tx.Hash()] = true
+	}
+
+	opts := &txpool.ValidationOptions{
+		Config: miner.chainConfig,
+		Accept: 0 |
+			1<<types.LegacyTxType |
+			1<<types.AccessListTxType |
+			1<<types.DynamicFeeTxType |
+			1<<types.SetCodeTxType,
+		MaxSize: params.MaxBytesPerInclusionList,
+		MinTip:  miner.config.GasPrice,
+	}
+
+	for _, tx := range env.inclusionListTxs {
+		// Skip if a transaction is already included in the block.
+		if isIncludedTx[tx.Hash()] {
+			continue
+		}
+
+		// EIP-7805 doesn't support blob transactions in inclusion list
+		if tx.Type() == types.BlobTxType {
+			continue
+		}
+
+		// Skip if a transaction is intrinsically invalid.
+		if err := txpool.ValidateTransaction(tx, env.header, env.signer, opts); err != nil {
+			continue
+		}
+
+		// Add a transaction to the block.
+		env.state.SetTxContext(tx.Hash(), env.tcount)
+
+		if err := miner.commitTransaction(env, tx); err != nil {
+			// Skip if a transaction cannot be appended at the end of the block.
+			log.Trace("Skipping inclusion list transaction", "hash", tx.Hash(), "err", err)
+		}
+	}
+
 	return nil
 }