@instadapp/interop-x 0.0.0-dev.0bace53 → 0.0.0-dev.0ca1aa1

package/dist/src/utils/index.js

@@ -1,168 +1,26 @@
 "use strict";
-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;
-/**
- * @module util
- */
-const axios_1 = __importDefault(require("axios"));
-const axios_retry_1 = __importDefault(require("axios-retry"));
-const constants_1 = require("@/constants");
-const ethers_1 = require("ethers");
-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) + '...';
-}
-exports.short = short;
-const signGnosisSafeTx = async ({ to, data = null, value = '0', operation = '1', baseGas = '0', gasPrice = "0", gasToken = "0x0000000000000000000000000000000000000000", refundReceiver = "0x0000000000000000000000000000000000000000", safeTxGas = "79668", nonce = "0", chainId = 137, }, { signer }) => {
-    const gnosisSafe = constants_1.addresses[chainId].gnosisSafe;
-    const domain = {
-        verifyingContract: gnosisSafe,
-        chainId,
-    };
-    const types = {
-        SafeTx: [
-            { type: 'address', name: 'to' },
-            { type: 'uint256', name: 'value' },
-            { type: 'bytes', name: 'data' },
-            { type: 'uint8', name: 'operation' },
-            { type: 'uint256', name: 'safeTxGas' },
-            { type: 'uint256', name: 'baseGas' },
-            { type: 'uint256', name: 'gasPrice' },
-            { type: 'address', name: 'gasToken' },
-            { type: 'address', name: 'refundReceiver' },
-            { type: 'uint256', name: 'nonce' },
-        ],
-    };
-    const message = {
-        baseGas,
-        data,
-        gasPrice,
-        gasToken,
-        nonce: Number(nonce),
-        operation,
-        refundReceiver,
-        safeAddress: gnosisSafe,
-        safeTxGas: String(safeTxGas),
-        to,
-        value,
-    };
-    return await signer._signTypedData(domain, types, message);
-};
-exports.signGnosisSafeTx = signGnosisSafeTx;
-const getRpcProviderUrl = (chainId) => {
-    switch (chainId) {
-        case 1:
-            return 'https://rpc.ankr.com/eth';
-        case 137:
-            return 'https://rpc.ankr.com/polygon';
-        case 43114:
-            return 'https://rpc.ankr.com/avalanche';
-        default:
-            throw new Error(`Unknown chainId: ${chainId}`);
-    }
-};
-exports.getRpcProviderUrl = getRpcProviderUrl;
-const buildSignatureBytes = (signatures) => {
-    signatures.sort((left, right) => left.signer.toLowerCase().localeCompare(right.signer.toLowerCase()));
-    let signatureBytes = "0x";
-    for (const sig of signatures) {
-        signatureBytes += sig.data.slice(2);
-    }
-    return signatureBytes;
-};
-exports.buildSignatureBytes = buildSignatureBytes;
-/**
- * Call an async function with a maximum time limit (in milliseconds) for the timeout
- *  Resolved promise for async function call, or an error if time limit reached
- */
-const asyncCallWithTimeout = async (asyncPromise, timeout) => {
-    let timeoutHandle;
-    const timeoutPromise = new Promise((_resolve, reject) => {
-        timeoutHandle = setTimeout(() => reject(new Error('Async call timeout limit reached')), timeout);
-    });
-    return Promise.race([asyncPromise, timeoutPromise]).then(result => {
-        clearTimeout(timeoutHandle);
-        return result;
-    });
-};
-exports.asyncCallWithTimeout = asyncCallWithTimeout;
-const generateInteropTransactionHash = (data) => {
-    return ethers_1.ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string', 'string'], [
-        String(data.action),
-        String(data.bridger),
-        String(data.requestTransactionHash),
-        String(data.sourceChainId),
-        String(data.targetChainId),
-    ]);
-};
-exports.generateInteropTransactionHash = generateInteropTransactionHash;
-function getContract(address, contractInterface, signerOrProvider) {
-    if (!ethers_1.ethers.utils.getAddress(address) || address === ethers_1.ethers.constants.AddressZero) {
-        throw Error(`Invalid 'address' parameter '${address}'.`);
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
     }
-    const contract = new ethers_1.ethers.Contract(address, contractInterface, signerOrProvider);
-    // Make sure the contract properties is writable
-    const desc = Object.getOwnPropertyDescriptor(contract, 'functions');
-    if (!desc || desc.writable !== true) {
-        return contract;
-    }
-    return new Proxy(contract, {
-        get(target, prop, receiver) {
-            const value = Reflect.get(target, prop, receiver);
-            if (typeof value === 'function' && (contract.functions.hasOwnProperty(prop) || ['queryFilter'].includes(String(prop)))) {
-                return async (...args) => {
-                    try {
-                        return await value.bind(contract)(...args);
-                    }
-                    catch (error) {
-                        throw new Error(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`);
-                    }
-                };
-            }
-            if (typeof value === 'object' && ['populateTransaction', 'estimateGas', 'functions', 'callStatic'].includes(String(prop))) {
-                const parentProp = String(prop);
-                return new Proxy(value, {
-                    get(target, prop, receiver) {
-                        const value = Reflect.get(target, prop, receiver);
-                        if (typeof value === 'function') {
-                            return async (...args) => {
-                                try {
-                                    return await value.bind(contract)(...args);
-                                }
-                                catch (error) {
-                                    throw new Error(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`);
-                                }
-                            };
-                        }
-                    }
-                });
-            }
-            return value;
-        },
-    });
-}
-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;
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-exports.generateGnosisTransaction = generateGnosisTransaction;
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./async"), exports);
+__exportStar(require("./dsa"), exports);
+__exportStar(require("./formatting"), exports);
+__exportStar(require("./gnosis"), exports);
+__exportStar(require("./http"), exports);
+__exportStar(require("./interop"), exports);
+__exportStar(require("./web3"), exports);
+__exportStar(require("./validate"), exports);
+__exportStar(require("./tokens"), exports);
+__exportStar(require("./aave"), exports);

