fix the bug when calculating l2TxCount. (#479)

* fix bug when calculate l2 tx count

* Update version

Author: mask-pp

miner/worker.go

@@ -971,11 +971,6 @@ loop:
 			}
 			return atomic.LoadInt32(interrupt) == commitInterruptNewHead, circuitCapacityReached
 		}
-		// 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)
-			break
-		}
 		// If we don't have enough gas for any further transactions then we're done
 		if w.current.gasPool.Gas() < params.TxGas {
 			log.Trace("Not enough gas for further transactions", "have", w.current.gasPool, "want", params.TxGas)
@@ -986,6 +981,15 @@ loop:
 		if tx == nil {
 			break
 		}
+		// If we have collected enough transactions then we're done
+		l2TxCount := w.current.tcount - w.current.l1TxCount
+		if !tx.IsL1MessageTx() { // If the next tx is not L1MessageTx type then +1.
+			l2TxCount++
+		}
+		if !w.chainConfig.Scroll.IsValidL2TxCount(l2TxCount) {
+			log.Trace("Transaction count limit reached", "have", w.current.tcount-w.current.l1TxCount, "want", w.chainConfig.Scroll.MaxTxPerBlock)
+			break
+		}
 		if tx.IsL1MessageTx() && tx.AsL1MessageTx().QueueIndex != w.current.nextL1MsgIndex {
 			log.Error(
 				"Unexpected L1 message queue index in worker",