From bc6d85ec06b50205300312c9ddff1d72148fba57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20T=C3=B3rz?= <tomasz.torz@l2beat.com>
Date: Thu, 21 Sep 2023 11:11:17 +0200
Subject: [PATCH 1/2] minor fixes

---
 .../src/api/controllers/StateUpdateController.ts       |  4 +++-
 .../backend/src/core/preprocessing/Preprocessor.ts     | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/api/controllers/StateUpdateController.ts b/packages/backend/src/api/controllers/StateUpdateController.ts
index e82fbd504..1903df1f9 100644
--- a/packages/backend/src/api/controllers/StateUpdateController.ts
+++ b/packages/backend/src/api/controllers/StateUpdateController.ts
@@ -67,7 +67,9 @@ export class StateUpdateController {
       l2Transactions,
     ] = await Promise.all([
       this.stateUpdateRepository.findById(stateUpdateId),
-      this.preprocessedStateDetailsRepository.findById(stateUpdateId),
+      this.preprocessedStateDetailsRepository.findByStateUpdateId(
+        stateUpdateId
+      ),
       this.preprocessedAssetHistoryRepository.getByStateUpdateIdPaginated(
         stateUpdateId,
         paginationOpts
diff --git a/packages/backend/src/core/preprocessing/Preprocessor.ts b/packages/backend/src/core/preprocessing/Preprocessor.ts
index 854451871..70f821197 100644
--- a/packages/backend/src/core/preprocessing/Preprocessor.ts
+++ b/packages/backend/src/core/preprocessing/Preprocessor.ts
@@ -133,13 +133,19 @@ export class Preprocessor<T extends AssetHash | AssetId> {
         )
 
         if (this.l2TransactionsEnabled) {
+          const preprocessL2TransactionTo =
+            await this.getStateUpdateIdToCatchUpL2TransactionsTo(
+              trx,
+              lastProcessedStateUpdate.stateUpdateId
+            )
+
           await this.stateDetailsPreprocessor.catchUpL2Transactions(
             trx,
-            lastProcessedStateUpdate.stateUpdateId
+            preprocessL2TransactionTo
           )
           await this.userL2TransactionsPreprocessor.catchUp(
             trx,
-            lastProcessedStateUpdate.stateUpdateId
+            preprocessL2TransactionTo
           )
         }
       }

From 9a3849f2399cc12090213507ae7c9a9b55d4fc3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20T=C3=B3rz?= <tomasz.torz@l2beat.com>
Date: Thu, 21 Sep 2023 11:29:43 +0200
Subject: [PATCH 2/2] fix test

---
 .../src/core/preprocessing/Preprocessor.test.ts     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/core/preprocessing/Preprocessor.test.ts b/packages/backend/src/core/preprocessing/Preprocessor.test.ts
index 7d30786c7..030a5dfa8 100644
--- a/packages/backend/src/core/preprocessing/Preprocessor.test.ts
+++ b/packages/backend/src/core/preprocessing/Preprocessor.test.ts
@@ -74,6 +74,7 @@ describe(Preprocessor.name, () => {
     it('catches up', async () => {
       const mockKnexTransaction = mockObject<Knex.Transaction>()
       const lastPreprocessedStateUpdateId = 10
+      const preprocessL2TransactionTo = 5
       const mockUserStatisticsPreprocessor =
         mockObject<UserStatisticsPreprocessor>({
           catchUp: mockFn().resolvesTo(undefined),
@@ -110,6 +111,12 @@ describe(Preprocessor.name, () => {
         true
       )
 
+      const mockGetStateUpdateIdToCatchUpL2TransactionsTo = mockFn().resolvesTo(
+        preprocessL2TransactionTo
+      )
+      preprocessor.getStateUpdateIdToCatchUpL2TransactionsTo =
+        mockGetStateUpdateIdToCatchUpL2TransactionsTo
+
       await preprocessor.catchUp()
 
       expect(
@@ -125,10 +132,10 @@ describe(Preprocessor.name, () => {
       )
       expect(
         mockStateDetailsPreprocessor.catchUpL2Transactions
-      ).toHaveBeenCalledWith(mockKnexTransaction, lastPreprocessedStateUpdateId)
-      expect(mockUserStatisticsPreprocessor.catchUp).toHaveBeenCalledWith(
+      ).toHaveBeenCalledWith(mockKnexTransaction, preprocessL2TransactionTo)
+      expect(mockUserL2TransactionsPreprocessor.catchUp).toHaveBeenCalledWith(
         mockKnexTransaction,
-        lastPreprocessedStateUpdateId
+        preprocessL2TransactionTo
       )
     })