@instadapp/interop-x 0.0.0-dev.326bdca → 0.0.0-dev.376f394

package/src/tasks/{InteropXContract/SyncBridgeRequestEvents.ts → InteropX/SyncLogSubmitEvents.ts}

@@ -7,17 +7,17 @@ import { generateInteropTransactionHash, getContract, getRpcProviderUrl } from "
 import { addresses } from "@/constants";
 import { ChainId } from "@/types";
 import config from "@/config";
-import { InteropXContract } from "@/typechain";
+import { InteropX } from "@/typechain";
 
-class SyncBridgeRequestEvents extends BaseTask {
+class SyncLogSubmitEvents extends BaseTask {
     contractAddress: string;
     provider: ethers.providers.JsonRpcProvider;
-    contract: InteropXContract;
+    contract: InteropX;
     chainId: ChainId;
 
     constructor({ chainId }: { chainId: ChainId }) {
         super({
-            logger: new Logger("InteropXContract::SyncBridgeRequestEvents"),
+            logger: new Logger("InteropX::SyncLogSubmitEvents"),
         })
         this.chainId = chainId;
     }
@@ -26,7 +26,7 @@ class SyncBridgeRequestEvents extends BaseTask {
         const currentBlock = await this.provider.getBlockNumber();
 
         const events = await this.contract.queryFilter(
-            this.contract.filters.LogBridgeRequest(),
+            this.contract.filters.LogSubmit(),
             currentBlock - 2000,
             currentBlock,
         );
@@ -40,14 +40,28 @@ class SyncBridgeRequestEvents extends BaseTask {
                     continue;
                 }
 
-                const { bridger, position, sourceChainId, targetChainId, metadata } = event.args;
+                const {
+                    position,
+                    actionId,
+                    actionIdHashHash,
+                    sourceSender,
+                    sourceDsaId,
+                    targetDsaId,
+                    sourceChainId,
+                    targetChainId,
+                    vnonce,
+                    metadata,
+
+                } = event.args;
 
                 const uniqueIdentifier = {
-                    action: 'withdraw', //todo
-                    bridger,
-                    requestTransactionHash: event.transactionHash,
+                    actionId,
+                    vnonce: vnonce.toString(),
+                    sourceSender: sourceSender.toString(),
                     sourceChainId: sourceChainId.toNumber(),
                     targetChainId: targetChainId.toNumber(),
+                    sourceDsaId: sourceDsaId.toString(),
+                    targetDsaId: targetDsaId.toString(),
                 }
 
                 let transactionHash = generateInteropTransactionHash(uniqueIdentifier);
@@ -55,17 +69,20 @@ class SyncBridgeRequestEvents extends BaseTask {
                 const transaction = await Transaction.findOne({ where: { transactionHash } });
 
                 if (transaction) {
-                    return;
+                    continue;
                 }
 
                 await Transaction.create({
                     transactionHash,
                     ...uniqueIdentifier,
-                    position,
-                    metadata,
-                    requestBlockNumber: event.blockNumber,
-                    requestEvent: {
-                        bridger,
+                    submitChainId: this.chainId,
+                    submitTransactionHash: event.transactionHash,
+                    submitBlockNumber: event.blockNumber,
+                    submitCreatedAt: new Date(),
+                    submitEvent: {
+                        actionId,
+                        actionIdHashHash,
+                        vnonce: vnonce.toString(),
                         position: {
                             withdraw: position.withdraw.map((v) => ({
                                 sourceToken: v.sourceToken,
@@ -80,12 +97,15 @@ class SyncBridgeRequestEvents extends BaseTask {
                         },
                         sourceChainId: sourceChainId.toNumber(),
                         targetChainId: targetChainId.toNumber(),
+                        sourceSender,
+                        sourceDsaId: sourceDsaId.toString(),
+                        targetDsaId: targetDsaId.toString(),
                         metadata,
                     }
                 })
 
                 this.logger.info(
-                    `New bridge request received: ${transactionHash} `
+                    `New InteropX tranaction: ${transactionHash} `
                 );
             } catch (error) {
                 this.logger.error(error);
@@ -97,15 +117,15 @@ class SyncBridgeRequestEvents extends BaseTask {
     }
 
     async start(): Promise<void> {
-        this.contractAddress = addresses[this.chainId].interopXContract;
+        this.contractAddress = addresses[this.chainId].interopX;
 
         this.provider = new ethers.providers.JsonRpcProvider(
             getRpcProviderUrl(this.chainId)
         );
 
-        this.contract = getContract<InteropXContract>(
+        this.contract = getContract<InteropX>(
             this.contractAddress,
-            abi.interopXContract,
+            abi.interopX,
             new ethers.Wallet(config.privateKey!, this.provider)
         );
 
@@ -113,4 +133,4 @@ class SyncBridgeRequestEvents extends BaseTask {
     }
 }
 
-export default SyncBridgeRequestEvents;
+export default SyncLogSubmitEvents;

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',
+                sourceStatus: {
+                    [Op.notIn] : ['success', 'failed'],
+                },
                 sourceCreatedAt: {
-                    [Op.gte]: new Date(Date.now() - 60 * 60 * 1000),
+                    [Op.gte]: new Date(Date.now() - 15 * 60 * 1000),
                 },
             }
         })

package/src/tasks/index.ts

@@ -1,11 +1,11 @@
 import { BaseTask } from "./BaseTask";
+import wait from "waait";
+
 import SyncTransactionStatusTask from "./Transactions/SyncTransactionStatusTask";
 
 import AutoUpdateTask from "./AutoUpdateTask";
 
-import SyncBridgeRequestEvents from "./InteropXContract/SyncBridgeRequestEvents";
-import ProccessBridgeRequestEvents from "./InteropXContract/ProcessBridgeRequestEvents";
-import wait from "waait";
+import SyncLogSubmitEvents from "./InteropX/SyncLogSubmitEvents";
 
 export class Tasks {
 
@@ -13,13 +13,11 @@ export class Tasks {
         // new SyncTransactionStatusTask(),
         new AutoUpdateTask(),
 
-        // InteropXContract
-
-        new SyncBridgeRequestEvents({ chainId: 137 }),
-        new SyncBridgeRequestEvents({ chainId: 43114 }),
+        // InteropX
+        new SyncLogSubmitEvents({ chainId: 137 }),
+        new SyncLogSubmitEvents({ chainId: 43114 }),
 
-        new ProccessBridgeRequestEvents({ chainId: 137 }),
-        new ProccessBridgeRequestEvents({ chainId: 43114 }),
+        new SyncTransactionStatusTask(),
     ];
 
     async start() {