@instadapp/interop-x 0.0.0-dev.4887ba6 → 0.0.0-dev.4df5dc2

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.InteropX__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 InteropX__factory_1 = require("./InteropX__factory");
+Object.defineProperty(exports, "InteropX__factory", { enumerable: true, get: function () { return InteropX__factory_1.InteropX__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.InteropX__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 InteropX__factory_1 = require("./factories/InteropX__factory");
+Object.defineProperty(exports, "InteropX__factory", { enumerable: true, get: function () { return InteropX__factory_1.InteropX__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.buildWithdrawDataForTransaction = exports.buildDepositDataForTransaction = exports.buildDataForTransaction = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.http = void 0;
+exports.LiquidityError = 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,11 +11,19 @@ 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 ethers_multisend_1 = require("ethers-multisend");
-const config_1 = __importDefault(require("@/config"));
-const abi_1 = __importDefault(require("@/abi"));
+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) {
+    if (!hash)
+        return;
+    if (hash.length < 12)
+        return hash;
+    const beginningChars = hash.startsWith("0x") ? length + 2 : length;
+    const shortened = hash.substr(0, beginningChars) + "…" + hash.substr(-length);
+    return shortened;
+}
+exports.shortenHash = shortenHash;
 function short(buffer) {
     return buffer.toString('hex').slice(0, 8) + '...';
 }
@@ -59,11 +67,11 @@ exports.signGnosisSafeTx = signGnosisSafeTx;
 const getRpcProviderUrl = (chainId) => {
     switch (chainId) {
         case 1:
-            return 'https://rpc.instadapp.io/mainnet';
+            return 'https://rpc.ankr.com/eth';
         case 137:
-            return 'https://rpc.instadapp.io/polygon';
+            return 'https://rpc.ankr.com/polygon';
         case 43114:
-            return 'https://rpc.instadapp.io/avalanche';
+            return 'https://rpc.ankr.com/avalanche';
         default:
             throw new Error(`Unknown chainId: ${chainId}`);
     }
@@ -94,92 +102,20 @@ 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(Array.from({ length: 7 }, () => 'string'), [
+        String(data.actionId),
+        String(data.vnonce),
+        String(data.sourceSender),
         String(data.sourceChainId),
+        String(data.sourceDsaId),
         String(data.targetChainId),
+        String(data.targetDsaId),
     ]);
 };
 exports.generateInteropTransactionHash = generateInteropTransactionHash;
-const buildDataForTransaction = async (transaction, type) => {
-    type = type || transaction.sourceStatus === 'pending' ? 'source' : 'target';
-    switch (transaction.action) {
-        case "deposit":
-            return await (0, exports.buildDepositDataForTransaction)(transaction, type);
-        case "withdraw":
-            return await (0, exports.buildWithdrawDataForTransaction)(transaction, type);
-        default:
-            throw new Error(`Unknown action: ${transaction.action}`);
-    }
-};
-exports.buildDataForTransaction = buildDataForTransaction;
-const buildDepositDataForTransaction = async (transaction, type) => {
-    const transactions = [];
-    if (transaction.action !== 'deposit') {
-        throw new Error(`Invalid action: ${transaction.action}`);
-    }
-    if (transaction.action === 'deposit' && transaction.sourceStatus === 'pending') {
-        throw Error('Cannot build data for pending deposit transaction');
-    }
-    if (!transaction.submitEvent) {
-        throw Error('Cannot build data for transaction without submitEvent');
-    }
-    const token = constants_1.tokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === transaction.submitEvent.token.toLowerCase());
-    if (!token) {
-        throw Error('Cannot build data for transaction without token');
-    }
-    const itoken = constants_1.itokens[transaction.targetChainId].find(itoken => itoken.symbol.toLowerCase() === token.symbol.toLowerCase());
-    if (!itoken) {
-        throw Error('Cannot build data for transaction without itoken');
-    }
-    const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, exports.getRpcProviderUrl)(transaction.targetChainId));
-    const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
-    const interopBridgeContract = getContract(itoken.address, abi_1.default.interopBridgeToken, targetWallet);
-    const { data } = await interopBridgeContract.populateTransaction.mint(transaction.submitEvent.user, ethers_1.ethers.BigNumber.from(transaction.submitEvent.amount.toString()), ethers_1.ethers.BigNumber.from(transaction.submitEvent.sourceChainId.toString()), transaction.submitTransactionHash);
-    transactions.push({
-        to: itoken.address,
-        data: data,
-        value: '0',
-        operation: ethers_multisend_1.OperationType.Call,
-    });
-    return (0, ethers_multisend_1.encodeMulti)(transactions).data;
-};
-exports.buildDepositDataForTransaction = buildDepositDataForTransaction;
-const buildWithdrawDataForTransaction = async (transaction, type) => {
-    const transactions = [];
-    if (transaction.action !== 'withdraw') {
-        throw new Error(`Invalid action: ${transaction.action}`);
-    }
-    if (transaction.action === 'withdraw' && transaction.sourceStatus === 'pending') {
-        throw Error('Cannot build data for pending withdraw transaction');
-    }
-    if (!transaction.submitEvent) {
-        throw Error('Cannot build data for transaction without submitEvent');
-    }
-    const { to, amount, chainId, itoken: itokenAddress } = transaction.submitEvent;
-    const itoken = constants_1.itokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
-    if (!itoken) {
-        throw Error('Cannot build data for transaction without itoken');
-    }
-    const token = constants_1.tokens[chainId].find(t => t.symbol.toLowerCase() === itoken.symbol.toLowerCase());
-    if (!token) {
-        throw Error('Cannot build data for transaction without token');
-    }
-    const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, exports.getRpcProviderUrl)(transaction.targetChainId));
-    const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
-    const gatewayAddress = constants_1.addresses[chainId].interopXGateway;
-    const interopBridgeContract = getContract(gatewayAddress, abi_1.default.interopXGateway, targetWallet);
-    const { data } = await interopBridgeContract.populateTransaction.systemWithdraw(ethers_1.ethers.BigNumber.from(amount.toString()), to, token.address, ethers_1.ethers.BigNumber.from(transaction.sourceChainId.toString()), transaction.submitTransactionHash);
-    transactions.push({
-        to: gatewayAddress,
-        data: data,
-        value: '0',
-        operation: ethers_multisend_1.OperationType.Call,
-    });
-    return (0, ethers_multisend_1.encodeMulti)(transactions).data;
-};
-exports.buildWithdrawDataForTransaction = buildWithdrawDataForTransaction;
+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}'.`);
@@ -194,12 +130,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;
                     }
                 };
             }
@@ -211,10 +157,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;
                                 }
                             };
                         }
@@ -226,3 +176,20 @@ 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;
+class LiquidityError extends Error {
+    constructor(message) {
+        super(message || 'Not enough liquidity');
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}
+exports.LiquidityError = LiquidityError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.4887ba6",
+  "version": "0.0.0-dev.4df5dc2",
   "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,17 +25,18 @@
   "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",
-    "bignumber.js": "^9.0.2",
+    "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",
     "libp2p-kad-dht": "^0.28.6",
@@ -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 interopX from "./interopX.json";
 
 export default {
     gnosisSafe,
     erc20,
-    interopXGateway,
-    interopBridgeToken,
+    interopX,
 }