@instadapp/interop-x 0.0.0-dev.bfeca30 → 0.0.0-dev.c279cb8

package/src/tasks/InteropX/ProcessSubmitSubmitEvents.ts

@@ -0,0 +1,270 @@
+import { BaseTask } from "../BaseTask";
+import Logger from "@/logger";
+import { ethers, Wallet } from "ethers";
+import abi from "@/abi";
+import { Transaction } from "@/db";
+import {
+  buildSignatureBytes,
+  generateGnosisTransaction,
+  generateInteropTransactionHash,
+  getContract,
+  getRpcProviderUrl,
+  LiquidityError,
+  Signature,
+} from "@/utils";
+import { addresses, blockConfirmations } from "@/constants";
+import { ChainId } from "@/types";
+import config from "@/config";
+import { GnosisSafe, InteropX } from "@/typechain";
+import moment from "moment";
+import { Op } from "sequelize";
+import { buildGnosisAction } from "@/gnosis";
+import { peerPool, protocol } from "@/net";
+import { LogDescription } from "ethers/lib/utils";
+import wait from "waait";
+
+class ProcessSubmitSubmitEvents extends BaseTask {
+  sourceProvider: ethers.providers.JsonRpcProvider;
+  sourceGnosisContract: GnosisSafe;
+  sourceWallet: Wallet;
+  chainId: ChainId;
+  leadNodeOnly: boolean = true;
+  blockConfirmationsCount: number = 12;
+
+  constructor({ chainId }: { chainId: ChainId }) {
+    super({
+      logger: new Logger("InteropX::ProcessSubmitSubmitEvents"),
+    });
+    this.chainId = chainId;
+  }
+
+  async pollHandler() {
+    const currentBlockNumber = await this.sourceProvider.getBlockNumber();
+
+    const transaction = await Transaction.findOne({
+      where: {
+        status: "pending",
+        sourceStatus: "pending",
+        sourceChainId: this.chainId,
+        submitBlockNumber: {
+          [Op.lt]: currentBlockNumber - this.blockConfirmationsCount,
+        },
+        sourceDelayUntil: {
+          [Op.or]: {
+            [Op.is]: null,
+            [Op.lt]: new Date(),
+          },
+        },
+
+        submitEvent: { $ne: null },
+
+        createdAt: {
+          [Op.gt]: moment().subtract({ hours: 12 }).toDate(),
+        },
+      },
+    });
+
+    if (!transaction) {
+      return;
+    }
+
+    this.logger.debug(`Processing transaction ${transaction.transactionHash}`);
+
+    transaction.sourceStatus = "proccessing";
+    await transaction.save();
+
+    const ownersThreshold = await this.sourceGnosisContract.getThreshold();
+    await wait(10000);
+
+    this.logger.debug(`Build gnosis action for ${transaction.transactionHash}`);
+
+    let data,
+      logs = [];
+
+    try {
+      ({ data, logs } = await buildGnosisAction(transaction, "source"));
+    } catch (error) {
+      if (error instanceof LiquidityError) {
+        await transaction.save();
+        transaction.sourceDelayUntil = new Date(Date.now() + 60 * 5 * 1000);
+        transaction.sourceStatus = "pending";
+
+        await transaction.save();
+
+        throw error;
+        return;
+      }
+
+      transaction.sourceStatus = "failed";
+      transaction.sourceErrors = [error.message];
+      transaction.targetStatus = "failed";
+
+      transaction.status = "failed";
+      await transaction.save();
+      protocol.sendTransaction(transaction);
+      return;
+    }
+
+    this.logger.debug(
+      `Generating gnosis tx for ${transaction.transactionHash}`
+    );
+
+    let gnosisTx = await generateGnosisTransaction(
+      {
+        baseGas: "0",
+        data,
+        gasPrice: "0",
+        gasToken: "0x0000000000000000000000000000000000000000",
+        nonce: "0",
+        operation: "1",
+        refundReceiver: "0x0000000000000000000000000000000000000000",
+        safeAddress: this.sourceGnosisContract.address,
+        safeTxGas: "79668",
+        to: addresses[transaction.sourceChainId].multisend,
+        value: "0",
+      },
+      this.sourceGnosisContract
+    );
+
+    const owners = await this.sourceGnosisContract
+      .getOwners()
+      .then((owners) => owners.map((owner) => owner.toLowerCase()));
+
+    const ownerPeerIds = peerPool.activePeers
+      .filter((peer) => owners.includes(peer.publicAddress.toLowerCase()))
+      .map((peer) => peer.id);
+
+    console.log(
+      `Collecting signatures for execution ${transaction.transactionHash}`
+    );
+
+    console.log(ownerPeerIds);
+
+    const signatures = await protocol.requestSignatures(
+      {
+        type: "source",
+        transactionHash: transaction.transactionHash,
+        safeTxGas: gnosisTx.safeTxGas,
+        safeNonce: gnosisTx.nonce,
+        chainId: this.chainId,
+      },
+      ownerPeerIds
+    );
+
+    const validSignatures = signatures.filter(
+      (s) => !!s.data && s.data !== "0x"
+    ) as Signature[];
+
+    console.log({
+      signatures,
+      validSignatures,
+      ownersThreshold: ownersThreshold.toString(),
+    });
+
+    if (
+      validSignatures.length === 0 ||
+      ownersThreshold.gt(validSignatures.length)
+    ) {
+      await transaction.save();
+      transaction.sourceDelayUntil = new Date(Date.now() + 30 * 1000);
+      transaction.sourceStatus = "pending";
+
+      await transaction.save();
+      const errorMessage = signatures.find((s) => !!s.error)?.error;
+      throw new Error(
+        `Not enough signatures` + (errorMessage ? `: ${errorMessage}` : "")
+      );
+    }
+
+    console.log(
+      `Executing transaction for execution ${transaction.transactionHash}`
+    );
+
+    const { data: txData } =
+      await this.sourceGnosisContract.populateTransaction.execTransaction(
+        gnosisTx.to,
+        gnosisTx.value,
+        gnosisTx.data,
+        gnosisTx.operation,
+        gnosisTx.safeTxGas,
+        gnosisTx.baseGas,
+        gnosisTx.gasPrice,
+        gnosisTx.gasToken,
+        gnosisTx.refundReceiver,
+        buildSignatureBytes(validSignatures)
+      );
+
+    const [gasPrice, gasLimit] = await Promise.all([
+      this.sourceProvider.getGasPrice(),
+      this.sourceProvider.estimateGas({
+        from: this.sourceWallet.address,
+        to: this.sourceGnosisContract.address,
+        data: txData,
+      }),
+    ]);
+
+    const txSent = await this.sourceWallet.sendTransaction({
+      from: this.sourceWallet.address,
+      to: this.sourceGnosisContract.address,
+      gasPrice: gasPrice.mul(120).div(100),
+      gasLimit: gasLimit.mul(120).div(100),
+      data: txData,
+    });
+
+    console.log(txSent);
+
+    const receipt = await txSent.wait();
+
+    const parsedLogs: LogDescription[] = [];
+
+    receipt.logs.forEach((log) => {
+      try {
+        parsedLogs.push(this.sourceGnosisContract.interface.parseLog(log));
+      } catch (e) {}
+    });
+
+    if (parsedLogs.find((e) => e.name === "ExecutionSuccess")) {
+      console.log("ExecutionSuccess");
+      transaction.sourceStatus = "success";
+      if (txSent.blockNumber)
+        transaction.sourceBlockNumber = txSent.blockNumber;
+      transaction.sourceTransactionHash = txSent.hash;
+      transaction.sourceLogs = logs;
+      await transaction.save();
+    } else {
+      console.log("ExecutionFailure");
+      transaction.sourceStatus = "failed";
+      if (txSent.blockNumber)
+        transaction.sourceBlockNumber = txSent.blockNumber;
+      transaction.sourceTransactionHash = txSent.hash;
+      transaction.sourceTransactionHash = txSent.hash;
+      transaction.status = "failed";
+      await transaction.save();
+    }
+
+    protocol.sendTransaction(transaction);
+  }
+
+  async start(): Promise<void> {
+    this.blockConfirmationsCount = blockConfirmations[this.chainId] + 1;
+
+    this.sourceProvider = new ethers.providers.JsonRpcProvider(
+      getRpcProviderUrl(this.chainId)
+    );
+
+    this.sourceWallet = new ethers.Wallet(
+      config.privateKey!,
+      this.sourceProvider
+    );
+
+    this.sourceGnosisContract = getContract<GnosisSafe>(
+      addresses[this.chainId].gnosisSafe,
+      abi.gnosisSafe,
+      this.sourceWallet
+    );
+
+    await super.start();
+  }
+}
+
+export default ProcessSubmitSubmitEvents;

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(),
+      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,
+            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),
                 },
             }
         })

