@instadapp/interop-x 0.0.0-dev.ee3d74b → 0.0.0-dev.ef38dfb

package/src/tasks/InteropX/SyncLogSubmitEvents.ts

@@ -86,6 +86,7 @@ class SyncLogSubmitEvents extends BaseTask {
           submitEvent: {
             actionId,
             actionIdHashHash,
+            actionIdHash: actionIdHashHash,
             vnonce: vnonce.toString(),
             position: {
               withdraw: position.withdraw.map((v) => ({

package/src/tasks/InteropX/SyncLogValidateEvents.ts

@@ -0,0 +1,152 @@
+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";
+
+class SyncLogValidateEvents extends BaseTask {
+  contractAddress: string;
+  provider: ethers.providers.JsonRpcProvider;
+  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 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 SyncLogValidateEvents;

package/src/tasks/index.ts

@@ -7,6 +7,9 @@ import AutoUpdateTask from "./AutoUpdateTask";
 
 import SyncLogSubmitEvents from "./InteropX/SyncLogSubmitEvents";
 import ProcessSubmitSubmitEvents from "./InteropX/ProcessSubmitSubmitEvents";
+import SyncLogValidateEvents from "./InteropX/SyncLogValidateEvents";
+import ProcessValidateEvents from "./InteropX/ProcessValidateEvents";
+import SyncLogExecuteEvents from "./InteropX/SyncLogExecuteEvents";
 
 export class Tasks {
 
@@ -21,6 +24,15 @@ export class Tasks {
         new ProcessSubmitSubmitEvents({ chainId: 137 }),
         new ProcessSubmitSubmitEvents({ chainId: 43114 }),
 
+        new SyncLogValidateEvents({ chainId: 137 }),
+        new SyncLogValidateEvents({ chainId: 43114 }),
+
+        new ProcessValidateEvents({ chainId: 137 }),
+        new ProcessValidateEvents({ chainId: 43114 }),
+
+        new SyncLogExecuteEvents({ targetChainId: 137 }),
+        new SyncLogExecuteEvents({ targetChainId: 43114 }),
+
         new SyncTransactionStatusTask(),
     ];
 
@@ -28,7 +40,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}`);
             }

package/src/typechain/InstList.ts

@@ -0,0 +1,402 @@
+/* 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 } from "@ethersproject/abi";
+import type { Listener, Provider } from "@ethersproject/providers";
+import type {
+  TypedEventFilter,
+  TypedEvent,
+  TypedListener,
+  OnEvent,
+} from "./common";
+
+export interface InstListInterface extends utils.Interface {
+  functions: {
+    "accountAddr(uint64)": FunctionFragment;
+    "accountID(address)": FunctionFragment;
+    "accountLink(uint64)": FunctionFragment;
+    "accountList(uint64,address)": FunctionFragment;
+    "accounts()": FunctionFragment;
+    "addAuth(address)": FunctionFragment;
+    "init(address)": FunctionFragment;
+    "instaIndex()": FunctionFragment;
+    "removeAuth(address)": FunctionFragment;
+    "userLink(address)": FunctionFragment;
+    "userList(address,uint64)": FunctionFragment;
+  };
+
+  getFunction(
+    nameOrSignatureOrTopic:
+      | "accountAddr"
+      | "accountID"
+      | "accountLink"
+      | "accountList"
+      | "accounts"
+      | "addAuth"
+      | "init"
+      | "instaIndex"
+      | "removeAuth"
+      | "userLink"
+      | "userList"
+  ): FunctionFragment;
+
+  encodeFunctionData(
+    functionFragment: "accountAddr",
+    values: [BigNumberish]
+  ): string;
+  encodeFunctionData(functionFragment: "accountID", values: [string]): string;
+  encodeFunctionData(
+    functionFragment: "accountLink",
+    values: [BigNumberish]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "accountList",
+    values: [BigNumberish, string]
+  ): string;
+  encodeFunctionData(functionFragment: "accounts", values?: undefined): string;
+  encodeFunctionData(functionFragment: "addAuth", values: [string]): string;
+  encodeFunctionData(functionFragment: "init", values: [string]): string;
+  encodeFunctionData(
+    functionFragment: "instaIndex",
+    values?: undefined
+  ): string;
+  encodeFunctionData(functionFragment: "removeAuth", values: [string]): string;
+  encodeFunctionData(functionFragment: "userLink", values: [string]): string;
+  encodeFunctionData(
+    functionFragment: "userList",
+    values: [string, BigNumberish]
+  ): string;
+
+  decodeFunctionResult(
+    functionFragment: "accountAddr",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(functionFragment: "accountID", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "accountLink",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "accountList",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(functionFragment: "accounts", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "addAuth", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "init", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "instaIndex", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "removeAuth", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "userLink", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "userList", data: BytesLike): Result;
+
+  events: {};
+}
+
+export interface InstList extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: InstListInterface;
+
+  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: {
+    accountAddr(
+      arg0: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<[string]>;
+
+    accountID(arg0: string, overrides?: CallOverrides): Promise<[BigNumber]>;
+
+    accountLink(
+      arg0: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<
+      [string, string, BigNumber] & {
+        first: string;
+        last: string;
+        count: BigNumber;
+      }
+    >;
+
+    accountList(
+      arg0: BigNumberish,
+      arg1: string,
+      overrides?: CallOverrides
+    ): Promise<[string, string] & { prev: string; next: string }>;
+
+    accounts(overrides?: CallOverrides): Promise<[BigNumber]>;
+
+    addAuth(
+      _owner: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    init(
+      _account: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    instaIndex(overrides?: CallOverrides): Promise<[string]>;
+
+    removeAuth(
+      _owner: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    userLink(
+      arg0: string,
+      overrides?: CallOverrides
+    ): Promise<
+      [BigNumber, BigNumber, BigNumber] & {
+        first: BigNumber;
+        last: BigNumber;
+        count: BigNumber;
+      }
+    >;
+
+    userList(
+      arg0: string,
+      arg1: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber, BigNumber] & { prev: BigNumber; next: BigNumber }>;
+  };
+
+  accountAddr(arg0: BigNumberish, overrides?: CallOverrides): Promise<string>;
+
+  accountID(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
+
+  accountLink(
+    arg0: BigNumberish,
+    overrides?: CallOverrides
+  ): Promise<
+    [string, string, BigNumber] & {
+      first: string;
+      last: string;
+      count: BigNumber;
+    }
+  >;
+
+  accountList(
+    arg0: BigNumberish,
+    arg1: string,
+    overrides?: CallOverrides
+  ): Promise<[string, string] & { prev: string; next: string }>;
+
+  accounts(overrides?: CallOverrides): Promise<BigNumber>;
+
+  addAuth(
+    _owner: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  init(
+    _account: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  instaIndex(overrides?: CallOverrides): Promise<string>;
+
+  removeAuth(
+    _owner: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  userLink(
+    arg0: string,
+    overrides?: CallOverrides
+  ): Promise<
+    [BigNumber, BigNumber, BigNumber] & {
+      first: BigNumber;
+      last: BigNumber;
+      count: BigNumber;
+    }
+  >;
+
+  userList(
+    arg0: string,
+    arg1: BigNumberish,
+    overrides?: CallOverrides
+  ): Promise<[BigNumber, BigNumber] & { prev: BigNumber; next: BigNumber }>;
+
+  callStatic: {
+    accountAddr(arg0: BigNumberish, overrides?: CallOverrides): Promise<string>;
+
+    accountID(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
+
+    accountLink(
+      arg0: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<
+      [string, string, BigNumber] & {
+        first: string;
+        last: string;
+        count: BigNumber;
+      }
+    >;
+
+    accountList(
+      arg0: BigNumberish,
+      arg1: string,
+      overrides?: CallOverrides
+    ): Promise<[string, string] & { prev: string; next: string }>;
+
+    accounts(overrides?: CallOverrides): Promise<BigNumber>;
+
+    addAuth(_owner: string, overrides?: CallOverrides): Promise<void>;
+
+    init(_account: string, overrides?: CallOverrides): Promise<void>;
+
+    instaIndex(overrides?: CallOverrides): Promise<string>;
+
+    removeAuth(_owner: string, overrides?: CallOverrides): Promise<void>;
+
+    userLink(
+      arg0: string,
+      overrides?: CallOverrides
+    ): Promise<
+      [BigNumber, BigNumber, BigNumber] & {
+        first: BigNumber;
+        last: BigNumber;
+        count: BigNumber;
+      }
+    >;
+
+    userList(
+      arg0: string,
+      arg1: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber, BigNumber] & { prev: BigNumber; next: BigNumber }>;
+  };
+
+  filters: {};
+
+  estimateGas: {
+    accountAddr(
+      arg0: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    accountID(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
+
+    accountLink(
+      arg0: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    accountList(
+      arg0: BigNumberish,
+      arg1: string,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
+    accounts(overrides?: CallOverrides): Promise<BigNumber>;
+
+    addAuth(
+      _owner: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    init(
+      _account: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    instaIndex(overrides?: CallOverrides): Promise<BigNumber>;
+
+    removeAuth(
+      _owner: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    userLink(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
+
+    userList(
+      arg0: string,
+      arg1: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+  };
+
+  populateTransaction: {
+    accountAddr(
+      arg0: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
+    accountID(
+      arg0: string,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
+    accountLink(
+      arg0: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
+    accountList(
+      arg0: BigNumberish,
+      arg1: string,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
+    accounts(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    addAuth(
+      _owner: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    init(
+      _account: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    instaIndex(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    removeAuth(
+      _owner: string,
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    userLink(
+      arg0: string,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
+    userList(
+      arg0: string,
+      arg1: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+  };
+}