@instadapp/interop-x 0.0.0-dev.8cb1c22 → 0.0.0-dev.909c44a

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

@@ -83,6 +83,22 @@ export class Transaction extends Model<
     metadata: string;
   }>;
 
+  declare executeEvent: CreationOptional<{
+    sourceSpells: Array<{ connector: string; data: string }>;
+    targetSpells: Array<{ connector: string; data: string }>;
+    position: IPosition;
+    actionId: string;
+    actionIdHashHash: string;
+    actionIdHash: string;
+    sourceSender: string;
+    sourceDsaId: string;
+    targetDsaId: string;
+    sourceChainId: number;
+    targetChainId: number;
+    vnonce: string;
+    metadata: string;
+  }>;
+
   declare status: CreationOptional<string>;
 
   declare createdAt: CreationOptional<Date>;
@@ -127,7 +143,7 @@ Transaction.init(
       type: DataTypes.DATE,
       defaultValue: Date.now(),
     },
-    sourceDelayUntil: DataTypes.STRING,
+    sourceDelayUntil: DataTypes.DATE,
 
     targetChainId: DataTypes.NUMBER,
     targetDsaId: DataTypes.STRING,
@@ -158,6 +174,11 @@ Transaction.init(
       allowNull: true,
     },
 
+    executeEvent: {
+      type: DataTypes.JSON,
+      allowNull: true,
+    },
+
     status: {
       type: DataTypes.STRING,
       defaultValue: "pending",

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,12 +2,14 @@ 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[] = [];
@@ -26,15 +28,41 @@ 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(
         config.privateKey,
         targetChainProvider
     );
+
+    const targetResolverContract = getContract<AaveV2Resolver>(
+        addresses[targetChainId].aaveV2Resolver,
+        abi.aaveV2Resolver,
+        targetWallet
+    );
+
+    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 sourceUserAddress = Number(sourceDsaId) == 0 ? sourceSender : dsaAddress;
     const interopAddress = addresses[targetChainId].interopX;
     const contract = getContract<InteropX>(
         interopAddress,
@@ -60,7 +88,7 @@ export default async function (transaction: Transaction) {
         let spellDataBasicWithdraw = {
             connector: "BASIC-A",
             method: "withdraw",
-            args: [supplyToken.targetToken, supplyToken.amount, sourceUserAddress, "0", "0"],
+            args: [supplyToken.targetToken, supplyToken.amount, targetDsaAddress, "0", "0"],
         };
 
         commonSpells.push({
@@ -94,14 +122,14 @@ export default async function (transaction: Transaction) {
             args: [
                 withdrawToken.targetToken,
                 withdrawToken.amount,
-                interopAddress,
+                dsaAddress,
                 "0",
                 "0",
             ],
         };
 
         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);
+}

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

@@ -0,0 +1,119 @@
+import abi from "@/abi";
+import config from "@/config";
+import { addresses } from "@/constants";
+import { Transaction } from "@/db";
+import { JsonRpcRetryProvider } from "@/providers";
+import { InteropX } from "@/typechain";
+import { ChainId } from "@/types";
+import { encodeConnectorMethod, getContract, getRpcProviderUrl } from "@/utils";
+import { ethers } from "ethers";
+import { MetaTransaction, OperationType } from "ethers-multisend";
+
+export default async function (transaction: Transaction) {
+  const transactions: MetaTransaction[] = [];
+  const logs: any[] = [];
+
+  const {
+    position,
+    actionId,
+    actionIdHashHash,
+    sourceSender,
+    sourceDsaId,
+    targetDsaId,
+    sourceChainId,
+    targetChainId,
+    vnonce,
+    metadata,
+  } = transaction.submitEvent;
+
+  const sourceChainProvider = new JsonRpcRetryProvider(
+    getRpcProviderUrl(sourceChainId as ChainId)
+  );
+  const sourceWallet = new ethers.Wallet(
+    config.privateKey,
+    sourceChainProvider
+  );
+  const dsaAddress = addresses[sourceChainId].dsaAddress;
+  const sourceUserAddress =
+    Number(sourceDsaId) == 0 ? sourceSender : dsaAddress;
+  const interopAddress = addresses[sourceChainId].interopX;
+  const contract = getContract<InteropX>(
+    interopAddress,
+    abi.interopX,
+    sourceWallet
+  );
+
+  const sourceSpells: any[] = [];
+  const commonSpells: any[] = [];
+
+  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: encodeConnectorMethod(spellData),
+    });
+
+    let spellDataBasicWithdraw = {
+      connector: "BASIC-A",
+      method: "withdraw",
+      args: [withdraw.sourceToken, withdraw.amount, sourceUserAddress, "0", "0"],
+    };
+
+    commonSpells.push({
+      connector: spellDataBasicWithdraw.connector,
+      data: 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: encodeConnectorMethod(spellDataWithdraw),
+    });
+
+    let spellDataBasicWithdraw = {
+      connector: "BASIC-A",
+      method: "withdraw",
+      args: [supply.sourceToken, supply.amount, dsaAddress, "0", "0"],
+    };
+
+    sourceSpells.push({
+      connector: spellDataBasicWithdraw.connector,
+      data: 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: OperationType.Call,
+  });
+
+  return { transactions, logs };
+}

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

@@ -0,0 +1,142 @@
+import abi from "@/abi";
+import config from "@/config";
+import { addresses } from "@/constants";
+import { Transaction } from "@/db";
+import { JsonRpcRetryProvider } from "@/providers";
+import { InteropX } from "@/typechain";
+import { InstList } from "@/typechain/InstList";
+import { ChainId } from "@/types";
+import { encodeConnectorMethod, getContract, getRpcProviderUrl } from "@/utils";
+import { ethers } from "ethers";
+import { MetaTransaction, OperationType } from "ethers-multisend";
+
+
+export default async function (transaction: Transaction) {
+    const transactions: MetaTransaction[] = [];
+    const logs: any[] = [];
+
+    const {
+        sourceSpells,
+        position,
+        actionId,
+        sourceSender,
+        sourceDsaId,
+        targetDsaId,
+        sourceChainId,
+        targetChainId,
+        vnonce,
+        metadata,
+    } = transaction.validateEvent;
+
+    const targetChainProvider = new JsonRpcRetryProvider(
+        getRpcProviderUrl(targetChainId as ChainId)
+    );
+    const targetWallet = new ethers.Wallet(
+        config.privateKey,
+        targetChainProvider
+    );
+
+
+    const targetInstListContract = getContract<InstList>(
+        addresses[targetChainId].instList,
+        abi.instList,
+        targetChainProvider,
+    );
+
+    const targetDsaAddress = await targetInstListContract.accountAddr(targetDsaId)
+    const dsaAddress = addresses[targetChainId].dsaAddress;
+    const interopAddress = addresses[targetChainId].interopX;
+    const contract = getContract<InteropX>(
+        interopAddress,
+        abi.interopX,
+        targetWallet
+    );
+
+    const targetSpells: any[] = [];
+    const commonSpells: any[] = [];
+
+    for (const supplyToken of position.supply) {
+        let spellData = {
+            connector: "AAVE-V3-A",
+            method: "deposit",
+            args: [supplyToken.targetToken, supplyToken.amount, "0", "0"],
+        };
+
+        targetSpells.push({
+            connector: spellData.connector,
+            data: encodeConnectorMethod(spellData),
+        });
+
+        let spellDataBasicWithdraw = {
+            connector: "BASIC-A",
+            method: "withdraw",
+            args: [supplyToken.targetToken, supplyToken.amount, targetDsaAddress, "0", "0"],
+        };
+
+        commonSpells.push({
+            connector: spellDataBasicWithdraw.connector,
+            data: encodeConnectorMethod(spellDataBasicWithdraw),
+        });
+    }
+
+    for (const withdrawToken of position.withdraw) {
+
+        let spellData = {
+            connector: "AAVE-V3-A",
+            method: "borrow",
+            args: [
+                withdrawToken.targetToken,
+                withdrawToken.amount,
+                "2",
+                "0",
+                "0",
+            ],
+        };
+
+        targetSpells.push({
+            connector: spellData.connector,
+            data: encodeConnectorMethod(spellData),
+        });
+
+        let spellData2 = {
+            connector: "BASIC-A",
+            method: "withdraw",
+            args: [
+                withdrawToken.targetToken,
+                withdrawToken.amount,
+                dsaAddress,
+                "0",
+                "0",
+            ],
+        };
+
+        targetSpells.push({
+            connector: spellData2.connector,
+            data: encodeConnectorMethod(spellData2),
+        });
+    }
+
+    const { data } = await contract.populateTransaction.targetAction(
+        sourceSpells,
+        targetSpells,
+        commonSpells,
+        position,
+        actionId,
+        sourceSender,
+        sourceDsaId,
+        targetDsaId,
+        sourceChainId,
+        targetChainId,
+        vnonce,
+        metadata
+    );
+
+    transactions.push({
+        to: interopAddress,
+        data: data!,
+        value: "0",
+        operation: OperationType.Call,
+    });
+
+    return { transactions, logs }
+}

package/src/gnosis/actions/index.ts

@@ -1,5 +1,7 @@
 import aaveV2 from "./aaveV2"
+import aaveV3 from "./aaveV3"
 
 export default {
     'A:AAVE-V2:AAVE-V2': aaveV2,
+    'A:AAVE-V3:AAVE-V3': aaveV3,
 }

package/src/index.ts

@@ -82,6 +82,7 @@ import { startPeer, protocol, peerPool } from "@/net";
 import { startApiServer } from '@/api';
 import { Transaction } from './db';
 import { shortenHash } from './utils';
+import './crons';
 
 async function main() {
 

package/src/providers/index.ts

@@ -0,0 +1 @@
+export * from './retry-provider';