@instadapp/interop-x 0.0.0-dev.59f2858 → 0.0.0-dev.59f84ce

package/bin/interop-x

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('../dist/index')
+require('../dist/src/index')

package/dist/package.json

@@ -0,0 +1,73 @@
+{
+    "name": "@instadapp/interop-x",
+    "version": "0.0.0-dev.59f84ce",
+    "license": "MIT",
+    "main": "dist/index.js",
+    "engines": {
+        "node": ">=16",
+        "yarn": "^1.22.0"
+    },
+    "scripts": {
+        "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": "rimraf src/typechain && typechain --target=ethers-v5 'src/abi/*.json' --out-dir 'src/typechain'",
+        "prepublishOnly": "yarn build",
+        "postinstall": "patch-package"
+    },
+    "nodemonConfig": {
+        "watch": [
+            "src"
+        ],
+        "ext": "ts",
+        "exec": "./node_modules/.bin/ts-node --files -r tsconfig-paths/register ./src/index.ts"
+    },
+    "dependencies": {
+        "@achingbrain/libp2p-gossipsub": "^0.12.2",
+        "@fastify/cors": "^7.0.0",
+        "await-spawn": "^4.0.2",
+        "axios": "^0.27.1",
+        "axios-retry": "^3.2.4",
+        "chalk": "4.1.2",
+        "dotenv": "^16.0.0",
+        "ethereumjs-util": "^7.1.4",
+        "ethers": "^5.6.4",
+        "ethers-multisend": "^2.1.1",
+        "expand-home-dir": "^0.0.3",
+        "fastify": "^3.28.0",
+        "fs-extra": "^10.1.0",
+        "libp2p": "^0.36.2",
+        "libp2p-bootstrap": "^0.14.0",
+        "libp2p-kad-dht": "^0.28.6",
+        "libp2p-mdns": "^0.18.0",
+        "libp2p-mplex": "^0.10.7",
+        "libp2p-noise": "^4.0.0",
+        "libp2p-pubsub-peer-discovery": "^4.0.0",
+        "libp2p-tcp": "^0.17.2",
+        "libp2p-websockets": "^0.16.2",
+        "luxon": "^2.3.2",
+        "module-alias": "^2.2.2",
+        "patch-package": "^6.4.7",
+        "postinstall-postinstall": "^2.1.0",
+        "sequelize": "6.18.0",
+        "sqlite3": "^5.0.5",
+        "waait": "^1.0.5"
+    },
+    "bin": {
+        "interop-x": "bin/interop-x",
+        "interopx": "bin/interop-x"
+    },
+    "devDependencies": {
+        "@typechain/ethers-v5": "^10.0.0",
+        "@types/bn.js": "^5.1.0",
+        "@types/fs-extra": "^9.0.13",
+        "@types/node": "^17.0.17",
+        "nodemon": "^2.0.15",
+        "replace-in-file": "^6.3.2",
+        "rimraf": "^3.0.2",
+        "ts-node": "^10.5.0",
+        "tsconfig-paths": "^3.12.0",
+        "typechain": "^8.0.0",
+        "typescript": "^4.5.5"
+    }
+}

package/dist/{abi → 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/{api → src/api}/index.js

@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startApiServer = void 0;
 const fastify_1 = __importDefault(require("fastify"));
-const fastify_cors_1 = __importDefault(require("fastify-cors"));
+const cors_1 = __importDefault(require("@fastify/cors"));
 const logger_1 = __importDefault(require("@/logger"));
 const db_1 = require("@/db");
 const logger = new logger_1.default("RPC");
 const server = (0, fastify_1.default)({ logger: false });
-server.register(fastify_cors_1.default, {});
+server.register(cors_1.default, {});
 server.get('/', async () => 'Interop X API');
 const startApiServer = async () => {
     const HOST = process.env.API_HOST || '0.0.0.0';
@@ -20,13 +20,16 @@ const startApiServer = async () => {
             return await db_1.Transaction.findAndCountAll({
                 limit: 20,
                 offset: 0,
+                order: [
+                    ['createdAt', 'DESC']
+                ]
             });
         });
         await server.listen(PORT, HOST);
         logger.log(`RPC Server listening at http://${HOST}:${PORT}`);
     }
     catch (err) {
-        logger.error(err);
+        logger.error(err.message);
         process.exit(1);
     }
 };

package/dist/{config → src/config}/index.js

@@ -1,15 +1,22 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const types_1 = require("@/types");
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const expand_home_dir_1 = __importDefault(require("expand-home-dir"));
 class Config {
     constructor() {
         this.events = new types_1.EventBus();
-        this.maxPeers = 10;
+        this.maxPeers = 20;
         this.privateKey = process.env.PRIVATE_KEY;
         this.staging = !!process.env.STAGING && process.env.STAGING === 'true';
+        this.autoUpdate = !!process.env.AUTO_UPDATE && process.env.AUTO_UPDATE === 'true';
         this.wallet = new ethers_1.Wallet(this.privateKey);
         this.leadNodeAddress = '0x910E413DBF3F6276Fe8213fF656726bDc142E08E';
+        this.baseConfigPath = (0, expand_home_dir_1.default)(`~/.interop-x`);
     }
     get publicAddress() {
         return this.wallet.address;
@@ -17,5 +24,8 @@ class Config {
     isLeadNode() {
         return ethers_1.ethers.utils.getAddress(this.leadNodeAddress) === ethers_1.ethers.utils.getAddress(this.wallet.address);
     }
+    isMaintenanceMode() {
+        return fs_extra_1.default.existsSync(this.baseConfigPath + '/maintenance');
+    }
 }
 exports.default = new Config();

package/dist/{constants → src/constants}/addresses.js

@@ -5,24 +5,16 @@ exports.addresses = {
     1: {
         gnosisSafe: '0x811Bff6eF88dAAA0aD6438386B534A81cE3F160F',
         multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-        interopXGateway: '',
-        interopBridgeTokens: [],
+        interopXContract: '',
     },
     137: {
         gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
         multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-        interopXGateway: '',
-        interopBridgeTokens: [
-            {
-                address: '0x6c20F03598d5ABF729348E2868b0ff5e8A48aB1F',
-                symbol: 'USDC',
-            }
-        ],
+        interopXContract: '0x2189741c8cAc1cf51570932817A7d6390646C80e',
     },
     43114: {
         gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
         multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-        interopXGateway: '0x8D27758751BA488690974B6Ccfcda771D462945f',
-        interopBridgeTokens: [],
+        interopXContract: '0x1867DF97Ec24bb0bbD4AD464F0Be9C6713422EAE',
     }
 };

package/dist/{db → src/db}/models/transaction.js

@@ -12,18 +12,26 @@ Transaction.init({
         autoIncrement: true,
         primaryKey: true
     },
+    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()
@@ -32,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
+    },
+    requestSendEvent: 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,