@instadapp/interop-x 0.0.0-dev.8a917f1 → 0.0.0-dev.8a9ef54

package/src/net/protocol/index.ts

@@ -36,7 +36,7 @@ interface PeerInfoEvent extends BaseMessageEvent {
 }
 
 interface TransactionStatusEvent extends BaseMessageEvent {
-    data: Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'status'>
+    data: Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'sourceLogs' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'targetLogs' | 'status'>
 }
 
 declare interface Protocol {
@@ -68,23 +68,33 @@ class Protocol extends EventEmitter {
                 Buffer.from(transaction.sourceStatus),
                 Buffer.from(transaction.sourceTransactionHash || ''),
                 transaction.sourceErrors ? transaction.sourceErrors.map((e) => Buffer.from(e)) : [],
+                transaction.sourceLogs ? transaction.sourceLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
 
                 Buffer.from(transaction.targetStatus),
                 Buffer.from(transaction.targetTransactionHash || ''),
                 transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
+                transaction.targetLogs ? transaction.targetLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
 
                 Buffer.from(transaction.status),
             ],
-            decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, targetStatus, targetTransactionHash, targetErrors, status]: [Buffer, Buffer, Buffer, Buffer[], Buffer, Buffer, Buffer[], Buffer]) => ({
+            decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, sourceLogs, targetStatus, targetTransactionHash, targetErrors, targetLogs, status]: [Buffer, Buffer, Buffer, Buffer[],[Buffer,Buffer][], Buffer, Buffer, Buffer[],[Buffer,Buffer][], Buffer]) => ({
                 transactionHash: transactionHash.toString(),
 
                 sourceStatus: sourceStatus.toString(),
                 sourceTransactionHash: sourceTransactionHash.toString() || null,
                 sourceErrors: sourceErrors.map((e) => e.toString()),
+                sourceLogs: sourceLogs.map(e => ({
+                    type: e[0].toString(),
+                    message: e[1].toString(),
+                })),
 
                 targetStatus: targetStatus.toString(),
-                targetTransactionHash: targetTransactionHash.toString()|| null,
+                targetTransactionHash: targetTransactionHash.toString() || null,
                 targetErrors: targetErrors.map((e) => e.toString()),
+                targetLogs: targetLogs.map(e => ({
+                    type: e[0].toString(),
+                    message: e[1].toString(),
+                })),
 
                 status: status.toString(),
             }),

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";
+
+class SyncLogSubmitEvents extends BaseTask {
+  contractAddress: string;
+  provider: ethers.providers.JsonRpcProvider;
+  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(),
+      29429078,
+      29429078
+    );
+
+    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,
+            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 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.chainId].interopX;
+
+    this.provider = new ethers.providers.JsonRpcProvider(
+      getRpcProviderUrl(this.chainId)
+    );
+
+    this.contract = getContract<InteropX>(
+      this.contractAddress,
+      abi.interopX,
+      new ethers.Wallet(config.privateKey!, this.provider)
+    );
+
+    await super.start();
+  }
+}
+
+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',
-                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,60 +1,30 @@
 import { BaseTask } from "./BaseTask";
-import InteropXGatewayProcessDepositEvents from "./InteropXGateway/ProcessDepositEvents";
-import InteropXGatewaySyncDepositEvents from "./InteropXGateway/SyncDepositEvents";
-import InteropXGatewaySyncWithdrawEvents from "./InteropXGateway/SyncWithdrawtEvents";
-
-import InteropBridgeSyncWithdrawEvents from "./InteropBridge/SyncBurnEvents";
-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";
+
 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 InteropXGatewaySyncWithdrawEvents({
-            chainId: 43114
-        }),
-
-
-        // InteropBridge
-
-        new InteropBridgeSyncWithdrawEvents({
-            chainId: 137,
-            itokenAddress: '0x62c0045f3277e7067cacad3c8038eeabb1bd92d1',
-        }),
-
-        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}`);
             }