make jobId mandatory for onFailed callback

zkBob · Jun 13, 2024 · 0edb5e8 · 0edb5e8
1 parent a312043
commit 0edb5e8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/zp-relayer/pool/BasePool.ts b/zp-relayer/pool/BasePool.ts
@@ -46,7 +46,7 @@ export abstract class BasePool<N extends Network = Network> {
   abstract onSend(p: ProcessResult<any>, txHash: string): Promise<void>
   abstract onConfirmed(p: ProcessResult<any>, txHash: string, callback?: () => Promise<void>, jobId?: string): Promise<void>
 
-  async onFailed(txHash: string, jobId?: string): Promise<void> {
+  async onFailed(txHash: string, jobId: string): Promise<void> {
     logger.error('Transaction reverted', { txHash })
 
     await this.clearOptimisticState()

diff --git a/zp-relayer/pool/RelayPool.ts b/zp-relayer/pool/RelayPool.ts
@@ -260,7 +260,7 @@ export class RelayPool extends BasePool<Network> {
 
   async onConfirmed(res: ProcessResult<RelayPool>, txHash: string, callback?: () => Promise<void>, jobId?: string): Promise<void> {
     logger.debug("Updating pool job %s completed, txHash %s", jobId, txHash);
-    if(jobId) {
+    if (jobId) {
       const poolJob = await poolTxQueue.getJob(jobId);
       if (!poolJob) {
         logger.error('Pool job not found', { jobId });
@@ -274,21 +274,17 @@ export class RelayPool extends BasePool<Network> {
     }
   }
 
-  async onFailed(txHash: string, jobId?: string): Promise<void> {
+  async onFailed(txHash: string, jobId: string): Promise<void> {
     super.onFailed(txHash, jobId);
-    this.txStore.removeAll();
-
-    if(jobId) {
-      const poolJob = await poolTxQueue.getJob(jobId);
-      if (!poolJob) {
-        logger.error('Pool job not found', { jobId });
-      } else {
-        poolJob.data.transaction.state = JobState.REVERTED;
-        poolJob.data.transaction.txHash = txHash;
-        await poolJob.update(poolJob.data);
-      }
+    this.txStore.remove(jobId);
+    const poolJob = await poolTxQueue.getJob(jobId);
+    if (!poolJob) {
+      logger.error('Pool job not found', { jobId });
+    } else {
+      poolJob.data.transaction.state = JobState.REVERTED;
+      poolJob.data.transaction.txHash = txHash;
+      await poolJob.update(poolJob.data);
     }
-
   }
 
   protected async cacheTxLocally(index: number, commit: string, txHash: string, memo: string) {