@dhedge/v2-sdk 1.10.0 → 1.10.2

package/src/test/velodromeCL.test.ts

@@ -1,21 +1,22 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import BigNumber from "bignumber.js";
 import { Dhedge, Pool, ethers } from "..";
+
 import { nonfungiblePositionManagerAddress } from "../config";
 import { AssetEnabled, Dapp, Network } from "../types";
 import { CONTRACT_ADDRESS, MAX_AMOUNT, TEST_POOL } from "./constants";
 import {
   TestingRunParams,
   beforeAfterReset,
+  setChainlinkTimeout,
   setUSDCAmount,
   setWETHAmount,
   testingHelper
 } from "./utils/testingHelper";
-import { balanceDelta } from "./utils/token";
+import { allowanceDelta, balanceDelta } from "./utils/token";
 import INonfungiblePositionManager from "../abi/INonfungiblePositionManager.json";
 
 const testVelodromeCL = ({ wallet, network, provider }: TestingRunParams) => {
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const VELODROME_POSITION_MANGER = nonfungiblePositionManagerAddress[network][
     Dapp.VELODROMECL
   ]!;
@@ -41,6 +42,10 @@ const testVelodromeCL = ({ wallet, network, provider }: TestingRunParams) => {
       ]);
       dhedge = new Dhedge(wallet, network);
       pool = await dhedge.loadPool(TEST_POOL[network]);
