@instadapp/interop-x 0.0.0-dev.f39d622 → 0.0.0-dev.f45bd03

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

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InteropX__factory = exports.InstList__factory = exports.GnosisSafe__factory = exports.Erc20__factory = exports.BalanceResolver__factory = exports.AaveV2Resolver__factory = void 0;
+exports.InteropX__factory = exports.InstList__factory = exports.GnosisSafe__factory = exports.Erc20__factory = exports.BalanceResolver__factory = exports.AaveV3Resolver__factory = exports.AaveV2Resolver__factory = void 0;
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
 var AaveV2Resolver__factory_1 = require("./AaveV2Resolver__factory");
 Object.defineProperty(exports, "AaveV2Resolver__factory", { enumerable: true, get: function () { return AaveV2Resolver__factory_1.AaveV2Resolver__factory; } });
+var AaveV3Resolver__factory_1 = require("./AaveV3Resolver__factory");
+Object.defineProperty(exports, "AaveV3Resolver__factory", { enumerable: true, get: function () { return AaveV3Resolver__factory_1.AaveV3Resolver__factory; } });
 var BalanceResolver__factory_1 = require("./BalanceResolver__factory");
 Object.defineProperty(exports, "BalanceResolver__factory", { enumerable: true, get: function () { return BalanceResolver__factory_1.BalanceResolver__factory; } });
 var Erc20__factory_1 = require("./Erc20__factory");

package/dist/src/typechain/index.js

@@ -23,10 +23,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InteropX__factory = exports.InstList__factory = exports.GnosisSafe__factory = exports.Erc20__factory = exports.BalanceResolver__factory = exports.AaveV2Resolver__factory = exports.factories = void 0;
+exports.InteropX__factory = exports.InstList__factory = exports.GnosisSafe__factory = exports.Erc20__factory = exports.BalanceResolver__factory = exports.AaveV3Resolver__factory = exports.AaveV2Resolver__factory = exports.factories = void 0;
 exports.factories = __importStar(require("./factories"));
 var AaveV2Resolver__factory_1 = require("./factories/AaveV2Resolver__factory");
 Object.defineProperty(exports, "AaveV2Resolver__factory", { enumerable: true, get: function () { return AaveV2Resolver__factory_1.AaveV2Resolver__factory; } });
+var AaveV3Resolver__factory_1 = require("./factories/AaveV3Resolver__factory");
+Object.defineProperty(exports, "AaveV3Resolver__factory", { enumerable: true, get: function () { return AaveV3Resolver__factory_1.AaveV3Resolver__factory; } });
 var BalanceResolver__factory_1 = require("./factories/BalanceResolver__factory");
 Object.defineProperty(exports, "BalanceResolver__factory", { enumerable: true, get: function () { return BalanceResolver__factory_1.BalanceResolver__factory; } });
 var Erc20__factory_1 = require("./factories/Erc20__factory");

package/dist/src/utils/gnosis.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateGnosisTransaction = exports.signGnosisSafeTx = exports.buildSignatureBytes = void 0;
+exports.getGnosisOwnerPeerIds = exports.generateGnosisTransaction = exports.signGnosisSafeTx = exports.generateGnosisSignatureMessage = exports.getGnosisSignatureAddress = exports.buildSignatureBytes = void 0;
 const constants_1 = require("@/constants");
