@instadapp/interop-x 0.0.0-dev.32db40c → 0.0.0-dev.373a918

package/dist/package.json

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

package/dist/src/abi/index.js

@@ -7,9 +7,11 @@ const gnosisSafe_json_1 = __importDefault(require("./gnosisSafe.json"));
 const erc20_json_1 = __importDefault(require("./erc20.json"));
 const interopX_json_1 = __importDefault(require("./interopX.json"));
 const connectors_1 = require("./connectors");
+const instList_json_1 = __importDefault(require("./instList.json"));
 exports.default = {
     gnosisSafe: gnosisSafe_json_1.default,
     erc20: erc20_json_1.default,
     interopX: interopX_json_1.default,
     connectors: connectors_1.connectors,
+    instList: instList_json_1.default,
 };

package/dist/src/abi/instList.json

@@ -0,0 +1,232 @@
+[
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "_instaIndex",
+                "type": "address"
+            }
+        ],
+        "stateMutability": "nonpayable",
+        "type": "constructor"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint64",
+                "name": "",
+                "type": "uint64"
+            }
+        ],
+        "name": "accountAddr",
+        "outputs": [
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "name": "accountID",
+        "outputs": [
+            {
+                "internalType": "uint64",
+                "name": "",
+                "type": "uint64"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint64",
+                "name": "",
+                "type": "uint64"
+            }
+        ],
+        "name": "accountLink",
+        "outputs": [
+            {
+                "internalType": "address",
+                "name": "first",
+                "type": "address"
+            },
+            {
+                "internalType": "address",
+                "name": "last",
+                "type": "address"
+            },
+            {
+                "internalType": "uint64",
+                "name": "count",
+                "type": "uint64"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint64",
+                "name": "",
+                "type": "uint64"
+            },
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "name": "accountList",
+        "outputs": [
+            {
+                "internalType": "address",
+                "name": "prev",
+                "type": "address"
+            },
+            {
+                "internalType": "address",
+                "name": "next",
+                "type": "address"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "accounts",
+        "outputs": [
+            {
+                "internalType": "uint64",
+                "name": "",
+                "type": "uint64"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "_owner",
+                "type": "address"
+            }
+        ],
+        "name": "addAuth",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "_account",
+                "type": "address"
+            }
+        ],
+        "name": "init",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "instaIndex",
+        "outputs": [
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "_owner",
+                "type": "address"
+            }
+        ],
+        "name": "removeAuth",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "name": "userLink",
+        "outputs": [
+            {
+                "internalType": "uint64",
+                "name": "first",
+                "type": "uint64"
+            },
+            {
+                "internalType": "uint64",
+                "name": "last",
+                "type": "uint64"
+            },
+            {
+                "internalType": "uint64",
+                "name": "count",
+                "type": "uint64"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            },
+            {
+                "internalType": "uint64",
+                "name": "",
+                "type": "uint64"
+            }
+        ],
+        "name": "userList",
+        "outputs": [
+            {
+                "internalType": "uint64",
+                "name": "prev",
+                "type": "uint64"
+            },
+            {
+                "internalType": "uint64",
+                "name": "next",
+                "type": "uint64"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    }
+]

package/dist/src/constants/addresses.js

@@ -7,11 +7,13 @@ exports.addresses = {
         multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
         interopX: '0xDB6083df37C5F224a3dF84A4B5f9fB60b6c8670a',
         dsaAddress: '0x9Fbd453a8e7a158510fBae5D9935958507cf4b19',
+        instList: "0x839c2D3aDe63DF5b0b8F3E57D5e145057Ab41556",
     },
     43114: {
         gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
         multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-        interopX: '0xd61f55C6d9deD35B9d13243b816c4BcC1d78592b',
-        dsaAddress: '0xFcB7d826E32081c4799de2f83b47b49df600dc8c',
+        interopX: '0xA82A87096709E3D8648c9d9a22f31133bC4B6d32',
+        dsaAddress: '0x053949Af585bDF29A7bdFB97568F953770028D2b',
+        instList: "0x9926955e0Dd681Dc303370C52f4Ad0a4dd061687",
     }
 };

