@instadapp/interop-x 0.0.0-dev.c696e38 → 0.0.0-dev.cb34b2e

package/src/tasks/InteropX/SyncLogExecuteEvents.ts

@@ -0,0 +1,161 @@
+import { BaseTask } from "../BaseTask";
+import Logger from "@/logger";
+import { ethers } from "ethers";
+import abi from "@/abi";
+import { Transaction } from "@/db";
+import {
+  generateInteropTransactionHash,
+  getContract,
+  getRpcProviderUrl,
+} from "@/utils";
+import { addresses } from "@/constants";
+import { ChainId } from "@/types";
+import config from "@/config";
+import { InteropX } from "@/typechain";
+import { Op } from "sequelize";
+import { JsonRpcRetryProvider } from "@/providers";
+
+export default class SyncLogExecuteEvents extends BaseTask {
+  contractAddress: string;
+  provider: JsonRpcRetryProvider;
+  contract: InteropX;
+  targetChainId: ChainId;
+
+  constructor({ targetChainId }: { targetChainId: ChainId }) {
+    super({
+      logger: new Logger("InteropX::SyncLogExecuteEvents"),
+    });
+    this.targetChainId = targetChainId;
+  }
+
+  async pollHandler() {
+    const currentBlock = await this.provider.getBlockNumber();
+
+    const events = await this.contract.queryFilter(
+      this.contract.filters.LogExecute(),
+      currentBlock - 2000,
+      currentBlock
+    );
+
+    let processedEvents = 0;
+
+    for (const event of events) {
+      try {
+        if (!event.args) {
+          continue;
+        }
+
+        const {
+          sourceSpells,
+          targetSpells,
+          position,
+          actionId,
+          actionIdHash,
+          sourceSender,
+          sourceDsaId,
+          targetDsaId,
+          sourceChainId,
+          targetChainId,
+          vnonce,
+          metadata,
+        } = event.args;
+
+        const uniqueIdentifier = {
+          actionId,
+          vnonce: vnonce.toString(),
+          sourceSender: sourceSender.toString(),
+          sourceChainId: sourceChainId.toNumber(),
+          targetChainId: targetChainId.toNumber(),
+          sourceDsaId: sourceDsaId.toString(),
+          targetDsaId: targetDsaId.toString(),
+        };
+
+        let transactionHash = generateInteropTransactionHash(uniqueIdentifier);
+
+        const transaction = await Transaction.findOne({
+          where: {
+            transactionHash,
+            executeEvent: { [Op.eq]: null },
+          },
+        });
+
+        if (!transaction) {
+          continue;
+        }
+
+        if (transaction.targetStatus != "success") {
+          transaction.targetStatus = "success";
+        }
+
+        if (transaction.status != "success") {
+          transaction.status = "success";
+        }
+
+        if (!transaction.targetCreatedAt) {
+          transaction.targetCreatedAt = new Date();
+        }
+
+        transaction.targetTransactionHash = event.transactionHash;
+        transaction.targetBlockNumber = event.blockNumber;
+        transaction.targetLogs = [];
+        transaction.executeEvent = {
+          actionId,
+          actionIdHashHash: actionIdHash,
+          actionIdHash,
+          vnonce: vnonce.toString(),
+          sourceSpells: sourceSpells.map(({ connector, data }) => ({
+            connector,
+            data,
+          })),
+          targetSpells: targetSpells.map(({ connector, data }) => ({
+            connector,
+            data,
+          })),
+          position: {
+            withdraw: position.withdraw.map((v) => ({
+              sourceToken: v.sourceToken,
+              targetToken: v.targetToken,
+              amount: v.amount.toString(),
+            })),
+            supply: position.supply.map((v) => ({
+              sourceToken: v.sourceToken,
+              targetToken: v.targetToken,
+              amount: v.amount.toString(),
+            })),
+          },
+          sourceChainId: sourceChainId.toNumber(),
+          targetChainId: targetChainId.toNumber(),
+          sourceSender,
+          sourceDsaId: sourceDsaId.toString(),
+          targetDsaId: targetDsaId.toString(),
+          metadata,
+        };
+
+        await transaction.save();
+
+        this.logger.info(`New InteropX tranaction: ${transactionHash} `);
+      } catch (error) {
+        this.logger.error(error);
+      }
+    }
+
+    if (processedEvents > 0)
+      this.logger.info(`${processedEvents} events processed`);
+  }
+
+  async start(): Promise<void> {
+    this.contractAddress = addresses[this.targetChainId].interopX;
+
+    this.provider = new JsonRpcRetryProvider(
+      getRpcProviderUrl(this.targetChainId)
+    );
+
+    this.contract = getContract<InteropX>(
+      this.contractAddress,
+      abi.interopX,
+      new ethers.Wallet(config.privateKey!, this.provider)
+    );
+
+    await super.start();
+  }
+}

package/src/tasks/InteropX/SyncLogSubmitEvents.ts

@@ -12,10 +12,11 @@ import { addresses } from "@/constants";
 import { ChainId } from "@/types";
 import config from "@/config";
 import { InteropX } from "@/typechain";
