@instadapp/interop-x 0.0.0-dev.733ff78 → 0.0.0-dev.76d0265

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.733ff78",
+    "version": "0.0.0-dev.76d0265",
     "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"
     },
@@ -25,16 +25,17 @@
     "dependencies": {
         "@achingbrain/libp2p-gossipsub": "^0.12.2",
         "@fastify/cors": "^7.0.0",
+        "async-retry": "^1.3.3",
         "await-spawn": "^4.0.2",
-        "axios": "^0.27.1",
-        "axios-retry": "^3.2.4",
+        "axios": "^0.27.2",
+        "axios-retry": "^3.2.5",
         "chalk": "4.1.2",
-        "dotenv": "^16.0.0",
+        "dotenv": "^16.0.1",
         "ethereumjs-util": "^7.1.4",
-        "ethers": "^5.6.4",
+        "ethers": "^5.6.5",
         "ethers-multisend": "^2.1.1",
         "expand-home-dir": "^0.0.3",
-        "fastify": "^3.28.0",
+        "fastify": "^3.29.0",
         "fs-extra": "^10.1.0",
         "libp2p": "^0.36.2",
         "libp2p-bootstrap": "^0.14.0",
@@ -45,12 +46,12 @@
         "libp2p-pubsub-peer-discovery": "^4.0.0",
         "libp2p-tcp": "^0.17.2",
         "libp2p-websockets": "^0.16.2",
-        "luxon": "^2.3.2",
+        "luxon": "^2.4.0",
         "module-alias": "^2.2.2",
         "patch-package": "^6.4.7",
         "postinstall-postinstall": "^2.1.0",
         "sequelize": "6.18.0",
-        "sqlite3": "^5.0.5",
+        "sqlite3": "^5.0.8",
         "waait": "^1.0.5"
     },
     "bin": {
@@ -61,13 +62,13 @@
         "@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",
+        "@types/node": "^17.0.33",
+        "nodemon": "^2.0.16",
         "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"
+        "typescript": "^4.6.4"
     }
 }

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,454 @@
+[
+    {
+        "anonymous": false,
+        "inputs": [
+            {
+                "indexed": false,
+                "internalType": "string",
+                "name": "actionId",
+                "type": "string"
+            },
+            {
+                "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": false,
+                "internalType": "string",
+                "name": "actionId",
+                "type": "string"
+            },
+            {
+                "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": false,
+                "internalType": "string",
+                "name": "actionId",
+                "type": "string"
+            },
+            {
+                "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": false,
+                "internalType": "string",
+                "name": "actionId",
+                "type": "string"
+            },
+            {
+                "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": [
+            { "internalType": "string", "name": "actionId", "type": "string" },
+            { "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": "sourceChainId_", "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": "user", "type": "address" },
+            { "internalType": "address[]", "name": "tokens", "type": "address[]" }
+        ],
+        "name": "getBridgeAmounts",
+        "outputs": [
+            {
+                "components": [
+                    { "internalType": "uint256", "name": "deposit", "type": "uint256" },
+                    { "internalType": "uint256", "name": "withdraw", "type": "uint256" }
+                ],
+                "internalType": "struct InteropXContractBeta.UserData[]",
+                "name": "userData",
+                "type": "tuple[]"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            { "internalType": "string", "name": "actionId", "type": "string" },
+            { "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": "token", "type": "address" },
+            { "internalType": "bool", "name": "toggle", "type": "bool" }
+        ],
+        "name": "toggleWhitelist",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            { "internalType": "address", "name": "", "type": "address" },
+            { "internalType": "address", "name": "", "type": "address" }
+        ],
+        "name": "userMapping",
+        "outputs": [
+            { "internalType": "uint256", "name": "deposit", "type": "uint256" },
+            { "internalType": "uint256", "name": "withdraw", "type": "uint256" }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
+        "name": "whitelistedTokens",
+        "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            { "internalType": "string", "name": "actionId", "type": "string" },
+            { "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/constants/addresses.js

@@ -2,19 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addresses = void 0;
 exports.addresses = {
-    1: {
-        gnosisSafe: '0x811Bff6eF88dAAA0aD6438386B534A81cE3F160F',
-        multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-        interopXGateway: '',
-    },
+    // 1: {
+    //   gnosisSafe: '0x811Bff6eF88dAAA0aD6438386B534A81cE3F160F',
+    //   multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
+    //   interopXContract: '',
+    // },
     137: {
         gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
         multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-        interopXGateway: '',
+        interopXContract: '0x28f175FBEAce469c27ed587016aD7Bb72f286759',
     },
     43114: {
         gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
         multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-        interopXGateway: '0xF0317C5Bc206F2291dd2f3eE9C4cDB5Bbb25418d',
+        interopXContract: '0x54d77C42Dae3Fc0f48b4Fdd5a193E776D07C1EEC',
     }
 };

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