@instadapp/interop-x 0.0.0-dev.868731f → 0.0.0-dev.8965b57

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.868731f",
+    "version": "0.0.0-dev.8965b57",
     "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"
     },
@@ -24,9 +24,10 @@
     },
     "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",
-        "bignumber.js": "^9.0.2",
         "chalk": "4.1.2",
         "dotenv": "^16.0.0",
         "ethereumjs-util": "^7.1.4",
@@ -34,7 +35,7 @@
         "ethers-multisend": "^2.1.1",
         "expand-home-dir": "^0.0.3",
         "fastify": "^3.28.0",
-        "fastify-cors": "^6.0.3",
+        "fs-extra": "^10.1.0",
         "libp2p": "^0.36.2",
         "libp2p-bootstrap": "^0.14.0",
         "libp2p-kad-dht": "^0.28.6",
@@ -46,7 +47,9 @@
         "libp2p-websockets": "^0.16.2",
         "luxon": "^2.3.2",
         "module-alias": "^2.2.2",
-        "sequelize": "^6.19.0",
+        "patch-package": "^6.4.7",
+        "postinstall-postinstall": "^2.1.0",
+        "sequelize": "6.18.0",
         "sqlite3": "^5.0.5",
         "waait": "^1.0.5"
     },
@@ -60,8 +63,6 @@
         "@types/fs-extra": "^9.0.13",
         "@types/node": "^17.0.17",
         "nodemon": "^2.0.15",
-        "patch-package": "^6.4.7",
-        "postinstall-postinstall": "^2.1.0",
         "replace-in-file": "^6.3.2",
         "rimraf": "^3.0.2",
         "ts-node": "^10.5.0",

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

@@ -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/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/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);