@dhedge/v2-sdk 1.10.1 → 1.10.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhedge/v2-sdk",
-  "version": "1.10.1",
+  "version": "1.10.3",
   "license": "MIT",
   "description": "🛠 An SDK for building applications on top of dHEDGE V2",
   "main": "dist/index.js",
@@ -34,7 +34,7 @@
     "@size-limit/preset-small-lib": "^5.0.1",
     "@types/jest": "^28.1.7",
     "@types/lodash": "^4.14.178",
-    "hardhat": "^2.12.6",
+    "hardhat": "2.19.3",
     "husky": "^7.0.1",
     "jest": "^28.1.3",
     "size-limit": "^5.0.1",

package/src/abi/AssetHandler.json

@@ -0,0 +1,286 @@
+{
+  "abi": [
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint16",
+          "name": "assetType",
+          "type": "uint16"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "aggregator",
+          "type": "address"
+        }
+      ],
+      "name": "AddedAsset",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "previousOwner",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "newOwner",
+          "type": "address"
+        }
+      ],
+      "name": "OwnershipTransferred",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        }
+      ],
+      "name": "RemovedAsset",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "_chainlinkTimeout",
+          "type": "uint256"
+        }
+      ],
+      "name": "SetChainlinkTimeout",
+      "type": "event"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        },
+        {
+          "internalType": "uint16",
+          "name": "assetType",
+          "type": "uint16"
+        },
+        {
+          "internalType": "address",
+          "name": "aggregator",
+          "type": "address"
+        }
+      ],
+      "name": "addAsset",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "components": [
+            {
+              "internalType": "address",
+              "name": "asset",
+              "type": "address"
+            },
+            {
+              "internalType": "uint16",
+              "name": "assetType",
+              "type": "uint16"
+            },
+            {
+              "internalType": "address",
+              "name": "aggregator",
+              "type": "address"
+            }
+          ],
+          "internalType": "struct IAssetHandler.Asset[]",
+          "name": "assets",
+          "type": "tuple[]"
+        }
+      ],
+      "name": "addAssets",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "name": "assetTypes",
+      "outputs": [
+        {
+          "internalType": "uint16",
+          "name": "",
+          "type": "uint16"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "chainlinkTimeout",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        }
+      ],
+      "name": "getUSDPrice",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "price",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "components": [
+            {
+              "internalType": "address",
+              "name": "asset",
+              "type": "address"
+            },
+            {
+              "internalType": "uint16",
+              "name": "assetType",
+              "type": "uint16"
+            },
+            {
+              "internalType": "address",
+              "name": "aggregator",
+              "type": "address"
+            }
+          ],
+          "internalType": "struct IAssetHandler.Asset[]",
+          "name": "assets",
+          "type": "tuple[]"
+        }
+      ],
+      "name": "initialize",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "owner",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "name": "priceAggregators",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "asset",
+          "type": "address"
+        }
+      ],
+      "name": "removeAsset",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "renounceOwnership",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "newTimeoutPeriod",
+          "type": "uint256"
+        }
+      ],
+      "name": "setChainlinkTimeout",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "newOwner",
+          "type": "address"
+        }
+      ],
+      "name": "transferOwnership",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    }
+  ]
+}

package/src/config.ts

