@instadapp/interop-x 0.0.0-dev.d4e8223 → 0.0.0-dev.d58bb7b

package/src/tasks/Transactions/SyncTransactionStatusTask.ts

@@ -20,14 +20,17 @@ class SyncTransactionStatusTask extends BaseTask {
         const leadNode = peerPool.getLeadPeer();
 
         if (!leadNode) {
+            console.log("No lead node found");
             return;
         }
 
         const transaction = await Transaction.findOne({
             where: {
-                status: 'pending',
-                sourceCreatedAt: {
-                    [Op.gte]: new Date(Date.now() - 60 * 60 * 1000),
+                status: {
+                    [Op.notIn] : ['success', 'failed'],
+                },
+                createdAt: {
+                    [Op.lt]: new Date(Date.now() - 15 * 60 * 1000),
                 },
             }
         })
@@ -49,10 +52,12 @@ class SyncTransactionStatusTask extends BaseTask {
         transaction.sourceStatus = transactionStatus.sourceStatus
         transaction.sourceTransactionHash = transactionStatus.sourceTransactionHash
         transaction.sourceErrors = transactionStatus.sourceErrors
+        transaction.sourceLogs = transactionStatus.sourceLogs
 
         transaction.targetStatus = transactionStatus.targetStatus
         transaction.targetTransactionHash = transactionStatus.targetTransactionHash
         transaction.targetErrors = transactionStatus.targetErrors
+        transaction.targetLogs = transactionStatus.targetLogs
 
         transaction.status = transactionStatus.status
 

package/src/tasks/index.ts

@@ -1,59 +1,38 @@
 import { BaseTask } from "./BaseTask";
-import InteropXGatewayProcessDepositEvents from "./InteropXGateway/ProcessDepositEvents";
-import InteropXGatewaySyncDepositEvents from "./InteropXGateway/SyncDepositEvents";
-import InteropXGatewaySyncWithdrawEvents from "./InteropXGateway/SyncWithdrawtEvents";
-
-import InteropBridgeProcessWithdrawEvents from "./InteropBridge/ProcessWithdrawEvents";
-import InteropBridgeSyncBurnEvents from "./InteropBridge/SyncBurnEvents";
-import InteropBridgeSyncMintEvents from "./InteropBridge/SyncMintEvents";
+import wait from "waait";
 
 import SyncTransactionStatusTask from "./Transactions/SyncTransactionStatusTask";
 
 import AutoUpdateTask from "./AutoUpdateTask";
 
+import SyncLogSubmitEvents from "./InteropX/SyncLogSubmitEvents";
+import ProcessSubmitSubmitEvents from "./InteropX/ProcessSubmitSubmitEvents";
+import SyncLogValidateEvents from "./InteropX/SyncLogValidateEvents";
+
 export class Tasks {
-    
+
     tasks: BaseTask[] = [
-        new SyncTransactionStatusTask(),
+        // new SyncTransactionStatusTask(),
         new AutoUpdateTask(),
 
-        // InteropXGateway
-
-        new InteropXGatewaySyncDepositEvents({
-            chainId: 43114
-        }),
-
-        new InteropXGatewayProcessDepositEvents({
-            chainId: 43114
-        }),
+        // InteropX
+        new SyncLogSubmitEvents({ chainId: 137 }),
+        new SyncLogSubmitEvents({ chainId: 43114 }),
 
+        new ProcessSubmitSubmitEvents({ chainId: 137 }),
+        new ProcessSubmitSubmitEvents({ chainId: 43114 }),
 
-        new InteropXGatewaySyncWithdrawEvents({
-            chainId: 43114
-        }),
+        new SyncLogValidateEvents({ chainId: 137 }),
+        new SyncLogValidateEvents({ chainId: 43114 }),
 
-
-        // InteropBridge
-
-        new InteropBridgeProcessWithdrawEvents({
-            chainId: 137,
-        }),
-
-        new InteropBridgeSyncMintEvents({
-            chainId: 137,
-            itokenAddress: '0x62c0045f3277e7067cacad3c8038eeabb1bd92d1',
-        }),
-
-        new InteropBridgeSyncBurnEvents({
-            chainId: 137,
-            itokenAddress: '0x62c0045f3277e7067cacad3c8038eeabb1bd92d1',
-        })
+        new SyncTransactionStatusTask(),
     ];
 
     async start() {
         for (const task of this.tasks) {
             try {
                 task.start();
+                await wait(1000)
             } catch (error) {
                 console.error(`Error starting task: ${task.constructor.name}`);
             }