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

package/dist/src/abi/balanceResolver.json

@@ -0,0 +1,211 @@
+[
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "_wnativeToken",
+                "type": "address"
+            }
+        ],
+        "stateMutability": "nonpayable",
+        "type": "constructor"
+    },
+    {
+        "inputs": [
+            {
+                "components": [
+                    {
+                        "components": [
+                            {
+                                "internalType": "address",
+                                "name": "sourceToken",
+                                "type": "address"
+                            },
+                            {
+                                "internalType": "address",
+                                "name": "targetToken",
+                                "type": "address"
+                            },
+                            {
+                                "internalType": "uint256",
+                                "name": "amount",
+                                "type": "uint256"
+                            }
+                        ],
+                        "internalType": "struct Variables.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 Variables.TokenInfo[]",
+                        "name": "withdraw",
+                        "type": "tuple[]"
+                    }
+                ],
+                "internalType": "struct Variables.Position",
+                "name": "position",
+                "type": "tuple"
+            },
+            {
+                "internalType": "address",
+                "name": "liquidityContract",
+                "type": "address"
+            },
+            {
+                "internalType": "bool",
+                "name": "isSupply",
+                "type": "bool"
+            },
+            {
+                "internalType": "bool",
+                "name": "isTargetToken",
+                "type": "bool"
+            }
+        ],
+        "name": "checkLiquidity",
+        "outputs": [
+            {
+                "components": [
+                    {
+                        "internalType": "bool",
+                        "name": "isOk",
+                        "type": "bool"
+                    },
+                    {
+                        "components": [
+                            {
+                                "internalType": "address",
+                                "name": "token",
+                                "type": "address"
+                            },
+                            {
+                                "internalType": "uint256",
+                                "name": "liquidityAvailable",
+                                "type": "uint256"
+                            },
+                            {
+                                "internalType": "uint256",
+                                "name": "liquidityShort",
+                                "type": "uint256"
+                            }
+                        ],
+                        "internalType": "struct Helpers.LiquidityData[]",
+                        "name": "supply",
+                        "type": "tuple[]"
+                    },
+                    {
+                        "components": [
+                            {
+                                "internalType": "address",
+                                "name": "token",
+                                "type": "address"
+                            },
+                            {
+                                "internalType": "uint256",
+                                "name": "liquidityAvailable",
+                                "type": "uint256"
+                            },
+                            {
+                                "internalType": "uint256",
+                                "name": "liquidityShort",
+                                "type": "uint256"
+                            }
+                        ],
+                        "internalType": "struct Helpers.LiquidityData[]",
+                        "name": "withdraw",
+                        "type": "tuple[]"
+                    }
+                ],
+                "internalType": "struct Helpers.PositionData",
+                "name": "p",
+                "type": "tuple"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address[]",
+                "name": "tokens",
+                "type": "address[]"
+            },
+            {
+                "internalType": "address",
+                "name": "liquidityContract",
+                "type": "address"
+            }
+        ],
+        "name": "getLiquidity",
+        "outputs": [
+            {
+                "components": [
+                    {
+                        "internalType": "address",
+                        "name": "token",
+                        "type": "address"
+                    },
+                    {
+                        "internalType": "uint256",
+                        "name": "liquidityAvailable",
+                        "type": "uint256"
+                    },
+                    {
+                        "internalType": "uint256",
+                        "name": "liquidityShort",
+                        "type": "uint256"
+                    }
+                ],
+                "internalType": "struct Helpers.LiquidityData[]",
+                "name": "l",
+                "type": "tuple[]"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "nativeToken",
+        "outputs": [
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "wnativeToken",
+        "outputs": [
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    }
+]

package/dist/src/abi/index.js

@@ -8,10 +8,16 @@ const erc20_json_1 = __importDefault(require("./erc20.json"));
 const interopX_json_1 = __importDefault(require("./interopX.json"));
 const connectors_1 = require("./connectors");
 const instList_json_1 = __importDefault(require("./instList.json"));
+const balanceResolver_json_1 = __importDefault(require("./balanceResolver.json"));
+const aaveV2Resolver_json_1 = __importDefault(require("./aaveV2Resolver.json"));
+const aaveV3Resolver_json_1 = __importDefault(require("./aaveV3Resolver.json"));
 exports.default = {
     gnosisSafe: gnosisSafe_json_1.default,
     erc20: erc20_json_1.default,
     interopX: interopX_json_1.default,
     connectors: connectors_1.connectors,
     instList: instList_json_1.default,
+    balanceResolver: balanceResolver_json_1.default,
+    aaveV2Resolver: aaveV2Resolver_json_1.default,
+    aaveV3Resolver: aaveV3Resolver_json_1.default,
 };

package/dist/src/constants/addresses.js

@@ -8,6 +8,9 @@ exports.addresses = {
         interopX: '0xDB6083df37C5F224a3dF84A4B5f9fB60b6c8670a',
         dsaAddress: '0x9Fbd453a8e7a158510fBae5D9935958507cf4b19',
         instList: "0x839c2D3aDe63DF5b0b8F3E57D5e145057Ab41556",
+        aaveV2Resolver: "0x0731c1d0154C2bE74d50e2083Df10aa531AAbb10",
+        aaveV3Resolver: "0x1bD311bd5aD4DCfE18bCb55d42F0a3c714E2bfDe",
+        balanceResolver: "0xecc3991846bB21717B95A593Fd86C5930A491F95",
     },
     43114: {
         gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
@@ -15,5 +18,8 @@ exports.addresses = {
         interopX: '0xA82A87096709E3D8648c9d9a22f31133bC4B6d32',
         dsaAddress: '0x995e67a652d2be45a8bff438b3dfac66dfff1c46',
         instList: "0x9926955e0Dd681Dc303370C52f4Ad0a4dd061687",
+        aaveV2Resolver: "0x7C5C59944263311a1e350E3B871B0d1d8E9A513E",
+        aaveV3Resolver: "0xB0862d7dB941698A0A92F8dF6672F4B56A5F5b02",
+        balanceResolver: "0xD45dFA34cEeAB567208041331F5ed9916C23b1E8",
     }
 };

package/dist/src/constants/capPerChain.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.capPerChain = void 0;
+exports.capPerChain = {
+    "1": 100000000,
+    "137": 100000000,
+    "43114": 100000000,
+};

package/dist/src/constants/index.js

@@ -17,3 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./addresses"), exports);
 __exportStar(require("./tokens"), exports);
 __exportStar(require("./blockConfirmations"), exports);
+__exportStar(require("./wrappedNativeToken"), exports);
+__exportStar(require("./capPerChain"), exports);

package/dist/src/constants/tokens.js

@@ -2,50 +2,50 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tokens = void 0;
 exports.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",
-    //     decimals: 8,
-    //   },
-    // ],
+    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",
+            decimals: 8,
+        },
+    ],
     137: [
         {
             aliases: ['eth', 'weth'],

package/dist/src/constants/wrappedNativeToken.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.wrappedNativeToken = void 0;
+exports.wrappedNativeToken = {
+    "1": '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+    "137": '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270',
+    "43114": '0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7'
+};

package/dist/src/crons/index.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("./prices");

package/dist/src/crons/prices.js

@@ -0,0 +1,16 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const services_1 = require("@/services");
+const node_cron_1 = __importDefault(require("node-cron"));
+services_1.Prices.fetch().catch(console.log);
+node_cron_1.default.schedule(`* * * * *`, async () => {
+    try {
+        await services_1.Prices.fetch();
+    }
+    catch (error) {
+        console.log("Prices: ", error.message);
+    }
+});

package/dist/src/db/models/transaction.js

@@ -40,7 +40,7 @@ Transaction.init({
         type: sequelize_2.DataTypes.DATE,
         defaultValue: Date.now(),
     },
-    sourceDelayUntil: sequelize_2.DataTypes.STRING,
+    sourceDelayUntil: sequelize_2.DataTypes.DATE,
     targetChainId: sequelize_2.DataTypes.NUMBER,
     targetDsaId: sequelize_2.DataTypes.STRING,
     targetTransactionHash: sequelize_2.DataTypes.STRING,

package/dist/src/errors/index.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InvalidChaindIdError = exports.LiquidityError = void 0;
+exports.LowLiquidityError = exports.InvalidChaindIdError = exports.LiquidityError = exports.UnsupportedChaindIdError = void 0;
+class UnsupportedChaindIdError extends Error {
+    constructor(chainId) {
+        super(`Unsupported chainId: ${chainId}`);
+    }
+}
+exports.UnsupportedChaindIdError = UnsupportedChaindIdError;
 class LiquidityError extends Error {
     constructor(message) {
         super(message || "Not enough liquidity");
@@ -15,3 +21,10 @@ class InvalidChaindIdError extends Error {
     }
 }
 exports.InvalidChaindIdError = InvalidChaindIdError;
+class LowLiquidityError extends Error {
+    constructor(message) {
+        super(message || "Low liquidity");
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}
+exports.LowLiquidityError = LowLiquidityError;

package/dist/src/gnosis/actions/aaveV2/source.js

@@ -6,19 +6,44 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const abi_1 = __importDefault(require("@/abi"));
 const config_1 = __importDefault(require("@/config"));
 const constants_1 = require("@/constants");
+const providers_1 = require("@/providers");
 const utils_1 = require("@/utils");
 const ethers_1 = require("ethers");
 const ethers_multisend_1 = require("ethers-multisend");
+const safeUserRatioGap = "800000000000000000";
 async function default_1(transaction) {
     const transactions = [];
     const logs = [];
     const { position, actionId, actionIdHashHash, sourceSender, sourceDsaId, targetDsaId, sourceChainId, targetChainId, vnonce, metadata, } = transaction.submitEvent;
-    const sourceChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(sourceChainId));
+    const sourceChainProvider = new providers_1.JsonRpcRetryProvider((0, utils_1.getRpcProviderUrl)(sourceChainId));
     const sourceWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, sourceChainProvider);
+    const targetChainProvider = new providers_1.JsonRpcRetryProvider((0, utils_1.getRpcProviderUrl)(targetChainId));
+    const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
     const dsaAddress = constants_1.addresses[sourceChainId].dsaAddress;
     const sourceUserAddress = Number(sourceDsaId) == 0 ? sourceSender : dsaAddress;
     const interopAddress = constants_1.addresses[sourceChainId].interopX;
     const contract = (0, utils_1.getContract)(interopAddress, abi_1.default.interopX, sourceWallet);
+    const sourceResolverContract = (0, utils_1.getContract)(constants_1.addresses[sourceChainId].aaveV2Resolver, abi_1.default.aaveV2Resolver, sourceWallet);
+    const targetResolverContract = (0, utils_1.getContract)(constants_1.addresses[targetChainId].aaveV2Resolver, abi_1.default.aaveV2Resolver, targetWallet);
+    const sourceAavePosition = await sourceResolverContract.checkAavePosition(sourceUserAddress, position, safeUserRatioGap, false);
+    const userSourceAaveIsOk = sourceAavePosition.isOk;
+    if (!userSourceAaveIsOk) {
+        throw new Error("Source chain aave position is not safe to migrate.");
+    }
+    const targetInstListContract = (0, utils_1.getContract)(constants_1.addresses[targetChainId].instList, abi_1.default.instList, targetChainProvider);
+    const targetDsaAddress = await targetInstListContract.accountAddr(targetDsaId);
+    const targetAavePosition = await targetResolverContract
+        .checkAavePosition(targetDsaAddress, position, safeUserRatioGap, true);
+    const userTargetAaveIsOk = targetAavePosition.isOk;
+    if (!userTargetAaveIsOk) {
+        throw new Error("Target chain aave position will not be safe after migration.");
+    }
+    const targetAavePositionWithFee = await targetResolverContract
+        .checkAavePosition(targetDsaAddress, position, safeUserRatioGap, true);
+    const userTargetAaveIsOkWithFee = targetAavePositionWithFee.isOk;
+    if (!userTargetAaveIsOkWithFee) {
+        throw new Error("Target chain aave position will not be safe after migration due to minimum fee.");
+    }
     const sourceSpells = [];
     const commonSpells = [];
     for (const withdraw of position.withdraw) {

package/dist/src/gnosis/actions/aaveV2/target.js

@@ -6,17 +6,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const abi_1 = __importDefault(require("@/abi"));
 const config_1 = __importDefault(require("@/config"));
 const constants_1 = require("@/constants");
+const providers_1 = require("@/providers");
 const utils_1 = require("@/utils");
 const ethers_1 = require("ethers");
 const ethers_multisend_1 = require("ethers-multisend");
+const safeUserRatioGap = "800000000000000000";
 async function default_1(transaction) {
     const transactions = [];
     const logs = [];
     const { sourceSpells, position, actionId, sourceSender, sourceDsaId, targetDsaId, sourceChainId, targetChainId, vnonce, metadata, } = transaction.validateEvent;
-    const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(targetChainId));
+    const targetChainProvider = new providers_1.JsonRpcRetryProvider((0, utils_1.getRpcProviderUrl)(targetChainId));
     const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
+    const targetResolverContract = (0, utils_1.getContract)(constants_1.addresses[targetChainId].aaveV2Resolver, abi_1.default.aaveV2Resolver, targetWallet);
     const targetInstListContract = (0, utils_1.getContract)(constants_1.addresses[targetChainId].instList, abi_1.default.instList, targetChainProvider);
     const targetDsaAddress = await targetInstListContract.accountAddr(targetDsaId);
+    const targetAavePosition = await targetResolverContract
+        .checkAavePosition(targetDsaAddress, position, safeUserRatioGap, true);
+    const userTargetAaveIsOk = targetAavePosition.isOk;
+    if (!userTargetAaveIsOk) {
+        throw new Error("Target chain aave position will not be safe after migration.");
+    }
+    const targetAavePositionWithFee = await targetResolverContract
+        .checkAavePosition(targetDsaAddress, position, safeUserRatioGap, true);
+    const userTargetAaveIsOkWithFee = targetAavePositionWithFee.isOk;
+    if (!userTargetAaveIsOkWithFee) {
+        throw new Error("Target chain aave position will not be safe after migration due to minimum fee.");
+    }
     const dsaAddress = constants_1.addresses[targetChainId].dsaAddress;
     const interopAddress = constants_1.addresses[targetChainId].interopX;
     const contract = (0, utils_1.getContract)(interopAddress, abi_1.default.interopX, targetWallet);

package/dist/src/gnosis/actions/aaveV3/index.js

@@ -0,0 +1,11 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const source_1 = __importDefault(require("./source"));
+const target_1 = __importDefault(require("./target"));
+async function default_1(transaction, type) {
+    return type === 'source' ? (0, source_1.default)(transaction) : (0, target_1.default)(transaction);
+}
+exports.default = default_1;

package/dist/src/gnosis/actions/aaveV3/source.js

@@ -0,0 +1,74 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const abi_1 = __importDefault(require("@/abi"));
+const config_1 = __importDefault(require("@/config"));
+const constants_1 = require("@/constants");
+const providers_1 = require("@/providers");
+const utils_1 = require("@/utils");
+const ethers_1 = require("ethers");
+const ethers_multisend_1 = require("ethers-multisend");
+async function default_1(transaction) {
+    const transactions = [];
+    const logs = [];
+    const { position, actionId, actionIdHashHash, sourceSender, sourceDsaId, targetDsaId, sourceChainId, targetChainId, vnonce, metadata, } = transaction.submitEvent;
+    const sourceChainProvider = new providers_1.JsonRpcRetryProvider((0, utils_1.getRpcProviderUrl)(sourceChainId));
+    const sourceWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, sourceChainProvider);
+    const dsaAddress = constants_1.addresses[sourceChainId].dsaAddress;
+    const sourceUserAddress = Number(sourceDsaId) == 0 ? sourceSender : dsaAddress;
+    const interopAddress = constants_1.addresses[sourceChainId].interopX;
+    const contract = (0, utils_1.getContract)(interopAddress, abi_1.default.interopX, sourceWallet);
+    const sourceSpells = [];
+    const commonSpells = [];
+    for (const withdraw of position.withdraw) {
+        let spellData = {
+            connector: "AAVE-V3-A",
+            method: "payback",
+            args: [withdraw.sourceToken, withdraw.amount, "2", "0", "0"],
+        };
+        sourceSpells.push({
+            connector: spellData.connector,
+            data: (0, utils_1.encodeConnectorMethod)(spellData),
+        });
+        let spellDataBasicWithdraw = {
+            connector: "BASIC-A",
+            method: "withdraw",
+            args: [withdraw.sourceToken, withdraw.amount, sourceUserAddress, "0", "0"],
+        };
+        commonSpells.push({
+            connector: spellDataBasicWithdraw.connector,
+            data: (0, utils_1.encodeConnectorMethod)(spellDataBasicWithdraw),
+        });
+    }
+    for (const supply of position.supply) {
+        let spellDataWithdraw = {
+            connector: "AAVE-V3-A",
+            method: "withdraw",
+            args: [supply.sourceToken, supply.amount, "0", "0"],
+        };
+        sourceSpells.push({
+            connector: spellDataWithdraw.connector,
+            data: (0, utils_1.encodeConnectorMethod)(spellDataWithdraw),
+        });
+        let spellDataBasicWithdraw = {
+            connector: "BASIC-A",
+            method: "withdraw",
+            args: [supply.sourceToken, supply.amount, dsaAddress, "0", "0"],
+        };
+        sourceSpells.push({
+            connector: spellDataBasicWithdraw.connector,
+            data: (0, utils_1.encodeConnectorMethod)(spellDataBasicWithdraw),
+        });
+    }
+    const { data } = await contract.populateTransaction.sourceAction(sourceSpells, commonSpells, position, actionId, sourceSender, sourceDsaId, targetDsaId, sourceChainId, targetChainId, vnonce, metadata);
+    transactions.push({
+        to: interopAddress,
+        data: data,
+        value: "0",
+        operation: ethers_multisend_1.OperationType.Call,
+    });
+    return { transactions, logs };
+}
+exports.default = default_1;