@instadapp/interop-x 0.0.0-dev.d05464a → 0.0.0-dev.d71f27e

package/src/tasks/Transactions/SyncTransactionStatusTask.ts

@@ -0,0 +1,67 @@
+import { BaseTask } from "../BaseTask";
+import Logger from '@/logger';
+import config from "@/config";
+import { peerPool, protocol } from "@/net";
+import { Transaction } from "@/db";
+import { Op } from "sequelize";
+
+class SyncTransactionStatusTask extends BaseTask {
+    pollIntervalMs: number = 60 * 1000
+    exceptLeadNode: boolean = true;
+
+    constructor() {
+        super({
+            logger: new Logger("SyncTransactionStatusTask"),
+        })
+    }
+    
+    async pollHandler() {
+        // if transaction is pending for more than 1 hour, check lead node for status
+        const leadNode = peerPool.getLeadPeer();
+
+        if (!leadNode) {
+            return;
+        }
+
+        const transaction = await Transaction.findOne({
+            where: {
+                status: 'pending',
+                sourceCreatedAt: {
+                    [Op.gte]: new Date(Date.now() - 60 * 60 * 1000),
+                },
+            }
+        })
+
+        if (!transaction) {
+            return;
+        }
+
+        this.logger.info(`Requesting transaction status for ${transaction.transactionHash}`)
+
+        const transactionStatus = await protocol.requestTransactionStatus(transaction.transactionHash, leadNode.id);
+
+        if (!transactionStatus) {
+            return;
+        }
+
+        this.logger.info(`Received transaction status for ${transaction.transactionHash}`)
+
+        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
+
+        await transaction.save()
+
+        this.logger.info(`Updated transaction status for ${transaction.transactionHash}`)
+    }
+}
+
+export default SyncTransactionStatusTask;

package/src/tasks/index.ts

@@ -1,38 +1,37 @@
 import { BaseTask } from "./BaseTask";
-import InteropXGatewayProcessDepositEvents from "./InteropXGateway/ProcessDepositEvents";
-import InteropXGatewaySyncDepositEvents from "./InteropXGateway/SyncDepositEvents";
+import wait from "waait";
+
+import SyncTransactionStatusTask from "./Transactions/SyncTransactionStatusTask";
 
-import InteropBridgeSyncWithdrawEvents from "./InteropBridge/SyncWithdrawEvents";
-import InteropBridgeProcessWithdrawEvents from "./InteropBridge/ProcessWithdrawEvents";
 import AutoUpdateTask from "./AutoUpdateTask";
 
