@dhedge/v2-sdk 1.10.16 → 1.11.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhedge/v2-sdk",
-  "version": "1.10.16",
+  "version": "1.11.1",
   "license": "MIT",
   "description": "🛠 An SDK for building applications on top of dHEDGE V2",
   "main": "dist/index.js",
@@ -23,7 +23,8 @@
     "fork:polygon": "hardhat node --port 8542 --fork $(grep POLYGON_URL .env | cut -d '=' -f2)",
     "fork:optimism": "hardhat node --port 8544 --fork $(grep OPTIMISM_URL .env | cut -d '=' -f2)",
     "fork:arbitrum": "hardhat node --port 8540 --fork $(grep ARBITRUM_URL .env | cut -d '=' -f2)",
-    "fork:base": "hardhat node --port 8546 --fork $(grep BASE_URL .env | cut -d '=' -f2)"
+    "fork:base": "hardhat node --port 8546 --fork $(grep BASE_URL .env | cut -d '=' -f2)",
+    "fork:ethereum": "hardhat node --port 8547 --fork $(grep ETHEREUM_URL .env | cut -d '=' -f2)"
   },
   "husky": {
     "hooks": {

package/src/abi/fluid/IFToken.json

@@ -0,0 +1,27 @@
+[
+  {
+    "inputs": [
+      { "internalType": "uint256", "name": "assets_", "type": "uint256" },
+      { "internalType": "address", "name": "receiver_", "type": "address" }
+    ],
+    "name": "deposit",
+    "outputs": [
+      { "internalType": "uint256", "name": "shares_", "type": "uint256" }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "uint256", "name": "shares_", "type": "uint256" },
+      { "internalType": "address", "name": "receiver_", "type": "address" },
+      { "internalType": "address", "name": "owner_", "type": "address" }
+    ],
+    "name": "redeem",
+    "outputs": [
+      { "internalType": "uint256", "name": "assets_", "type": "uint256" }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]

package/src/config.ts

@@ -18,7 +18,7 @@ export const factoryAddress: AddressNetworkMap = {
   [Network.OPTIMISM]: "0x5e61a079A178f0E5784107a4963baAe0c5a680c6",
   [Network.ARBITRUM]: "0xfffb5fb14606eb3a548c113026355020ddf27535",
   [Network.BASE]: "0x49Afe3abCf66CF09Fab86cb1139D8811C8afe56F",
-  [Network.SONIC]: ""
+  [Network.ETHEREUM]: "0x96D33bCF84DdE326014248E2896F79bbb9c13D6d"
 };
 
 export const routerAddress: AddressDappNetworkMap = {
@@ -65,10 +65,11 @@ export const routerAddress: AddressDappNetworkMap = {
     [Dapp.ODOS]: "0x19cEeAd7105607Cd444F5ad10dd51356436095a1",
     [Dapp.PENDLE]: "0x888888888889758F76e7103c6CbF23ABbF58F946"
   },
-  [Network.SONIC]: {
-    [Dapp.AAVEV3]: "0x5362dBb1e601abF3a4c14c22ffEdA64042E5eAA3",
-    [Dapp.ODOS]: "0xaC041Df48dF9791B0654f1Dbbf2CC8450C5f2e9D",
-    [Dapp.PENDLE]: "0x888888888889758F76e7103c6CbF23ABbF58F946"
+  [Network.ETHEREUM]: {
+    [Dapp.AAVEV3]: "0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2",
+    [Dapp.ODOS]: "0xCf5540fFFCdC3d510B18bFcA6d2b9987b0772559",
+    [Dapp.PENDLE]: "0x888888888889758F76e7103c6CbF23ABbF58F946",
+    [Dapp.ONEINCH]: "0x111111125421ca6dc452d289314280a0f8842a65"
   }
 };
 
@@ -80,7 +81,7 @@ export const dappFactoryAddress: AddressDappNetworkMap = {
   [Network.OPTIMISM]: {},
   [Network.ARBITRUM]: {},
   [Network.BASE]: {},
-  [Network.SONIC]: {}
+  [Network.ETHEREUM]: {}
 };
 
 export const stakingAddress: AddressDappNetworkMap = {
@@ -101,9 +102,7 @@ export const stakingAddress: AddressDappNetworkMap = {
   [Network.BASE]: {
     [Dapp.PANCAKECL]: "0xC6A2Db661D5a5690172d8eB0a7DEA2d3008665A3"
   },
-  [Network.SONIC]: {
-    [Dapp.SHADOWCL]: "0xe879d0E44e6873cf4ab71686055a4f6817685f02" //specific  for wS/USDC CL
-  }
+  [Network.ETHEREUM]: {}
 };
 
 export const aaveAddressProvider: AddressDappNetworkMap = {
@@ -121,8 +120,8 @@ export const aaveAddressProvider: AddressDappNetworkMap = {
     // https://docs.aave.com/developers/deployed-contracts/v3-mainnet/base
     [Dapp.AAVEV3]: "0xe20fCBdBfFC4Dd138cE8b2E6FBb6CB49777ad64D"
   },
-  [Network.SONIC]: {
-    [Dapp.AAVEV3]: "0x5C2e738F6E27bCE0F7558051Bf90605dD6176900"
+  [Network.ETHEREUM]: {
+    [Dapp.AAVEV3]: "0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e"
   }
 };
 export const nonfungiblePositionManagerAddress: AddressDappNetworkMap = {
@@ -143,9 +142,7 @@ export const nonfungiblePositionManagerAddress: AddressDappNetworkMap = {
     [Dapp.AERODROMECL]: "0x827922686190790b37229fd06084350e74485b72",
     [Dapp.PANCAKECL]: "0x46A15B0b27311cedF172AB29E4f4766fbE7F4364"
   },
-  [Network.SONIC]: {
-    [Dapp.SHADOWCL]: "0x12e66c8f215ddd5d48d150c8f46ad0c6fb0f4406"
-  }
+  [Network.ETHEREUM]: {}
 };
 
 export const networkChainIdMap: NetworkChainIdMap = {
@@ -153,7 +150,7 @@ export const networkChainIdMap: NetworkChainIdMap = {
   [Network.OPTIMISM]: 10,
   [Network.ARBITRUM]: 42161,
   [Network.BASE]: 8453,
-  [Network.SONIC]: 146
+  [Network.ETHEREUM]: 1
 };
 
 export const balancerSubgraph: AddressNetworkMap = {
@@ -162,7 +159,7 @@ export const balancerSubgraph: AddressNetworkMap = {
   [Network.OPTIMISM]: "",
   [Network.ARBITRUM]: "",
   [Network.BASE]: "",
-  [Network.SONIC]: ""
+  [Network.ETHEREUM]: ""
 };
 
 export const multiCallAddress: AddressNetworkMap = {
@@ -170,7 +167,7 @@ export const multiCallAddress: AddressNetworkMap = {
   [Network.OPTIMISM]: "",
   [Network.ARBITRUM]: "",
   [Network.BASE]: "",
-  [Network.SONIC]: ""
+  [Network.ETHEREUM]: ""
 };
 
 export const lyraNetworkMap: LyraNetworkMap = {

package/src/entities/pool.ts

@@ -19,7 +19,7 @@ import {
   nonfungiblePositionManagerAddress,
   routerAddress,
   stakingAddress,
-  SYNTHETIX_TRACKING_CODE,
+  SYNTHETIX_TRACKING_CODE
 } from "../config";
 import {
   Dapp,
@@ -30,60 +30,60 @@ import {
   LyraOptionMarket,
   LyraOptionType,
   LyraTradeType,
-  LyraPosition,
+  LyraPosition
 } from "../types";
 
 import { Utils } from "./utils";
 import {
   getDecreaseLiquidityTxData,
   getIncreaseLiquidityTxData,
-  getUniswapV3MintTxData,
+  getUniswapV3MintTxData
 } from "../services/uniswap/V3Liquidity";
 import { getUniswapV3SwapTxData } from "../services/uniswap/V3Trade";
 import {
   getCompleteWithdrawalTxData,
-  getEasySwapperTxData,
+  getEasySwapperTxData
 } from "../services/toros/easySwapper";
 import { getAaveV3ClaimTxData } from "../services/aave/incentives";
 import {
   getClOwner,
   getVelodromeAddLiquidityTxData,
-  getVelodromeRemoveLiquidityTxData,
+  getVelodromeRemoveLiquidityTxData
 } from "../services/velodrome/liquidity";
 import {
   getVelodromeClaimTxData,
   getVelodromeCLClaimTxData,
-  getVelodromeStakeTxData,
+  getVelodromeStakeTxData
 } from "../services/velodrome/staking";
 import { getLyraOptionTxData } from "../services/lyra/trade";
 import { getOptionPositions } from "../services/lyra/positions";
 import { getDeadline } from "../utils/deadline";
 import {
   getFuturesChangePositionTxData,
-  getFuturesChangeMarginTxData,
+  getFuturesChangeMarginTxData
 } from "../services/futures";
 import { getFuturesCancelOrderTxData } from "../services/futures/trade";
 import { getOneInchSwapTxData } from "../services/oneInch";
 import {
   getCreateVestTxData,
   getExitVestTxData,
-  getRewardsTxDta,
+  getRewardsTxDta
 } from "../services/ramses/vesting";
 import { getPoolTxOrGasEstimate } from "../utils/contract";
 import {
   cancelOrderViaFlatMoney,
   mintUnitViaFlatMoney,
-  redeemUnitViaFlatMoney,
+  redeemUnitViaFlatMoney
 } from "../services/flatmoney/stableLp";
 import {
   getCompoundV3LendTxData,
-  getCompoundV3WithdrawTxData,
+  getCompoundV3WithdrawTxData
 } from "../services/compound/lending";
 import { getCompoundV3ClaimTxData } from "../services/compound/rewards";
 import {
   getPancakeHarvestClaimTxData,
   getPancakeStakeTxData,
-  getPancakeUnStakeTxData,
+  getPancakeUnStakeTxData
 } from "../services/pancake/staking";
 import { getOdosSwapTxData } from "../services/odos";
 import { getPendleSwapTxData } from "../services/pendle";
@@ -131,7 +131,7 @@ export class Pool {
           asset: asset,
           isDeposit: isDeposit,
           balance: result[1][index],
-          rate: result[2][index],
+          rate: result[2][index]
         };
       }
     );
@@ -226,7 +226,7 @@ export class Pool {
     const iERC20 = new ethers.utils.Interface(IERC20.abi);
     const approveTxData = iERC20.encodeFunctionData("approve", [
       routerAddress[this.network][dapp],
-      amount,
+      amount
     ]);
     const tx = await getPoolTxOrGasEstimate(
       this,
@@ -255,7 +255,7 @@ export class Pool {
     const iERC20 = new ethers.utils.Interface(IERC20.abi);
     const approveTxData = iERC20.encodeFunctionData("approve", [
       stakingAddress[this.network][dapp],
-      amount,
+      amount
     ]);
     const tx = await getPoolTxOrGasEstimate(
       this,
@@ -283,7 +283,7 @@ export class Pool {
     const iERC20 = new ethers.utils.Interface(IERC20.abi);
     const approveTxData = iERC20.encodeFunctionData("approve", [
       nonfungiblePositionManagerAddress[this.network][Dapp.UNISWAPV3],
-      amount,
+      amount
     ]);
     const tx = await getPoolTxOrGasEstimate(
       this,
@@ -312,7 +312,7 @@ export class Pool {
     const iERC20 = new ethers.utils.Interface(IERC20.abi);
     const approveTxData = iERC20.encodeFunctionData("approve", [
       spender,
-      amount,
+      amount
     ]);
     const tx = await getPoolTxOrGasEstimate(
       this,
@@ -341,7 +341,7 @@ export class Pool {
     const iERC721 = new ethers.utils.Interface(IERC721.abi);
     const approveTxData = iERC721.encodeFunctionData("approve", [
       spender,
-      tokenId,
+      tokenId
     ]);
     const tx = await getPoolTxOrGasEstimate(
       this,
@@ -393,7 +393,7 @@ export class Pool {
         break;
       case Dapp.SYNTHETIX:
         const iSynthetix = new ethers.utils.Interface(ISynthetix.abi);
-        const assets = [assetFrom, assetTo].map((asset) =>
+        const assets = [assetFrom, assetTo].map(asset =>
           ethers.utils.formatBytes32String(asset)
         );
         const daoAddress = await this.factory.owner();
@@ -402,7 +402,7 @@ export class Pool {
           amountIn,
           assets[1],
           daoAddress,
-          SYNTHETIX_TRACKING_CODE,
+          SYNTHETIX_TRACKING_CODE
         ]);
         break;
       case Dapp.TOROS:
@@ -448,7 +448,7 @@ export class Pool {
           minAmountOut,
           [assetFrom, assetTo],
           this.address,
-          await getDeadline(this),
+          await getDeadline(this)
         ]);
     }
     const tx = await getPoolTxOrGasEstimate(
@@ -490,7 +490,7 @@ export class Pool {
         0,
         0,
         this.address,
-        await getDeadline(this),
+        await getDeadline(this)
       ]
     );
     const tx = await getPoolTxOrGasEstimate(
@@ -553,7 +553,7 @@ export class Pool {
     const stakeTxData = iMiniChefV2.encodeFunctionData(Transaction.DEPOSIT, [
       poolId,
       amount,
-      this.address,
+      this.address
     ]);
     const tx = await getPoolTxOrGasEstimate(
       this,
@@ -586,7 +586,7 @@ export class Pool {
           IBalancerRewardsGauge.abi
         );
         stakeTxData = rewardsGauge.encodeFunctionData("deposit(uint256)", [
-          amount,
+          amount
         ]);
         break;
       case Dapp.VELODROME:
@@ -638,7 +638,7 @@ export class Pool {
     const unStakeTxData = iMiniChefV2.encodeFunctionData(Transaction.WITHDRAW, [
       poolId,
       amount,
-      this.address,
+      this.address
     ]);
     const tx = await getPoolTxOrGasEstimate(
       this,
@@ -671,7 +671,7 @@ export class Pool {
       unstakeTxData = getPancakeUnStakeTxData(this, amount.toString());
     } else {
       unstakeTxData = rewardsGauge.encodeFunctionData("withdraw(uint256)", [
-        amount,
+        amount
       ]);
     }
     const tx = await getPoolTxOrGasEstimate(
@@ -705,7 +705,7 @@ export class Pool {
       asset,
       amount,
       this.address,
-      referralCode,
+      referralCode
     ]);
 
     const tx = await getPoolTxOrGasEstimate(
@@ -717,8 +717,8 @@ export class Pool {
   }
 
   /**
-   * Lend asset to a Compound V3 style lending pool
-   * @param {string} market Address of market e.g cUSDCv3 address
+   * Lend asset to a Compound V3 or Fluid lending pool
+   * @param {string} market Address of cToken or fToken
    * @param {string} asset Asset
    * @param {BigNumber | string} amount Amount of asset to lend
    * @param {any} options Transaction options
@@ -732,7 +732,12 @@ export class Pool {
     options: any = null,
     estimateGas = false
   ): Promise<any> {
-    const supplyTxData = getCompoundV3LendTxData(asset, amount);
+    const supplyTxData = await getCompoundV3LendTxData(
+      this,
+      market,
+      asset,
+      amount
+    );
 
     const tx = await getPoolTxOrGasEstimate(
       this,
@@ -773,8 +778,8 @@ export class Pool {
   }
 
   /**
-   * Witdraw asset from a COmpound V3 style lending pool
-   * @param {string} market Address of market e.g cUSDCv3 address
+   * Witdraw asset from a Compound V3 or Fluid lending pool
+   * @param {string} market Address of cToken or fToken
    * @param {string} asset Asset
    * @param  {BigNumber | string} amount Amount of asset to withdraw
    * @param {any} options Transaction options
@@ -788,7 +793,12 @@ export class Pool {
     options: any = null,
     estimateGas = false
   ): Promise<any> {
-    const withdrawTxData = getCompoundV3WithdrawTxData(asset, amount);
+    const withdrawTxData = await getCompoundV3WithdrawTxData(
+      this,
+      market,
+      asset,
+      amount
+    );
 
     const tx = await getPoolTxOrGasEstimate(
       this,
@@ -822,7 +832,7 @@ export class Pool {
       amount,
       2,
       referralCode,
-      this.address,
+      this.address
     ]);
     const tx = await getPoolTxOrGasEstimate(
       this,
@@ -853,7 +863,7 @@ export class Pool {
       asset,
       amount,
       2,
-      this.address,
+      this.address
     ]);
     const tx = await getPoolTxOrGasEstimate(
       this,
@@ -881,7 +891,7 @@ export class Pool {
     const poolId = await this.utils.getLpPoolId(dapp, asset);
     const harvestTxData = iMiniChefV2.encodeFunctionData(Transaction.HARVEST, [
       poolId,
-      this.address,
+      this.address
     ]);
     const tx = await getPoolTxOrGasEstimate(
       this,
@@ -904,12 +914,12 @@ export class Pool {
     estimateGas = false
   ): Promise<any> {
     const currentAssetsEnabled = await this.getComposition();
-    const currentAssets = currentAssetsEnabled.map((e) =>
+    const currentAssets = currentAssetsEnabled.map(e =>
       e.asset.toLocaleLowerCase()
     );
-    const newAssets = assets.map((e) => e.asset.toLocaleLowerCase());
-    const removedAssets = currentAssets.filter((e) => !newAssets.includes(e));
-    const changedAssets = assets.map((e) => [e.asset, e.isDeposit]);
+    const newAssets = assets.map(e => e.asset.toLocaleLowerCase());
+    const removedAssets = currentAssets.filter(e => !newAssets.includes(e));
+    const changedAssets = assets.map(e => [e.asset, e.isDeposit]);
 
     if (estimateGas) {
       return await this.managerLogic.estimateGas.changeAssets(
@@ -1066,7 +1076,7 @@ export class Pool {
       [
         stakingAddress[this.network][Dapp.AAVEV3] as string,
         claimTxData,
-        options,
+        options
       ],
       estimateGas
     );
@@ -1091,7 +1101,7 @@ export class Pool {
       [
         stakingAddress[this.network][Dapp.COMPOUNDV3] as string,
         claimTxData,
-        options,
+        options
       ],
       estimateGas
     );
@@ -1120,8 +1130,7 @@ export class Pool {
       | Dapp.VELODROMECL
       | Dapp.AERODROMECL
       | Dapp.RAMSESCL
-      | Dapp.PANCAKECL
-      | Dapp.SHADOWCL,
+      | Dapp.PANCAKECL,
     assetA: string,
     assetB: string,
     amountA: BigNumber | string,
@@ -1161,7 +1170,7 @@ export class Pool {
       [
         nonfungiblePositionManagerAddress[this.network][dapp],
         mintTxData,
-        options,
+        options
       ],
       estimateGas
     );
@@ -1190,7 +1199,6 @@ export class Pool {
     switch (dapp) {
       case Dapp.UNISWAPV3:
       case Dapp.RAMSESCL:
-      case Dapp.SHADOWCL:
         dappAddress = nonfungiblePositionManagerAddress[this.network][dapp];
         break;
       case Dapp.VELODROMECL:
@@ -1256,7 +1264,6 @@ export class Pool {
     switch (dapp) {
       case Dapp.UNISWAPV3:
       case Dapp.RAMSESCL:
-      case Dapp.SHADOWCL:
         dappAddress = nonfungiblePositionManagerAddress[this.network][dapp];
         break;
       case Dapp.VELODROMECL:
@@ -1321,7 +1328,6 @@ export class Pool {
     switch (dapp) {
       case Dapp.UNISWAPV3:
       case Dapp.RAMSESCL:
-      case Dapp.SHADOWCL:
         contractAddress = nonfungiblePositionManagerAddress[this.network][dapp];
         txData = iNonfungiblePositionManager.encodeFunctionData(
           Transaction.COLLECT,
@@ -1392,13 +1398,13 @@ export class Pool {
     options: any = null,
     estimateGas = false
   ): Promise<any> {
-    const claimAddress =
-      dapp === Dapp.SHADOWCL
-        ? stakingAddress[this.network][dapp] //specific  for wS/USDC CL
-        : nonfungiblePositionManagerAddress[this.network][dapp];
     const tx = await getPoolTxOrGasEstimate(
       this,
-      [claimAddress, getRewardsTxDta(tokenId, rewards), options],
+      [
+        nonfungiblePositionManagerAddress[this.network][dapp],
+        getRewardsTxDta(tokenId, rewards),
+        options
+      ],
       estimateGas
     );
     return tx;
@@ -1473,7 +1479,7 @@ export class Pool {
           amountB,
           isStable
         ),
-        options,
+        options
       ],
       estimateGas
     );
@@ -1509,7 +1515,7 @@ export class Pool {
           amount,
           isStable
         ),
-        options,
+        options
       ],
       estimateGas
     );
@@ -1548,7 +1554,7 @@ export class Pool {
           amountB,
           isStable
         ),
-        options,
+        options
       ],
       estimateGas
     );
@@ -1584,7 +1590,7 @@ export class Pool {
           amount,
           isStable
         ),
-        options,
+        options
       ],
       estimateGas
     );
@@ -1625,7 +1631,7 @@ export class Pool {
           amountB,
           isStable
         ),
-        options,
+        options
       ],
       estimateGas
     );
@@ -1663,7 +1669,7 @@ export class Pool {
           amount,
           isStable
         ),
-        options,
+        options
       ],
       estimateGas
     );

package/src/services/compound/lending.ts

@@ -1,20 +1,59 @@
-import { ethers } from "../..";
+import { ethers, Pool } from "../..";
 import ICompoundV3Comet from "../../abi/compound/ICompoundV3Comet.json";
+import IFToken from "../../abi/fluid/IFToken.json";
 
-export function getCompoundV3LendTxData(
+export async function getCompoundV3LendTxData(
+  pool: Pool,
+  market: string,
   asset: string,
   amount: ethers.BigNumber | string
-): string {
-  return new ethers.utils.Interface(
-    ICompoundV3Comet
-  ).encodeFunctionData("supply", [asset, amount]);
+): Promise<string> {
+  if (await isCompoundV3Market(pool, market)) {
+    return new ethers.utils.Interface(
+      ICompoundV3Comet
+    ).encodeFunctionData("supply", [asset, amount]);
+  } else {
+    //Fluid lending
+    return new ethers.utils.Interface(IFToken).encodeFunctionData("deposit", [
+      amount,
+      pool.address
+    ]);
+  }
 }
 
-export function getCompoundV3WithdrawTxData(
+export async function getCompoundV3WithdrawTxData(
+  pool: Pool,
+  market: string,
   asset: string,
   amount: ethers.BigNumber | string
-): string {
-  return new ethers.utils.Interface(
-    ICompoundV3Comet
-  ).encodeFunctionData("withdraw", [asset, amount]);
+): Promise<string> {
+  if (await isCompoundV3Market(pool, market)) {
+    return new ethers.utils.Interface(
+      ICompoundV3Comet
+    ).encodeFunctionData("withdraw", [asset, amount]);
+  } else {
+    //Fluid withdrawal
+    return new ethers.utils.Interface(IFToken).encodeFunctionData("redeem", [
+      amount,
+      pool.address,
+      pool.address
+    ]);
+  }
+}
+
+export async function isCompoundV3Market(
+  pool: Pool,
+  market: string
+): Promise<boolean> {
+  const marketContract = new ethers.Contract(
+    market,
+    ICompoundV3Comet,
+    pool.signer
+  );
+  try {
+    await marketContract.baseToken();
+    return true;
+  } catch (error) {
+    return false;
+  }
 }