@dhedge/v2-sdk 1.5.0 → 1.5.1

package/src/config.ts

@@ -26,14 +26,14 @@ export const routerAddress: AddressDappNetworkMap = {
     [Dapp.BALANCER]: "0xBA12222222228d8Ba445958a75a0704d566BF2C8",
     [Dapp.UNISWAPV3]: "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
     [Dapp.ARRAKIS]: "0xbc91a120cCD8F80b819EAF32F0996daC3Fa76a6C",
-    [Dapp.TOROS]: "0x9e080df81d9Db50348ef40F630fAE74f5Aea1f68"
+    [Dapp.TOROS]: "0x42B1DDcFa1c43E06F483BA0Dd1b9cC923043677f"
   },
   [Network.OPTIMISM]: {
     [Dapp.UNISWAPV3]: "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
     [Dapp.SYNTHETIX]: "0x8700dAec35aF8Ff88c16BdF0418774CB3D7599B4",
     [Dapp.AAVEV3]: "0x794a61358D6845594F94dc1DB02A252b5b4814aD",
     [Dapp.ONEINCH]: "0x1111111254760F7ab3F16433eea9304126DCd199",
-    [Dapp.TOROS]: "0x15B7199AA9b9CaE9e611d858ab458aea8D36555B"
+    [Dapp.TOROS]: "0xf8C62BD5f2fEf9E1a329c197F32E77AD6866B022"
   }
 };
 
@@ -49,11 +49,23 @@ export const stakingAddress: AddressDappNetworkMap = {
   [Network.POLYGON]: {
     [Dapp.SUSHISWAP]: "0x0769fd68dFb93167989C6f7254cd0D766Fb2841F",
     [Dapp.BALANCER]: "0x0F3e0c4218b7b0108a3643cFe9D3ec0d4F57c54e",
-    [Dapp.AAVE]: "0x357D51124f59836DeD84c8a1730D72B749d8BC23"
+    [Dapp.AAVE]: "0x357D51124f59836DeD84c8a1730D72B749d8BC23",
+    [Dapp.AAVEV3]: "0x929EC64c34a17401F460460D4B9390518E5B473e"
   },
-  [Network.OPTIMISM]: {}
+  [Network.OPTIMISM]: {
+    [Dapp.AAVEV3]: "0x929EC64c34a17401F460460D4B9390518E5B473e"
+  }
 };
 
