@dhedge/v2-sdk 1.10.16 → 1.11.1

package/src/services/uniswap/V3Liquidity.ts

@@ -19,7 +19,6 @@ import {
 } from "../../config";
 import INonfungiblePositionManager from "../../abi/INonfungiblePositionManager.json";
 import IVeldodromePositionManager from "../../abi/IVelodromeNonfungiblePositionManager.json";
-import IShadowNonfungiblePositionManager from "../../abi/IShadowNonfungiblePositionManager.json";
 import IRamsesPositionManager from "../../abi/IRamsesNonfungiblePositionManager.json";
 import IArrakisV1RouterStaking from "../../abi/IArrakisV1RouterStaking.json";
 import IPancakeMasterChef from "../../abi/IPancakeMasterChefV3.json";
@@ -78,8 +77,8 @@ export async function getUniswapV3MintTxData(
     | Dapp.VELODROMECL
     | Dapp.AERODROMECL
     | Dapp.RAMSESCL
-    | Dapp.PANCAKECL
-    | Dapp.SHADOWCL,
+    | Dapp.PANCAKECL,
+
   pool: Pool,
   assetA: string,
   assetB: string,
@@ -170,12 +169,6 @@ export async function getUniswapV3MintTxData(
     mintParams.push(0);
   }
 
-  if (dapp === Dapp.SHADOWCL) {
-    iNonfungiblePositionManager = new ethers.utils.Interface(
-      IShadowNonfungiblePositionManager
-    );
-  }
-
   return iNonfungiblePositionManager.encodeFunctionData(Transaction.MINT, [
     mintParams
   ]);
@@ -196,9 +189,7 @@ export async function getUniswapV3Liquidity(
   const iNonfungiblePositionManager = new ethers.Contract(
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     nonfungiblePositionManagerAddress[pool.network][dapp]!,
-    dapp === Dapp.SHADOWCL
-      ? IShadowNonfungiblePositionManager
-      : INonfungiblePositionManager.abi,
+    INonfungiblePositionManager.abi,
     pool.signer
   );
   const result = await iNonfungiblePositionManager.positions(tokenId);
@@ -218,8 +209,7 @@ export async function getIncreaseLiquidityTxData(
     dapp === Dapp.VELODROMECL ||
     dapp === Dapp.AERODROMECL ||
     dapp === Dapp.RAMSESCL ||
-    dapp === Dapp.PANCAKECL ||
-    dapp === Dapp.SHADOWCL
+    dapp === Dapp.PANCAKECL
   ) {
     const abi = new ethers.utils.Interface(INonfungiblePositionManager.abi);
     txData = abi.encodeFunctionData(Transaction.INCREASE_LIQUIDITY, [
@@ -256,8 +246,7 @@ export async function getDecreaseLiquidityTxData(
     dapp === Dapp.VELODROMECL ||
     dapp === Dapp.AERODROMECL ||
     dapp === Dapp.RAMSESCL ||
-    dapp === Dapp.PANCAKECL ||
-    dapp === Dapp.SHADOWCL
+    dapp === Dapp.PANCAKECL
   ) {
     const abi = new ethers.utils.Interface(INonfungiblePositionManager.abi);
     const liquidity = (await getUniswapV3Liquidity(dapp, tokenId, pool))

package/src/test/constants.ts

@@ -43,7 +43,7 @@ export const TEST_POOL = {
   [Network.OPTIMISM]: "0x12573bfdf764ab9d52aca20e2827497a66829716",
   [Network.ARBITRUM]: "0x0b5f6591c8eb23e5a68102d3d39ebbb464ee5c14",
   [Network.BASE]: "0x4842b42F68524383F609aa46eAfc18c1459cE3cD",
-  [Network.SONIC]: ""
+  [Network.ETHEREUM]: "0xe8e74f664d2d6a919a18b911990db0979789b6f7"
 };
 
 export const CONTRACT_ADDRESS = {
@@ -63,6 +63,7 @@ export const CONTRACT_ADDRESS = {
     VELODROME_CL_USDC_WETH_GAUGE: "",
     VELO: "",
     COMPOUNDV3_WETH: "",
+    FLUID_WETH: "",
     TOROS: "",
     UNIT: ""
   },
@@ -87,6 +88,7 @@ export const CONTRACT_ADDRESS = {
     VELODROME_CL_USDC_WETH_GAUGE: "0xa75127121d28a9BF848F3B70e7Eea26570aa7700",
     VELO: "0x9560e827aF36c94D2Ac33a39bCE1Fe78631088Db",
     COMPOUNDV3_WETH: "",
+    FLUID_WETH: "",
     TOROS: "0x49bf093277bf4dde49c48c6aa55a3bda3eedef68" //USDmny
   },
   [Network.ARBITRUM]: {
@@ -113,6 +115,7 @@ export const CONTRACT_ADDRESS = {
     VELODROME_CL_USDC_WETH_GAUGE: "",
     VELO: "",
     COMPOUNDV3_WETH: "0x6f7D514bbD4aFf3BcD1140B7344b32f063dEe486",
+    FLUID_WETH: "0x45df0656f8adf017590009d2f1898eeca4f0a205",
     TOROS: ""
   },
   [Network.BASE]: {
@@ -133,13 +136,14 @@ export const CONTRACT_ADDRESS = {
     VELODROME_CL_USDC_WETH_GAUGE: "0xF33a96b5932D9E9B9A0eDA447AbD8C9d48d2e0c8",
     VELO: "0x940181a94A35A4569E4529A3CDfB74e38FD98631",
     COMPOUNDV3_WETH: "",
+    FLUID_WETH: "",
     TOROS: ""
   },
-  [Network.SONIC]: {
-    USDC: "0x29219dd400f2bf60e5a23d13be72b486d4038894",
+  [Network.ETHEREUM]: {
+    USDC: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
     USDT: "",
     SUSD: "",
-    WETH: "0x50c42deacd8fc9773493ed674b675be577f2634b",
+    WETH: "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
     WBTC: "",
     SWETH: "",
     uniswapV3: {
@@ -152,6 +156,7 @@ export const CONTRACT_ADDRESS = {
     VELODROME_CL_USDC_WETH_GAUGE: "",
     VELO: "",
     COMPOUNDV3_WETH: "",
+    FLUID_WETH: "",
     TOROS: "",
     UNIT: ""
   }
@@ -164,7 +169,7 @@ export const USDC_BALANCEOF_SLOT = {
   [Network.ARBITRUM]: 9,
   [Network.POLYGON]: 0,
   [Network.BASE]: 9,
-  [Network.SONIC]: 9
+  [Network.ETHEREUM]: 9
 };
 
 export const WETH_BALANCEOF_SLOT = {
@@ -172,5 +177,5 @@ export const WETH_BALANCEOF_SLOT = {
   [Network.ARBITRUM]: 51,
   [Network.POLYGON]: 0,
   [Network.BASE]: 0,
-  [Network.SONIC]: 0
+  [Network.ETHEREUM]: 3
 };

package/src/test/fluid.test.ts

@@ -0,0 +1,90 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import BigNumber from "bignumber.js";
+import { Dhedge, Pool } from "..";
+import { AssetEnabled, Network } from "../types";
+import { CONTRACT_ADDRESS, MAX_AMOUNT, TEST_POOL } from "./constants";
+import {
+  TestingRunParams,
+  beforeAfterReset,
+  setWETHAmount,
+  testingHelper
+} from "./utils/testingHelper";
+import { allowanceDelta, balanceDelta } from "./utils/token";
+import { getWalletData } from "./wallet";
+
+const testFluid = ({ network, provider }: TestingRunParams) => {
+  const WETH = CONTRACT_ADDRESS[network].WETH;
+  const FLUID_WETH = CONTRACT_ADDRESS[network].FLUID_WETH;
+
+  let dhedge: Dhedge;
+  let pool: Pool;
+  jest.setTimeout(100000);
+
+  describe(`[${network}] compound V3 tests`, () => {
+    beforeAll(async () => {
+      const { wallet } = getWalletData(network);
+      // top up ETH (gas)
+      await provider.send("hardhat_setBalance", [
+        wallet.address,
+        "0x100000000000000"
+      ]);
+      dhedge = new Dhedge(wallet, network);
+      pool = await dhedge.loadPool(TEST_POOL[network]);
+      await setWETHAmount({
+        amount: new BigNumber(1e18).toFixed(0),
+        userAddress: pool.address,
+        network,
+        provider
+      });
+
+      const newAssets: AssetEnabled[] = [
+        { asset: WETH, isDeposit: true },
+        {
+          asset: FLUID_WETH,
+          isDeposit: false
+        }
+      ];
+      await pool.managerLogic.changeAssets(newAssets, []);
+    });
+    beforeAfterReset({ beforeAll, afterAll, provider });
+
+    it("approves unlimited WETH for fWETH market", async () => {
+      await pool.approveSpender(FLUID_WETH, WETH, MAX_AMOUNT);
+      const wethAllowanceDelta = await allowanceDelta(
+        pool.address,
+        WETH,
+        FLUID_WETH,
+        pool.signer
+      );
+      await expect(wethAllowanceDelta.gt(0));
+    });
+
+    it("lends WETH to Fluid WETH market", async () => {
+      const wethBalance = await pool.utils.getBalance(WETH, pool.address);
+      await pool.lendCompoundV3(FLUID_WETH, WETH, wethBalance);
+
+      const fWETHTokenDelta = await balanceDelta(
+        pool.address,
+        FLUID_WETH,
+        pool.signer
+      );
+      expect(fWETHTokenDelta.gt(0));
+    });
+
+    it("withdraw WETH from Fluid WETH market", async () => {
+      const fWETHBalance = await pool.utils.getBalance(
+        FLUID_WETH,
+        pool.address
+      );
+      await pool.withdrawCompoundV3(FLUID_WETH, WETH, fWETHBalance);
+      const wethBalance = await balanceDelta(pool.address, WETH, pool.signer);
+      expect(wethBalance.gt(0));
+    });
+  });
+};
+
+testingHelper({
+  network: Network.ARBITRUM,
+  testingRun: testFluid
+});

package/src/test/oneInch.test.ts

@@ -34,6 +34,13 @@ const testOneInch = ({ wallet, network, provider }: TestingRunParams) => {
         "0x10000000000000000"
       ]);
       await provider.send("evm_mine", []);
+
+      const newAssets = [
+        { asset: USDC, isDeposit: true },
+        { asset: WETH, isDeposit: true }
+      ];
+
+      await pool.managerLogic.changeAssets(newAssets, []);
       // top up USDC
       await setUSDCAmount({
         amount: new BigNumber(2).times(1e6).toFixed(0),
@@ -104,10 +111,10 @@ const testOneInch = ({ wallet, network, provider }: TestingRunParams) => {
   });
 };
 
-testingHelper({
-  network: Network.OPTIMISM,
-  testingRun: testOneInch
-});
+// testingHelper({
+//   network: Network.OPTIMISM,
+//   testingRun: testOneInch
+// });
 
 // testingHelper({
 //   network: Network.POLYGON,
@@ -120,3 +127,8 @@ testingHelper({
 //   onFork: false,
 //   testingRun: testOneInch
 // });
+
+testingHelper({
+  network: Network.ETHEREUM,
+  testingRun: testOneInch
+});

package/src/test/wallet.ts

@@ -8,7 +8,7 @@ export const networkPortMap = {
   [Network.OPTIMISM]: 8544,
   [Network.ARBITRUM]: 8540,
   [Network.BASE]: 8546,
-  [Network.SONIC]: 8547
+  [Network.ETHEREUM]: 8547
 };
 
 export const getWalletData = (

package/src/types.ts

@@ -6,7 +6,7 @@ export enum Network {
   OPTIMISM = "optimism",
   ARBITRUM = "arbitrum",
   BASE = "base",
-  SONIC = "sonic"
+  ETHEREUM = "ethereum"
 }
 
 export enum Dapp {
@@ -31,7 +31,6 @@ export enum Dapp {
   PANCAKECL = "pancakeCL",
   COMPOUNDV3 = "compoundV3",
   ODOS = "odos",
-  SHADOWCL = "shadowCL",
   PENDLE = "pendle"
 }