package/dist/src/utils/interop.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateInteropTransactionHash = void 0;
+const ethers_1 = require("ethers");
+const generateInteropTransactionHash = (data) => {
+    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;

package/dist/src/utils/tokens.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isNativeOrWrappedToken = exports.isNativeWrappedToken = exports.isNativeToken = void 0;
+const constants_1 = require("@/constants");
+const isNativeToken = (tokenAddress) => {
+    return tokenAddress.toLowerCase() === "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE".toLowerCase();
+};
+exports.isNativeToken = isNativeToken;
+const isNativeWrappedToken = (tokenAddress, chainId) => {
+    return constants_1.wrappedNativeToken[chainId].toLowerCase() == tokenAddress.toLowerCase();
+};
+exports.isNativeWrappedToken = isNativeWrappedToken;
+const isNativeOrWrappedToken = (tokenAddress, chainId) => {
+    if ((0, exports.isNativeToken)(tokenAddress)) {
+        return true;
+    }
+    if ((0, exports.isNativeWrappedToken)(tokenAddress, chainId)) {
+        return true;
+    }
+    return false;
+};
+exports.isNativeOrWrappedToken = isNativeOrWrappedToken;

package/dist/src/utils/validate.js

@@ -0,0 +1,111 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateLiquidityCap = exports.validateTargetLiquidity = exports.validateSourceLiquidity = exports.validateChains = void 0;
+const abi_1 = __importDefault(require("@/abi"));
+const constants_1 = require("@/constants");
+const errors_1 = require("@/errors");
+const web3_1 = require("./web3");
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const formatting_1 = require("./formatting");
+const tokens_1 = require("./tokens");
+const services_1 = require("@/services");
+const providers_1 = require("@/providers");
+const dsa_1 = require("./dsa");
+const validateChains = ({ sourceChainId, targetChainId }) => {
+    if (!sourceChainId) {
+        throw new errors_1.InvalidChaindIdError("Source chain id is required");
+    }
+    if (!targetChainId) {
+        throw new errors_1.InvalidChaindIdError("Target chain id is required");
+    }
+    if (sourceChainId == targetChainId) {
+        throw new errors_1.InvalidChaindIdError("Source and target chain cannot be the same");
+    }
+    if (!constants_1.addresses[sourceChainId]) {
+        throw new errors_1.InvalidChaindIdError("Invalid source chain id");
+    }
+    if (!constants_1.addresses[targetChainId]) {
+        throw new errors_1.InvalidChaindIdError("Invalid target chain id");
+    }
+};
+exports.validateChains = validateChains;
+const validateSourceLiquidity = async ({ position = null, sourceChainId, sourceDsaId, isSupply = false, sourceProvider = null, }) => {
+    sourceProvider = sourceProvider || new providers_1.JsonRpcRetryProvider((0, web3_1.getRpcProviderUrl)(sourceChainId));
+    const sourceBalanceResolverContract = (0, web3_1.getContract)(constants_1.addresses[sourceChainId].balanceResolver, abi_1.default.balanceResolver, sourceProvider);
+    const srcDsaAddress = await (0, dsa_1.getDsaAccountAddress)({ dsaId: sourceDsaId, chainId: sourceChainId, provider: sourceProvider });
+    const srcBalance = await sourceBalanceResolverContract.checkLiquidity(position, srcDsaAddress, isSupply, false);
+    if (!srcBalance.isOk) {
+        let liquidityRequired = "";
+        srcBalance.withdraw.forEach(a => {
+            const token = constants_1.tokens[sourceChainId].find(t => t.address.toLowerCase() === a.token.toLowerCase());
+            if (token && (new bignumber_js_1.default(a.liquidityShort.toString()).isZero()) == false) {
+                liquidityRequired += `- Need ${new bignumber_js_1.default(a.liquidityShort.toString()).dividedBy(10 ** token.decimals).toFormat()} ${token.symbol}\n`;
+            }
+        });
+        throw new errors_1.LowLiquidityError(`Liquidity low on ${(0, formatting_1.chainIdToName)(sourceChainId)}: \n` + liquidityRequired);
+    }
+};
+exports.validateSourceLiquidity = validateSourceLiquidity;
+const validateTargetLiquidity = async ({ position = null, targetChainId, targetDsaId, targetProvider = null, }) => {
+    targetProvider = targetProvider || new providers_1.JsonRpcRetryProvider((0, web3_1.getRpcProviderUrl)(targetChainId));
+    const sourceBalanceResolverContract = (0, web3_1.getContract)(constants_1.addresses[targetChainId].balanceResolver, abi_1.default.balanceResolver, targetProvider);
+    // TODO:
+    const targetDsaAddress = await (0, dsa_1.getDsaAccountAddress)({ dsaId: targetDsaId, chainId: targetChainId, provider: targetProvider });
+    const targetBalance = await sourceBalanceResolverContract.checkLiquidity(position, targetDsaAddress, true, true);
+    if (!targetBalance.isOk) {
+        let liquidityRequired = "";
+        targetBalance.supply.forEach(a => {
+            const token = constants_1.tokens[targetChainId].find(t => t.address.toLowerCase() === a.token.toLowerCase());
+            if (token) {
+                liquidityRequired += `- Need ${new bignumber_js_1.default(a.liquidityShort.toString()).dividedBy(10 ** token.decimals).toFormat()} ${token.symbol}\n`;
+            }
+        });
+        throw new errors_1.LowLiquidityError(`Liquidity low on ${(0, formatting_1.chainIdToName)(targetChainId)}: \n` + liquidityRequired);
+    }
+};
+exports.validateTargetLiquidity = validateTargetLiquidity;
+const mapTokenAddressToMainnetToken = (address, targetChainId) => {
+    targetChainId = String(targetChainId);
+    const token = constants_1.tokens[targetChainId].find((t) => t.address.toLowerCase() === address.toLowerCase());
+    if (targetChainId === "1") {
+        return token;
+    }
+    if (!token) {
+        return null;
+    }
+    return constants_1.tokens["1"].find((t) => t.symbol === token.symbol);
+};
+const validateLiquidityCap = async (position, sourceChainId, targetChainId) => {
+    const cap = constants_1.capPerChain[targetChainId] || 1000000;
+    const mainnetPrices = services_1.Prices.getMainnetPrices();
+    const nativeTokenPrice = services_1.Prices.getNetworkTokenPrices()[targetChainId];
+    let total = new bignumber_js_1.default(0);
+    const supplyPosition = position.supply;
+    for (const { sourceToken: srcTokenAddress, targetToken: tokenAddress, amount } of supplyPosition) {
+        let tokenPrice;
+        let token;
+        if ((0, tokens_1.isNativeWrappedToken)(srcTokenAddress, sourceChainId)) {
+            tokenPrice = nativeTokenPrice;
+            token = constants_1.tokens[targetChainId].find(t => t.address === '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE');
+        }
+        else {
+            const mainnetToken = mapTokenAddressToMainnetToken(tokenAddress, targetChainId);
+            if (!mainnetToken) {
+                throw new Error(`Token ${tokenAddress} is not valid.`);
+            }
+            tokenPrice = mainnetPrices[mainnetToken.address];
+            if (!tokenPrice) {
+                throw new Error(`Token ${tokenAddress} is not valid!`);
+            }
+            token = mainnetToken;
+        }
+        total = total.plus((tokenPrice * Number(amount)) / 10 ** token.decimals);
+    }
+    if (total.isGreaterThan(cap)) {
+        throw new Error(`Total amount of tokens in the transaction is greater than the maximum limit of estimated ${(0, formatting_1.formatUsd)(cap)}`);
+    }
+};
+exports.validateLiquidityCap = validateLiquidityCap;

package/dist/src/utils/web3.js

@@ -0,0 +1,106 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getContract = exports.ContractError = exports.chainIdToNetwork = exports.getRpcProviderUrl = void 0;
+const errors_1 = require("@/errors");
+const async_retry_1 = __importDefault(require("async-retry"));
+const ethers_1 = require("ethers");
+const getRpcProviderUrl = (chainId) => {
+    switch (String(chainId)) {
+        case "1":
+            return "https://rpc.ankr.com/eth";
+        case "137":
+            return "https://rpc.ankr.com/polygon";
+        case "43114":
+            return "https://rpc.ankr.com/avalanche";
+        default:
+            throw new errors_1.UnsupportedChaindIdError(chainId);
+    }
+};
+exports.getRpcProviderUrl = getRpcProviderUrl;
+const chainIdToNetwork = (chainId) => {
+    switch (String(chainId)) {
+        case "1":
+            return "mainnet";
+        case "137":
+            return "polygon";
+        case "43114":
+            return "avalanche";
+        default:
+            throw new errors_1.UnsupportedChaindIdError(chainId);
+    }
+};
+exports.chainIdToNetwork = chainIdToNetwork;
+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}'.`);
+    }
+    const contract = new ethers_1.ethers.Contract(address, contractInterface, signerOrProvider);
+    // Make sure the contract properties is writable
+    const desc = Object.getOwnPropertyDescriptor(contract, "functions");
+    if (!desc || desc.writable !== true) {
+        return contract;
+    }
+    return new Proxy(contract, {
+        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 (0, async_retry_1.default)(async () => await value.bind(contract)(...args), { retries: isConstant ? 1 : 3 });
+                    }
+                    catch (error) {
+                        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;
+                    }
+                };
+            }
+            if (typeof value === "object" &&
+                [
+                    "populateTransaction",
+                    "estimateGas",
+                    "functions",
+                    "callStatic",
+                ].includes(String(prop))) {
+                const parentProp = String(prop);
+                return new Proxy(value, {
+                    get(target, prop, receiver) {
+                        const value = Reflect.get(target, prop, receiver);
+                        if (typeof value === "function") {
+                            return async (...args) => {
+                                try {
+                                    return await (0, async_retry_1.default)(async () => await value.bind(contract)(...args), { retries: parentProp === "callStatic" ? 3 : 1 });
+                                }
+                                catch (error) {
+                                    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;
+                                }
+                            };
+                        }
+                    },
+                });
+            }
+            return value;
+        },
+    });
+}
+exports.getContract = getContract;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.0bace53",
+  "version": "0.0.0-dev.0ca1aa1",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -25,16 +25,20 @@
   "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",
+    "bignumber.js": "^9.0.2",
+    "bluebird": "^3.7.2",
     "chalk": "4.1.2",
-    "dotenv": "^16.0.0",
+    "dedent": "^0.7.0",
+    "dotenv": "^16.0.1",
     "ethereumjs-util": "^7.1.4",
-    "ethers": "^5.6.4",
+    "ethers": "^5.6.8",
     "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,13 +49,16 @@
     "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",
+    "node-cron": "^3.0.1",
     "patch-package": "^6.4.7",
     "postinstall-postinstall": "^2.1.0",
     "sequelize": "6.18.0",
-    "sqlite3": "^5.0.5",
-    "waait": "^1.0.5"
+    "sqlite3": "^5.0.8",
+    "waait": "^1.0.5",
+    "web3-eth-abi": "^1.7.3",
+    "web3-utils": "^1.7.3"
   },
   "bin": {
     "interop-x": "bin/interop-x",
@@ -59,15 +66,18 @@
   },
   "devDependencies": {
     "@typechain/ethers-v5": "^10.0.0",
+    "@types/async-retry": "^1.4.4",
+    "@types/bluebird": "^3.5.36",
     "@types/bn.js": "^5.1.0",
+    "@types/dedent": "^0.7.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"
   }
 }