@instadapp/interop-x 0.0.0-dev.c4e0c91 → 0.0.0-dev.c696e38

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.c4e0c91",
+    "version": "0.0.0-dev.c696e38",
     "license": "MIT",
     "main": "dist/index.js",
     "engines": {

package/dist/src/constants/addresses.js

@@ -11,7 +11,7 @@ exports.addresses = {
     43114: {
         gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
         multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-        interopX: '0xd61f55C6d9deD35B9d13243b816c4BcC1d78592b',
+        interopX: '0xA82A87096709E3D8648c9d9a22f31133bC4B6d32',
         dsaAddress: '0xFcB7d826E32081c4799de2f83b47b49df600dc8c',
     }
 };

package/dist/src/gnosis/actions/aaveV2/target.js

@@ -17,7 +17,7 @@ async function default_1(transaction) {
     const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
     const dsaAddress = constants_1.addresses[targetChainId].dsaAddress;
     const sourceUserAddress = Number(sourceDsaId) == 0 ? sourceSender : dsaAddress;
-    const interopAddress = constants_1.addresses[sourceChainId].interopX;
+    const interopAddress = constants_1.addresses[targetChainId].interopX;
     const contract = (0, utils_1.getContract)(interopAddress, abi_1.default.interopX, targetWallet);
     const targetSpells = [];
     const commonSpells = [];
@@ -27,10 +27,19 @@ async function default_1(transaction) {
             method: "deposit",
             args: [supplyToken.targetToken, supplyToken.amount, "0", "0"],
         };
-        commonSpells.push({
+        targetSpells.push({
             connector: spellData.connector,
             data: (0, utils_1.encodeConnectorMethod)(spellData),
         });
+        let spellDataBasicWithdraw = {
+            connector: "BASIC-A",
+            method: "withdraw",
+            args: [supplyToken.targetToken, supplyToken.amount, sourceUserAddress, "0", "0"],
+        };
+        commonSpells.push({
+            connector: spellDataBasicWithdraw.connector,
+            data: (0, utils_1.encodeConnectorMethod)(spellDataBasicWithdraw),
+        });
     }
     for (const withdrawToken of position.withdraw) {
         let spellData = {

package/dist/src/index.js

@@ -13,7 +13,7 @@ const package_json_1 = __importDefault(require("../package.json"));
 dotenv_1.default.config();
 const logger_1 = __importDefault(require("@/logger"));
 const logger = new logger_1.default('Process');
-const GIT_SHORT_HASH = 'c4e0c91';
+const GIT_SHORT_HASH = 'c696e38';
 const printUsage = () => {
     console.log();
     console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);

package/dist/src/tasks/InteropX/ProcessValidateEvents.js

@@ -0,0 +1,183 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const BaseTask_1 = require("../BaseTask");
+const logger_1 = __importDefault(require("@/logger"));
+const ethers_1 = require("ethers");
+const abi_1 = __importDefault(require("@/abi"));
+const db_1 = require("@/db");
+const utils_1 = require("@/utils");
+const constants_1 = require("@/constants");
+const config_1 = __importDefault(require("@/config"));
+const moment_1 = __importDefault(require("moment"));
+const sequelize_1 = require("sequelize");
+const gnosis_1 = require("@/gnosis");
+const net_1 = require("@/net");
+const waait_1 = __importDefault(require("waait"));
+class ProcessValidateEvents extends BaseTask_1.BaseTask {
+    constructor({ chainId }) {
+        super({
+            logger: new logger_1.default("InteropX::ProcessValidateEvents"),
+        });
+        this.leadNodeOnly = true;
+        this.blockConfirmationsCount = 12;
+        this.chainId = chainId;
+    }
+    async pollHandler() {
+        var _a;
+        const currentBlockNumber = await this.sourceProvider.getBlockNumber();
+        const transaction = await db_1.Transaction.findOne({
+            where: {
+                status: "pending",
+                sourceStatus: "success",
+                targetStatus: "pending",
+                sourceChainId: this.chainId,
+                sourceBlockNumber: {
+                    [sequelize_1.Op.lt]: currentBlockNumber - this.blockConfirmationsCount,
+                },
+                targetDelayUntil: {
+                    [sequelize_1.Op.or]: {
+                        [sequelize_1.Op.is]: null,
+                        [sequelize_1.Op.lt]: new Date(),
+                    },
+                },
+                submitEvent: { $ne: null },
+                validateEvent: { $ne: null },
+                createdAt: {
+                    [sequelize_1.Op.gt]: (0, moment_1.default)().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_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(targetChainId));
+        const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetProvider);
+        const targetGnosisContract = (0, utils_1.getContract)(constants_1.addresses[targetChainId].gnosisSafe, abi_1.default.gnosisSafe, targetWallet);
+        const ownersThreshold = await targetGnosisContract.getThreshold();
+        await (0, waait_1.default)(10000);
+        this.logger.debug(`Build gnosis action for ${transaction.transactionHash}`);
+        let data, logs = [];
+        try {
+            ({ data, logs } = await (0, gnosis_1.buildGnosisAction)(transaction, "target"));
+        }
+        catch (error) {
+            if (error instanceof utils_1.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();
+            net_1.protocol.sendTransaction(transaction);
+            return;
+        }
+        this.logger.debug(`Generating gnosis tx for ${transaction.transactionHash}`);
+        let gnosisTx = await (0, utils_1.generateGnosisTransaction)({
+            baseGas: "0",
+            data,
+            gasPrice: "0",
+            gasToken: "0x0000000000000000000000000000000000000000",
+            nonce: "0",
+            operation: "1",
+            refundReceiver: "0x0000000000000000000000000000000000000000",
+            safeAddress: targetGnosisContract.address,
+            safeTxGas: "79668",
+            to: constants_1.addresses[transaction.targetChainId].multisend,
+            value: "0",
+        }, targetGnosisContract);
+        const owners = await targetGnosisContract
+            .getOwners()
+            .then((owners) => owners.map((owner) => owner.toLowerCase()));
+        const ownerPeerIds = net_1.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 net_1.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");
+        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 = (_a = signatures.find((s) => !!s.error)) === null || _a === void 0 ? void 0 : _a.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, (0, utils_1.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: 5000000,
+            data: txData,
+        });
+        console.log(txSent);
+        const receipt = await txSent.wait();
+        const parsedLogs = [];
+        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();
+        }
+        net_1.protocol.sendTransaction(transaction);
+    }
+    async start() {
+        this.blockConfirmationsCount = constants_1.blockConfirmations[this.chainId] + 1;
+        this.sourceProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
+        await super.start();
+    }
+}
+exports.default = ProcessValidateEvents;

package/dist/src/tasks/InteropX/SyncLogValidateEvents.js

@@ -48,8 +48,8 @@ class SyncLogValidateEvents extends BaseTask_1.BaseTask {
                 if (!transaction) {
                     continue;
                 }
-                if (transaction.sourceStatus != "confirmed") {
-                    transaction.sourceStatus = "confirmed";
+                if (transaction.sourceStatus != "success") {
+                    transaction.sourceStatus = "success";
                 }
                 if (!transaction.sourceCreatedAt) {
                     transaction.sourceCreatedAt = new Date();

package/dist/src/tasks/index.js

@@ -10,6 +10,7 @@ const AutoUpdateTask_1 = __importDefault(require("./AutoUpdateTask"));
 const SyncLogSubmitEvents_1 = __importDefault(require("./InteropX/SyncLogSubmitEvents"));
 const ProcessSubmitSubmitEvents_1 = __importDefault(require("./InteropX/ProcessSubmitSubmitEvents"));
 const SyncLogValidateEvents_1 = __importDefault(require("./InteropX/SyncLogValidateEvents"));
+const ProcessValidateEvents_1 = __importDefault(require("./InteropX/ProcessValidateEvents"));
 class Tasks {
     constructor() {
         this.tasks = [
@@ -22,6 +23,8 @@ class Tasks {
             new ProcessSubmitSubmitEvents_1.default({ chainId: 43114 }),
             new SyncLogValidateEvents_1.default({ chainId: 137 }),
             new SyncLogValidateEvents_1.default({ chainId: 43114 }),
+            new ProcessValidateEvents_1.default({ chainId: 137 }),
+            new ProcessValidateEvents_1.default({ chainId: 43114 }),
             new SyncTransactionStatusTask_1.default(),
         ];
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.c4e0c91",
+  "version": "0.0.0-dev.c696e38",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {

package/src/constants/addresses.ts

@@ -8,7 +8,7 @@ export const addresses = {
   43114: {
     gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
     multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-    interopX: '0xd61f55C6d9deD35B9d13243b816c4BcC1d78592b',
+    interopX: '0xA82A87096709E3D8648c9d9a22f31133bC4B6d32',
     dsaAddress: '0xFcB7d826E32081c4799de2f83b47b49df600dc8c',
   }
 } as Record<number, { gnosisSafe: string, multisend: string, interopX: string, dsaAddress: string }>

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

@@ -35,7 +35,7 @@ export default async function (transaction: Transaction) {
     );
     const dsaAddress = addresses[targetChainId].dsaAddress;
     const sourceUserAddress = Number(sourceDsaId) == 0 ? sourceSender : dsaAddress;
-    const interopAddress = addresses[sourceChainId].interopX;
+    const interopAddress = addresses[targetChainId].interopX;
     const contract = getContract<InteropX>(
         interopAddress,
         abi.interopX,
@@ -52,10 +52,21 @@ export default async function (transaction: Transaction) {
             args: [supplyToken.targetToken, supplyToken.amount, "0", "0"],
         };
 
-        commonSpells.push({
+        targetSpells.push({
             connector: spellData.connector,
             data: encodeConnectorMethod(spellData),
         });
+
+        let spellDataBasicWithdraw = {
+            connector: "BASIC-A",
+            method: "withdraw",
+            args: [supplyToken.targetToken, supplyToken.amount, sourceUserAddress, "0", "0"],
+        };
+
+        commonSpells.push({
+            connector: spellDataBasicWithdraw.connector,
+            data: encodeConnectorMethod(spellDataBasicWithdraw),
+        });
     }
 
     for (const withdrawToken of position.withdraw) {

package/src/tasks/InteropX/ProcessValidateEvents.ts

@@ -0,0 +1,274 @@
+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 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();
+  }
+}
+
+export default ProcessValidateEvents;

package/src/tasks/InteropX/SyncLogValidateEvents.ts

@@ -81,8 +81,8 @@ class SyncLogValidateEvents extends BaseTask {
           continue;
         }
 
-        if (transaction.sourceStatus != "confirmed") {
-          transaction.sourceStatus = "confirmed";
+        if (transaction.sourceStatus != "success") {
+          transaction.sourceStatus = "success";
         }
 
         if (!transaction.sourceCreatedAt) {

package/src/tasks/index.ts

@@ -8,6 +8,7 @@ import AutoUpdateTask from "./AutoUpdateTask";
 import SyncLogSubmitEvents from "./InteropX/SyncLogSubmitEvents";
 import ProcessSubmitSubmitEvents from "./InteropX/ProcessSubmitSubmitEvents";
 import SyncLogValidateEvents from "./InteropX/SyncLogValidateEvents";
+import ProcessValidateEvents from "./InteropX/ProcessValidateEvents";
 
 export class Tasks {
 
@@ -25,6 +26,9 @@ export class Tasks {
         new SyncLogValidateEvents({ chainId: 137 }),
         new SyncLogValidateEvents({ chainId: 43114 }),
 
+        new ProcessValidateEvents({ chainId: 137 }),
+        new ProcessValidateEvents({ chainId: 43114 }),
+
         new SyncTransactionStatusTask(),
     ];