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

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InteropXGateway__factory = exports.InteropBridgeToken__factory = exports.GnosisSafe__factory = exports.Erc20__factory = void 0;
+exports.InteropXContract__factory = exports.GnosisSafe__factory = exports.Erc20__factory = void 0;
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
@@ -8,7 +8,5 @@ var Erc20__factory_1 = require("./Erc20__factory");
 Object.defineProperty(exports, "Erc20__factory", { enumerable: true, get: function () { return Erc20__factory_1.Erc20__factory; } });
 var GnosisSafe__factory_1 = require("./GnosisSafe__factory");
 Object.defineProperty(exports, "GnosisSafe__factory", { enumerable: true, get: function () { return GnosisSafe__factory_1.GnosisSafe__factory; } });
-var InteropBridgeToken__factory_1 = require("./InteropBridgeToken__factory");
-Object.defineProperty(exports, "InteropBridgeToken__factory", { enumerable: true, get: function () { return InteropBridgeToken__factory_1.InteropBridgeToken__factory; } });
-var InteropXGateway__factory_1 = require("./InteropXGateway__factory");
-Object.defineProperty(exports, "InteropXGateway__factory", { enumerable: true, get: function () { return InteropXGateway__factory_1.InteropXGateway__factory; } });
+var InteropXContract__factory_1 = require("./InteropXContract__factory");
+Object.defineProperty(exports, "InteropXContract__factory", { enumerable: true, get: function () { return InteropXContract__factory_1.InteropXContract__factory; } });

package/dist/src/typechain/index.js

@@ -23,13 +23,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InteropXGateway__factory = exports.InteropBridgeToken__factory = exports.GnosisSafe__factory = exports.Erc20__factory = exports.factories = void 0;
+exports.InteropXContract__factory = exports.GnosisSafe__factory = exports.Erc20__factory = exports.factories = void 0;
 exports.factories = __importStar(require("./factories"));
 var Erc20__factory_1 = require("./factories/Erc20__factory");
 Object.defineProperty(exports, "Erc20__factory", { enumerable: true, get: function () { return Erc20__factory_1.Erc20__factory; } });
 var GnosisSafe__factory_1 = require("./factories/GnosisSafe__factory");
 Object.defineProperty(exports, "GnosisSafe__factory", { enumerable: true, get: function () { return GnosisSafe__factory_1.GnosisSafe__factory; } });
-var InteropBridgeToken__factory_1 = require("./factories/InteropBridgeToken__factory");
-Object.defineProperty(exports, "InteropBridgeToken__factory", { enumerable: true, get: function () { return InteropBridgeToken__factory_1.InteropBridgeToken__factory; } });
-var InteropXGateway__factory_1 = require("./factories/InteropXGateway__factory");
-Object.defineProperty(exports, "InteropXGateway__factory", { enumerable: true, get: function () { return InteropXGateway__factory_1.InteropXGateway__factory; } });
+var InteropXContract__factory_1 = require("./factories/InteropXContract__factory");
+Object.defineProperty(exports, "InteropXContract__factory", { enumerable: true, get: function () { return InteropXContract__factory_1.InteropXContract__factory; } });

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.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) {
@@ -101,14 +102,18 @@ const asyncCallWithTimeout = async (asyncPromise, timeout) => {
 };
 exports.asyncCallWithTimeout = asyncCallWithTimeout;
 const generateInteropTransactionHash = (data) => {
-    return ethers_1.ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string'], [
-        String(data.action),
-        String(data.submitTransactionHash),
+    return ethers_1.ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string', 'string'], [
+        String(data.actionId),
+        String(data.bridger),
+        String(data.requestTransactionHash),
         String(data.sourceChainId),
         String(data.targetChainId),
     ]);
 };
 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}'.`);
@@ -123,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;
                     }
                 };
             }
@@ -140,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;
                                 }
                             };
                         }
@@ -155,3 +174,13 @@ function getContract(address, contractInterface, signerOrProvider) {
     });
 }
 exports.getContract = getContract;
+const generateGnosisTransaction = async (transactionData, safeContract) => {
+    console.log(transactionData);
+    let isExecuted = await safeContract.dataHashes(await safeContract.getTransactionHash(transactionData.to, transactionData.value, transactionData.data, transactionData.operation, transactionData.safeTxGas, transactionData.baseGas, transactionData.gasPrice, transactionData.gasToken, transactionData.refundReceiver, transactionData.nonce));
+    while (isExecuted == 1) {
+        transactionData.safeTxGas = ethers_1.ethers.BigNumber.from(String(transactionData.safeTxGas)).add(1).toString();
+        isExecuted = await safeContract.dataHashes(await safeContract.getTransactionHash(transactionData.to, transactionData.value, transactionData.data, transactionData.operation, transactionData.safeTxGas, transactionData.baseGas, transactionData.gasPrice, transactionData.gasToken, transactionData.refundReceiver, transactionData.nonce));
+    }
+    return transactionData;
+};
+exports.generateGnosisTransaction = generateGnosisTransaction;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.de23e71",
+  "version": "0.0.0-dev.e33810b",
   "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/src/abi/index.ts

@@ -1,11 +1,9 @@
 import gnosisSafe from "./gnosisSafe.json";
 import erc20 from "./erc20.json";
-import interopXGateway from "./interopXGateway.json";
-import interopBridgeToken from "./interopBridgeToken.json";
+import interopXContract from "./interopXContract.json";
 
 export default {
     gnosisSafe,
     erc20,
-    interopXGateway,
-    interopBridgeToken,
+    interopXContract,
 }

package/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"
+  }
+]