@instadapp/interop-x 0.0.0-dev.e916c22 → 0.0.0-dev.ea4acf6

package/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/src/abi/index.ts

@@ -3,6 +3,9 @@ import erc20 from "./erc20.json";
 import interopX from "./interopX.json";
 import { connectors } from "./connectors";
 import instList from "./instList.json";
+import balanceResolver from "./balanceResolver.json";
+import aaveV2Resolver from "./aaveV2Resolver.json";
+import aaveV3Resolver from "./aaveV3Resolver.json";
 
 export default {
   gnosisSafe,
@@ -10,4 +13,7 @@ export default {
   interopX,
   connectors,
   instList,
+  balanceResolver,
+  aaveV2Resolver,
+  aaveV3Resolver,
 };

package/src/api/index.ts

@@ -26,6 +26,14 @@ export const startApiServer = async () => {
             })
         })
 
+        server.get('/transactions/:transaction', async (req) => {
+            return await Transaction.findOne({
+                where: {
+                    transactionHash: (req.params as any).transaction
+                }
+            })
+        })
+
         await server.listen(PORT, HOST)
 
         logger.log(`RPC Server listening at http://${HOST}:${PORT}`)

package/src/constants/addresses.ts

@@ -1,3 +1,14 @@
+export type NetworkAddresses = {
+  gnosisSafe: string
+  multisend: string
+  interopX: string
+  dsaAddress: string
+  instList: string
+  aaveV2Resolver: string
+  aaveV3Resolver: string
+  balanceResolver: string
+}
+
 export const addresses = {
   137: {
     gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
@@ -5,6 +16,9 @@ export const addresses = {
     interopX: '0xDB6083df37C5F224a3dF84A4B5f9fB60b6c8670a',
     dsaAddress: '0x9Fbd453a8e7a158510fBae5D9935958507cf4b19',
     instList: "0x839c2D3aDe63DF5b0b8F3E57D5e145057Ab41556",
+    aaveV2Resolver: "0x0731c1d0154C2bE74d50e2083Df10aa531AAbb10",
+    aaveV3Resolver: "0x1bD311bd5aD4DCfE18bCb55d42F0a3c714E2bfDe",
+    balanceResolver: "0xecc3991846bB21717B95A593Fd86C5930A491F95",
   },
   43114: {
     gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
@@ -12,5 +26,8 @@ export const addresses = {
     interopX: '0xA82A87096709E3D8648c9d9a22f31133bC4B6d32',
     dsaAddress: '0x995e67a652d2be45a8bff438b3dfac66dfff1c46',
     instList: "0x9926955e0Dd681Dc303370C52f4Ad0a4dd061687",
+    aaveV2Resolver: "0x7C5C59944263311a1e350E3B871B0d1d8E9A513E",
+    aaveV3Resolver: "0xB0862d7dB941698A0A92F8dF6672F4B56A5F5b02",
+    balanceResolver: "0xD45dFA34cEeAB567208041331F5ed9916C23b1E8",
   }
-} as Record<number, { gnosisSafe: string, multisend: string, interopX: string, dsaAddress: string, instList: string }>
+} as Record<number, NetworkAddresses>

package/src/constants/capPerChain.ts

@@ -0,0 +1,5 @@
+export const capPerChain =  {
+    "1": 100_000_000,
+    "137": 100_000_000,
+    "43114": 100_000_000,
+};

package/src/constants/index.ts

@@ -1,3 +1,5 @@
 export * from './addresses';
 export * from './tokens';
 export * from './blockConfirmations';
+export * from './wrappedNativeToken';
+export * from './capPerChain';

package/src/constants/tokens.ts

@@ -1,48 +1,48 @@
 export const 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/src/constants/wrappedNativeToken.ts

@@ -0,0 +1,5 @@
+export const wrappedNativeToken = {
+  "1": '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+  "137": '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270',
+  "43114": '0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7'
+};

package/src/crons/index.ts

@@ -0,0 +1 @@
+import "./prices"

package/src/crons/prices.ts

@@ -0,0 +1,12 @@
+import { Prices } from "@/services";
+import cron from "node-cron";
+
+Prices.fetch().catch(console.log);
+
+cron.schedule(`* * * * *`, async () => {
+    try {
+        await Prices.fetch();
+    } catch (error) {
+        console.log("Prices: ", error.message);
+    }
+});

package/src/db/models/transaction.ts

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

package/src/errors/index.ts

@@ -0,0 +1,26 @@
+export class UnsupportedChaindIdError extends Error {
+    constructor(chainId: any) {
+        super(`Unsupported chainId: ${chainId}`);
+    }
+}
+
+export class LiquidityError extends Error {
+    constructor(message?: string) {
+        super(message || "Not enough liquidity");
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}
+
+export class InvalidChaindIdError extends Error {
+    constructor(message?: string) {
+        super(message || "Invalid chain id");
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}
+
+export class LowLiquidityError extends Error {
+    constructor(message?: string) {
+        super(message || "Low liquidity");
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}

package/src/gnosis/actions/aaveV2/source.ts

@@ -2,12 +2,15 @@ import abi from "@/abi";
 import config from "@/config";
 import { addresses } from "@/constants";
 import { Transaction } from "@/db";
-import { InteropX } from "@/typechain";
+import { JsonRpcRetryProvider } from "@/providers";
+import { AaveV2Resolver, InteropX } from "@/typechain";
 import { ChainId } from "@/types";
-import { encodeConnectorMethod, getContract, getRpcProviderUrl } from "@/utils";
+import { encodeConnectorMethod, getContract, getDsaAccountAddress, getRpcProviderUrl } from "@/utils";
 import { ethers } from "ethers";
 import { MetaTransaction, OperationType } from "ethers-multisend";
 
+const safeUserRatioGap = "800000000000000000"
+
 export default async function (transaction: Transaction) {
   const transactions: MetaTransaction[] = [];
   const logs: any[] = [];
@@ -25,13 +28,20 @@ export default async function (transaction: Transaction) {
     metadata,
   } = transaction.submitEvent;
 
-  const sourceChainProvider = new ethers.providers.JsonRpcProvider(
+  const sourceChainProvider = new JsonRpcRetryProvider(
     getRpcProviderUrl(sourceChainId as ChainId)
   );
   const sourceWallet = new ethers.Wallet(
     config.privateKey,
     sourceChainProvider
   );
+  const targetChainProvider = new JsonRpcRetryProvider(
+    getRpcProviderUrl(targetChainId as ChainId)
+  );
+  const targetWallet = new ethers.Wallet(
+    config.privateKey,
+    targetChainProvider
+  );
   const dsaAddress = addresses[sourceChainId].dsaAddress;
   const sourceUserAddress =
     Number(sourceDsaId) == 0 ? sourceSender : dsaAddress;
@@ -42,6 +52,49 @@ export default async function (transaction: Transaction) {
     sourceWallet
   );
 
+  const sourceResolverContract = getContract<AaveV2Resolver>(
+    addresses[sourceChainId].aaveV2Resolver,
+    abi.aaveV2Resolver,
+    sourceWallet
+  );
+
+  const targetResolverContract = getContract<AaveV2Resolver>(
+    addresses[targetChainId].aaveV2Resolver,
+    abi.aaveV2Resolver,
+    targetWallet
+  );
+
+
+  const sourceDsaAddress = await getDsaAccountAddress({ dsaId: sourceDsaId, chainId: sourceChainId, provider: sourceChainProvider });
+
+  const sourceAavePosition = await sourceResolverContract.checkAavePosition(sourceDsaAddress, position, safeUserRatioGap, false)
+
+  const userSourceAaveIsOk = sourceAavePosition.isOk;
+
+  if (!userSourceAaveIsOk) {
+    throw new Error("Source chain aave position is not safe to migrate.");
+  }
+
+  const targetDsaAddress = await getDsaAccountAddress({ dsaId: targetDsaId, chainId: targetChainId, provider: targetChainProvider });
+
+  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: any[] = [];
   const commonSpells: any[] = [];
 

package/src/gnosis/actions/aaveV2/target.ts

@@ -2,13 +2,14 @@ import abi from "@/abi";
 import config from "@/config";
 import { addresses } from "@/constants";
 import { Transaction } from "@/db";
-import { InteropX } from "@/typechain";
-import { InstList } from "@/typechain/InstList";
+import { JsonRpcRetryProvider } from "@/providers";
+import { AaveV2Resolver, InteropX } from "@/typechain";
 import { ChainId } from "@/types";
-import { encodeConnectorMethod, getContract, getRpcProviderUrl } from "@/utils";
+import { encodeConnectorMethod, getContract, getDsaAccountAddress, getRpcProviderUrl } from "@/utils";
 import { ethers } from "ethers";
 import { MetaTransaction, OperationType } from "ethers-multisend";
 
+const safeUserRatioGap = "800000000000000000"
 
 export default async function (transaction: Transaction) {
     const transactions: MetaTransaction[] = [];
@@ -27,7 +28,7 @@ export default async function (transaction: Transaction) {
         metadata,
     } = transaction.validateEvent;
 
-    const targetChainProvider = new ethers.providers.JsonRpcProvider(
+    const targetChainProvider = new JsonRpcRetryProvider(
         getRpcProviderUrl(targetChainId as ChainId)
     );
     const targetWallet = new ethers.Wallet(
@@ -35,14 +36,32 @@ export default async function (transaction: Transaction) {
         targetChainProvider
     );
 
-
-    const targetInstListContract = getContract<InstList>(
-        addresses[targetChainId].instList,
-        abi.instList,
-        targetChainProvider,
+    const targetResolverContract = getContract<AaveV2Resolver>(
+        addresses[targetChainId].aaveV2Resolver,
+        abi.aaveV2Resolver,
+        targetWallet
     );
 
-    const targetDsaAddress = await targetInstListContract.accountAddr(targetDsaId)
+    const targetDsaAddress = await getDsaAccountAddress({ dsaId: targetDsaId, chainId: targetChainId, provider: targetChainProvider });
+
+    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 = addresses[targetChainId].dsaAddress;
     const interopAddress = addresses[targetChainId].interopX;
     const contract = getContract<InteropX>(
@@ -110,7 +129,7 @@ export default async function (transaction: Transaction) {
         };
 
         targetSpells.push({
-            connector: spellData.connector,
+            connector: spellData2.connector,
             data: encodeConnectorMethod(spellData2),
         });
     }

package/src/gnosis/actions/aaveV3/index.ts

@@ -0,0 +1,9 @@
+import { Transaction } from "@/db";
+import source from "./source";
+import target from "./target";
+
+
+
+export default async function (transaction: Transaction, type: 'source' | 'target') {
+    return type === 'source' ? source(transaction) : target(transaction);
+}