@instadapp/interop-x 0.0.0-dev.a775e30 → 0.0.0-dev.a861339

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.a775e30",
+    "version": "0.0.0-dev.a861339",
     "license": "MIT",
     "main": "dist/index.js",
     "engines": {
@@ -11,7 +11,7 @@
         "start": "yarn build && node bin/interop-x",
         "build": "yarn generate-abi-types && export GIT_REF=$(git rev-parse --short HEAD) && rimraf ./dist && tsc -p tsconfig.json && replace-in-file '@GIT_SHORT_HASH@' $GIT_REF ./dist/**/*.js",
         "dev": "yarn generate-abi-types && NODE_ENV=development nodemon",
-        "generate-abi-types": "typechain --target=ethers-v5 'src/abi/*.json' --out-dir 'src/typechain'",
+        "generate-abi-types": "rimraf src/typechain && typechain --target=ethers-v5 'src/abi/*.json' --out-dir 'src/typechain'",
         "prepublishOnly": "yarn build",
         "postinstall": "patch-package"
     },

package/dist/src/abi/index.js

@@ -5,11 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const gnosisSafe_json_1 = __importDefault(require("./gnosisSafe.json"));
 const erc20_json_1 = __importDefault(require("./erc20.json"));
-const interopXGateway_json_1 = __importDefault(require("./interopXGateway.json"));
-const interopBridgeToken_json_1 = __importDefault(require("./interopBridgeToken.json"));
+const interopXContract_json_1 = __importDefault(require("./interopXContract.json"));
 exports.default = {
     gnosisSafe: gnosisSafe_json_1.default,
     erc20: erc20_json_1.default,
-    interopXGateway: interopXGateway_json_1.default,
-    interopBridgeToken: interopBridgeToken_json_1.default,
+    interopXContract: interopXContract_json_1.default,
 };

package/dist/src/abi/interopXContract.json

