upgrade

miner/worker.go

@@ -1062,37 +1062,28 @@ loop:
 			txs.Pop()
 
 		case errors.Is(err, circuitcapacitychecker.ErrBlockRowConsumptionOverflow):
-			circuitCapacityReached = true
-
 			// Circuit capacity check.
-			// 1. circuit capacity limit reached in a block, and it's not the first tx:
-			// don't pop or shift, just quit the loop immediately;
-			// though it might still be possible to add some "smaller" txs,
-			// but it's a trade-off between tracing overhead & block usage rate
-			if w.current.tcount>=1 {
+			if w.current.tcount >= 1 { // 1. circuit capacity limit reached in a block, and it's not the first tx:
+				// don't pop or shift, just quit the loop immediately;
+				// though it might still be possible to add some "smaller" txs,
+				// but it's a trade-off between tracing overhead & block usage rate
 				log.Trace("Circuit capacity limit reached in a block", "acc_rows", w.current.accRows, "tx", tx.Hash().String())
+				circuitCapacityReached = true
 				break loop
-			} else { // 2. circuit capacity limit reached in a block, and it's the first tx:
+			} else { // 2. circuit capacity limit reached in a block, and it's the first tx: drop the tx.
+				circuitCapacityReached = false
 				if tx.IsL1MessageTx() { // 2.1 L1MessageTx row consumption too high, shift to the next from the account,
 					// because we shouldn't skip the entire txs from the same account.
 					// This is also useful for skipping "problematic" L1MessageTxs.
 					queueIndex := tx.AsL1MessageTx().QueueIndex
 					log.Trace("Circuit capacity limit reached for a single tx", "tx", tx.Hash().String(), "queueIndex", queueIndex)
 					log.Info("Skipping L1 message", "queueIndex", queueIndex, "tx", tx.Hash().String(), "block", w.current.header.Number, "reason", "row consumption overflow")
 					w.current.nextL1MsgIndex = queueIndex + 1
-
-					// after `ErrTxRowConsumptionOverflow`, ccc might not revert updates
-					// associated with this transaction so we cannot pack more transactions.
-					// TODO: fix this in ccc and change these lines back to `txs.Shift()`
-					break loop			
-				} else { 2.2 //L2MessageTx row consumption too high, skip the account.
+					txs.Shift()
+				} else { // 2.2 L2MessageTx row consumption too high, skip the account.
 					// This is also useful for skipping "problematic" L2MessageTxs.
 					log.Trace("Circuit capacity limit reached for a single tx", "tx", tx.Hash().String())
-
-					// after `ErrTxRowConsumptionOverflow`, ccc might not revert updates
-					// associated with this transaction so we cannot pack more transactions.
-					// TODO: fix this in ccc and change these lines back to `txs.Pop()`
-					break loop
+					txs.Pop()
 				}
 			}
 
@@ -1103,22 +1094,12 @@ loop:
 			log.Trace("Unknown circuit capacity checker error for L1MessageTx", "tx", tx.Hash().String(), "queueIndex", queueIndex)
 			log.Info("Skipping L1 message", "queueIndex", queueIndex, "tx", tx.Hash().String(), "block", w.current.header.Number, "reason", "unknown row consumption error")
 			w.current.nextL1MsgIndex = queueIndex + 1
-
-			// after `ErrUnknown`, ccc might not revert updates associated
-			// with this transaction so we cannot pack more transactions.
-			// TODO: fix this in ccc and change these lines back to `txs.Shift()`
-			circuitCapacityReached = true
-			break loop
+			txs.Shift()
 
 		case (errors.Is(err, circuitcapacitychecker.ErrUnknown) && !tx.IsL1MessageTx()):
 			// Circuit capacity check: unknown circuit capacity checker error for L2MessageTx, skip the account
 			log.Trace("Unknown circuit capacity checker error for L2MessageTx", "tx", tx.Hash().String())
-
-			// after `ErrUnknown`, ccc might not revert updates associated
-			// with this transaction so we cannot pack more transactions.
-			// TODO: fix this in ccc and change these lines back to `txs.Pop()`
-			circuitCapacityReached = true
-			break loop
+			txs.Pop()
 
 		default:
 			// Strange error, discard the transaction and get the next in line (note, the