@instadapp/interop-x 0.0.0-dev.5953f3d → 0.0.0-dev.5a90c8d

package/src/tasks/InteropX/{ProcessSubmitSubmitEvents.ts → ProcessSubmitEvents.ts}

@@ -5,12 +5,16 @@ import abi from "@/abi";
 import { Transaction } from "@/db";
 import {
   buildSignatureBytes,
+  chainIdToName,
   generateGnosisTransaction,
-  generateInteropTransactionHash,
+  getChainIdNativeSymbol,
   getContract,
+  getExplorerUrl,
   getRpcProviderUrl,
-  LiquidityError,
   Signature,
+  validateChains,
+  validateLiquidityCap,
+  validateSourceLiquidity,
 } from "@/utils";
 import { addresses, blockConfirmations } from "@/constants";
 import { ChainId } from "@/types";
@@ -22,9 +26,13 @@ import { buildGnosisAction } from "@/gnosis";
 import { peerPool, protocol } from "@/net";
 import { LogDescription } from "ethers/lib/utils";
 import wait from "waait";
+import { LiquidityError, UnsupportedChaindIdError } from "@/errors";
+import { BigNumber } from "bignumber.js";
+import dedent from "dedent";
+import { JsonRpcRetryProvider } from "@/providers";
 
-class ProcessSubmitSubmitEvents extends BaseTask {
-  sourceProvider: ethers.providers.JsonRpcProvider;
+export default class ProcessSubmitEvents extends BaseTask {
+  sourceProvider: JsonRpcRetryProvider;
   sourceGnosisContract: GnosisSafe;
   sourceWallet: Wallet;
   chainId: ChainId;
@@ -33,7 +41,7 @@ class ProcessSubmitSubmitEvents extends BaseTask {
 
   constructor({ chainId }: { chainId: ChainId }) {
     super({
-      logger: new Logger("InteropX::ProcessSubmitSubmitEvents"),
+      logger: new Logger("InteropX::ProcessSubmitEvents"),
     });
     this.chainId = chainId;
   }
@@ -68,12 +76,86 @@ class ProcessSubmitSubmitEvents extends BaseTask {
       return;
     }
 
+    this.logger.debug(`Processing transaction ${transaction.transactionHash}`);
+
     transaction.sourceStatus = "proccessing";
     await transaction.save();
 
+    const { submitEvent: { position, sourceChainId, targetChainId } } = transaction;
+    try {
+      validateChains({ sourceChainId, targetChainId });
+    } catch (error) {
+      transaction.sourceErrors = [error.message];
+      transaction.sourceStatus = "failed";
+      transaction.targetStatus = "failed";
+      transaction.status = "failed";
+      await transaction.save();
+      return;
+    }
+
+    const walletBalance = (await this.sourceWallet.getBalance()).toString();
+    const currentGasPrice = (await this.sourceWallet.getGasPrice()).toString()
+
+    const minBalanceRequired = new BigNumber(currentGasPrice)
+      .multipliedBy(4_000_000)
+      .multipliedBy(2) // 2x balance
+
+    if (
+      new BigNumber(walletBalance).isLessThan(minBalanceRequired)
+    ) {
+      console.log(
+        dedent`Not enough balance in wallet ${getExplorerUrl(sourceChainId, '/address/' + this.sourceWallet.address)} on ${chainIdToName(sourceChainId)}
+        Balance: ${ethers.utils.parseEther(walletBalance)} ${getChainIdNativeSymbol(sourceChainId)}
+        Required Balance: ${ethers.utils.parseEther(minBalanceRequired.toString())}
+        Require more: ${ethers.utils.parseEther(minBalanceRequired.minus(walletBalance).toString())}`
+      );
+      transaction.sourceDelayUntil = moment().add({ minutes: 5 }).toDate();
+      transaction.sourceStatus = "pending";
+      await transaction.save();
+      return;
+    }
+
+    try {
+      await validateLiquidityCap(position, sourceChainId, targetChainId);
+    } catch (error) {
+      transaction.sourceErrors = [error.message];
+      transaction.sourceStatus = "failed";
+      transaction.targetStatus = "failed";
+      transaction.status = "failed";
+      await transaction.save();
+      return;
+    }
+
+    try {
+      await validateSourceLiquidity({
+        position,
+        sourceChainId,
+        sourceProvider: this.sourceProvider,
+      });
+    } catch (error) {
+      if (error instanceof UnsupportedChaindIdError) {
+        console.log(`Dropping transaction ${transaction.transactionHash}`);
+
+        transaction.sourceErrors = [error.message];
+        transaction.sourceStatus = "failed";
+        transaction.targetStatus = "failed";
+        transaction.status = "failed";
+        await transaction.save();
+      } else {
+        transaction.sourceStatus = "pending";
+        transaction.sourceDelayUntil = moment().add({ minutes: 5 }).toDate();
+        await transaction.save();
+
+        console.log("[validateSourceLiquidity][Warning]", error.message);
+        return;
+      }
+    }
+
     const ownersThreshold = await this.sourceGnosisContract.getThreshold();
     await wait(10000);
 
+    this.logger.debug(`Build gnosis action for ${transaction.transactionHash}`);
+
     let data,
       logs = [];
 
@@ -101,6 +183,10 @@ class ProcessSubmitSubmitEvents extends BaseTask {
       return;
     }
 
+    this.logger.debug(
+      `Generating gnosis tx for ${transaction.transactionHash}`
+    );
+
     let gnosisTx = await generateGnosisTransaction(
       {
         baseGas: "0",
@@ -186,10 +272,20 @@ class ProcessSubmitSubmitEvents extends BaseTask {
         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,
-      gasPrice: ethers.BigNumber.from(120 * 10 ** 9),
       to: this.sourceGnosisContract.address,
+      gasPrice: gasPrice.mul(120).div(100),
+      gasLimit: 5_000_000,//gasLimit.mul(120).div(100),
       data: txData,
     });
 
@@ -202,7 +298,7 @@ class ProcessSubmitSubmitEvents extends BaseTask {
     receipt.logs.forEach((log) => {
       try {
         parsedLogs.push(this.sourceGnosisContract.interface.parseLog(log));
-      } catch (e) {}
+      } catch (e) { }
     });
 
     if (parsedLogs.find((e) => e.name === "ExecutionSuccess")) {
@@ -219,7 +315,6 @@ class ProcessSubmitSubmitEvents extends BaseTask {
       if (txSent.blockNumber)
         transaction.sourceBlockNumber = txSent.blockNumber;
       transaction.sourceTransactionHash = txSent.hash;
-      transaction.sourceTransactionHash = txSent.hash;
       transaction.status = "failed";
       await transaction.save();
     }
@@ -230,7 +325,7 @@ class ProcessSubmitSubmitEvents extends BaseTask {
   async start(): Promise<void> {
     this.blockConfirmationsCount = blockConfirmations[this.chainId] + 1;
 
-    this.sourceProvider = new ethers.providers.JsonRpcProvider(
+    this.sourceProvider = new JsonRpcRetryProvider(
       getRpcProviderUrl(this.chainId)
     );
 
@@ -248,5 +343,3 @@ class ProcessSubmitSubmitEvents extends BaseTask {
     await super.start();
   }
 }
-
-export default ProcessSubmitSubmitEvents;

package/src/tasks/InteropX/ProcessValidateEvents.ts

@@ -0,0 +1,272 @@
+import { BaseTask } from "../BaseTask";
+import Logger from "@/logger";
+import { ethers, Wallet } from "ethers";
+import abi from "@/abi";
+import { Transaction } from "@/db";
+import {
+  buildSignatureBytes,
+  generateGnosisTransaction,
+  getContract,
+  getRpcProviderUrl,
+  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";
+import { LiquidityError } from "@/errors";
+import { JsonRpcRetryProvider } from "@/providers";
+
+export default class ProcessValidateEvents extends BaseTask {
+  sourceProvider: JsonRpcRetryProvider;
+  chainId: ChainId;
+  leadNodeOnly: boolean = true;
+  blockConfirmationsCount: number = 12;
+
+  constructor({ chainId }: { chainId: ChainId }) {
+    super({
+      logger: new Logger("InteropX::ProcessValidateEvents"),
+    });
+    this.chainId = chainId;
+  }
+
+  async pollHandler() {
+    const currentBlockNumber = await this.sourceProvider.getBlockNumber();
+
+    const transaction = await Transaction.findOne({
+      where: {
+        status: "pending",
+        sourceStatus: "success",
+        targetStatus: "pending",
+        sourceChainId: this.chainId,
+        sourceBlockNumber: {
+          [Op.lt]: currentBlockNumber - this.blockConfirmationsCount,
+        },
+        targetDelayUntil: {
+          [Op.or]: {
+            [Op.is]: null,
+            [Op.lt]: new Date(),
+          },
+        },
+
+        submitEvent: { $ne: null },
+        validateEvent: { $ne: null },
+
+        createdAt: {
+          [Op.gt]: moment().subtract({ hours: 12 }).toDate(),
+        },
+      },
+    });
+
+    if (!transaction) {
+      return;
+    }
+
+    this.logger.debug(`Processing transaction ${transaction.transactionHash}`);
+
+    transaction.targetStatus = "proccessing";
+    await transaction.save();
+
+    const { sourceChainId, targetChainId } = transaction.validateEvent
+
+    const targetProvider = new JsonRpcRetryProvider(
+      getRpcProviderUrl(targetChainId as ChainId)
+    );
+
+    const targetWallet = new ethers.Wallet(
+      config.privateKey!,
+      targetProvider
+    );
+
+    const targetGnosisContract = getContract<GnosisSafe>(
+      addresses[targetChainId].gnosisSafe,
+      abi.gnosisSafe,
+      targetWallet
+    );
+
+    const ownersThreshold = await targetGnosisContract.getThreshold();
+    await wait(10000);
+
+    this.logger.debug(`Build gnosis action for ${transaction.transactionHash}`);
+
+    let data,
+      logs = [];
+
+    try {
+      ({ data, logs } = await buildGnosisAction(transaction, "target"));
+    } catch (error) {
+      if (error instanceof LiquidityError) {
+        await transaction.save();
+        transaction.targetDelayUntil = new Date(Date.now() + 60 * 5 * 1000);
+        transaction.targetStatus = "pending";
+
+        await transaction.save();
+
+        throw error;
+        return;
+      }
+
+      transaction.targetStatus = "failed";
+      transaction.targetErrors = [error.message];
+      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: targetGnosisContract.address,
+        safeTxGas: "79668",
+        to: addresses[transaction.targetChainId].multisend,
+        value: "0",
+      },
+      targetGnosisContract
+    );
+
+    const owners = await targetGnosisContract
+      .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: "target",
+        transactionHash: transaction.transactionHash,
+        safeTxGas: gnosisTx.safeTxGas,
+        safeNonce: gnosisTx.nonce,
+        chainId: targetChainId,
+      },
+      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.targetDelayUntil = new Date(Date.now() + 30 * 1000);
+      transaction.targetStatus = "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 targetGnosisContract.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([
+      targetProvider.getGasPrice(),
+      targetProvider.estimateGas({
+        from: targetWallet.address,
+        to: targetGnosisContract.address,
+        data: txData,
+      }),
+    ]);
+
+    const txSent = await targetWallet.sendTransaction({
+      from: targetWallet.address,
+      to: targetGnosisContract.address,
+      gasPrice: gasPrice.mul(120).div(100),
+      gasLimit: 5_000_000,//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(targetGnosisContract.interface.parseLog(log));
+      } catch (e) { }
+    });
+
+    if (parsedLogs.find((e) => e.name === "ExecutionSuccess")) {
+      console.log("ExecutionSuccess");
+      transaction.targetStatus = "success";
+      transaction.status = "success";
+      if (txSent.blockNumber)
+        transaction.targetBlockNumber = txSent.blockNumber;
+      transaction.targetTransactionHash = txSent.hash;
+      transaction.targetLogs = logs;
+      await transaction.save();
+    } else {
+      console.log("ExecutionFailure");
+      transaction.targetStatus = "failed";
+      if (txSent.blockNumber)
+        transaction.targetBlockNumber = txSent.blockNumber;
+      transaction.targetTransactionHash = txSent.hash;
+      transaction.status = "failed";
+      await transaction.save();
+    }
+
+    protocol.sendTransaction(transaction);
+  }
+
+  async start(): Promise<void> {
+    this.blockConfirmationsCount = blockConfirmations[this.chainId] + 1;
+
+    this.sourceProvider = new JsonRpcRetryProvider(
+      getRpcProviderUrl(this.chainId)
+    );
+
+    await super.start();
+  }
+}

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 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.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

@@ -12,10 +12,11 @@ import { addresses } from "@/constants";
 import { ChainId } from "@/types";
 import config from "@/config";
 import { InteropX } from "@/typechain";
+import { JsonRpcRetryProvider } from "@/providers";
 
-class SyncLogSubmitEvents extends BaseTask {
+export default class SyncLogSubmitEvents extends BaseTask {
   contractAddress: string;
-  provider: ethers.providers.JsonRpcProvider;
+  provider: JsonRpcRetryProvider;
   contract: InteropX;
   chainId: ChainId;
 
@@ -86,6 +87,7 @@ class SyncLogSubmitEvents extends BaseTask {
           submitEvent: {
             actionId,
             actionIdHashHash,
+            actionIdHash: actionIdHashHash,
             vnonce: vnonce.toString(),
             position: {
               withdraw: position.withdraw.map((v) => ({
@@ -121,7 +123,7 @@ class SyncLogSubmitEvents extends BaseTask {
   async start(): Promise<void> {
     this.contractAddress = addresses[this.chainId].interopX;
 
-    this.provider = new ethers.providers.JsonRpcProvider(
+    this.provider = new JsonRpcRetryProvider(
       getRpcProviderUrl(this.chainId)
     );
 
@@ -133,6 +135,4 @@ class SyncLogSubmitEvents extends BaseTask {
 
     await super.start();
   }
-}
-
-export default SyncLogSubmitEvents;
+}