@@ -0,0 +1,391 @@
+[
+    {
+        "anonymous": false,
+        "inputs": [
+            {
+                "indexed": true,
+                "internalType": "address",
+                "name": "bridger",
+                "type": "address"
+            },
+            {
+                "components": [
+                    {
+                        "components": [
+                            {
+                                "internalType": "address",
+                                "name": "sourceToken",
+                                "type": "address"
+                            },
+                            {
+                                "internalType": "address",
+                                "name": "targetToken",
+                                "type": "address"
+                            },
+                            { "internalType": "uint256", "name": "amount", "type": "uint256" }
+                        ],
+                        "internalType": "struct InteropXContractBeta.TokenInfo[]",
+                        "name": "supply",
+                        "type": "tuple[]"
+                    },
+                    {
+                        "components": [
+                            {
+                                "internalType": "address",
+                                "name": "sourceToken",
+                                "type": "address"
+                            },
+                            {
+                                "internalType": "address",
+                                "name": "targetToken",
+                                "type": "address"
+                            },
+                            { "internalType": "uint256", "name": "amount", "type": "uint256" }
+                        ],
+                        "internalType": "struct InteropXContractBeta.TokenInfo[]",
+                        "name": "withdraw",
+                        "type": "tuple[]"
+                    }
+                ],
+                "indexed": false,
+                "internalType": "struct InteropXContractBeta.Position",
+                "name": "position",
+                "type": "tuple"
+            },
+            {
+                "indexed": true,
+                "internalType": "uint32",
+                "name": "sourceChainId",
+                "type": "uint32"
+            },
+            {
+                "indexed": false,
+                "internalType": "uint32",
+                "name": "targetChainId",
+                "type": "uint32"
+            },
+            {
+                "indexed": true,
+                "internalType": "bytes32",
+                "name": "requestTransactionHash",
+                "type": "bytes32"
+            },
+            {
+                "indexed": false,
+                "internalType": "bytes",
+                "name": "metadata",
+                "type": "bytes"
+            }
+        ],
+        "name": "LogBridgeCommitted",
+        "type": "event"
+    },
+    {
+        "anonymous": false,
+        "inputs": [
+            {
+                "indexed": true,
+                "internalType": "address",
+                "name": "bridger",
+                "type": "address"
+            },
+            {
+                "components": [
+                    {
+                        "components": [
+                            {
+                                "internalType": "address",
+                                "name": "sourceToken",
+                                "type": "address"
+                            },
+                            {
+                                "internalType": "address",
+                                "name": "targetToken",
+                                "type": "address"
+                            },
+                            { "internalType": "uint256", "name": "amount", "type": "uint256" }
+                        ],
+                        "internalType": "struct InteropXContractBeta.TokenInfo[]",
+                        "name": "supply",
+                        "type": "tuple[]"
+                    },
+                    {
+                        "components": [
+                            {
+                                "internalType": "address",
+                                "name": "sourceToken",
+                                "type": "address"
+                            },
+                            {
+                                "internalType": "address",
+                                "name": "targetToken",
+                                "type": "address"
+                            },
+                            { "internalType": "uint256", "name": "amount", "type": "uint256" }
+                        ],
+                        "internalType": "struct InteropXContractBeta.TokenInfo[]",
+                        "name": "withdraw",
+                        "type": "tuple[]"
+                    }
+                ],
+                "indexed": false,
+                "internalType": "struct InteropXContractBeta.Position",
+                "name": "position",
+                "type": "tuple"
+            },
+            {
+                "indexed": false,
+                "internalType": "uint256",
+                "name": "sourceChainId",
+                "type": "uint256"
+            },
+            {
+                "indexed": true,
+                "internalType": "uint256",
+                "name": "targetChainId",
+                "type": "uint256"
+            },
+            {
+                "indexed": true,
+                "internalType": "bytes32",
+                "name": "requestTransactionHash",
+                "type": "bytes32"
+            },
+            {
+                "indexed": false,
+                "internalType": "bytes32",
+                "name": "targetCommittedTransactionHash",
+                "type": "bytes32"
+            },
+            {
+                "indexed": false,
+                "internalType": "bytes",
+                "name": "metadata",
+                "type": "bytes"
+            }
+        ],
+        "name": "LogBridgeCompleted",
+        "type": "event"
+    },
+    {
+        "anonymous": false,
+        "inputs": [
+            {
+                "indexed": true,
+                "internalType": "address",
+                "name": "bridger",
+                "type": "address"
+            },
+            {
+                "components": [
+                    {
+                        "components": [
+                            {
+                                "internalType": "address",
+                                "name": "sourceToken",
+                                "type": "address"
+                            },
+                            {
+                                "internalType": "address",
+                                "name": "targetToken",
+                                "type": "address"
+                            },
+                            { "internalType": "uint256", "name": "amount", "type": "uint256" }
+                        ],
+                        "internalType": "struct InteropXContractBeta.TokenInfo[]",
+                        "name": "supply",
+                        "type": "tuple[]"
+                    },
+                    {
+                        "components": [
+                            {
+                                "internalType": "address",
+                                "name": "sourceToken",
+                                "type": "address"
+                            },
+                            {
+                                "internalType": "address",
+                                "name": "targetToken",
+                                "type": "address"
+                            },
+                            { "internalType": "uint256", "name": "amount", "type": "uint256" }
+                        ],
+                        "internalType": "struct InteropXContractBeta.TokenInfo[]",
+                        "name": "withdraw",
+                        "type": "tuple[]"
+                    }
+                ],
+                "indexed": false,
+                "internalType": "struct InteropXContractBeta.Position",
+                "name": "position",
+                "type": "tuple"
+            },
+            {
+                "indexed": false,
+                "internalType": "uint256",
+                "name": "sourceChainId",
+                "type": "uint256"
+            },
+            {
+                "indexed": true,
+                "internalType": "uint256",
+                "name": "targetChainId",
+                "type": "uint256"
+            },
+            {
+                "indexed": false,
+                "internalType": "bytes",
+                "name": "metadata",
+                "type": "bytes"
+            }
+        ],
+        "name": "LogBridgeRequest",
+        "type": "event"
+    },
+    {
+        "anonymous": false,
+        "inputs": [
+            {
+                "indexed": true,
+                "internalType": "address",
+                "name": "bridger",
+                "type": "address"
+            },
+            {
+                "components": [
+                    {
+                        "components": [
+                            {
+                                "internalType": "address",
+                                "name": "sourceToken",
+                                "type": "address"
+                            },
+                            {
+                                "internalType": "address",
+                                "name": "targetToken",
+                                "type": "address"
+                            },
+                            { "internalType": "uint256", "name": "amount", "type": "uint256" }
+                        ],
+                        "internalType": "struct InteropXContractBeta.TokenInfo[]",
+                        "name": "supply",
+                        "type": "tuple[]"
+                    },
+                    {
+                        "components": [
+                            {
+                                "internalType": "address",
+                                "name": "sourceToken",
+                                "type": "address"
+                            },
+                            {
+                                "internalType": "address",
+                                "name": "targetToken",
+                                "type": "address"
+                            },
+                            { "internalType": "uint256", "name": "amount", "type": "uint256" }
+                        ],
+                        "internalType": "struct InteropXContractBeta.TokenInfo[]",
+                        "name": "withdraw",
+                        "type": "tuple[]"
+                    }
+                ],
+                "indexed": false,
+                "internalType": "struct InteropXContractBeta.Position",
+                "name": "position",
+                "type": "tuple"
+            },
+            {
+                "indexed": false,
+                "internalType": "uint32",
+                "name": "sourceChainId",
+                "type": "uint32"
+            },
+            {
+                "indexed": true,
+                "internalType": "uint32",
+                "name": "targetChainId",
+                "type": "uint32"
+            },
+            {
+                "indexed": true,
+                "internalType": "bytes32",
+                "name": "requestTransactionHash",
+                "type": "bytes32"
+            },
+            {
+                "indexed": false,
+                "internalType": "bytes",
+                "name": "metadata",
+                "type": "bytes"
+            }
+        ],
+        "name": "LogBridgeRequestSent",
+        "type": "event"
+    },
+    {
+        "inputs": [],
+        "name": "_vnonce",
+        "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            { "internalType": "address", "name": "to_", "type": "address" },
+            { "internalType": "address", "name": "sourceToken_", "type": "address" },
+            { "internalType": "address", "name": "targetToken_", "type": "address" },
+            { "internalType": "uint256", "name": "amount_", "type": "uint256" },
+            { "internalType": "uint32", "name": "targetChainId_", "type": "uint32" },
+            {
+                "internalType": "bytes32",
+                "name": "transactionHash_",
+                "type": "bytes32"
+            },
+            { "internalType": "bytes", "name": "metadata_", "type": "bytes" }
+        ],
+        "name": "completeBridge",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            { "internalType": "address", "name": "sourceToken_", "type": "address" },
+            { "internalType": "address", "name": "targetToken_", "type": "address" },
+            { "internalType": "uint256", "name": "amount_", "type": "uint256" },
+            { "internalType": "uint32", "name": "targetChainId_", "type": "uint32" },
+            { "internalType": "bytes", "name": "metadata_", "type": "bytes" }
+        ],
+        "name": "requestWithdraw",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
+        "name": "whitelistedMapping",
+        "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            { "internalType": "address", "name": "user_", "type": "address" },
+            { "internalType": "address", "name": "sourceToken_", "type": "address" },
+            { "internalType": "address", "name": "targetToken_", "type": "address" },
+            { "internalType": "uint256", "name": "amount_", "type": "uint256" },
+            { "internalType": "uint32", "name": "chainId_", "type": "uint32" },
+            {
+                "internalType": "bytes32",
+                "name": "transactionHash_",
+                "type": "bytes32"
+            },
+            { "internalType": "bytes", "name": "metadata_", "type": "bytes" }
+        ],
+        "name": "withdrawRequested",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    }
+]