package/src/tasks/index.ts

@@ -5,10 +5,8 @@ import SyncTransactionStatusTask from "./Transactions/SyncTransactionStatusTask"
 
 import AutoUpdateTask from "./AutoUpdateTask";
 
-import SyncBridgeRequestEvents from "./InteropXContract/SyncBridgeRequestEvents";
-import ProccessBridgeRequestEvents from "./InteropXContract/ProcessBridgeRequestEvents";
-import SyncBridgeRequestSentEvents from "./InteropXContract/SyncBridgeRequestSentEvents";
-import SyncBridgeCommittedEvents from "./InteropXContract/SyncBridgeCommittedEvents";
+import SyncLogSubmitEvents from "./InteropX/SyncLogSubmitEvents";
+import ProcessSubmitSubmitEvents from "./InteropX/ProcessSubmitSubmitEvents";
 
 export class Tasks {
 
@@ -16,19 +14,14 @@ export class Tasks {
         // new SyncTransactionStatusTask(),
         new AutoUpdateTask(),
 
-        // InteropXContract
+        // InteropX
+        new SyncLogSubmitEvents({ chainId: 137 }),
+        new SyncLogSubmitEvents({ chainId: 43114 }),
 
-        new SyncBridgeRequestEvents({ chainId: 137 }),
-        new SyncBridgeRequestEvents({ chainId: 43114 }),
+        new ProcessSubmitSubmitEvents({ chainId: 137 }),
+        new ProcessSubmitSubmitEvents({ chainId: 43114 }),
 
-        new SyncBridgeRequestSentEvents({ chainId: 137 }),
-        new SyncBridgeRequestSentEvents({ chainId: 43114 }),
-
-        new SyncBridgeCommittedEvents({ chainId: 137 }),
-        new SyncBridgeCommittedEvents({ chainId: 43114 }),
-
-        new ProccessBridgeRequestEvents({ chainId: 137 }),
-        new ProccessBridgeRequestEvents({ chainId: 43114 }),
+        new SyncTransactionStatusTask(),
     ];
 
     async start() {