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

package/src/errors/index.ts

@@ -0,0 +1,13 @@
+export class LiquidityError extends Error {
+    constructor(message?: string) {
+        super(message || "Not enough liquidity");
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}
+
+export class InvalidChaindIdError extends Error {
+    constructor(message?: string) {
+        super(message || "Invalid chain id");
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}

package/src/gnosis/actions/aaveV2/source.ts

@@ -32,6 +32,9 @@ export default async function (transaction: Transaction) {
     config.privateKey,
     sourceChainProvider
   );
+  const dsaAddress = addresses[sourceChainId].dsaAddress;
+  const sourceUserAddress =
+    Number(sourceDsaId) == 0 ? sourceSender : dsaAddress;
   const interopAddress = addresses[sourceChainId].interopX;
   const contract = getContract<InteropX>(
     interopAddress,
@@ -40,7 +43,7 @@ export default async function (transaction: Transaction) {
   );
 
   const sourceSpells: any[] = [];
-  const commonSpells = [];
+  const commonSpells: any[] = [];
 
   for (const withdraw of position.withdraw) {
     let spellData = {
@@ -50,9 +53,20 @@ export default async function (transaction: Transaction) {
     };
 
     sourceSpells.push({
-      connector: spellData.method,
+      connector: spellData.connector,
       data: encodeConnectorMethod(spellData),
     });
+
+    let spellDataBasicWithdraw = {
+      connector: "BASIC-A",
+      method: "withdraw",
+      args: [withdraw.sourceToken, withdraw.amount, sourceUserAddress, "0", "0"],
+    };
+
+    commonSpells.push({
+      connector: spellDataBasicWithdraw.connector,
+      data: encodeConnectorMethod(spellDataBasicWithdraw),
+    });
   }
 
   for (const supply of position.supply) {
@@ -63,18 +77,18 @@ export default async function (transaction: Transaction) {
     };
 
     sourceSpells.push({
-      connector: spellDataWithdraw.method,
+      connector: spellDataWithdraw.connector,
       data: encodeConnectorMethod(spellDataWithdraw),
     });
 
     let spellDataBasicWithdraw = {
       connector: "BASIC-A",
       method: "withdraw",
-      args: [supply.sourceToken, supply.amount, interopAddress, "0", "0"],
+      args: [supply.sourceToken, supply.amount, dsaAddress, "0", "0"],
     };
 
     sourceSpells.push({
-      connector: spellDataBasicWithdraw.method,
+      connector: spellDataBasicWithdraw.connector,
       data: encodeConnectorMethod(spellDataBasicWithdraw),
     });
   }

package/src/gnosis/actions/aaveV2/target.ts

@@ -1,6 +1,12 @@
-
-
+import abi from "@/abi";
+import config from "@/config";
+import { addresses } from "@/constants";
 import { Transaction } from "@/db";
+import { InteropX } from "@/typechain";
+import { InstList } from "@/typechain/InstList";
+import { ChainId } from "@/types";
+import { encodeConnectorMethod, getContract, getRpcProviderUrl } from "@/utils";
+import { ethers } from "ethers";
 import { MetaTransaction, OperationType } from "ethers-multisend";
 
 
@@ -8,6 +14,128 @@ export default async function (transaction: Transaction) {
     const transactions: MetaTransaction[] = [];
     const logs: any[] = [];
 
+    const {
+        sourceSpells,
+        position,
+        actionId,
+        sourceSender,
+        sourceDsaId,
+        targetDsaId,
+        sourceChainId,
+        targetChainId,
+        vnonce,
+        metadata,
+    } = transaction.validateEvent;
+
+    const targetChainProvider = new ethers.providers.JsonRpcProvider(
+        getRpcProviderUrl(targetChainId as ChainId)
+    );
+    const targetWallet = new ethers.Wallet(
+        config.privateKey,
+        targetChainProvider
+    );
+
+
+    const targetInstListContract = getContract<InstList>(
+        addresses[targetChainId].instList,
+        abi.instList,
+        targetChainProvider,
+    );
+
+    const targetDsaAddress = await targetInstListContract.accountAddr(targetDsaId)
+    const dsaAddress = addresses[targetChainId].dsaAddress;
+    const interopAddress = addresses[targetChainId].interopX;
+    const contract = getContract<InteropX>(
+        interopAddress,
+        abi.interopX,
+        targetWallet
+    );
+
+    const targetSpells: any[] = [];
+    const commonSpells: any[] = [];
+
+    for (const supplyToken of position.supply) {
+        let spellData = {
+            connector: "AAVE-V2-A",
+            method: "deposit",
+            args: [supplyToken.targetToken, supplyToken.amount, "0", "0"],
+        };
+
+        targetSpells.push({
+            connector: spellData.connector,
+            data: encodeConnectorMethod(spellData),
+        });
+
+        let spellDataBasicWithdraw = {
+            connector: "BASIC-A",
+            method: "withdraw",
+            args: [supplyToken.targetToken, supplyToken.amount, targetDsaAddress, "0", "0"],
+        };
+
+        commonSpells.push({
+            connector: spellDataBasicWithdraw.connector,
+            data: encodeConnectorMethod(spellDataBasicWithdraw),
+        });
+    }
+
+    for (const withdrawToken of position.withdraw) {
+
+        let spellData = {
+            connector: "AAVE-V2-A",
+            method: "borrow",
+            args: [
+                withdrawToken.targetToken,
+                withdrawToken.amount,
+                "2",
+                "0",
+                "0",
+            ],
+        };
+
+        targetSpells.push({
+            connector: spellData.connector,
+            data: encodeConnectorMethod(spellData),
+        });
+
+        let spellData2 = {
+            connector: "BASIC-A",
+            method: "withdraw",
+            args: [
+                withdrawToken.targetToken,
+                withdrawToken.amount,
+                dsaAddress,
+                "0",
+                "0",
+            ],
+        };
+
+        targetSpells.push({
+            connector: spellData.connector,
+            data: encodeConnectorMethod(spellData2),
+        });
+    }
+
+    const { data } = await contract.populateTransaction.targetAction(
+        sourceSpells,
+        targetSpells,
+        commonSpells,
+        position,
+        actionId,
+        sourceSender,
+        sourceDsaId,
+        targetDsaId,
+        sourceChainId,
+        targetChainId,
+        vnonce,
+        metadata
+    );
+
+    transactions.push({
+        to: interopAddress,
+        data: data!,
+        value: "0",
+        operation: OperationType.Call,
+    });
 
     return { transactions, logs }
 }

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

@@ -9,8 +9,8 @@ import {
   generateInteropTransactionHash,
   getContract,
   getRpcProviderUrl,
-  LiquidityError,
   Signature,
+  validateChains,
 } from "@/utils";
 import { addresses, blockConfirmations } from "@/constants";
 import { ChainId } from "@/types";
@@ -22,8 +22,9 @@ import { buildGnosisAction } from "@/gnosis";
 import { peerPool, protocol } from "@/net";
 import { LogDescription } from "ethers/lib/utils";
 import wait from "waait";
+import { LiquidityError } from "@/errors";
 
-class ProcessSubmitSubmitEvents extends BaseTask {
+export default class ProcessSubmitEvents extends BaseTask {
   sourceProvider: ethers.providers.JsonRpcProvider;
   sourceGnosisContract: GnosisSafe;
   sourceWallet: Wallet;
@@ -68,12 +69,28 @@ class ProcessSubmitSubmitEvents extends BaseTask {
       return;
     }
 
+    this.logger.debug(`Processing transaction ${transaction.transactionHash}`);
+
     transaction.sourceStatus = "proccessing";
     await transaction.save();
 
+    const { 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 ownersThreshold = await this.sourceGnosisContract.getThreshold();
     await wait(10000);
 
+    this.logger.debug(`Build gnosis action for ${transaction.transactionHash}`);
+
     let data,
       logs = [];
 
@@ -101,6 +118,10 @@ class ProcessSubmitSubmitEvents extends BaseTask {
       return;
     }
 
+    this.logger.debug(
+      `Generating gnosis tx for ${transaction.transactionHash}`
+    );
+
     let gnosisTx = await generateGnosisTransaction(
       {
         baseGas: "0",
@@ -186,10 +207,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 +233,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 +250,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();
     }
@@ -248,5 +278,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,
+  generateInteropTransactionHash,
+  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";
+
+export default class ProcessValidateEvents extends BaseTask {
+  sourceProvider: ethers.providers.JsonRpcProvider;
+  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 ethers.providers.JsonRpcProvider(
+      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 ethers.providers.JsonRpcProvider(
+      getRpcProviderUrl(this.chainId)
+    );
+
+    await super.start();
+  }
+}