package/dist/src/alias.js

@@ -0,0 +1,10 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const module_alias_1 = __importDefault(require("module-alias"));
+module_alias_1.default.addAliases({
+    "@": __dirname,
+});
+(0, module_alias_1.default)();

package/dist/src/api/index.js

@@ -20,6 +20,9 @@ const startApiServer = async () => {
             return await db_1.Transaction.findAndCountAll({
                 limit: 20,
                 offset: 0,
+                order: [
+                    ['createdAt', 'DESC']
+                ]
             });
         });
         await server.listen(PORT, HOST);

package/dist/src/constants/addresses.js

@@ -5,16 +5,16 @@ exports.addresses = {
     1: {
         gnosisSafe: '0x811Bff6eF88dAAA0aD6438386B534A81cE3F160F',
         multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-        interopXGateway: '',
+        interopXContract: '',
     },
     137: {
         gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
         multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-        interopXGateway: '',
+        interopXContract: '0x2189741c8cAc1cf51570932817A7d6390646C80e',
     },
     43114: {
         gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
         multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-        interopXGateway: '0x8D27758751BA488690974B6Ccfcda771D462945f',
+        interopXContract: '0x1867DF97Ec24bb0bbD4AD464F0Be9C6713422EAE',
     }
 };

package/dist/src/constants/index.js