+export const aaveAddressProvider: AddressDappNetworkMap = {
+  [Network.POLYGON]: {
+    [Dapp.AAVE]: "0xd05e3E715d945B59290df0ae8eF85c1BdB684744",
+    [Dapp.AAVEV3]: "0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb"
+  },
+  [Network.OPTIMISM]: {
+    [Dapp.AAVEV3]: "0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb"
+  }
+};
 export const nonfungiblePositionManagerAddress: AddressNetworkMap = {
   [Network.POLYGON]: "0xC36442b4a4522E871399CD717aBDD847Ab11FE88",
   [Network.OPTIMISM]: "0xC36442b4a4522E871399CD717aBDD847Ab11FE88"

package/src/entities/pool.ts

@@ -42,6 +42,7 @@ import { FeeAmount } from "@uniswap/v3-sdk";
 import { getUniswapV3SwapTxData } from "../services/uniswap/V3Trade";
 import { getEasySwapperTxData } from "../services/toros/easySwapper";
 import { getOneInchProtocols } from "../services/oneInch/protocols";
+import { getAaveV3ClaimTxData } from "../services/aave/incentives";
 
 export class Pool {
   public readonly poolLogic: Contract;
@@ -813,6 +814,27 @@ export class Pool {
     return tx;
   }
 
+  /**
+   * Claim rewards from Aave platform
+   * @param {string[]} assets Assets invested in Aave
+   * @param {string} rewardAssets Reward token address
+   * @param {any} options Transaction options
+   * @returns {Promise<any>} Transaction
+   */
+  async harvestAaveV3Rewards(
+    assets: string[],
+    rewardAsset: string,
+    options: any = null
+  ): Promise<any> {
+    const claimTxData = await getAaveV3ClaimTxData(this, assets, rewardAsset);
+    const tx = await this.poolLogic.execTransaction(
+      stakingAddress[this.network][Dapp.AAVEV3] as string,
+      claimTxData,
+      options
+    );
+    return tx;
+  }
+
   /**
    * Create UniswapV3 liquidity pool
    * @param {string} assetA First asset

package/src/services/aave/assets.ts

@@ -0,0 +1,26 @@
+import { Dapp, ethers, Pool } from "../..";
+
+import ILendingPool from "../../abi/ILendingPool.json";
+import ILendingPoolV3 from "../../abi/IAaveV3LendingPool.json";
+import { routerAddress } from "../../config";
+
+export async function getAaveAssetsForUnderlying(
+  pool: Pool,
+  dapp: Dapp,
+  assets: string[]
+): Promise<string[]> {
+  const iLendingPool = dapp === Dapp.AAVEV3 ? ILendingPoolV3 : ILendingPool;
+  const lendingPool = new ethers.Contract(
+    routerAddress[pool.network][dapp] as string,
+    iLendingPool.abi,
+    pool.signer
+  );
+
+  const reserveData = await Promise.all(
+    assets.map(e => lendingPool.getReserveData(e))
+  );
+
+  const aTokens = reserveData.map(e => e.aTokenAddress);
+  const debtTokens = reserveData.map(e => e.variableDebtTokenAddress);
+  return aTokens.concat(debtTokens);
+}

package/src/services/aave/incentives.ts

@@ -0,0 +1,23 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { ethers } from "ethers";
+import { Dapp } from "../../types";
+import IAaveV3Incentives from "../../abi/IAaveV3Incentives.json";
+import { Pool } from "../..";
+import { getAaveAssetsForUnderlying } from "./assets";
+
+export async function getAaveV3ClaimTxData(
+  pool: Pool,
+  assets: string[],
+  rewardAsset: string
+): Promise<any> {
+  const iAaveIncentives = new ethers.utils.Interface(IAaveV3Incentives.abi);
+  const aaveAsset = await getAaveAssetsForUnderlying(pool, Dapp.AAVEV3, assets);
+
+  const claimTxData = iAaveIncentives.encodeFunctionData("claimRewards", [
+    aaveAsset,
+    ethers.constants.MaxUint256,
+    pool.address,
+    rewardAsset
+  ]);
+  return claimTxData;
+}

package/src/services/chainLink/price.ts

@@ -1,7 +1,8 @@
-import { ethers, Pool } from "../..";
+import { Dapp, ethers, Pool } from "../..";
 
 import IAaveV3PoolAddressProvider from "../../abi/IAaveV3PoolAddressProvider.json";
 import IPriceOracle from "../../abi/IPriceOracle.json";
+import { aaveAddressProvider } from "../../config";
 
 export async function getChainlinkPriceInUsd(
   pool: Pool,
@@ -10,7 +11,7 @@ export async function getChainlinkPriceInUsd(
   //Workaround as Chainlink doesn't have feed registry on Polygon/Optimism
   //Use oracle from Aave which uses Chainlink
   const lendingPoolAddressProvider = new ethers.Contract(
-    "0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb",
+    aaveAddressProvider[pool.network][Dapp.AAVEV3] as string,
     IAaveV3PoolAddressProvider.abi,
     pool.signer
   );

package/src/test/aave.test.ts

@@ -1,6 +1,6 @@
 import { Dhedge } from "..";
-import { Dapp, Network } from "../types";
-import { TEST_POOL, WETH } from "./constants";
+import { Network } from "../types";
+import { OP, TEST_POOL, USDC, WBTC, WETH } from "./constants";
 
 import { wallet } from "./wallet";
 
@@ -51,17 +51,17 @@ describe("pool", () => {
   //   expect(result).not.toBe(null);
   // });
 
-  it("borrows 0.001 WETH from Aave lending pool", async () => {
-    let result;
-    const pool = await dhedge.loadPool(TEST_POOL);
-    try {
-      result = await pool.borrow(Dapp.AAVEV3, WETH, "1000000000000000");
-      console.log(result);
-    } catch (e) {
-      console.log(e);
-    }
-    expect(result).not.toBe(null);
-  });
+  // it("borrows 0.001 WETH from Aave lending pool", async () => {
+  //   let result;
+  //   const pool = await dhedge.loadPool(TEST_POOL);
+  //   try {
+  //     result = await pool.borrow(Dapp.AAVEV3, WETH, "1000000000000000");
+  //     console.log(result);
+  //   } catch (e) {
+  //     console.log(e);
+  //   }
+  //   expect(result).not.toBe(null);
+  // });
 
   // it("reapys 1USDC to Aave lending pool", async () => {
   //   let result;
@@ -98,4 +98,31 @@ describe("pool", () => {
   //   }
   //   expect(result).not.toBe(null);
   // });
+
+  // it("gets Aave assets for underlying", async () => {
+  //   let result;
+  //   const pool = await dhedge.loadPool(TEST_POOL);
+  //   try {
+  //     result = await getAaveAssetsForUnderlying(pool, Dapp.AAVEV3, [
+  //       USDC,
+  //       WETH
+  //     ]);
+  //     console.log(result);
+  //   } catch (e) {
+  //     console.log(e);
+  //   }
+  //   expect(result).not.toBe(null);
+  // });
+
+  it("claims rewards from AaveV3", async () => {
+    let result;
+    const pool = await dhedge.loadPool(TEST_POOL);
+    try {
+      result = await pool.harvestAaveV3Rewards([USDC, WETH, WBTC], OP);
+      console.log(result);
+    } catch (e) {
+      console.log(e);
+    }
+    expect(result).not.toBe(null);
+  });
 });

package/src/test/constants.ts

@@ -1,6 +1,6 @@
 //Polygon
 // export const USDC = "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174";
-// //export const WETH = "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619";
+// export const WETH = "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619";
 // export const USDT = "0xc2132D05D31c914a87C6611C10748AEb04B58e8F";
 // export const DAI = "0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063";
 // export const TUSD = "0x2e1ad108ff1d8c782fcbbb89aad783ac49586756";
@@ -25,5 +25,6 @@ export const USDC = "0x7F5c764cBc14f9669B88837ca1490cCa17c31607";
 export const DAI = "0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1";
 export const USDy = "0x1ec50880101022c11530a069690f5446d1464592";
 export const WBTC = "0x68f180fcCe6836688e9084f035309E29Bf0A2095";
+export const OP = "4200000000000000000000000000000000000042";
 
 export const TEST_POOL = "TEST_POOL";

package/src/test/wallet.ts

@@ -3,14 +3,14 @@ import { ethers } from "ethers";
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 require("dotenv").config();
 
-// const provider = new ethers.providers.JsonRpcProvider(
-//   `https://opt-mainnet.g.alchemy.com/v2/${process.env.ALCHEMY_PROJECT_ID}`
-// );
-
 const provider = new ethers.providers.JsonRpcProvider(
-  `https://polygon-mainnet.infura.io/v3/${process.env.INFURA_PROJECT_ID}`
+  `https://opt-mainnet.g.alchemy.com/v2/${process.env.ALCHEMY_PROJECT_ID}`
 );
 
+// const provider = new ethers.providers.JsonRpcProvider(
+//   `https://polygon-mainnet.infura.io/v3/${process.env.INFURA_PROJECT_ID}`
+// );
+
 export const wallet = new ethers.Wallet(
   process.env.PRIVATE_KEY as string,
   provider