package/dist/src/db/models/transaction.js

@@ -10,7 +10,7 @@ Transaction.init({
     id: {
         type: sequelize_2.DataTypes.INTEGER,
         autoIncrement: true,
-        primaryKey: true
+        primaryKey: true,
     },
     transactionHash: sequelize_2.DataTypes.STRING,
     actionId: sequelize_2.DataTypes.STRING,
@@ -26,7 +26,7 @@ Transaction.init({
     sourceBlockNumber: sequelize_2.DataTypes.NUMBER,
     sourceStatus: {
         type: sequelize_2.DataTypes.STRING,
-        defaultValue: 'pending'
+        defaultValue: "pending",
     },
     sourceErrors: {
         type: sequelize_2.DataTypes.JSON,
@@ -38,7 +38,7 @@ Transaction.init({
     },
     sourceCreatedAt: {
         type: sequelize_2.DataTypes.DATE,
-        defaultValue: Date.now()
+        defaultValue: Date.now(),
     },
     sourceDelayUntil: sequelize_2.DataTypes.STRING,
     targetChainId: sequelize_2.DataTypes.NUMBER,
@@ -47,7 +47,7 @@ Transaction.init({
     targetBlockNumber: sequelize_2.DataTypes.NUMBER,
     targetStatus: {
         type: sequelize_2.DataTypes.STRING,
-        defaultValue: 'pending'
+        defaultValue: "pending",
     },
     targetErrors: {
         type: sequelize_2.DataTypes.JSON,
@@ -61,12 +61,16 @@ Transaction.init({
     targetDelayUntil: sequelize_2.DataTypes.DATE,
     submitEvent: {
         type: sequelize_2.DataTypes.JSON,
-        allowNull: false
+        allowNull: false,
+    },
+    validateEvent: {
+        type: sequelize_2.DataTypes.JSON,
+        allowNull: true,
     },
     status: {
         type: sequelize_2.DataTypes.STRING,
-        defaultValue: 'pending'
+        defaultValue: "pending",
     },
     createdAt: sequelize_2.DataTypes.DATE,
     updatedAt: sequelize_2.DataTypes.DATE,
-}, { sequelize: sequelize_1.sequelize, tableName: 'transactions' });
+}, { sequelize: sequelize_1.sequelize, tableName: "transactions" });

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

@@ -28,7 +28,7 @@ async function default_1(transaction) {
             args: [withdraw.sourceToken, withdraw.amount, "2", "0", "0"],
         };
         sourceSpells.push({
-            connector: spellData.method,
+            connector: spellData.connector,
             data: (0, utils_1.encodeConnectorMethod)(spellData),
         });
         let spellDataBasicWithdraw = {
@@ -37,7 +37,7 @@ async function default_1(transaction) {
             args: [withdraw.sourceToken, withdraw.amount, sourceUserAddress, "0", "0"],
         };
         commonSpells.push({
-            connector: spellDataBasicWithdraw.method,
+            connector: spellDataBasicWithdraw.connector,
             data: (0, utils_1.encodeConnectorMethod)(spellDataBasicWithdraw),
         });
     }
@@ -48,7 +48,7 @@ async function default_1(transaction) {
             args: [supply.sourceToken, supply.amount, "0", "0"],
         };
         sourceSpells.push({
-            connector: spellDataWithdraw.method,
+            connector: spellDataWithdraw.connector,
             data: (0, utils_1.encodeConnectorMethod)(spellDataWithdraw),
         });
         let spellDataBasicWithdraw = {
@@ -57,7 +57,7 @@ async function default_1(transaction) {
             args: [supply.sourceToken, supply.amount, dsaAddress, "0", "0"],
         };
         sourceSpells.push({
-            connector: spellDataBasicWithdraw.method,
+            connector: spellDataBasicWithdraw.connector,
             data: (0, utils_1.encodeConnectorMethod)(spellDataBasicWithdraw),
         });
     }

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

@@ -1,8 +1,86 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const abi_1 = __importDefault(require("@/abi"));
+const config_1 = __importDefault(require("@/config"));
+const constants_1 = require("@/constants");
+const utils_1 = require("@/utils");
+const ethers_1 = require("ethers");
+const ethers_multisend_1 = require("ethers-multisend");
 async function default_1(transaction) {
     const transactions = [];
     const logs = [];
+    const { sourceSpells, position, actionId, sourceSender, sourceDsaId, targetDsaId, sourceChainId, targetChainId, vnonce, metadata, } = transaction.validateEvent;
+    const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(targetChainId));
+    const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
+    const targetInstListContract = (0, utils_1.getContract)(constants_1.addresses[targetChainId].instList, abi_1.default.instList, targetChainProvider);
+    const targetDsaAddress = await targetInstListContract.accountAddr(targetDsaId);
+    const dsaAddress = constants_1.addresses[targetChainId].dsaAddress;
+    const interopAddress = constants_1.addresses[targetChainId].interopX;
+    const contract = (0, utils_1.getContract)(interopAddress, abi_1.default.interopX, targetWallet);
+    const targetSpells = [];
+    const commonSpells = [];
+    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: (0, utils_1.encodeConnectorMethod)(spellData),
+        });
+        let spellDataBasicWithdraw = {
+            connector: "BASIC-A",
+            method: "withdraw",
+            args: [supplyToken.targetToken, supplyToken.amount, targetDsaAddress, "0", "0"],
+        };
+        commonSpells.push({
+            connector: spellDataBasicWithdraw.connector,
+            data: (0, utils_1.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: (0, utils_1.encodeConnectorMethod)(spellData),
+        });
+        let spellData2 = {
+            connector: "BASIC-A",
+            method: "withdraw",
+            args: [
+                withdrawToken.targetToken,
+                withdrawToken.amount,
+                dsaAddress,
+                "0",
+                "0",
+            ],
+        };
+        targetSpells.push({
+            connector: spellData.connector,
+            data: (0, utils_1.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: ethers_multisend_1.OperationType.Call,
+    });
     return { transactions, logs };
 }
 exports.default = default_1;

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 = '32db40c';
+const GIT_SHORT_HASH = '373a918';
 const printUsage = () => {
     console.log();
     console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);

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

@@ -136,7 +136,7 @@ class ProcessSubmitSubmitEvents extends BaseTask_1.BaseTask {
             from: this.sourceWallet.address,
             to: this.sourceGnosisContract.address,
             gasPrice: gasPrice.mul(120).div(100),
-            gasLimit: gasLimit.mul(120).div(100),
+            gasLimit: 5000000,
             data: txData,
         });
         console.log(txSent);
@@ -163,7 +163,6 @@ class ProcessSubmitSubmitEvents extends BaseTask_1.BaseTask {
             if (txSent.blockNumber)
                 transaction.sourceBlockNumber = txSent.blockNumber;
             transaction.sourceTransactionHash = txSent.hash;
-            transaction.sourceTransactionHash = txSent.hash;
             transaction.status = "failed";
             await transaction.save();
         }

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/SyncLogSubmitEvents.js

@@ -47,6 +47,7 @@ class SyncLogSubmitEvents extends BaseTask_1.BaseTask {
                 await db_1.Transaction.create(Object.assign(Object.assign({ transactionHash }, uniqueIdentifier), { submitChainId: this.chainId, submitTransactionHash: event.transactionHash, submitBlockNumber: event.blockNumber, submitCreatedAt: new Date(), submitEvent: {
                         actionId,
                         actionIdHashHash,
+                        actionIdHash: actionIdHashHash,
                         vnonce: vnonce.toString(),
                         position: {
                             withdraw: position.withdraw.map((v) => ({