count fix

Author: FletcherMan

miner/worker.go

@@ -834,8 +834,8 @@ func (w *worker) commitTransactions(env *environment, txs *types.TransactionsByP
 			return atomic.LoadInt32(interrupt) == commitInterruptNewHead
 		}
 		// If we have collected enough transactions then we're done
-		if !w.chainConfig.Scroll.IsValidL2TxCount(w.current.tcount - w.current.l1TxCount + 1) {
-			log.Trace("Transaction count limit reached", "have", w.current.tcount-w.current.l1TxCount, "want", w.chainConfig.Scroll.MaxTxPerBlock)
+		if !w.chainConfig.Scroll.IsValidL2TxCount(env.tcount - env.l1TxCount + 1) {
+			log.Trace("Transaction count limit reached", "have", env.tcount-env.l1TxCount, "want", w.chainConfig.Scroll.MaxTxPerBlock)
 			break
 		}
 		// If we don't have enough gas for any further transactions then we're done
@@ -848,8 +848,8 @@ func (w *worker) commitTransactions(env *environment, txs *types.TransactionsByP
 		if tx == nil {
 			break
 		}
-		if !w.chainConfig.Scroll.IsValidBlockSize(w.current.blockSize + tx.Size()) {
-			log.Trace("Block size limit reached", "have", w.current.blockSize, "want", w.chainConfig.Scroll.MaxTxPayloadBytesPerBlock, "tx", tx.Size())
+		if !w.chainConfig.Scroll.IsValidBlockSize(env.blockSize + tx.Size()) {
+			log.Trace("Block size limit reached", "have", env.blockSize, "want", w.chainConfig.Scroll.MaxTxPayloadBytesPerBlock, "tx", tx.Size())
 			txs.Pop() // skip transactions from this account
 			continue
 		}
@@ -890,7 +890,7 @@ func (w *worker) commitTransactions(env *environment, txs *types.TransactionsByP
 			// Everything ok, collect the logs and shift in the next transaction from the same account
 			coalescedLogs = append(coalescedLogs, logs...)
 			if tx.IsL1MessageTx() {
-				w.current.l1TxCount++
+				env.l1TxCount++
 			}
 			env.tcount++
 			env.blockSize += tx.Size()

miner/worker_l2.go

@@ -91,7 +91,23 @@ func (w *worker) makeHeader(parent *types.Block, timestamp uint64, coinBase comm
 // fillTransactions retrieves the pending transactions from the txpool and fills them
 // into the given sealing block. The transaction selection and ordering strategy can
 // be customized with the plugin in the future.
-func (w *worker) fillTransactions(env *environment) {
+func (w *worker) fillTransactions(env *environment, l1Transactions types.Transactions) {
+	if len(l1Transactions) > 0 {
+		l1Txs := make(map[common.Address]types.Transactions)
+		for _, tx := range l1Transactions {
+			sender, _ := types.Sender(env.signer, tx)
+			senderTxs, ok := l1Txs[sender]
+			if ok {
+				senderTxs = append(senderTxs, tx)
+				l1Txs[sender] = senderTxs
+			} else {
+				l1Txs[sender] = types.Transactions{tx}
+			}
+		}
+		txs := types.NewTransactionsByPriceAndNonce(env.signer, l1Txs, env.header.BaseFee)
+		w.commitTransactions(env, txs, env.header.Coinbase, nil)
+	}
+
 	// Split the pending transactions into locals and remotes
 	// Fill the block with all available pending transactions.
 	pending := w.eth.TxPool().Pending(true)
@@ -123,18 +139,19 @@ func (w *worker) generateWork(genParams *generateParams) (*types.Block, *state.S
 		work.gasPool = new(core.GasPool).AddGas(work.header.GasLimit)
 	}
 
-	for _, tx := range genParams.transactions {
-		from, _ := types.Sender(work.signer, tx)
-		// Start executing the transaction
-		work.state.Prepare(tx.Hash(), work.tcount)
-		_, err := w.commitTransaction(work, tx, work.header.Coinbase)
-		if err != nil {
-			return nil, nil, nil, fmt.Errorf("failed to force-include tx: %s type: %d sender: %s nonce: %d, err: %w", tx.Hash(), tx.Type(), from, tx.Nonce(), err)
-		}
-		work.tcount++
-	}
+	//for _, tx := range genParams.transactions {
+	//
+	//	from, _ := types.Sender(work.signer, tx)
+	//	// Start executing the transaction
+	//	work.state.Prepare(tx.Hash(), work.tcount)
+	//	_, err := w.commitTransaction(work, tx, work.header.Coinbase)
+	//	if err != nil {
+	//		return nil, nil, nil, fmt.Errorf("failed to force-include tx: %s type: %d sender: %s nonce: %d, err: %w", tx.Hash(), tx.Type(), from, tx.Nonce(), err)
+	//	}
+	//	work.l1TxCount++
+	//}
 
-	w.fillTransactions(work)
+	w.fillTransactions(work, genParams.transactions)
 
 	block, err := w.engine.FinalizeAndAssemble(w.chain, work.header, work.state, work.txs, nil, work.receipts)
 	if err != nil {