Move receipt handling down and add back sendTransaction to simplify diff

op-batcher/batcher/driver.go

@@ -337,17 +337,6 @@ func (l *BatchSubmitter) drainState(receiptsCh chan txmgr.TxReceipt[txData], que
 	}
 }
 
-func (l *BatchSubmitter) handleReceipt(r txmgr.TxReceipt[txData]) {
-	// Record TX Status
-	if r.Err != nil {
-		l.log.Warn("unable to publish tx", "err", r.Err, "data_size", r.ID.Len())
-		l.recordFailedTx(r.ID.ID(), r.Err)
-	} else {
-		l.log.Info("tx successfully published", "tx_hash", r.Receipt.TxHash, "data_size", r.ID.Len())
-		l.recordConfirmedTx(r.ID.ID(), r.Receipt)
-	}
-}
-
 // publishStateToL1Factory returns a txmgr factory function that pulls the block data
 // loaded into `state`, and returns a txmgr transaction candidate that can be used to
 // submit the associated data to the L1 in the form of channel frames. The factory
@@ -372,20 +361,38 @@ func (l *BatchSubmitter) publishStateToL1(ctx context.Context, queue *txmgr.Queu
 			return
 		}
 
-		// Do the gas estimation offline. A value of 0 will cause the [txmgr] to estimate the gas limit.
-		data := txdata.Bytes()
-		intrinsicGas, err := core.IntrinsicGas(data, nil, false, true, true, false)
-		if err != nil {
-			l.log.Error("Failed to calculate intrinsic gas", "error", err)
-			return
-		}
+		l.sendTransaction(txdata, queue, receiptsCh)
+	}
+}
 
-		candidate := txmgr.TxCandidate{
-			To:       &l.Rollup.BatchInboxAddress,
-			TxData:   data,
-			GasLimit: intrinsicGas,
-		}
-		queue.Send(txdata, candidate, receiptsCh)
+// sendTransaction creates & submits a transaction to the batch inbox address with the given `data`.
+// It currently uses the underlying `txmgr` to handle transaction sending & price management.
+// This is a blocking method. It should not be called concurrently.
+func (l *BatchSubmitter) sendTransaction(txdata txData, queue *txmgr.Queue[txData], receiptsCh chan txmgr.TxReceipt[txData]) {
+	// Do the gas estimation offline. A value of 0 will cause the [txmgr] to estimate the gas limit.
+	data := txdata.Bytes()
+	intrinsicGas, err := core.IntrinsicGas(data, nil, false, true, true, false)
+	if err != nil {
+		l.log.Error("Failed to calculate intrinsic gas", "error", err)
+		return
+	}
+
+	candidate := txmgr.TxCandidate{
+		To:       &l.Rollup.BatchInboxAddress,
+		TxData:   data,
+		GasLimit: intrinsicGas,
+	}
+	queue.Send(txdata, candidate, receiptsCh)
+}
+
+func (l *BatchSubmitter) handleReceipt(r txmgr.TxReceipt[txData]) {
+	// Record TX Status
+	if r.Err != nil {
+		l.log.Warn("unable to publish tx", "err", r.Err, "data_size", r.ID.Len())
+		l.recordFailedTx(r.ID.ID(), r.Err)
+	} else {
+		l.log.Info("tx successfully published", "tx_hash", r.Receipt.TxHash, "data_size", r.ID.Len())
+		l.recordConfirmedTx(r.ID.ID(), r.Receipt)
 	}
 }