@instadapp/interop-x 0.0.0-dev.e53015f → 0.0.0-dev.ea4acf6

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 transaction: ${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

@@ -0,0 +1,138 @@
+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 { JsonRpcRetryProvider } from "@/providers";
+
+export default class SyncLogSubmitEvents extends BaseTask {
+  contractAddress: string;
+  provider: JsonRpcRetryProvider;
+  contract: InteropX;
+  chainId: ChainId;
+
+  constructor({ chainId }: { chainId: ChainId }) {
+    super({
+      logger: new Logger("InteropX::SyncLogSubmitEvents"),
+    });
+    this.chainId = chainId;
+  }
+
+  async pollHandler() {
+    const currentBlock = await this.provider.getBlockNumber();
+
+    const events = await this.contract.queryFilter(
+      this.contract.filters.LogSubmit(),
+      currentBlock - 2000,
+      currentBlock
+    );
+
+    let processedEvents = 0;
+
+    for (const event of events) {
+      try {
+        if (!event.args) {
+          continue;
+        }
+
+        const {
+          position,
+          actionId,
+          actionIdHashHash,
+          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 },
+        });
+
+        if (transaction) {
+          continue;
+        }
+
+        await Transaction.create({
+          transactionHash,
+          ...uniqueIdentifier,
+          submitChainId: this.chainId,
+          submitTransactionHash: event.transactionHash,
+          submitBlockNumber: event.blockNumber,
+          submitCreatedAt: new Date(),
+          submitEvent: {
+            actionId,
+            actionIdHashHash,
+            actionIdHash: actionIdHashHash,
+            vnonce: vnonce.toString(),
+            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,
+          },
+        });
+
+        this.logger.info(`New InteropX transaction: ${transactionHash} `);
+      } catch (error) {
+        this.logger.error(error);
+      }
+    }
+
+    if (processedEvents > 0)
+      this.logger.info(`${processedEvents} events processed`);
+  }
+
+  async start(): Promise<void> {
+    this.contractAddress = addresses[this.chainId].interopX;
+
+    this.provider = new JsonRpcRetryProvider(
+      getRpcProviderUrl(this.chainId)
+    );
+
+    this.contract = getContract<InteropX>(
+      this.contractAddress,
+      abi.interopX,
+      new ethers.Wallet(config.privateKey!, this.provider)
+    );
+
+    await super.start();
+  }
+}

package/src/tasks/InteropX/SyncLogValidateEvents.ts

@@ -0,0 +1,151 @@
+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 SyncLogValidateEvents extends BaseTask {
+  contractAddress: string;
+  provider: JsonRpcRetryProvider;
+  contract: InteropX;
+  chainId: ChainId;
+
+  constructor({ chainId }: { chainId: ChainId }) {
+    super({
+      logger: new Logger("InteropX::SyncLogValidateEvents"),
+    });
+    this.chainId = chainId;
+  }
+
+  async pollHandler() {
+    const currentBlock = await this.provider.getBlockNumber();
+
+    const events = await this.contract.queryFilter(
+      this.contract.filters.LogValidate(),
+      currentBlock - 2000,
+      currentBlock
+    );
+
+    let processedEvents = 0;
+
+    for (const event of events) {
+      try {
+        if (!event.args) {
+          continue;
+        }
+
+        const {
+          sourceSpells,
+          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,
+            validateEvent: { [Op.eq]: null },
+          },
+        });
+
+        if (!transaction) {
+          continue;
+        }
+
+        if (transaction.sourceStatus != "success") {
+          transaction.sourceStatus = "success";
+        }
+
+        if (!transaction.sourceCreatedAt) {
+          transaction.sourceCreatedAt = new Date();
+        }
+
+        transaction.sourceTransactionHash = event.transactionHash;
+        transaction.sourceBlockNumber = event.blockNumber;
+        transaction.sourceLogs = [];
+        transaction.validateEvent = {
+          actionId,
+          actionIdHashHash: actionIdHash,
+          actionIdHash,
+          vnonce: vnonce.toString(),
+          sourceSpells: sourceSpells.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 transaction: ${transactionHash} `);
+      } catch (error) {
+        this.logger.error(error);
+      }
+    }
+
+    if (processedEvents > 0)
+      this.logger.info(`${processedEvents} events processed`);
+  }
+
+  async start(): Promise<void> {
+    this.contractAddress = addresses[this.chainId].interopX;
+
+    this.provider = new JsonRpcRetryProvider(
+      getRpcProviderUrl(this.chainId)
+    );
+
+    this.contract = getContract<InteropX>(
+      this.contractAddress,
+      abi.interopX,
+      new ethers.Wallet(config.privateKey!, this.provider)
+    );
+
+    await super.start();
+  }
+}

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,40 +1,45 @@
 import { BaseTask } from "./BaseTask";
-import InteropXGatewayProcessDepositEvents from "./InteropXGateway/ProcessDepositEvents";
-import InteropXGatewaySyncDepositEvents from "./InteropXGateway/SyncDepositEvents";
+import wait from "waait";
 
-import InteropBridgeSyncWithdrawEvents from "./InteropBridge/SyncWithdrawEvents";
-import InteropBridgeProcessWithdrawEvents from "./InteropBridge/ProcessWithdrawEvents";
-import AutoUpdateTask from "./AutoUpdateTask";
 import SyncTransactionStatusTask from "./Transactions/SyncTransactionStatusTask";
 
+import AutoUpdateTask from "./AutoUpdateTask";
+
+import SyncLogSubmitEvents from "./InteropX/SyncLogSubmitEvents";
+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(),
 
-        new InteropXGatewaySyncDepositEvents({
-            chainId: 43114
-        }),
+        // InteropX
+        new SyncLogSubmitEvents({ chainId: 137 }),
+        new SyncLogSubmitEvents({ chainId: 43114 }),
+
+        new ProcessSubmitEvents({ chainId: 137 }),
+        new ProcessSubmitEvents({ chainId: 43114 }),
 
-        new InteropXGatewayProcessDepositEvents({
-            chainId: 43114
-        }),
+        new SyncLogValidateEvents({ chainId: 137 }),
+        new SyncLogValidateEvents({ chainId: 43114 }),
 
-        new InteropBridgeSyncWithdrawEvents({
-            chainId: 137,
-            itokenAddress: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
-        }),
+        new ProcessValidateEvents({ chainId: 137 }),
+        new ProcessValidateEvents({ chainId: 43114 }),
 
-        new InteropBridgeProcessWithdrawEvents({
-            chainId: 137,
-        })
+        new SyncLogExecuteEvents({ targetChainId: 137 }),
+        new SyncLogExecuteEvents({ targetChainId: 43114 }),
+
+        new SyncTransactionStatusTask(),
     ];
 
     async start() {
         for (const task of this.tasks) {
             try {
                 task.start();
+                await wait(300)
             } catch (error) {
                 console.error(`Error starting task: ${task.constructor.name}`);
             }