@@ -25,7 +25,7 @@ export const routerAddress: AddressDappNetworkMap = {
     [Dapp.SUSHISWAP]: "0x1b02dA8Cb0d097eB8D57A175b88c7D8b47997506",
     [Dapp.AAVE]: "0x8dFf5E27EA6b7AC08EbFdf9eB090F32ee9a30fcf",
     [Dapp.AAVEV3]: "0x794a61358D6845594F94dc1DB02A252b5b4814aD",
-    [Dapp.ONEINCH]: "0x1111111254EEB25477B68fb85Ed929f73A960582",
+    [Dapp.ONEINCH]: "0x111111125421ca6dc452d289314280a0f8842a65",
     [Dapp.QUICKSWAP]: "0xa5E0829CaCEd8fFDD4De3c43696c57F7D7A678ff",
     [Dapp.BALANCER]: "0xBA12222222228d8Ba445958a75a0704d566BF2C8",
     [Dapp.UNISWAPV3]: "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
@@ -37,7 +37,7 @@ export const routerAddress: AddressDappNetworkMap = {
     [Dapp.UNISWAPV3]: "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
     [Dapp.SYNTHETIX]: "0x8700dAec35aF8Ff88c16BdF0418774CB3D7599B4",
     [Dapp.AAVEV3]: "0x794a61358D6845594F94dc1DB02A252b5b4814aD",
-    [Dapp.ONEINCH]: "0x1111111254EEB25477B68fb85Ed929f73A960582",
+    [Dapp.ONEINCH]: "0x111111125421ca6dc452d289314280a0f8842a65",
     [Dapp.TOROS]: "0x3988513793bCE39f0167064A9F7fC3617FaF35AB",
     [Dapp.VELODROME]: "0x9c12939390052919aF3155f41Bf4160Fd3666A6f",
     [Dapp.VELODROMEV2]: "0xa062ae8a9c5e11aaa026fc2670b0d65ccc8b2858",
@@ -46,14 +46,15 @@ export const routerAddress: AddressDappNetworkMap = {
     [Dapp.ZEROEX]: "0xdef1abe32c034e558cdd535791643c58a13acc10"
   },
   [Network.ARBITRUM]: {
-    [Dapp.ONEINCH]: "0x1111111254EEB25477B68fb85Ed929f73A960582",
+    [Dapp.ONEINCH]: "0x111111125421ca6dc452d289314280a0f8842a65",
     [Dapp.UNISWAPV3]: "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
     [Dapp.AAVEV3]: "0x794a61358D6845594F94dc1DB02A252b5b4814aD",
     [Dapp.BALANCER]: "0xBA12222222228d8Ba445958a75a0704d566BF2C8",
-    [Dapp.RAMSES]: "0xaaa87963efeb6f7e0a2711f397663105acb1805e"
+    [Dapp.RAMSES]: "0xaaa87963efeb6f7e0a2711f397663105acb1805e",
+    [Dapp.ZEROEX]: "0xdef1c0ded9bec7f1a1670819833240f027b25eff"
   },
   [Network.BASE]: {
-    [Dapp.ONEINCH]: "0x1111111254EEB25477B68fb85Ed929f73A960582",
+    [Dapp.ONEINCH]: "0x111111125421ca6dc452d289314280a0f8842a65",
     [Dapp.ZEROEX]: "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
     [Dapp.AERODROME]: "0xcF77a3Ba9A5CA399B7c97c74d54e5b1Beb874E43",
     [Dapp.AAVEV3]: "0xA238Dd80C259a72e81d7e4664a9801593F98d1c5"
@@ -106,13 +107,14 @@ export const nonfungiblePositionManagerAddress: AddressDappNetworkMap = {
   },
   [Network.OPTIMISM]: {
     [Dapp.UNISWAPV3]: "0xC36442b4a4522E871399CD717aBDD847Ab11FE88",
-    [Dapp.VELODROMECL]: "0xbb5dfe1380333cee4c2eebd7202c80de2256adf4"
+    [Dapp.VELODROMECL]: "0x416b433906b1B72FA758e166e239c43d68dC6F29"
   },
   [Network.ARBITRUM]: {
     [Dapp.UNISWAPV3]: "0xC36442b4a4522E871399CD717aBDD847Ab11FE88"
   },
   [Network.BASE]: {
-    [Dapp.UNISWAPV3]: "0x03a520b32C04BF3bEEf7BEb72E919cf822Ed34f1"
+    [Dapp.UNISWAPV3]: "0x03a520b32C04BF3bEEf7BEb72E919cf822Ed34f1",
+    [Dapp.AERODROMECL]: "0x827922686190790b37229fd06084350e74485b72"
   }
 };
 

package/src/entities/pool.ts

@@ -44,8 +44,6 @@ import { getEasySwapperTxData } from "../services/toros/easySwapper";
 import { getAaveV3ClaimTxData } from "../services/aave/incentives";
 import {
   getVelodromeAddLiquidityTxData,
-  getVelodromeCLDecreaseStakedLiquidityTxData,
-  getVelodromeCLIncreaseStakedLiquidityTxData,
   getVelodromeClOwner,
   getVelodromeRemoveLiquidityTxData
 } from "../services/velodrome/liquidity";
@@ -572,6 +570,7 @@ export class Pool {
       case Dapp.VELODROMEV2:
       case Dapp.AERODROME:
       case Dapp.VELODROMECL:
+      case Dapp.AERODROMECL:
         stakeTxData = getVelodromeStakeTxData(amount, true);
         break;
       default:
@@ -981,7 +980,7 @@ export class Pool {
 
   /**
    * Create UniswapV3 liquidity pool
-   * @param {dapp} Platform either UniswapV3 or VelodromeCL
+   * @param {dapp} Platform UniswapV3, VelodromeCL or AerodromeCL
    * @param {string} assetA First asset
    * @param {string} assetB Second asset
    * @param {BigNumber | string} amountA Amount first asset
@@ -996,7 +995,7 @@ export class Pool {
    * @returns {Promise<any>} Transaction
    */
   async addLiquidityUniswapV3(
-    dapp: Dapp.UNISWAPV3 | Dapp.VELODROMECL,
+    dapp: Dapp.UNISWAPV3 | Dapp.VELODROMECL | Dapp.AERODROMECL,
     assetA: string,
     assetB: string,
     amountA: BigNumber | string,
@@ -1014,8 +1013,8 @@ export class Pool {
       (minTick === null || maxTick === null)
     )
       throw new Error("Need to provide price or tick range");
-    if ((minPrice || maxPrice) && dapp === Dapp.VELODROMECL)
-      throw new Error("no price conversion for Velodrome CL");
+    if ((minPrice || maxPrice) && dapp !== Dapp.UNISWAPV3)
+      throw new Error("no price conversion for Aerodrome/Velodrome CL");
 
     const mintTxData = await getUniswapV3MintTxData(
       dapp,
@@ -1067,7 +1066,8 @@ export class Pool {
         dappAddress = nonfungiblePositionManagerAddress[this.network][dapp];
         break;
       case Dapp.VELODROMECL:
-        const tokenIdOwner = await getVelodromeClOwner(this, tokenId);
+      case Dapp.AERODROMECL:
+        const tokenIdOwner = await getVelodromeClOwner(this, dapp, tokenId);
         if (tokenIdOwner.toLowerCase() === this.address.toLowerCase()) {
           dappAddress = nonfungiblePositionManagerAddress[this.network][dapp];
         } else {
@@ -1085,10 +1085,8 @@ export class Pool {
     if (!isStaked) {
       txData = await getDecreaseLiquidityTxData(this, dapp, tokenId, amount);
     } else {
-      txData = await getVelodromeCLDecreaseStakedLiquidityTxData(
-        this,
-        tokenId,
-        amount
+      throw new Error(
+        "unsupported decreaseStakedLiquidity: unstake first to decrease lp"
       );
     }
     const tx = await getPoolTxOrGasEstimate(
@@ -1125,7 +1123,8 @@ export class Pool {
         dappAddress = nonfungiblePositionManagerAddress[this.network][dapp];
         break;
       case Dapp.VELODROMECL:
-        const tokenIdOwner = await getVelodromeClOwner(this, tokenId);
+      case Dapp.AERODROMECL:
+        const tokenIdOwner = await getVelodromeClOwner(this, dapp, tokenId);
         if (tokenIdOwner.toLowerCase() === this.address.toLowerCase()) {
           dappAddress = nonfungiblePositionManagerAddress[this.network][dapp];
         } else {
@@ -1149,11 +1148,8 @@ export class Pool {
         amountB
       );
     } else {
-      txData = await getVelodromeCLIncreaseStakedLiquidityTxData(
-        this,
-        tokenId,
-        amountA,
-        amountB
+      throw new Error(
+        "unsupported increaseStakedLiquidity: unstake first to increase lp"
       );
     }
     const tx = await getPoolTxOrGasEstimate(
@@ -1208,7 +1204,8 @@ export class Pool {
         txData = getVelodromeClaimTxData(this, tokenId, true);
         break;
       case Dapp.VELODROMECL:
-        const tokenIdOwner = await getVelodromeClOwner(this, tokenId);
+      case Dapp.AERODROMECL:
+        const tokenIdOwner = await getVelodromeClOwner(this, dapp, tokenId);
         if (tokenIdOwner.toLowerCase() === this.address.toLowerCase()) {
           contractAddress =
             nonfungiblePositionManagerAddress[this.network][dapp];

package/src/services/oneInch/index.ts

@@ -4,7 +4,7 @@ import { ApiError, ethers } from "../..";
 import { networkChainIdMap } from "../../config";
 import { Pool } from "../../entities";
 
-const oneInchBaseUrl = "https://api.1inch.dev/swap/v5.2/";
+const oneInchBaseUrl = "https://api.1inch.dev/swap/v6.0/";
 
 export async function getOneInchSwapTxData(
   pool: Pool,
@@ -17,14 +17,23 @@ export async function getOneInchSwapTxData(
     throw new Error("ONEINCH_API_KEY not configured in .env file");
 
   const chainId = networkChainIdMap[pool.network];
-  const apiUrl = `${oneInchBaseUrl}${chainId}/swap?src=${assetFrom}&dst=${assetTo}&amount=${amountIn.toString()}&from=${
-    pool.address
-  }&slippage=${slippage.toString()}&disableEstimate=true`;
+  const apiUrl = `${oneInchBaseUrl}${chainId}/swap`;
+  const params = {
+    src: assetFrom,
+    dst: assetTo,
+    amount: amountIn.toString(),
+    from: pool.address,
+    origin: pool.signer.address,
+    slippage: slippage,
+    disableEstimate: true,
+    usePermit2: false
+  };
   try {
     const response = await axios.get(apiUrl, {
       headers: {
         Authorization: `Bearer ${process.env.ONEINCH_API_KEY}`
-      }
+      },
+      params
     });
     return response.data.tx.data;
   } catch (e) {

package/src/services/uniswap/V3Liquidity.ts

@@ -70,7 +70,7 @@ export function tryParseTick(
 }
 
 export async function getUniswapV3MintTxData(
-  dapp: Dapp.UNISWAPV3 | Dapp.VELODROMECL,
+  dapp: Dapp.UNISWAPV3 | Dapp.VELODROMECL | Dapp.AERODROMECL,
   pool: Pool,
   assetA: string,
   assetB: string,
@@ -147,7 +147,7 @@ export async function getUniswapV3MintTxData(
     INonfungiblePositionManager.abi
   );
 
-  if (dapp === Dapp.VELODROMECL) {
+  if (dapp === Dapp.VELODROMECL || dapp === Dapp.AERODROMECL) {
     iNonfungiblePositionManager = new ethers.utils.Interface(
       IVeldodromePositionManager.abi
     );
@@ -162,7 +162,7 @@ export async function getUniswapV3MintTxData(
 }
 
 export async function getUniswapV3Liquidity(
-  dapp: Dapp.UNISWAPV3 | Dapp.VELODROMECL,
+  dapp: Dapp.UNISWAPV3 | Dapp.VELODROMECL | Dapp.AERODROMECL,
   tokenId: string,
   pool: Pool
 ): Promise<BigNumber> {
@@ -184,7 +184,11 @@ export async function getIncreaseLiquidityTxData(
   amountB: ethers.BigNumber | string
 ): Promise<any> {
   let txData;
-  if (dapp === Dapp.UNISWAPV3 || dapp === Dapp.VELODROMECL) {
+  if (
+    dapp === Dapp.UNISWAPV3 ||
+    dapp === Dapp.VELODROMECL ||
+    dapp === Dapp.AERODROMECL
+  ) {
     const abi = new ethers.utils.Interface(INonfungiblePositionManager.abi);
     txData = abi.encodeFunctionData(Transaction.INCREASE_LIQUIDITY, [
       [tokenId, amountA, amountB, 0, 0, await getDeadline(pool)]
@@ -214,7 +218,11 @@ export async function getDecreaseLiquidityTxData(
   amount = 100
 ): Promise<any> {
   let txData;
-  if (dapp === Dapp.UNISWAPV3 || dapp === Dapp.VELODROMECL) {
+  if (
+    dapp === Dapp.UNISWAPV3 ||
+    dapp === Dapp.VELODROMECL ||
+    dapp === Dapp.AERODROMECL
+  ) {
     const abi = new ethers.utils.Interface(INonfungiblePositionManager.abi);
     const liquidity = (await getUniswapV3Liquidity(dapp, tokenId, pool))
       .times(amount)

package/src/services/velodrome/liquidity.ts

@@ -1,11 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { ethers } from "ethers";
 import IVelodromeRouter from "../../abi/IVeldodromeRouter.json";
-import IVelodromeCLGauge from "../../abi/IVelodromeCLGauge.json";
 import { Pool } from "../../entities";
 import { Dapp, Transaction } from "../../types";
 import { getDeadline } from "../../utils/deadline";
-import { getUniswapV3Liquidity } from "../uniswap/V3Liquidity";
 import { nonfungiblePositionManagerAddress } from "../../config";
 import INonfungiblePositionManager from "../../abi/INonfungiblePositionManager.json";
 
@@ -51,68 +49,14 @@ export async function getVelodromeRemoveLiquidityTxData(
   ]);
 }
 
-export async function getVelodromeCLDecreaseStakedLiquidityTxData(
-  pool: Pool,
-  tokenId: string,
-  amount: number
-): Promise<any> {
-  const abi = new ethers.utils.Interface(IVelodromeCLGauge.abi);
-  const liquidity = (
-    await getUniswapV3Liquidity(Dapp.VELODROMECL, tokenId, pool)
-  )
-    .times(amount)
-    .div(100);
-
-  return abi.encodeFunctionData("decreaseStakedLiquidity", [
-    tokenId,
-    liquidity.toFixed(0),
-    0,
-    0,
-    await getDeadline(pool)
-  ]);
-}
-
-export async function getVelodromeCLIncreaseStakedLiquidityTxData(
-  pool: Pool,
-  tokenId: string,
-  amountA: ethers.BigNumber | string,
-  amountB: ethers.BigNumber | string
-): Promise<any> {
-  const abi = new ethers.utils.Interface(IVelodromeCLGauge.abi);
-  return abi.encodeFunctionData("increaseStakedLiquidity", [
-    tokenId,
-    amountA,
-    amountB,
-    0,
-    0,
-    await getDeadline(pool)
-  ]);
-}
-
-export async function getVelodromeCLIncreaseLiquidityTxData(
-  pool: Pool,
-  tokenId: string,
-  amountA: ethers.BigNumber | string,
-  amountB: ethers.BigNumber | string
-): Promise<any> {
-  const abi = new ethers.utils.Interface(IVelodromeCLGauge.abi);
-  return abi.encodeFunctionData("increaseStakedLiquidity", [
-    tokenId,
-    amountA,
-    amountB,
-    0,
-    0,
-    await getDeadline(pool)
-  ]);
-}
-
 export async function getVelodromeClOwner(
   pool: Pool,
+  dapp: Dapp.VELODROMECL | Dapp.AERODROMECL,
   tokenId: string
 ): Promise<string> {
   const iNonfungiblePositionManager = new ethers.Contract(
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    nonfungiblePositionManagerAddress[pool.network][Dapp.VELODROMECL]!,
+    nonfungiblePositionManagerAddress[pool.network][dapp]!,
     INonfungiblePositionManager.abi,
     pool.signer
   );