+import { JsonRpcRetryProvider } from "@/providers";
 
-class SyncLogSubmitEvents extends BaseTask {
+export default class SyncLogSubmitEvents extends BaseTask {
   contractAddress: string;
-  provider: ethers.providers.JsonRpcProvider;
+  provider: JsonRpcRetryProvider;
   contract: InteropX;
   chainId: ChainId;
 
@@ -122,7 +123,7 @@ class SyncLogSubmitEvents extends BaseTask {
   async start(): Promise<void> {
     this.contractAddress = addresses[this.chainId].interopX;
 
-    this.provider = new ethers.providers.JsonRpcProvider(
+    this.provider = new JsonRpcRetryProvider(
       getRpcProviderUrl(this.chainId)
     );
 
@@ -134,6 +135,4 @@ class SyncLogSubmitEvents extends BaseTask {
 
     await super.start();
   }
-}
-
-export default SyncLogSubmitEvents;
+}

package/src/tasks/InteropX/SyncLogValidateEvents.ts

@@ -13,10 +13,11 @@ import { ChainId } from "@/types";
 import config from "@/config";
 import { InteropX } from "@/typechain";
 import { Op } from "sequelize";
+import { JsonRpcRetryProvider } from "@/providers";
 
-class SyncLogValidateEvents extends BaseTask {
+export default class SyncLogValidateEvents extends BaseTask {
   contractAddress: string;
-  provider: ethers.providers.JsonRpcProvider;
+  provider: JsonRpcRetryProvider;
   contract: InteropX;
   chainId: ChainId;
 
@@ -92,7 +93,7 @@ class SyncLogValidateEvents extends BaseTask {
         transaction.sourceTransactionHash = event.transactionHash;
         transaction.sourceBlockNumber = event.blockNumber;
         transaction.sourceLogs = [];
-        (transaction.validateEvent = {
+        transaction.validateEvent = {
           actionId,
           actionIdHashHash: actionIdHash,
           actionIdHash,
@@ -119,8 +120,8 @@ class SyncLogValidateEvents extends BaseTask {
           sourceDsaId: sourceDsaId.toString(),
           targetDsaId: targetDsaId.toString(),
           metadata,
-        }),
-          await transaction.save();
+        }
+        await transaction.save();
 
         this.logger.info(`New InteropX tranaction: ${transactionHash} `);
       } catch (error) {
@@ -135,7 +136,7 @@ class SyncLogValidateEvents extends BaseTask {
   async start(): Promise<void> {
     this.contractAddress = addresses[this.chainId].interopX;
 
-    this.provider = new ethers.providers.JsonRpcProvider(
+    this.provider = new JsonRpcRetryProvider(
       getRpcProviderUrl(this.chainId)
     );
 
@@ -147,6 +148,4 @@ class SyncLogValidateEvents extends BaseTask {
 
     await super.start();
   }
-}
-
-export default SyncLogValidateEvents;
+}

package/src/tasks/index.ts

@@ -6,22 +6,22 @@ import SyncTransactionStatusTask from "./Transactions/SyncTransactionStatusTask"
 import AutoUpdateTask from "./AutoUpdateTask";
 
 import SyncLogSubmitEvents from "./InteropX/SyncLogSubmitEvents";
-import ProcessSubmitSubmitEvents from "./InteropX/ProcessSubmitSubmitEvents";
+import ProcessSubmitEvents from "./InteropX/ProcessSubmitEvents";
 import SyncLogValidateEvents from "./InteropX/SyncLogValidateEvents";
 import ProcessValidateEvents from "./InteropX/ProcessValidateEvents";
+import SyncLogExecuteEvents from "./InteropX/SyncLogExecuteEvents";
 
 export class Tasks {
 
     tasks: BaseTask[] = [
-        // new SyncTransactionStatusTask(),
         new AutoUpdateTask(),
 
         // InteropX
         new SyncLogSubmitEvents({ chainId: 137 }),
         new SyncLogSubmitEvents({ chainId: 43114 }),
 
-        new ProcessSubmitSubmitEvents({ chainId: 137 }),
-        new ProcessSubmitSubmitEvents({ chainId: 43114 }),
+        new ProcessSubmitEvents({ chainId: 137 }),
+        new ProcessSubmitEvents({ chainId: 43114 }),
 
         new SyncLogValidateEvents({ chainId: 137 }),
         new SyncLogValidateEvents({ chainId: 43114 }),
@@ -29,6 +29,9 @@ export class Tasks {
         new ProcessValidateEvents({ chainId: 137 }),
         new ProcessValidateEvents({ chainId: 43114 }),
 
+        new SyncLogExecuteEvents({ targetChainId: 137 }),
+        new SyncLogExecuteEvents({ targetChainId: 43114 }),
+
         new SyncTransactionStatusTask(),
     ];
 
@@ -36,7 +39,7 @@ export class Tasks {
         for (const task of this.tasks) {
             try {
                 task.start();
-                await wait(1000)
+                await wait(300)
             } catch (error) {
                 console.error(`Error starting task: ${task.constructor.name}`);
             }