+const net_1 = require("@/net");
 const ethers_1 = require("ethers");
 const buildSignatureBytes = (signatures) => {
     signatures.sort((left, right) => left.signer.toLowerCase().localeCompare(right.signer.toLowerCase()));
@@ -12,26 +13,31 @@ const buildSignatureBytes = (signatures) => {
     return signatureBytes;
 };
 exports.buildSignatureBytes = buildSignatureBytes;
-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 gnosisSignatureTypes = {
+    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 getGnosisSignatureAddress = ({ signature, message, chainId }) => {
     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" },
-        ],
-    };
+    return ethers_1.ethers.utils.verifyTypedData(domain, gnosisSignatureTypes, message, signature);
+};
+exports.getGnosisSignatureAddress = getGnosisSignatureAddress;
+const generateGnosisSignatureMessage = ({ to, data = null, value = "0", operation = "1", baseGas = "0", gasPrice = "0", gasToken = "0x0000000000000000000000000000000000000000", refundReceiver = "0x0000000000000000000000000000000000000000", safeTxGas = "79668", nonce = "0", chainId = 137, }) => {
+    const gnosisSafe = constants_1.addresses[chainId].gnosisSafe;
     const message = {
         baseGas,
         data,
@@ -45,7 +51,17 @@ const signGnosisSafeTx = async ({ to, data = null, value = "0", operation = "1",
         to,
         value,
     };
-    return await signer._signTypedData(domain, types, message);
+    return message;
+};
+exports.generateGnosisSignatureMessage = generateGnosisSignatureMessage;
+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 message = (0, exports.generateGnosisSignatureMessage)({ to, data, value, operation, baseGas, gasPrice, gasToken, refundReceiver, safeTxGas, nonce, chainId });
+    return await signer._signTypedData(domain, gnosisSignatureTypes, message);
 };
 exports.signGnosisSafeTx = signGnosisSafeTx;
 const generateGnosisTransaction = async (transactionData, safeContract) => {
@@ -60,3 +76,12 @@ const generateGnosisTransaction = async (transactionData, safeContract) => {
     return transactionData;
 };
 exports.generateGnosisTransaction = generateGnosisTransaction;
+const getGnosisOwnerPeerIds = async ({ gnosisContract = null }) => {
+    const owners = await gnosisContract
+        .getOwners()
+        .then((owners) => owners.map((owner) => owner.toLowerCase()));
+    return net_1.peerPool.activePeers
+        .filter((peer) => owners.includes(peer.publicAddress.toLowerCase()))
+        .map((peer) => peer.id);
+};
+exports.getGnosisOwnerPeerIds = getGnosisOwnerPeerIds;

package/dist/src/utils/validate.js

@@ -7,12 +7,12 @@ exports.validateLiquidityCap = exports.validateTargetLiquidity = exports.validat
 const abi_1 = __importDefault(require("@/abi"));
 const constants_1 = require("@/constants");
 const errors_1 = require("@/errors");
-const ethers_1 = require("ethers");
 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 validateChains = ({ sourceChainId, targetChainId }) => {
     if (!sourceChainId) {
         throw new errors_1.InvalidChaindIdError("Source chain id is required");
@@ -31,12 +31,10 @@ const validateChains = ({ sourceChainId, targetChainId }) => {
     }
 };
 exports.validateChains = validateChains;
-const validateSourceLiquidity = async ({ position, sourceChainId, isSupply = false, sourceProvider = null, }) => {
-    sourceProvider = sourceProvider || new ethers_1.ethers.providers.JsonRpcProvider((0, web3_1.getRpcProviderUrl)(sourceChainId));
+const validateSourceLiquidity = async ({ position = null, sourceChainId, 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 srcBalance = await sourceBalanceResolverContract.methods
-        .checkLiquidity(position, constants_1.addresses[sourceChainId].interopX, isSupply, false)
-        .call();
+    const srcBalance = await sourceBalanceResolverContract.checkLiquidity(position, constants_1.addresses[sourceChainId].interopX, isSupply, false);
     if (!srcBalance.isOk) {
         let liquidityRequired = "";
         srcBalance.withdraw.forEach(a => {
@@ -49,12 +47,10 @@ const validateSourceLiquidity = async ({ position, sourceChainId, isSupply = fal
     }
 };
 exports.validateSourceLiquidity = validateSourceLiquidity;
-const validateTargetLiquidity = async ({ position, targetChainId, targetProvider = null, }) => {
-    targetProvider = targetProvider || new ethers_1.ethers.providers.JsonRpcProvider((0, web3_1.getRpcProviderUrl)(targetChainId));
+const validateTargetLiquidity = async ({ position = null, targetChainId, 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);
-    const targetBalance = await sourceBalanceResolverContract.methods
-        .checkLiquidity(position, constants_1.addresses[targetChainId].interopX, true, true)
-        .call();
+    const targetBalance = await sourceBalanceResolverContract.checkLiquidity(position, constants_1.addresses[targetChainId].interopX, true, true);
     if (!targetBalance.isOk) {
         let liquidityRequired = "";
         targetBalance.supply.forEach(a => {
@@ -83,8 +79,8 @@ const validateLiquidityCap = async (position, sourceChainId, targetChainId) => {
     const mainnetPrices = services_1.Prices.getMainnetPrices();
     const nativeTokenPrice = services_1.Prices.getNetworkTokenPrices()[targetChainId];
     let total = new bignumber_js_1.default(0);
-    const supplyPosition = position[0];
-    for (const [srcTokenAddress, tokenAddress, amount] of supplyPosition) {
+    const supplyPosition = position.supply;
+    for (const { sourceToken: srcTokenAddress, targetToken: tokenAddress, amount } of supplyPosition) {
         let tokenPrice;
         let token;
         if ((0, tokens_1.isNativeWrappedToken)(srcTokenAddress, sourceChainId)) {
@@ -102,7 +98,7 @@ const validateLiquidityCap = async (position, sourceChainId, targetChainId) => {
             }
             token = mainnetToken;
         }
-        total = total.plus((tokenPrice * amount) / 10 ** token.decimals);
+        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)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.f39d622",
+  "version": "0.0.0-dev.f45bd03",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -30,11 +30,12 @@
     "axios": "^0.27.2",
     "axios-retry": "^3.2.5",
     "bignumber.js": "^9.0.2",
+    "bluebird": "^3.7.2",
     "chalk": "4.1.2",
     "dedent": "^0.7.0",
     "dotenv": "^16.0.1",
     "ethereumjs-util": "^7.1.4",
-    "ethers": "^5.6.5",
+    "ethers": "^5.6.8",
     "ethers-multisend": "^2.1.1",
     "expand-home-dir": "^0.0.3",
     "fastify": "^3.29.0",
@@ -66,6 +67,7 @@
   "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",