@@ -16,4 +16,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./addresses"), exports);
 __exportStar(require("./tokens"), exports);
-__exportStar(require("./itokens"), exports);

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

@@ -12,20 +12,26 @@ Transaction.init({
         autoIncrement: true,
         primaryKey: true
     },
-    submitTransactionHash: sequelize_2.DataTypes.NUMBER,
-    submitBlockNumber: sequelize_2.DataTypes.NUMBER,
+    requestTransactionHash: sequelize_2.DataTypes.NUMBER,
+    requestBlockNumber: sequelize_2.DataTypes.NUMBER,
     transactionHash: sequelize_2.DataTypes.STRING,
     action: sequelize_2.DataTypes.STRING,
-    from: sequelize_2.DataTypes.STRING,
-    to: sequelize_2.DataTypes.STRING,
+    bridger: sequelize_2.DataTypes.STRING,
     sourceChainId: sequelize_2.DataTypes.NUMBER,
     sourceTransactionHash: sequelize_2.DataTypes.STRING,
     sourceBlockNumber: sequelize_2.DataTypes.NUMBER,
-    sourceStatus: sequelize_2.DataTypes.STRING,
+    sourceStatus: {
+        type: sequelize_2.DataTypes.STRING,
+        defaultValue: 'uninitialised'
+    },
     sourceErrors: {
         type: sequelize_2.DataTypes.JSON,
         // defaultValue: [],
     },
+    sourceLogs: {
+        type: sequelize_2.DataTypes.JSON,
+        // defaultValue: [],
+    },
     sourceCreatedAt: {
         type: sequelize_2.DataTypes.DATE,
         defaultValue: Date.now()
@@ -34,16 +40,28 @@ Transaction.init({
     targetChainId: sequelize_2.DataTypes.NUMBER,
     targetTransactionHash: sequelize_2.DataTypes.STRING,
     targetBlockNumber: sequelize_2.DataTypes.NUMBER,
-    targetStatus: sequelize_2.DataTypes.STRING,
+    targetStatus: {
+        type: sequelize_2.DataTypes.STRING,
+        defaultValue: 'uninitialised'
+    },
     targetErrors: {
         type: sequelize_2.DataTypes.JSON,
         // defaultValue: [],
     },
+    targetLogs: {
+        type: sequelize_2.DataTypes.JSON,
+        // defaultValue: [],
+    },
     targetCreatedAt: sequelize_2.DataTypes.DATE,
     targetDelayUntil: sequelize_2.DataTypes.DATE,
-    submitEvent: sequelize_2.DataTypes.JSON,
-    sourceEvent: sequelize_2.DataTypes.JSON,
-    targetEvent: sequelize_2.DataTypes.JSON,
+    requestEvent: {
+        type: sequelize_2.DataTypes.JSON,
+        allowNull: false
+    },
+    requestSentEvent: sequelize_2.DataTypes.JSON,
+    committedEvent: sequelize_2.DataTypes.JSON,
+    completedEvent: sequelize_2.DataTypes.JSON,
+    position: sequelize_2.DataTypes.JSON,
     metadata: sequelize_2.DataTypes.JSON,
     status: {
         type: sequelize_2.DataTypes.STRING,

package/dist/src/gnosis/actions/index.js

@@ -0,0 +1,9 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const withdraw_1 = __importDefault(require("./withdraw"));
+exports.default = {
+    withdraw: withdraw_1.default,
+};

package/dist/src/gnosis/actions/withdraw/index.js

@@ -0,0 +1,41 @@
+"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, type) {
+    const transactions = [];
+    const logs = [];
+    if (transaction.action !== 'withdraw') {
+        throw new Error(`Invalid action: ${transaction.action}`);
+    }
+    if (type !== 'source') {
+        throw new Error(`Type not supported: ${type}`);
+    }
+    if (transaction.action === 'withdraw' && transaction.sourceStatus === 'pending') {
+        throw Error('Cannot build data for pending withdraw transaction');
+    }
+    if (!transaction.requestEvent) {
+        throw Error('Cannot build data for transaction without requestEvent');
+    }
+    const { bridger, position, sourceChainId, targetChainId, metadata, } = transaction.requestEvent;
+    const sourceChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(targetChainId));
+    const sourceWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, sourceChainProvider);
+    const contractAddress = constants_1.addresses[sourceChainId].interopXContract;
+    const contract = (0, utils_1.getContract)(contractAddress, abi_1.default.interopXContract, sourceWallet);
+    const { data } = await contract.populateTransaction.withdrawRequested(bridger, position.withdraw[0].sourceToken, position.withdraw[0].targetToken, position.withdraw[0].amount, targetChainId, transaction.requestTransactionHash, metadata);
+    transactions.push({
+        to: contractAddress,
+        data: data,
+        value: '0',
+        operation: ethers_multisend_1.OperationType.Call,
+    });
+    return { transactions, logs };
+}
+exports.default = default_1;

package/dist/src/gnosis/index.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildGnosisAction = void 0;
+const ethers_multisend_1 = require("ethers-multisend");
+const actions_1 = __importDefault(require("./actions"));
+const buildGnosisAction = async (transaction, type) => {
+    // type = type || (transaction.sourceStatus === 'success' ? 'target' : 'source')
+    if (actions_1.default.hasOwnProperty(transaction.action)) {
+        const { transactions, logs } = await actions_1.default[transaction.action](transaction, type);
+        return {
+            data: (0, ethers_multisend_1.encodeMulti)(transactions).data,
+            logs
+        };
+    }
+    throw new Error(`Unknown action: ${transaction.action}`);
+};
+exports.buildGnosisAction = buildGnosisAction;

package/dist/src/index.js

@@ -3,24 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const module_alias_1 = __importDefault(require("module-alias"));
+require("./alias");
 const expand_home_dir_1 = __importDefault(require("expand-home-dir"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-module_alias_1.default.addAliases({
-    "@/": __dirname + "/",
-    "@/logger": __dirname + "/logger",
-    "@/tasks": __dirname + "/tasks",
-    "@/utils": __dirname + "/utils",
-    "@/api": __dirname + "/api",
-    "@/net": __dirname + "/net",
-    "@/db": __dirname + "/db",
-    "@/config": __dirname + "/config",
-    "@/types": __dirname + "/types",
-    "@/abi": __dirname + "/abi",
-    "@/constants": __dirname + "/constants",
-    "@/typechain": __dirname + "/typechain"
-});
-(0, module_alias_1.default)();
 const dotenv_1 = __importDefault(require("dotenv"));
 const chalk_1 = __importDefault(require("chalk"));
 const ethers_1 = require("ethers");
@@ -28,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 = 'a775e30';
+const GIT_SHORT_HASH = 'a861339';
 const printUsage = () => {
     console.log();
     console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
@@ -87,7 +72,9 @@ const utils_1 = require("./utils");
 async function main() {
     (0, net_1.startPeer)({});
     const tasks = new tasks_1.Tasks();
-    tasks.start();
+    setTimeout(() => {
+        tasks.start();
+    }, 10000);
     (0, api_1.startApiServer)();
     net_1.protocol.on('TransactionStatus', async (payload) => {
         if (!net_1.peerPool.isLeadNode(payload.peerId)) {
@@ -105,9 +92,11 @@ async function main() {
         transaction.sourceStatus = payload.data.sourceStatus;
         transaction.sourceTransactionHash = payload.data.sourceTransactionHash;
         transaction.sourceErrors = payload.data.sourceErrors;
+        transaction.sourceLogs = payload.data.sourceLogs;
         transaction.targetStatus = payload.data.targetStatus;
         transaction.targetTransactionHash = payload.data.targetTransactionHash;
         transaction.targetErrors = payload.data.targetErrors;
+        transaction.targetLogs = payload.data.targetLogs;
         transaction.status = payload.data.status;
         await transaction.save();
     });