+import SyncBridgeRequestEvents from "./InteropXContract/SyncBridgeRequestEvents";
+import ProccessBridgeRequestEvents from "./InteropXContract/ProcessBridgeRequestEvents";
+import SyncBridgeRequestSentEvents from "./InteropXContract/SyncBridgeRequestSentEvents";
+
 export class Tasks {
-    
+
     tasks: BaseTask[] = [
+        // new SyncTransactionStatusTask(),
         new AutoUpdateTask(),
 
-        new InteropXGatewaySyncDepositEvents({
-            chainId: 43114
-        }),
+        // InteropXContract
 
-        new InteropXGatewayProcessDepositEvents({
-            chainId: 43114
-        }),
+        new SyncBridgeRequestEvents({ chainId: 137 }),
+        new SyncBridgeRequestEvents({ chainId: 43114 }),
 
-        new InteropBridgeSyncWithdrawEvents({
-            chainId: 137,
-            itokenAddress: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
-        }),
+        new SyncBridgeRequestSentEvents({ chainId: 137 }),
+        new SyncBridgeRequestSentEvents({ chainId: 43114 }),
 
-        new InteropBridgeProcessWithdrawEvents({
-            chainId: 137,
-        })
+        new ProccessBridgeRequestEvents({ chainId: 137 }),
+        new ProccessBridgeRequestEvents({ chainId: 43114 }),
     ];
 
     async start() {
         for (const task of this.tasks) {
             try {
                 task.start();
+                await wait(1000)
             } catch (error) {
                 console.error(`Error starting task: ${task.constructor.name}`);
             }

package/src/typechain/InteropXContract.ts

@@ -0,0 +1,524 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from "ethers";
+import type {
+  FunctionFragment,
+  Result,
+  EventFragment,
+} from "@ethersproject/abi";
+import type { Listener, Provider } from "@ethersproject/providers";
+import type {
+  TypedEventFilter,
+  TypedEvent,
+  TypedListener,
+  OnEvent,
+} from "./common";
+
+export declare namespace InteropXContractBeta {
+  export type TokenInfoStruct = {
+    sourceToken: string;
+    targetToken: string;
+    amount: BigNumberish;
+  };
+
+  export type TokenInfoStructOutput = [string, string, BigNumber] & {
+    sourceToken: string;
+    targetToken: string;
+    amount: BigNumber;
+  };
+
+  export type PositionStruct = {
+    supply: InteropXContractBeta.TokenInfoStruct[];
+    withdraw: InteropXContractBeta.TokenInfoStruct[];
+  };
+
+  export type PositionStructOutput = [
+    InteropXContractBeta.TokenInfoStructOutput[],
+    InteropXContractBeta.TokenInfoStructOutput[]
+  ] & {
+    supply: InteropXContractBeta.TokenInfoStructOutput[];
+    withdraw: InteropXContractBeta.TokenInfoStructOutput[];
+  };
+}
+
+export interface InteropXContractInterface extends utils.Interface {
+  functions: {
+    "_vnonce()": FunctionFragment;
+    "completeBridge(address,address,address,uint256,uint32,bytes32,bytes)": FunctionFragment;
+    "requestWithdraw(address,address,uint256,uint32,bytes)": FunctionFragment;
+    "whitelistedMapping(address)": FunctionFragment;
+    "withdrawRequested(address,address,address,uint256,uint32,bytes32,bytes)": FunctionFragment;
+  };
+
+  getFunction(
+    nameOrSignatureOrTopic:
+      | "_vnonce"
+      | "completeBridge"
+      | "requestWithdraw"
+      | "whitelistedMapping"
+      | "withdrawRequested"
+  ): FunctionFragment;
+
+  encodeFunctionData(functionFragment: "_vnonce", values?: undefined): string;
+  encodeFunctionData(
+    functionFragment: "completeBridge",
+    values: [
+      string,
+      string,
+      string,
+      BigNumberish,
+      BigNumberish,
+      BytesLike,
+      BytesLike
+    ]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "requestWithdraw",
+    values: [string, string, BigNumberish, BigNumberish, BytesLike]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "whitelistedMapping",
+    values: [string]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "withdrawRequested",
+    values: [
+      string,
+      string,
+      string,
+      BigNumberish,
+      BigNumberish,
+      BytesLike,
+      BytesLike
+    ]
+  ): string;
+
+  decodeFunctionResult(functionFragment: "_vnonce", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "completeBridge",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "requestWithdraw",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "whitelistedMapping",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "withdrawRequested",
+    data: BytesLike
+  ): Result;
+
+  events: {
+    "LogBridgeCommitted(address,tuple,uint32,uint32,bytes32,bytes)": EventFragment;
+    "LogBridgeCompleted(address,tuple,uint256,uint256,bytes32,bytes32,bytes)": EventFragment;
+    "LogBridgeRequest(address,tuple,uint256,uint256,bytes)": EventFragment;
+    "LogBridgeRequestSent(address,tuple,uint32,uint32,bytes32,bytes)": EventFragment;
+  };
+
+  getEvent(nameOrSignatureOrTopic: "LogBridgeCommitted"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "LogBridgeCompleted"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "LogBridgeRequest"): EventFragment;
+  getEvent(nameOrSignatureOrTopic: "LogBridgeRequestSent"): EventFragment;
+}
+
+export interface LogBridgeCommittedEventObject {
+  bridger: string;
+  position: InteropXContractBeta.PositionStructOutput;
+  sourceChainId: number;
+  targetChainId: number;
+  requestTransactionHash: string;
+  metadata: string;
+}
+export type LogBridgeCommittedEvent = TypedEvent<
+  [
+    string,
+    InteropXContractBeta.PositionStructOutput,
+    number,
+    number,
+    string,
+    string
+  ],
+  LogBridgeCommittedEventObject
+>;
+
+export type LogBridgeCommittedEventFilter =
+  TypedEventFilter<LogBridgeCommittedEvent>;
+
+export interface LogBridgeCompletedEventObject {
+  bridger: string;
+  position: InteropXContractBeta.PositionStructOutput;
+  sourceChainId: BigNumber;
+  targetChainId: BigNumber;
+  requestTransactionHash: string;
+  targetCommittedTransactionHash: string;
+  metadata: string;
+}
+export type LogBridgeCompletedEvent = TypedEvent<
+  [
+    string,
+    InteropXContractBeta.PositionStructOutput,
+    BigNumber,
+    BigNumber,
+    string,
+    string,
+    string
+  ],
+  LogBridgeCompletedEventObject
+>;
+
+export type LogBridgeCompletedEventFilter =
+  TypedEventFilter<LogBridgeCompletedEvent>;
+
+export interface LogBridgeRequestEventObject {
+  bridger: string;
+  position: InteropXContractBeta.PositionStructOutput;
+  sourceChainId: BigNumber;
+  targetChainId: BigNumber;
+  metadata: string;
+}
+export type LogBridgeRequestEvent = TypedEvent<
+  [
+    string,
+    InteropXContractBeta.PositionStructOutput,
+    BigNumber,
+    BigNumber,
+    string
+  ],
+  LogBridgeRequestEventObject
+>;
+
+export type LogBridgeRequestEventFilter =
+  TypedEventFilter<LogBridgeRequestEvent>;
+
+export interface LogBridgeRequestSentEventObject {
+  bridger: string;
+  position: InteropXContractBeta.PositionStructOutput;
+  sourceChainId: number;
+  targetChainId: number;
+  requestTransactionHash: string;
+  metadata: string;
+}
+export type LogBridgeRequestSentEvent = TypedEvent<
+  [
+    string,
+    InteropXContractBeta.PositionStructOutput,
+    number,
+    number,
+    string,
+    string
+  ],
+  LogBridgeRequestSentEventObject
+>;
+
+export type LogBridgeRequestSentEventFilter =
+  TypedEventFilter<LogBridgeRequestSentEvent>;
+
+export interface InteropXContract extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: InteropXContractInterface;
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>;
+
+  listeners<TEvent extends TypedEvent>(
+    eventFilter?: TypedEventFilter<TEvent>
+  ): Array<TypedListener<TEvent>>;
+  listeners(eventName?: string): Array<Listener>;
+  removeAllListeners<TEvent extends TypedEvent>(
+    eventFilter: TypedEventFilter<TEvent>
+  ): this;
+  removeAllListeners(eventName?: string): this;
+  off: OnEvent<this>;
+  on: OnEvent<this>;
+  once: OnEvent<this>;
+  removeListener: OnEvent<this>;
+
+  functions: {
+    _vnonce(overrides?: CallOverrides): Promise<[BigNumber]>;
+
+    completeBridge(
+      to_: string,
+      sourceToken_: string,
+      targetToken_: string,
+      amount_: BigNumberish,
+      targetChainId_: BigNumberish,
+      transactionHash_: BytesLike,
+      metadata_: BytesLike,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    requestWithdraw(
+      sourceToken_: string,
+      targetToken_: string,
+      amount_: BigNumberish,
+      targetChainId_: BigNumberish,
+      metadata_: BytesLike,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    whitelistedMapping(
+      arg0: string,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber]>;
+
+    withdrawRequested(
+      user_: string,
+      sourceToken_: string,
+      targetToken_: string,
+      amount_: BigNumberish,
+      chainId_: BigNumberish,
+      transactionHash_: BytesLike,
+      metadata_: BytesLike,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+  };
+
+  _vnonce(overrides?: CallOverrides): Promise<BigNumber>;
+
+  completeBridge(
+    to_: string,
+    sourceToken_: string,
+    targetToken_: string,
+    amount_: BigNumberish,
+    targetChainId_: BigNumberish,
+    transactionHash_: BytesLike,
+    metadata_: BytesLike,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  requestWithdraw(
+    sourceToken_: string,
+    targetToken_: string,
+    amount_: BigNumberish,
+    targetChainId_: BigNumberish,
+    metadata_: BytesLike,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  whitelistedMapping(
+    arg0: string,
+    overrides?: CallOverrides
+  ): Promise<BigNumber>;
+
+  withdrawRequested(
+    user_: string,
+    sourceToken_: string,
+    targetToken_: string,
+    amount_: BigNumberish,
+    chainId_: BigNumberish,
+    transactionHash_: BytesLike,
+    metadata_: BytesLike,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  callStatic: {
+    _vnonce(overrides?: CallOverrides): Promise<BigNumber>;
+
+    completeBridge(
+      to_: string,
+      sourceToken_: string,
+      targetToken_: string,
+      amount_: BigNumberish,
+      targetChainId_: BigNumberish,
+      transactionHash_: BytesLike,
+      metadata_: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<void>;
+
+    requestWithdraw(
+      sourceToken_: string,
+      targetToken_: string,
+      amount_: BigNumberish,
+      targetChainId_: BigNumberish,
+      metadata_: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<void>;
+
+    whitelistedMapping(
+      arg0: string,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    withdrawRequested(
+      user_: string,
+      sourceToken_: string,
+      targetToken_: string,
+      amount_: BigNumberish,
+      chainId_: BigNumberish,
+      transactionHash_: BytesLike,
+      metadata_: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<void>;
+  };
+
+  filters: {
+    "LogBridgeCommitted(address,tuple,uint32,uint32,bytes32,bytes)"(
+      bridger?: string | null,
+      position?: null,
+      sourceChainId?: BigNumberish | null,
+      targetChainId?: null,
+      requestTransactionHash?: BytesLike | null,
+      metadata?: null
+    ): LogBridgeCommittedEventFilter;
+    LogBridgeCommitted(
+      bridger?: string | null,
+      position?: null,
+      sourceChainId?: BigNumberish | null,
+      targetChainId?: null,
+      requestTransactionHash?: BytesLike | null,
+      metadata?: null
+    ): LogBridgeCommittedEventFilter;
+
+    "LogBridgeCompleted(address,tuple,uint256,uint256,bytes32,bytes32,bytes)"(
+      bridger?: string | null,
+      position?: null,
+      sourceChainId?: null,
+      targetChainId?: BigNumberish | null,
+      requestTransactionHash?: BytesLike | null,
+      targetCommittedTransactionHash?: null,
+      metadata?: null
+    ): LogBridgeCompletedEventFilter;
+    LogBridgeCompleted(
+      bridger?: string | null,
+      position?: null,
+      sourceChainId?: null,
+      targetChainId?: BigNumberish | null,
+      requestTransactionHash?: BytesLike | null,
+      targetCommittedTransactionHash?: null,
+      metadata?: null
+    ): LogBridgeCompletedEventFilter;
+
+    "LogBridgeRequest(address,tuple,uint256,uint256,bytes)"(
+      bridger?: string | null,
+      position?: null,
+      sourceChainId?: null,
+      targetChainId?: BigNumberish | null,
+      metadata?: null
+    ): LogBridgeRequestEventFilter;
+    LogBridgeRequest(
+      bridger?: string | null,
+      position?: null,
+      sourceChainId?: null,
+      targetChainId?: BigNumberish | null,
+      metadata?: null
+    ): LogBridgeRequestEventFilter;
+
+    "LogBridgeRequestSent(address,tuple,uint32,uint32,bytes32,bytes)"(
+      bridger?: string | null,
+      position?: null,
+      sourceChainId?: null,
+      targetChainId?: BigNumberish | null,
+      requestTransactionHash?: BytesLike | null,
+      metadata?: null
+    ): LogBridgeRequestSentEventFilter;
+    LogBridgeRequestSent(
+      bridger?: string | null,
+      position?: null,
+      sourceChainId?: null,
+      targetChainId?: BigNumberish | null,
+      requestTransactionHash?: BytesLike | null,
+      metadata?: null
+    ): LogBridgeRequestSentEventFilter;
+  };
+
+  estimateGas: {
+    _vnonce(overrides?: CallOverrides): Promise<BigNumber>;
+
+    completeBridge(
+      to_: string,
+      sourceToken_: string,
+      targetToken_: string,
+      amount_: BigNumberish,
+      targetChainId_: BigNumberish,
+      transactionHash_: BytesLike,
+      metadata_: BytesLike,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    requestWithdraw(
+      sourceToken_: string,
+      targetToken_: string,
+      amount_: BigNumberish,
+      targetChainId_: BigNumberish,
+      metadata_: BytesLike,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    whitelistedMapping(
+      arg0: string,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    withdrawRequested(
+      user_: string,
+      sourceToken_: string,
+      targetToken_: string,
+      amount_: BigNumberish,
+      chainId_: BigNumberish,
+      transactionHash_: BytesLike,
+      metadata_: BytesLike,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+  };
+
+  populateTransaction: {
+    _vnonce(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    completeBridge(
+      to_: string,
+      sourceToken_: string,
+      targetToken_: string,
+      amount_: BigNumberish,
+      targetChainId_: BigNumberish,
+      transactionHash_: BytesLike,
+      metadata_: BytesLike,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    requestWithdraw(
+      sourceToken_: string,
+      targetToken_: string,
+      amount_: BigNumberish,
+      targetChainId_: BigNumberish,
+      metadata_: BytesLike,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    whitelistedMapping(
+      arg0: string,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
+    withdrawRequested(
+      user_: string,
+      sourceToken_: string,
+      targetToken_: string,
+      amount_: BigNumberish,
+      chainId_: BigNumberish,
+      transactionHash_: BytesLike,
+      metadata_: BytesLike,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+  };
+}