+
+      // setChainlinkTimeout
+      await setChainlinkTimeout({ pool, provider }, 86400 * 365);
+
       await setUSDCAmount({
         amount: new BigNumber(10000).times(1e6).toFixed(0),
         userAddress: pool.address,
@@ -60,6 +65,10 @@ const testVelodromeCL = ({ wallet, network, provider }: TestingRunParams) => {
         {
           asset: VELODROME_POSITION_MANGER,
           isDeposit: false
+        },
+        {
+          asset: VELO,
+          isDeposit: false
         }
       ];
       await pool.changeAssets(newAssets);
@@ -73,77 +82,20 @@ const testVelodromeCL = ({ wallet, network, provider }: TestingRunParams) => {
 
     beforeAfterReset({ beforeAll, afterAll, provider });
 
-    // describe("Liquidity", () => {
-    //   it("approves unlimited USDC and WETH on for Velodrome CL", async () => {
-    //     await pool.approveSpender(VELODROME_POSITION_MANGER, USDC, MAX_AMOUNT);
-    //     await pool.approveSpender(VELODROME_POSITION_MANGER, WETH, MAX_AMOUNT);
-    //     const UsdcAllowanceDelta = await allowanceDelta(
-    //       pool.address,
-    //       USDC,
-    //       VELODROME_POSITION_MANGER,
-    //       pool.signer
-    //     );
-    //     await expect(UsdcAllowanceDelta.gt(0));
-    //   });
-
-    //   it("adds USDC and WETH to a Velodrome CL (mint position)", async () => {
-    //     const usdcBalance = await pool.utils.getBalance(USDC, pool.address);
-    //     const wethBalance = await pool.utils.getBalance(WETH, pool.address);
-    //     await pool.addLiquidityUniswapV3(
-    //       Dapp.VELODROMECL,
-    //       USDC,
-    //       WETH,
-    //       usdcBalance.div(2),
-    //       wethBalance.div(2),
-    //       null,
-    //       null,
-    //       193700,
-    //       193900,
-    //       100
-    //     );
-
-    //     tokenId = (
-    //       await velodromePositionManager.tokenOfOwnerByIndex(pool.address, 0)
-    //     ).toString();
-    //     expect(tokenId).not.toBe(null);
-    //   });
-
-    //   it("increases liquidity in a CL position", async () => {
-    //     const usdcBalance = await pool.utils.getBalance(USDC, pool.address);
-    //     const wethBalance = await pool.utils.getBalance(WETH, pool.address);
-    //     const positionBefore = await velodromePositionManager.positions(
-    //       tokenId
-    //     );
-    //     await pool.increaseLiquidity(
-    //       Dapp.VELODROMECL,
-    //       tokenId,
-    //       usdcBalance.div(2),
-    //       wethBalance.div(2)
-    //     );
-    //     const positionAfter = await velodromePositionManager.positions(tokenId);
-    //     expect(positionAfter.liquidity.gt(positionBefore.liquidity));
-    //   });
-
-    //   it("decreases liquidity from a CL position", async () => {
-    //     const positionBefore = await velodromePositionManager.positions(
-    //       tokenId
-    //     );
-    //     await pool.decreaseLiquidity(Dapp.VELODROMECL, tokenId, 50);
-    //     const positionAfter = await velodromePositionManager.positions(tokenId);
-    //     expect(positionAfter.liquidity.lt(positionBefore.liquidity));
-    //   });
-
-    //   it("collects fess of a CL position", async () => {
-    //     await provider.send("evm_increaseTime", [24 * 3600 * 3]); // 1 day
-    //     await provider.send("evm_mine", []);
-    //     await pool.claimFees(Dapp.VELODROMECL, tokenId);
-    //     expect((await balanceDelta(pool.address, USDC, pool.signer)).gt(0));
-    //   });
-    // });
-    describe("Liquidity staking", () => {
-      it("stakes a CL position in gauge", async () => {
+    describe("Liquidity", () => {
+      it("approves unlimited USDC and WETH on for Velodrome CL", async () => {
         await pool.approveSpender(VELODROME_POSITION_MANGER, USDC, MAX_AMOUNT);
         await pool.approveSpender(VELODROME_POSITION_MANGER, WETH, MAX_AMOUNT);
+        const UsdcAllowanceDelta = await allowanceDelta(
+          pool.address,
+          USDC,
+          VELODROME_POSITION_MANGER,
+          pool.signer
+        );
+        await expect(UsdcAllowanceDelta.gt(0));
+      });
+
+      it("adds USDC and WETH to a Velodrome CL (mint position)", async () => {
         const usdcBalance = await pool.utils.getBalance(USDC, pool.address);
         const wethBalance = await pool.utils.getBalance(WETH, pool.address);
         await pool.addLiquidityUniswapV3(
@@ -162,18 +114,26 @@ const testVelodromeCL = ({ wallet, network, provider }: TestingRunParams) => {
         tokenId = (
           await velodromePositionManager.tokenOfOwnerByIndex(pool.address, 0)
         ).toString();
-        await pool.approveSpenderNFT(
-          USDC_WETH_CL_GAUGE,
-          VELODROME_POSITION_MANGER,
+        expect(tokenId).not.toBe(null);
+      });
+
+      it("increases liquidity in a CL position", async () => {
+        const usdcBalance = await pool.utils.getBalance(USDC, pool.address);
+        const wethBalance = await pool.utils.getBalance(WETH, pool.address);
+        const positionBefore = await velodromePositionManager.positions(
           tokenId
         );
-        await pool.stakeInGauge(Dapp.VELODROMECL, USDC_WETH_CL_GAUGE, tokenId);
-        expect(await velodromePositionManager.ownerOf(tokenId)).toBe(
-          USDC_WETH_CL_GAUGE
+        await pool.increaseLiquidity(
+          Dapp.VELODROMECL,
+          tokenId,
+          usdcBalance.div(2),
+          wethBalance.div(2)
         );
+        const positionAfter = await velodromePositionManager.positions(tokenId);
+        expect(positionAfter.liquidity.gt(positionBefore.liquidity));
       });
 
-      it("decreases liquidity from a staked CL position", async () => {
+      it("decreases liquidity from a CL position", async () => {
         const positionBefore = await velodromePositionManager.positions(
           tokenId
         );
@@ -182,22 +142,44 @@ const testVelodromeCL = ({ wallet, network, provider }: TestingRunParams) => {
         expect(positionAfter.liquidity.lt(positionBefore.liquidity));
       });
 
-      it("increases liquidity in a staked CL position", async () => {
+      it("collects fess of a CL position", async () => {
+        await provider.send("evm_increaseTime", [24 * 3600 * 3]); // 1 day
+        await provider.send("evm_mine", []);
+        await pool.claimFees(Dapp.VELODROMECL, tokenId);
+        expect((await balanceDelta(pool.address, USDC, pool.signer)).gt(0));
+      });
+    });
+    describe("Liquidity staking", () => {
+      it("stakes a CL position in gauge", async () => {
+        await pool.approveSpender(VELODROME_POSITION_MANGER, USDC, MAX_AMOUNT);
+        await pool.approveSpender(VELODROME_POSITION_MANGER, WETH, MAX_AMOUNT);
         const usdcBalance = await pool.utils.getBalance(USDC, pool.address);
         const wethBalance = await pool.utils.getBalance(WETH, pool.address);
-        const positionBefore = await velodromePositionManager.positions(
-          tokenId
-        );
-        await pool.approveSpender(USDC_WETH_CL_GAUGE, USDC, MAX_AMOUNT);
-        await pool.approveSpender(USDC_WETH_CL_GAUGE, WETH, MAX_AMOUNT);
-        await pool.increaseLiquidity(
+        await pool.addLiquidityUniswapV3(
           Dapp.VELODROMECL,
-          tokenId,
+          USDC,
+          WETH,
           usdcBalance.div(2),
-          wethBalance.div(2)
+          wethBalance.div(2),
+          null,
+          null,
+          193700,
+          193900,
+          100
+        );
+
+        tokenId = (
+          await velodromePositionManager.tokenOfOwnerByIndex(pool.address, 0)
+        ).toString();
+        await pool.approveSpenderNFT(
+          USDC_WETH_CL_GAUGE,
+          VELODROME_POSITION_MANGER,
+          tokenId
+        );
+        await pool.stakeInGauge(Dapp.VELODROMECL, USDC_WETH_CL_GAUGE, tokenId);
+        expect(await velodromePositionManager.ownerOf(tokenId)).toBe(
+          USDC_WETH_CL_GAUGE
         );
-        const positionAfter = await velodromePositionManager.positions(tokenId);
-        expect(positionAfter.liquidity.gt(positionBefore.liquidity));
       });
 
       it("collects fess of a staked CL position", async () => {

package/src/test/wallet.ts

@@ -3,29 +3,6 @@ import { Network } from "../types";
 // 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://opt-kovan.g.alchemy.com/v2/${process.env.ALCHEMY_PROJECT_ID}`
-// );
-
-// const provider = new ethers.providers.JsonRpcProvider(
-//   `https://arb-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}`
-// );
-
-const provider = new ethers.providers.JsonRpcProvider("http://127.0.0.1:8545/");
-
-export const wallet = new ethers.Wallet(
-  process.env.PRIVATE_KEY as string,
-  provider
-);
-
 export const networkPortMap = {
   [Network.POLYGON]: 8542,
   [Network.OPTIMISM]: 8544,
@@ -34,16 +11,17 @@ export const networkPortMap = {
 };
 
 export const getWalletData = (
-  network: Network
+  network: Network,
+  onFork = true
 ): {
   wallet: ethers.Wallet;
   provider: ethers.providers.JsonRpcProvider;
   rpcUrl: string;
 } => {
-  const provider = new ethers.providers.JsonRpcProvider(
-    `http://127.0.0.1:${networkPortMap[network]}/`
-  );
-  const rpcUrl = process.env[`${network.toUpperCase()}_URL`] || "";
+  const rpcUrl = onFork
+    ? `http://127.0.0.1:${networkPortMap[network]}/`
+    : process.env[`${network.toUpperCase()}_URL`] || "";
+  const provider = new ethers.providers.JsonRpcProvider(rpcUrl);
   return {
     wallet: new ethers.Wallet(process.env.PRIVATE_KEY as string, provider),
     provider,

package/src/test/zeroEx.test.ts

@@ -88,3 +88,8 @@ testingHelper({
   network: Network.BASE,
   testingRun: testZeroEx
 });
+
+testingHelper({
+  network: Network.ARBITRUM,
+  testingRun: testZeroEx
+});