Setting reverted state to failed txs

zkBob · May 30, 2024 · 95227b1 · 95227b1
1 parent 179dc44
commit 95227b1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 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): 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
@@ -274,6 +274,23 @@ export class RelayPool extends BasePool<Network> {
     }
   }
 
+  async onFailed(txHash: string, jobId?: string): Promise<void> {
+    super.onFailed(txHash, jobId);
+
+    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);
+      }
+    }
+
+    // TODO: remove cached tx from txStore
+  }
+
   protected async cacheTxLocally(index: number, commit: string, txHash: string, memo: string) {
     // store or updating local tx store
     // (we should keep sent transaction until the indexer grab them)

diff --git a/zp-relayer/workers/sentTxWorker.ts b/zp-relayer/workers/sentTxWorker.ts
@@ -87,8 +87,8 @@ export async function createSentTxWorker({ redis, mutex, pool, txManager }: ISen
 
       await pool.onConfirmed(processResult, txHash, updatePoolJobState,poolJobId)
     } else {
-      await pool.onFailed(txHash)
-      await updatePoolJobState()
+      await pool.onFailed(txHash, poolJobId);
+      //await updatePoolJobState()
     }
   }