@instadapp/interop-x 0.0.0-dev.d71f27e → 0.0.0-dev.e33810b

package/dist/src/typechain/factories/InteropXContract__factory.js

@@ -9,6 +9,12 @@ const _abi = [
     {
         anonymous: false,
         inputs: [
+            {
+                indexed: false,
+                internalType: "string",
+                name: "actionId",
+                type: "string",
+            },
             {
                 indexed: true,
                 internalType: "address",
@@ -98,6 +104,12 @@ const _abi = [
     {
         anonymous: false,
         inputs: [
+            {
+                indexed: false,
+                internalType: "string",
+                name: "actionId",
+                type: "string",
+            },
             {
                 indexed: true,
                 internalType: "address",
@@ -193,6 +205,12 @@ const _abi = [
     {
         anonymous: false,
         inputs: [
+            {
+                indexed: false,
+                internalType: "string",
+                name: "actionId",
+                type: "string",
+            },
             {
                 indexed: true,
                 internalType: "address",
@@ -276,6 +294,12 @@ const _abi = [
     {
         anonymous: false,
         inputs: [
+            {
+                indexed: false,
+                internalType: "string",
+                name: "actionId",
+                type: "string",
+            },
             {
                 indexed: true,
                 internalType: "address",
@@ -363,20 +387,12 @@ const _abi = [
         type: "event",
     },
     {
-        inputs: [],
-        name: "_vnonce",
-        outputs: [
+        inputs: [
             {
-                internalType: "uint256",
-                name: "",
-                type: "uint256",
+                internalType: "string",
+                name: "actionId",
+                type: "string",
             },
-        ],
-        stateMutability: "view",
-        type: "function",
-    },
-    {
-        inputs: [
             {
                 internalType: "address",
                 name: "to_",
@@ -399,7 +415,7 @@ const _abi = [
             },
             {
                 internalType: "uint32",
-                name: "targetChainId_",
+                name: "sourceChainId_",
                 type: "uint32",
             },
             {
@@ -420,6 +436,47 @@ const _abi = [
     },
     {
         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_",
@@ -451,6 +508,24 @@ const _abi = [
         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: [
             {
@@ -458,20 +533,54 @@ const _abi = [
                 name: "",
                 type: "address",
             },
+            {
+                internalType: "address",
+                name: "",
+                type: "address",
+            },
         ],
-        name: "whitelistedMapping",
+        name: "userMapping",
         outputs: [
             {
                 internalType: "uint256",
-                name: "",
+                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_",

package/dist/src/utils/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateGnosisTransaction = exports.getContract = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.shortenHash = exports.http = void 0;
+exports.generateGnosisTransaction = exports.getContract = exports.ContractError = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.shortenHash = exports.http = void 0;
 /**
  * @module util
  */
@@ -11,6 +11,7 @@ const axios_1 = __importDefault(require("axios"));
 const axios_retry_1 = __importDefault(require("axios-retry"));
 const constants_1 = require("@/constants");
 const ethers_1 = require("ethers");
+const async_retry_1 = __importDefault(require("async-retry"));
 exports.http = axios_1.default.create();
 (0, axios_retry_1.default)(exports.http, { retries: 3, retryDelay: axios_retry_1.default.exponentialDelay });
 function shortenHash(hash, length = 4) {
@@ -102,7 +103,7 @@ const asyncCallWithTimeout = async (asyncPromise, timeout) => {
 exports.asyncCallWithTimeout = asyncCallWithTimeout;
 const generateInteropTransactionHash = (data) => {
     return ethers_1.ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string', 'string'], [
-        String(data.action),
+        String(data.actionId),
         String(data.bridger),
         String(data.requestTransactionHash),
         String(data.sourceChainId),
@@ -110,6 +111,9 @@ const generateInteropTransactionHash = (data) => {
     ]);
 };
 exports.generateInteropTransactionHash = generateInteropTransactionHash;
+class ContractError extends Error {
+}
+exports.ContractError = ContractError;
 function getContract(address, contractInterface, signerOrProvider) {
     if (!ethers_1.ethers.utils.getAddress(address) || address === ethers_1.ethers.constants.AddressZero) {
         throw Error(`Invalid 'address' parameter '${address}'.`);
@@ -124,12 +128,22 @@ function getContract(address, contractInterface, signerOrProvider) {
         get(target, prop, receiver) {
             const value = Reflect.get(target, prop, receiver);
             if (typeof value === 'function' && (contract.functions.hasOwnProperty(prop) || ['queryFilter'].includes(String(prop)))) {
+                let isConstant = false;
+                try {
+                    isConstant = contract.interface.getFunction(String(prop)).constant;
+                }
+                catch (error) {
+                }
                 return async (...args) => {
                     try {
-                        return await value.bind(contract)(...args);
+                        return await (0, async_retry_1.default)(async () => await value.bind(contract)(...args), { retries: isConstant ? 1 : 3 });
                     }
                     catch (error) {
-                        throw new Error(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`);
+                        const err = new ContractError(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`);
+                        err.method = String(prop);
+                        err.address = address;
+                        err.args = [...args];
+                        throw err;
                     }
                 };
             }
@@ -141,10 +155,14 @@ function getContract(address, contractInterface, signerOrProvider) {
                         if (typeof value === 'function') {
                             return async (...args) => {
                                 try {
-                                    return await value.bind(contract)(...args);
+                                    return await (0, async_retry_1.default)(async () => await value.bind(contract)(...args), { retries: parentProp === 'callStatic' ? 3 : 1 });
                                 }
                                 catch (error) {
-                                    throw new Error(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`);
+                                    const err = new ContractError(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`);
+                                    err.method = String(prop);
+                                    err.address = address;
+                                    err.args = [...args];
+                                    throw err;
                                 }
                             };
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.d71f27e",
+  "version": "0.0.0-dev.e33810b",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -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/src/abi/interopXContract.json

@@ -2,6 +2,12 @@
   {
     "anonymous": false,
     "inputs": [
+      {
+        "indexed": false,
+        "internalType": "string",
+        "name": "actionId",
+        "type": "string"
+      },
       {
         "indexed": true,
         "internalType": "address",
@@ -83,6 +89,12 @@
   {
     "anonymous": false,
     "inputs": [
+      {
+        "indexed": false,
+        "internalType": "string",
+        "name": "actionId",
+        "type": "string"
+      },
       {
         "indexed": true,
         "internalType": "address",
@@ -170,6 +182,12 @@
   {
     "anonymous": false,
     "inputs": [
+      {
+        "indexed": false,
+        "internalType": "string",
+        "name": "actionId",
+        "type": "string"
+      },
       {
         "indexed": true,
         "internalType": "address",
@@ -245,6 +263,12 @@
   {
     "anonymous": false,
     "inputs": [
+      {
+        "indexed": false,
+        "internalType": "string",
+        "name": "actionId",
+        "type": "string"
+      },
       {
         "indexed": true,
         "internalType": "address",
@@ -323,20 +347,14 @@
     "name": "LogBridgeRequestSent",
     "type": "event"
   },
-  {
-    "inputs": [],
-    "name": "_vnonce",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "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": "targetChainId_", "type": "uint32" },
+      { "internalType": "uint32", "name": "sourceChainId_", "type": "uint32" },
       {
         "internalType": "bytes32",
         "name": "transactionHash_",
@@ -351,6 +369,27 @@
   },
   {
     "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" },
@@ -362,15 +401,39 @@
     "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": "whitelistedMapping",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "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" },

package/src/constants/addresses.ts

@@ -7,11 +7,11 @@ export const addresses = {
   137: {
     gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
     multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-    interopXContract: '0x2189741c8cAc1cf51570932817A7d6390646C80e',
+    interopXContract: '0x41bd77583674B3a5c073FBb4922C0C8dA91C43cF',
   },
   43114: {
     gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
     multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-    interopXContract: '0x1867DF97Ec24bb0bbD4AD464F0Be9C6713422EAE',
+    interopXContract: '0xCF391A3057eDba541c80307aC5E3Bc1E4a9471b7',
   }
 }

package/src/constants/tokens.ts

@@ -1,30 +1,42 @@
 export const tokens = {
   1: [
     {
+      aliases: ['eth'],
       symbol: "ETH",
       name: "Ethereum",
       address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
       decimals: 18,
     },
     {
+      aliases: ['weth'],
+      symbol: "WETH",
+      name: "Wrapped Ethereum",
+      address: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
+      decimals: 18,
+    },
+    {
+      aliases: ['dai'],
       symbol: "DAI",
       name: "DAI Stable",
       address: "0x6B175474E89094C44Da98b954EedeAC495271d0F",
       decimals: 18,
     },
     {
+      aliases: ['usdc'],
       symbol: "USDC",
       name: "USD Coin",
       address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
       decimals: 6,
     },
     {
+      aliases: ['usdt'],
       symbol: "USDT",
       name: "Tether USD Coin",
       address: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
       decimals: 6,
     },
     {
+      aliases: ['wbtc'],
       symbol: "WBTC",
       name: "Wrapped BTC",
       address: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
@@ -33,36 +45,42 @@ export const tokens = {
   ],
   137: [
     {
+      aliases: ['eth', 'weth'],
       symbol: "ETH",
       name: "Ethereum",
       address: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619",
       decimals: 18,
     },
     {
+      aliases: ['dai'],
       symbol: "DAI",
       name: "DAI Stable",
       address: "0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063",
       decimals: 18,
     },
     {
+      aliases: ['usdc'],
       symbol: "USDC",
       name: "USD Coin",
       address: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
       decimals: 6,
     },
     {
+      aliases: ['usdt'],
       symbol: "USDT",
       name: "Tether USD Coin",
       address: "0xc2132D05D31c914a87C6611C10748AEb04B58e8F",
       decimals: 6,
     },
     {
+      aliases: ['wbtc'],
       symbol: "WBTC",
       name: "Wrapped BTC",
       address: "0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6",
       decimals: 8,
     },
     {
+      aliases: ['avax'],
       symbol: "AVAX",
       name: "Avalanche Token",
       address: "0x2C89bbc92BD86F8075d1DEcc58C7F4E0107f286b",
@@ -71,34 +89,46 @@ export const tokens = {
   ],
   43114: [
     {
+      aliases: ['eth', 'weth'],
       symbol: "ETH",
       name: "Ethereum",
       address: "0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB",
       decimals: 18,
     },
     {
+      aliases: ['dai'],
       symbol: "DAI",
       name: "DAI Stable",
       address: "0xd586E7F844cEa2F87f50152665BCbc2C279D8d70",
       decimals: 18,
     },
     {
+      aliases: ['usdc'],
       symbol: "USDC",
       name: "USD Coin",
       address: "0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664",
       decimals: 6,
     },
     {
-      symbol: "USDT",
+      aliases: ['usdt'],
+      symbol: "USDt",
       name: "Tether USD Coin",
+      address: "0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7",
+      decimals: 6,
+    },
+    {
+      aliases: ['usdt'],
+      symbol: "USDT.e",
+      name: "Tether USD",
       address: "0xc7198437980c041c805A1EDcbA50c1Ce5db95118",
       decimals: 6,
     },
     {
+      aliases: ["wbtc"],
       symbol: "WBTC",
       name: "Wrapped BTC",
       address: "0x50b7545627a5162F82A992c33b87aDc75187B218",
       decimals: 8,
     },
   ],
-};
+} as Record<number, { aliases: string[], symbol: string, name: string, address: string, decimals: number }[]>;