fix blockchain sync

CabinDAO · Mar 7, 2024 · 3b6f915 · 3b6f915
1 parent 82f7fdf
commit 3b6f915
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 30 deletions.
diff --git a/lib/sync/attemptSync.ts b/lib/sync/attemptSync.ts
@@ -1,14 +1,18 @@
 import { providers } from 'ethers'
 import { NextApiResponse } from 'next'
 import { prisma } from '@/lib/prisma'
-import { $Enums, BlockSyncAttempt } from '@prisma/client'
+import {
+  BlockSyncType,
+  BlockSyncAttempt,
+  BlockSyncStatus,
+} from '@prisma/client'
 import { Decimal } from '@prisma/client/runtime/library'
 
 const SAFE_BLOCK_THRESHOLD = 30
 
 export interface SyncAttemptInput {
   provider: providers.Provider
-  type: $Enums.BlockSyncType
+  type: BlockSyncType
   initialBlock: Decimal
   blockCount: Decimal
   res: NextApiResponse
@@ -36,17 +40,17 @@ export async function attemptSync(input: SyncAttemptInput) {
 
   // Short circuit if there are any pending sync attempts
   if (latestPendingAttempt) {
-    console.log('Pending sync attempt found, skipping')
+    console.log(`${type} sync already in progress`)
     res
       .status(200)
-      .send(JSON.stringify({ message: 'Pending sync attempt found, skipping' }))
+      .send(JSON.stringify({ message: `${type} sync already in progress` }))
     return
   }
 
   const latestBlockNumber = await provider.getBlockNumber()
   const syncAttempt =
     latestFailedAttempt ??
-    (await _tryCreateNewSyncAttempt(
+    (await createNewSyncAttempt(
       input,
       latestBlockNumber,
       latestSuccessfulAttempt
@@ -71,16 +75,16 @@ export async function attemptSync(input: SyncAttemptInput) {
       endBlock: syncAttempt.endBlock,
     })
 
-    await completeSync(syncAttempt.id)
+    await completeSync(syncAttempt)
 
     res.status(200).send(
       JSON.stringify(
         {
           type,
           id: syncAttempt.id,
-          startBlock: syncAttempt.startBlock.toString(),
-          endBlock: syncAttempt.endBlock.toString(),
-          blocksTillLatest: blocksTillLatest.toString(),
+          startBlock: syncAttempt.startBlock.toNumber(),
+          endBlock: syncAttempt.endBlock.toNumber(),
+          blocksTillLatest: blocksTillLatest.toNumber(),
           result,
         },
         null,
@@ -90,15 +94,7 @@ export async function attemptSync(input: SyncAttemptInput) {
   } catch (error) {
     console.error(error)
     try {
-      await prisma.blockSyncAttempt.update({
-        where: {
-          id: syncAttempt.id,
-          status: 'Pending',
-        },
-        data: {
-          status: 'Failed',
-        },
-      })
+      await failSync(syncAttempt)
 
       res
         .status(400)
@@ -112,13 +108,13 @@ export async function attemptSync(input: SyncAttemptInput) {
     } catch (error) {
       console.error(error)
       res
-        .status(422)
+        .status(400)
         .send(JSON.stringify({ error: 'Sync attempt failed.' }, null, 2))
     }
   }
 }
 
-async function _tryCreateNewSyncAttempt(
+async function createNewSyncAttempt(
   input: SyncAttemptInput,
   latestBlockNumber: number,
   latestSuccessfulAttempt: BlockSyncAttempt | undefined
@@ -148,22 +144,43 @@ async function _tryCreateNewSyncAttempt(
   return prisma.blockSyncAttempt.create({
     data: {
       type,
-      status: 'Pending',
+      status: BlockSyncStatus.Pending,
       startBlock: startBlock,
       endBlock: endBlock,
-      failedAttemptCount: 0,
     },
   })
 }
 
-export async function completeSync(syncAttemptId: number) {
+async function completeSync(syncAttempt: BlockSyncAttempt) {
+  if (syncAttempt.status == BlockSyncStatus.Successful) {
+    console.error(`sync attempt ${syncAttempt.id} already completed`)
+    return
+  }
+
+  return prisma.blockSyncAttempt.update({
+    where: {
+      id: syncAttempt.id,
+      status: syncAttempt.status,
+    },
+    data: {
+      status: BlockSyncStatus.Successful,
+    },
+  })
+}
+
+async function failSync(syncAttempt: BlockSyncAttempt) {
+  if (syncAttempt.status == BlockSyncStatus.Failed) {
+    console.error(`sync attempt ${syncAttempt.id} already failed`)
+    return
+  }
+
   return prisma.blockSyncAttempt.update({
     where: {
-      id: syncAttemptId,
-      status: 'Pending',
+      id: syncAttempt.id,
+      status: syncAttempt.status,
     },
     data: {
-      status: 'Successful',
+      status: BlockSyncStatus.Failed,
     },
   })
 }
diff --git a/prisma/migrations/20240307185629_drop_failed_sync_attempt_count/migration.sql b/prisma/migrations/20240307185629_drop_failed_sync_attempt_count/migration.sql
@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `failedAttemptCount` on the `BlockSyncAttempt` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "BlockSyncAttempt" DROP COLUMN "failedAttemptCount";
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -481,11 +481,9 @@ model BlockSyncAttempt {
   updatedAt DateTime @updatedAt
 
   type       BlockSyncType
+  status     BlockSyncStatus
   startBlock Decimal         @db.Decimal(9, 0)
   endBlock   Decimal         @db.Decimal(9, 0)
-  status     BlockSyncStatus
-
-  failedAttemptCount Int // TODO: do we need this at all?
 
   @@index([type, status])
 }

diff --git a/scripts/postgres-import.ts b/scripts/postgres-import.ts
@@ -149,7 +149,7 @@ async function importBlockSyncAttempt(datum: BlockSyncAttempt) {
       startBlock: d.data.startBlock,
       endBlock: d.data.endBlock,
       status: d.data.status,
-      failedAttemptCount: d.data.failedAttemptCount ?? 0,
+      // failedAttemptCount: d.data.failedAttemptCount ?? 0, // dropped this column later
     },
   })
 }