Merge pull request zkLinkProtocol#123 from zkLinkProtocol/feat-direct…

…PointOp fix direact points.
uxuycom · Jul 26, 2024 · 3ef6c57 · 3ef6c57
2 parents 48c2e49 + 094574d
commit 3ef6c57
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/app.service.ts b/src/app.service.ts
@@ -41,7 +41,6 @@ export class AppService implements OnModuleInit, OnModuleDestroy {
     // second params is utc+8
     // await this.tvlPointService.handleHoldPoint(1395273, new Date(1715159940 * 1000).toISOString());
     // this.compensatePoints()
-    await this.directPointService.runProcess();
     this.redistributePointService.runProcess();
     this.startWorkers();
   }

diff --git a/src/points/directPoint.service.ts b/src/points/directPoint.service.ts
@@ -83,18 +83,20 @@ export class DirectPointService extends Worker {
 
   public async runProcess(): Promise<void> {
     const blockNumbers = await this.directHoldProcessingStatusRepository.getUnprocessedBlockNumber();
-    if (blockNumbers.length === 0) {
-      this.logger.log(`No block to process`);
-      return;
-    }
-    for (const blockNumber of blockNumbers) {
-      try {
-        await this.handleHoldPoint(blockNumber.blockNumber);
-      } catch (error) {
-        this.logger.error("Failed to calculate hold point", error.stack);
+    if (blockNumbers.length > 0) {
+      for (const blockNumber of blockNumbers) {
+        try {
+          await this.handleHoldPoint(blockNumber.blockNumber);
+        } catch (error) {
+          this.logger.error("Failed to calculate hold point", error.stack);
+        }
+      }
+      await waitFor(() => !this.currentProcessPromise, 10000, 10000);
+      if (!this.currentProcessPromise) {
+        return;
       }
     }
-    await waitFor(() => false, 1000, 1000);
+    return this.runProcess();
   }
 
   async handleHoldPoint(currentBlockNumber: number) {