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.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() const lastPreprocessedStateUpdateId = 10 + const preprocessL2TransactionTo = 5 const mockUserStatisticsPreprocessor = mockObject({ 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 ) }) 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 { ) 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 ) } }