@dhedge/v2-sdk 1.10.0 → 1.10.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhedge/v2-sdk",
-  "version": "1.10.0",
+  "version": "1.10.2",
   "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"
@@ -77,7 +78,9 @@ export const stakingAddress: AddressDappNetworkMap = {
     [Dapp.AAVE]: "0x357D51124f59836DeD84c8a1730D72B749d8BC23",
     [Dapp.AAVEV3]: "0x929EC64c34a17401F460460D4B9390518E5B473e"
   },
-  [Network.OPTIMISM]: {},
+  [Network.OPTIMISM]: {
+    [Dapp.AAVEV3]: "0x929EC64c34a17401F460460D4B9390518E5B473e"
+  },
   [Network.ARBITRUM]: {},
   [Network.BASE]: {}
 };
@@ -104,7 +107,7 @@ export const nonfungiblePositionManagerAddress: AddressDappNetworkMap = {
   },
   [Network.OPTIMISM]: {
     [Dapp.UNISWAPV3]: "0xC36442b4a4522E871399CD717aBDD847Ab11FE88",
-    [Dapp.VELODROMECL]: "0xbb5dfe1380333cee4c2eebd7202c80de2256adf4"
+    [Dapp.VELODROMECL]: "0x416b433906b1B72FA758e166e239c43d68dC6F29"
   },
   [Network.ARBITRUM]: {
     [Dapp.UNISWAPV3]: "0xC36442b4a4522E871399CD717aBDD847Ab11FE88"

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";
@@ -1085,10 +1083,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(
@@ -1149,11 +1145,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(

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/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,61 +49,6 @@ 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,
   tokenId: string

package/src/test/constants.ts

@@ -76,7 +76,7 @@ export const CONTRACT_ADDRESS = {
     //
     ARRAKIS_USDC_WETH_GAUGE: "",
     ARRAKIS_USDC_WETH_LP: "",
-    VELODROME_CL_USDC_WETH_GAUGE: "0x8d8d1CdDD5960276A1CDE360e7b5D210C3387948",
+    VELODROME_CL_USDC_WETH_GAUGE: "0xa75127121d28a9BF848F3B70e7Eea26570aa7700",
     VELO: "0x9560e827aF36c94D2Ac33a39bCE1Fe78631088Db"
   },
   [Network.ARBITRUM]: {

package/src/test/oneInch.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
-import BigNumber from "bignumber.js";
+
 import { Dhedge, Pool } from "..";
-import { routerAddress } from "../config";
+
 import { Dapp, Network } from "../types";
 import { CONTRACT_ADDRESS, MAX_AMOUNT, TEST_POOL } from "./constants";
 import {
@@ -12,6 +12,9 @@ import {
 } from "./utils/testingHelper";
 import { allowanceDelta, balanceDelta } from "./utils/token";
 import { getTxOptions } from "./txOptions";
+import BigNumber from "bignumber.js";
+import { routerAddress } from "../config";
+// import { routerAddress } from "../config";
 
 const testOneInch = ({ wallet, network, provider }: TestingRunParams) => {
   const USDC = CONTRACT_ADDRESS[network].USDC;
@@ -57,7 +60,7 @@ const testOneInch = ({ wallet, network, provider }: TestingRunParams) => {
         USDC,
         WETH,
         "2000000",
-        0.5,
+        1,
         await getTxOptions(network),
         true
       );
@@ -73,7 +76,7 @@ const testOneInch = ({ wallet, network, provider }: TestingRunParams) => {
           USDC,
           WETH,
           "200000000",
-          0.5,
+          1,
           await getTxOptions(network),
           true
         );
@@ -106,12 +109,14 @@ testingHelper({
   testingRun: testOneInch
 });
 
-testingHelper({
-  network: Network.POLYGON,
-  testingRun: testOneInch
-});
+// testingHelper({
+//   network: Network.POLYGON,
+//   onFork: false,
+//   testingRun: testOneInch
+// });
 
-testingHelper({
-  network: Network.BASE,
-  testingRun: testOneInch
-});
+// testingHelper({
+//   network: Network.BASE,
+//   onFork: false,
+//   testingRun: testOneInch
+// });

package/src/test/utils/testingHelper.ts

@@ -1,4 +1,4 @@
-import { BigNumber, ethers } from "ethers";
+import { BigNumber, Contract, ethers } from "ethers";
 import { Network } from "../../types";
 import { getWalletData } from "../wallet";
 import {
@@ -6,6 +6,8 @@ import {
   USDC_BALANCEOF_SLOT,
   WETH_BALANCEOF_SLOT
 } from "../constants";
+import { Pool } from "../../entities";
+import AssetHandler from "../../abi/AssetHandler.json";
 
 export type TestingRunParams = {
   network: Network;
@@ -16,13 +18,14 @@ export type TestingRunParams = {
 
 type TestHelperParams = {
   testingRun: (testingRunParams: TestingRunParams) => void;
-} & { network: Network };
+} & { network: Network; onFork?: boolean };
 
 export const testingHelper = ({
   network,
+  onFork = true,
   testingRun
 }: TestHelperParams): void => {
-  const { wallet, provider, rpcUrl } = getWalletData(network);
+  const { wallet, provider, rpcUrl } = getWalletData(network, onFork);
   testingRun({ network, wallet, provider, rpcUrl });
 };
 
@@ -119,3 +122,52 @@ export const setWETHAmount = async ({
 export const wait = (seconds: number): Promise<void> => {
   return new Promise(resolve => setTimeout(resolve, seconds * 1000));
 };
+
+export const runWithImpersonateAccount = async (
+  {
+    account,
+    provider
+  }: {
+    account: string;
+    provider: ethers.providers.JsonRpcProvider;
+  },
+  fnToRun: ({ signer }: { signer: ethers.providers.JsonRpcSigner }) => void
+): Promise<void> => {
+  await provider.send("hardhat_impersonateAccount", [account]);
+
+  await provider.send("hardhat_setBalance", [
+    account,
+    ethers.utils.hexValue(ethers.utils.parseEther("1000"))
+  ]);
+  const signer = provider.getSigner(account);
+  await fnToRun({ signer });
+
+  await provider.send("hardhat_stopImpersonatingAccount", [account]);
+};
+
+export const setChainlinkTimeout = async (
+  {
+    pool,
+    provider
+  }: {
+    pool: Pool;
+    provider: ethers.providers.JsonRpcProvider;
+  },
+  time: number
+): Promise<void> => {
+  const assetHandler = await pool.factory.callStatic.getAssetHandler();
+  const assetHandlerContract = new Contract(
+    assetHandler,
+    AssetHandler.abi,
+    provider
+  );
+  const ownerOfAssetHandler = await assetHandlerContract.callStatic.owner();
+  await runWithImpersonateAccount(
+    { provider, account: ownerOfAssetHandler },
+    async ({ signer }) => {
+      await assetHandlerContract
+        .connect(signer)
+        .functions.setChainlinkTimeout(time);
+    }
+  );
+};