sync transactions on every block rather than on every state update

l2beat · Jun 29, 2023 · cac0a17 · cac0a17
1 parent c973e19
commit cac0a17
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/packages/backend/src/core/PerpetualValidiumSyncService.ts b/packages/backend/src/core/PerpetualValidiumSyncService.ts
@@ -48,11 +48,10 @@ export class PerpetualValidiumSyncService implements IDataSyncService {
     })
 
     await this.processStateTransitions(stateTransitions)
+    await this.feederGatewayCollector?.collect()
   }
 
   async processStateTransitions(stateTransitions: ValidiumStateTransition[]) {
-    let lastStateUpdateId: number | undefined
-
     for (const stateTransition of stateTransitions) {
       const [perpetualCairoOutput, batch] = await Promise.all([
         this.perpetualCairoOutputCollector.collect(
@@ -66,17 +65,11 @@ export class PerpetualValidiumSyncService implements IDataSyncService {
       if (!batch) {
         throw new Error(`Unable to download batch ${stateTransition.batchId}`)
       }
-      const stateUpdate =
-        await this.perpetualValidiumUpdater.processValidiumStateTransition(
-          stateTransition,
-          perpetualCairoOutput,
-          batch
-        )
-      lastStateUpdateId = stateUpdate.id
-    }
-
-    if (lastStateUpdateId) {
-      await this.feederGatewayCollector?.collect(lastStateUpdateId)
+      await this.perpetualValidiumUpdater.processValidiumStateTransition(
+        stateTransition,
+        perpetualCairoOutput,
+        batch
+      )
     }
   }
 

diff --git a/packages/backend/src/core/collectors/FeederGatewayCollector.ts b/packages/backend/src/core/collectors/FeederGatewayCollector.ts
@@ -11,15 +11,18 @@ export class FeederGatewayCollector {
     private readonly logger: Logger
   ) {}
 
-  async collect(syncToStateUpdateId: number) {
+  async collect() {
+    const latestStateUpdate = await this.stateUpdateRepository.findLast()
+    if (!latestStateUpdate) return
+
     const latestSyncedTransactionStateUpdateId =
       await this.l2TransactionRepository.findLatestStateUpdateId()
 
     for (
       let stateUpdateId = latestSyncedTransactionStateUpdateId
         ? latestSyncedTransactionStateUpdateId + 1
         : 1;
-      stateUpdateId <= syncToStateUpdateId;
+      stateUpdateId <= latestStateUpdate.id;
       stateUpdateId++
     ) {
       const stateUpdate = await this.stateUpdateRepository.findById(