address review comments

rollup/internal/controller/relayer/l2_relayer.go

@@ -387,8 +387,8 @@ func (r *Layer2Relayer) ProcessPendingBatches() {
 	var batchesToSubmit []*dbBatchWithChunksAndParent
 	var forceSubmit bool
 	for i, dbBatch := range dbBatches {
-		if i == 0 && encoding.CodecVersion(dbBatch.CodecVersion) < encoding.CodecV6 {
-			// if the first batch is not >= V6 then we need to submit batches one by one
+		if i == 0 && encoding.CodecVersion(dbBatch.CodecVersion) < encoding.CodecV7 {
+			// if the first batch is not >= V7 then we need to submit batches one by one
 			r.processPendingBatchesV4(dbBatches)
 			return
 		}
@@ -418,9 +418,20 @@ func (r *Layer2Relayer) ProcessPendingBatches() {
 				return
 			}
 
-			dbParentBatch, err = r.batchOrm.GetBatchByIndex(r.ctx, dbBatch.Index-1)
-			if err != nil {
-				log.Error("failed to get parent batch header", "err", err)
+			// get parent batch
+			if i == 0 {
+				dbParentBatch, err = r.batchOrm.GetBatchByIndex(r.ctx, dbBatch.Index-1)
+				if err != nil {
+					log.Error("failed to get parent batch header", "err", err)
+					return
+				}
+			} else {
+				dbParentBatch = dbBatches[i-1]
+			}
+
+			// make sure batch index is continuous
+			if dbParentBatch.Index != dbBatch.Index-1 {
+				log.Error("parent batch index is not equal to current batch index - 1", "index", dbBatch.Index, "parent index", dbParentBatch.Index)
 				return
 			}
 
@@ -442,13 +453,17 @@ func (r *Layer2Relayer) ProcessPendingBatches() {
 			forceSubmit = true
 		}
 
-		if batchesToSubmitLen <= r.cfg.SenderConfig.BatchSubmission.MaxBatches {
+		if batchesToSubmitLen < r.cfg.SenderConfig.BatchSubmission.MaxBatches {
 			batchesToSubmit = append(batchesToSubmit, &dbBatchWithChunksAndParent{
 				Batch:       dbBatch,
 				Chunks:      dbChunks,
 				ParentBatch: dbParentBatch,
 			})
 		}
+
+		if len(batchesToSubmit) >= r.cfg.SenderConfig.BatchSubmission.MaxBatches {
+			break
+		}
 	}
 
 	if !forceSubmit && len(batchesToSubmit) < r.cfg.SenderConfig.BatchSubmission.MinBatches {
@@ -471,10 +486,10 @@ func (r *Layer2Relayer) ProcessPendingBatches() {
 
 	codecVersion := encoding.CodecVersion(firstBatch.CodecVersion)
 	switch codecVersion {
-	case encoding.CodecV6:
-		calldata, blobs, maxBlockHeight, totalGasUsed, err = r.constructCommitBatchPayloadCodecV6(batchesToSubmit)
+	case encoding.CodecV7:
+		calldata, blobs, maxBlockHeight, totalGasUsed, err = r.constructCommitBatchPayloadCodecV7(batchesToSubmit)
 		if err != nil {
-			log.Error("failed to construct commitBatchWithBlobProof payload for V6", "codecVersion", codecVersion, "start index", firstBatch.Index, "end index", lastBatch.Index, "err", err)
+			log.Error("failed to construct commitBatchWithBlobProof payload for V7", "codecVersion", codecVersion, "start index", firstBatch.Index, "end index", lastBatch.Index, "err", err)
 			return
 		}
 	default:
@@ -521,7 +536,8 @@ func (r *Layer2Relayer) ProcessPendingBatches() {
 	r.metrics.rollupL2RelayerCommitBlockHeight.Set(float64(maxBlockHeight))
 	r.metrics.rollupL2RelayerCommitThroughput.Add(float64(totalGasUsed))
 	r.metrics.rollupL2RelayerProcessPendingBatchSuccessTotal.Add(float64(len(batchesToSubmit)))
-
+	r.metrics.rollupL2RelayerProcessBatchesPerTxCount.Set(float64(len(batchesToSubmit)))
+
 	log.Info("Sent the commitBatches tx to layer1", "batches count", len(batchesToSubmit), "start index", firstBatch.Index, "start hash", firstBatch.Hash, "end index", lastBatch.Index, "end hash", lastBatch.Hash, "tx hash", txHash.String())
 }
 
@@ -1062,7 +1078,7 @@ func (r *Layer2Relayer) constructCommitBatchPayloadCodecV4(dbBatch *orm.Batch, d
 	return calldata, daBatch.Blob(), nil
 }
 
-func (r *Layer2Relayer) constructCommitBatchPayloadCodecV6(batchesToSubmit []*dbBatchWithChunksAndParent) ([]byte, []*kzg4844.Blob, uint64, uint64, error) {
+func (r *Layer2Relayer) constructCommitBatchPayloadCodecV7(batchesToSubmit []*dbBatchWithChunksAndParent) ([]byte, []*kzg4844.Blob, uint64, uint64, error) {
 	var maxBlockHeight uint64
 	var totalGasUsed uint64
 	blobs := make([]*kzg4844.Blob, len(batchesToSubmit))

rollup/internal/controller/relayer/l2_relayer_metrics.go

@@ -8,14 +8,12 @@ import (
 )
 
 type l2RelayerMetrics struct {
+	rollupL2RelayerProcessBatchesPerTxCount                         prometheus.Gauge
 	rollupL2RelayerProcessPendingBatchTotal                         prometheus.Counter
 	rollupL2RelayerProcessPendingBatchSuccessTotal                  prometheus.Counter
 	rollupL2RelayerProcessPendingBatchErrTooManyPendingBlobTxsTotal prometheus.Counter
 	rollupL2RelayerGasPriceOraclerRunTotal                          prometheus.Counter
 	rollupL2RelayerLastGasPrice                                     prometheus.Gauge
-	rollupL2RelayerProcessCommittedBatchesTotal                     prometheus.Counter
-	rollupL2RelayerProcessCommittedBatchesFinalizedTotal            prometheus.Counter
-	rollupL2RelayerProcessCommittedBatchesFinalizedSuccessTotal     prometheus.Counter
 	rollupL2BatchesCommittedConfirmedTotal                          prometheus.Counter
 	rollupL2BatchesCommittedConfirmedFailedTotal                    prometheus.Counter
 	rollupL2BatchesFinalizedConfirmedTotal                          prometheus.Counter
@@ -42,6 +40,10 @@ var (
 func initL2RelayerMetrics(reg prometheus.Registerer) *l2RelayerMetrics {
 	initL2RelayerMetricOnce.Do(func() {
 		l2RelayerMetric = &l2RelayerMetrics{
+			rollupL2RelayerProcessBatchesPerTxCount: promauto.With(reg).NewGauge(prometheus.GaugeOpts{
+				Name: "rollup_layer2_process_batches_per_tx_count",
+				Help: "The number of batches processed per transaction",
+			}),
 			rollupL2RelayerProcessPendingBatchTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{
 				Name: "rollup_layer2_process_pending_batch_total",
 				Help: "The total number of layer2 process pending batch",
@@ -62,18 +64,6 @@ func initL2RelayerMetrics(reg prometheus.Registerer) *l2RelayerMetrics {
 				Name: "rollup_layer2_gas_price_latest_gas_price",
 				Help: "The latest gas price of rollup relayer l2",
 			}),
-			rollupL2RelayerProcessCommittedBatchesTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{
-				Name: "rollup_layer2_process_committed_batches_total",
-				Help: "The total number of layer2 process committed batches run total",
-			}),
-			rollupL2RelayerProcessCommittedBatchesFinalizedTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{
-				Name: "rollup_layer2_process_committed_batches_finalized_total",
-				Help: "The total number of layer2 process committed batches finalized total",
-			}),
-			rollupL2RelayerProcessCommittedBatchesFinalizedSuccessTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{
-				Name: "rollup_layer2_process_committed_batches_finalized_success_total",
-				Help: "The total number of layer2 process committed batches finalized success total",
-			}),
 			rollupL2BatchesCommittedConfirmedTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{
 				Name: "rollup_layer2_process_committed_batches_confirmed_total",
 				Help: "The total number of layer2 process committed batches confirmed total",

rollup/internal/controller/sender/sender.go

@@ -682,8 +682,8 @@ func (s *Sender) getBlockNumberAndBaseFeeAndBlobFee(ctx context.Context) (uint64
 }
 
 func makeSidecar(blobsInput []*kzg4844.Blob) (*gethTypes.BlobTxSidecar, error) {
-	if blobsInput == nil {
-		return nil, errors.New("blobs cannot be nil")
+	if len(blobsInput) == 0 {
+		return nil, errors.New("blobsInput is empty")
 	}
 
 	blobs := make([]kzg4844.Blob, len(blobsInput))