From 49d8ba6ed4ad05827b11a216192e7e7bcd89be4d Mon Sep 17 00:00:00 2001
From: HXHke <ke.he@davionlabs.com>
Date: Wed, 20 Sep 2023 17:08:40 +0800
Subject: [PATCH 1/2] modify batch end block number

---
 mt-batcher/services/sequencer/driver.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mt-batcher/services/sequencer/driver.go b/mt-batcher/services/sequencer/driver.go
index 52b2997fd..2f586ed59 100644
--- a/mt-batcher/services/sequencer/driver.go
+++ b/mt-batcher/services/sequencer/driver.go
@@ -235,7 +235,7 @@ func (d *Driver) GetBatchBlockRange(ctx context.Context) (*big.Int, *big.Int, er
 		return nil, nil, fmt.Errorf("invalid range, end(%v) < start(%v)", end, start)
 	}
 	if end.Cmp(latestHeader.Number) > 0 {
-		end = latestHeader.Number
+		end = new(big.Int).Add(latestHeader.Number, bigOne)
 	}
 	return start, end, nil
 }

From f5b151cb1b13d56df12c4adea8f49d76296ca81a Mon Sep 17 00:00:00 2001
From: HXHke <ke.he@davionlabs.com>
Date: Wed, 20 Sep 2023 17:25:52 +0800
Subject: [PATCH 2/2] fix da currentL2TransactionIndex metric that may not
 exist

---
 .../src/services/da-ingestion/service.ts                    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/data-transport-layer/src/services/da-ingestion/service.ts b/packages/data-transport-layer/src/services/da-ingestion/service.ts
index 57a043f29..850d49519 100644
--- a/packages/data-transport-layer/src/services/da-ingestion/service.ts
+++ b/packages/data-transport-layer/src/services/da-ingestion/service.ts
@@ -448,6 +448,9 @@ export class DaIngestionService extends BaseService<DaIngestionServiceOptions> {
             )
             return false
           }
+          this.daIngestionMetrics.currentL2TransactionIndex.set(
+            batchTx['TxMeta']['index']
+          )
         }
         transactionEntries.push({
           index: batchTx['TxMeta']['index'],
@@ -464,9 +467,6 @@ export class DaIngestionService extends BaseService<DaIngestionServiceOptions> {
           decoded,
           confirmed: true,
         })
-        this.daIngestionMetrics.currentL2TransactionIndex.set(
-          batchTx['TxMeta']['index']
-        )
       }
       await this.state.db.putTransactions(transactionEntries)
       await this.state.db.putBatchTransactionByDsId(