@dhedge/v2-sdk 2.1.7 → 2.2.0

package/src/test/kyberSwap.test.ts

@@ -1,19 +1,22 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 
+import BigNumber from "bignumber.js";
+import { ethers } from "ethers";
 import { Dhedge, Pool } from "..";
 
+import { routerAddress } from "../config";
 import { Dapp, Network } from "../types";
 import { CONTRACT_ADDRESS, MAX_AMOUNT, TEST_POOL } from "./constants";
 import {
   TestingRunParams,
+  fixOracleAggregatorStaleness,
+  runWithImpersonateAccount,
+  setChainlinkTimeout,
   setUSDCAmount,
   testingHelper,
   wait
 } from "./utils/testingHelper";
-
-import { allowanceDelta, balanceDelta } from "./utils/token";
-import { routerAddress } from "../config";
-import BigNumber from "bignumber.js";
+import { balanceDelta } from "./utils/token";
 
 const testKyberSwap = ({ wallet, network, provider }: TestingRunParams) => {
   const USDC = CONTRACT_ADDRESS[network].USDC;
@@ -25,15 +28,30 @@ const testKyberSwap = ({ wallet, network, provider }: TestingRunParams) => {
 
   describe(`kyberswap on ${network}`, () => {
     beforeAll(async () => {
-      dhedge = new Dhedge(wallet, network);
-      pool = await dhedge.loadPool(TEST_POOL[network]);
-      // top up gas
       await provider.send("hardhat_setBalance", [
         wallet.address,
         "0x10000000000000000"
       ]);
-      await provider.send("evm_mine", []);
-      // top up USDC
+      dhedge = new Dhedge(wallet, network);
+      pool = await dhedge.loadPool(TEST_POOL[network]);
+
+      await setChainlinkTimeout({ pool, provider }, 86400 * 365);
+      await fixOracleAggregatorStaleness({ pool, provider });
+
+      await runWithImpersonateAccount(
+        { provider, account: await pool.managerLogic.manager() },
+        async ({ signer }) => {
+          await pool.managerLogic.connect(signer).setTrader(wallet.address);
+          await pool.managerLogic.connect(signer).changeAssets(
+            [
+              [USDC, true],
+              [WETH, true]
+            ],
+            []
+          );
+        }
+      );
+
       await setUSDCAmount({
         amount: new BigNumber(2).times(1e6).toFixed(0),
         userAddress: pool.address,
@@ -44,13 +62,16 @@ const testKyberSwap = ({ wallet, network, provider }: TestingRunParams) => {
 
     it("approves unlimited USDC on KyberSwap", async () => {
       await pool.approve(Dapp.KYBERSWAP, USDC, MAX_AMOUNT);
-      const usdcAllowanceDelta = await allowanceDelta(
-        pool.address,
+      const iERC20 = new ethers.Contract(
         USDC,
-        routerAddress[network]["kyberswap"]!,
+        ["function allowance(address,address) view returns (uint256)"],
         pool.signer
       );
-      await expect(usdcAllowanceDelta.gt(0));
+      const usdcAllowance = await iERC20.allowance(
+        pool.address,
+        routerAddress[network][Dapp.KYBERSWAP]!
+      );
+      expect(usdcAllowance.gt(0)).toBe(true);
     });
 
     it("gets only amount and txData for 2 USDC into WETH on KyberSwap", async () => {
@@ -77,7 +98,7 @@ const testKyberSwap = ({ wallet, network, provider }: TestingRunParams) => {
         WETH,
         pool.signer
       );
-      expect(wethBalanceDelta.gt(0));
+      expect(wethBalanceDelta.gt(0)).toBe(true);
     });
   });
 };
@@ -96,11 +117,11 @@ testingHelper({
 // testingHelper({
 //   network: Network.POLYGON,
 //   onFork: false,
-//   testingRun: testOdos
+//   testingRun: testKyberSwap
 // });
 
 // testingHelper({
 //   network: Network.BASE,
 //   onFork: false,
-//   testingRun: testOdos
+//   testingRun: testKyberSwap
 // });

package/src/test/lyra.test.ts

@@ -1,164 +1,173 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+import { utils } from "ethers";
 import { Dhedge } from "..";
 import { Network } from "../types";
-import { utils } from "ethers";
-import { SUSD, TEST_POOL } from "./constants";
+import { CONTRACT_ADDRESS, TEST_POOL } from "./constants";
 import { getTxOptions } from "./txOptions";
-import { wallet } from "./wallet";
+import { TestingRunParams, testingHelper } from "./utils/testingHelper";
 
-jest.setTimeout(100000);
-const TEST_POOL_OP = TEST_POOL.optimism;
+const testLyra = ({ wallet, network }: TestingRunParams) => {
+  const SUSD = CONTRACT_ADDRESS[network].SUSD;
 
-describe("pool", () => {
   let dhedge: Dhedge;
-  const options = getTxOptions(Network.OPTIMISM);
-  beforeAll(async () => {
-    dhedge = new Dhedge(wallet, Network.OPTIMISM);
-  });
+  jest.setTimeout(100000);
 
-  it("buys 0.1 1400 calls with expiry October 28th", async () => {
-    let result;
-    const pool = await dhedge.loadPool(TEST_POOL_OP);
-    try {
-      result = await pool.tradeLyraOption(
-        "eth",
-        1666944000,
-        1400,
-        "call",
-        "buy",
-        utils.parseEther("0.1"),
-        SUSD
-      );
-    } catch (e) {
-      console.log(e);
-    }
-    result.wait(1);
-    const positions = await pool.getLyraPositions("eth");
-    expect(positions.length > 0);
-  });
+  describe(`pool on ${network}`, () => {
+    let options: any;
+    beforeAll(async () => {
+      options = await getTxOptions(network);
+      dhedge = new Dhedge(wallet, network);
+    });
 
-  it("adds 0.05 1400 calls with expiry October 28th", async () => {
-    let result;
-    const pool = await dhedge.loadPool(TEST_POOL_OP);
-    try {
-      result = await pool.tradeLyraOption(
-        "eth",
-        1666944000,
-        1400,
-        "call",
-        "buy",
-        utils.parseEther("0.05"),
-        SUSD,
-        "0",
-        false,
-        options
-      );
-    } catch (e) {
-      console.log(e);
-    }
-    result.wait(1);
-    const positions = await pool.getLyraPositions("eth");
-    expect(utils.formatEther(positions[0].amount)).toBe("0.15");
-  });
+    it("buys 0.1 1400 calls with expiry October 28th", async () => {
+      let result;
+      const pool = await dhedge.loadPool(TEST_POOL[network]);
+      try {
+        result = await pool.tradeLyraOption(
+          "eth",
+          1666944000,
+          1400,
+          "call",
+          "buy",
+          utils.parseEther("0.1"),
+          SUSD
+        );
+      } catch (e) {
+        console.log(e);
+      }
+      result.wait(1);
+      const positions = await pool.getLyraPositions("eth");
+      expect(positions.length > 0);
+    });
 
-  it("sells 0.1 1300 Covered Call with expiry October 28th", async () => {
-    let result;
-    const pool = await dhedge.loadPool(TEST_POOL_OP);
-    try {
-      result = await pool.tradeLyraOption(
-        "eth",
-        1666944000,
-        1300,
-        "call",
-        "sell",
-        utils.parseEther("0.1"),
-        SUSD,
-        utils.parseEther("0.1"),
-        true,
-        options
-      );
-    } catch (e) {
-      console.log(e);
-    }
-    result.wait(1);
-    const positions = await pool.getLyraPositions("eth");
-    const cCall = positions.find(e => e.optionType === 2);
-    expect(cCall).not.toBe(undefined);
-  });
+    it("adds 0.05 1400 calls with expiry October 28th", async () => {
+      let result;
+      const pool = await dhedge.loadPool(TEST_POOL[network]);
+      try {
+        result = await pool.tradeLyraOption(
+          "eth",
+          1666944000,
+          1400,
+          "call",
+          "buy",
+          utils.parseEther("0.05"),
+          SUSD,
+          "0",
+          false,
+          options
+        );
+      } catch (e) {
+        console.log(e);
+      }
+      result.wait(1);
+      const positions = await pool.getLyraPositions("eth");
+      expect(utils.formatEther(positions[0].amount)).toBe("0.15");
+    });
 
-  it("adds 0.05 1300 Covered Call with expiry October 28th", async () => {
-    let result;
-    const pool = await dhedge.loadPool(TEST_POOL_OP);
-    try {
-      result = await pool.tradeLyraOption(
-        "eth",
-        1666944000,
-        1300,
-        "call",
-        "sell",
-        utils.parseEther("0.05"),
-        SUSD,
-        utils.parseEther("0.05"),
-        true,
-        options
-      );
-    } catch (e) {
-      console.log(e);
-    }
-    result.wait(1);
-    const positions = await pool.getLyraPositions("eth");
-    const cCall = positions.find(e => e.optionType === 2);
-    expect(cCall);
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    expect(utils.formatEther(cCall!.amount)).toBe("0.15");
-  });
+    it("sells 0.1 1300 Covered Call with expiry October 28th", async () => {
+      let result;
+      const pool = await dhedge.loadPool(TEST_POOL[network]);
+      try {
+        result = await pool.tradeLyraOption(
+          "eth",
+          1666944000,
+          1300,
+          "call",
+          "sell",
+          utils.parseEther("0.1"),
+          SUSD,
+          utils.parseEther("0.1"),
+          true,
+          options
+        );
+      } catch (e) {
+        console.log(e);
+      }
+      result.wait(1);
+      const positions = await pool.getLyraPositions("eth");
+      const cCall = positions.find(e => e.optionType === 2);
+      expect(cCall).not.toBe(undefined);
+    });
 
-  it("closes all 0.15 1300 Covered Call with expiry October 28th", async () => {
-    let result;
-    const pool = await dhedge.loadPool(TEST_POOL_OP);
-    try {
-      result = await pool.tradeLyraOption(
-        "eth",
-        1666944000,
-        1300,
-        "call",
-        "buy",
-        utils.parseEther("0.15"),
-        SUSD,
-        utils.parseEther("0.15"),
-        true,
-        options
-      );
-    } catch (e) {
-      console.log(e);
-    }
-    result.wait(1);
-    const positions = await pool.getLyraPositions("eth");
-    const cCall = positions.find(e => e.optionType === 2 && e.state === 1);
-    expect(cCall).toBe(undefined);
-  });
+    it("adds 0.05 1300 Covered Call with expiry October 28th", async () => {
+      let result;
+      const pool = await dhedge.loadPool(TEST_POOL[network]);
+      try {
+        result = await pool.tradeLyraOption(
+          "eth",
+          1666944000,
+          1300,
+          "call",
+          "sell",
+          utils.parseEther("0.05"),
+          SUSD,
+          utils.parseEther("0.05"),
+          true,
+          options
+        );
+      } catch (e) {
+        console.log(e);
+      }
+      result.wait(1);
+      const positions = await pool.getLyraPositions("eth");
+      const cCall = positions.find(e => e.optionType === 2);
+      expect(cCall);
+      expect(utils.formatEther(cCall!.amount)).toBe("0.15");
+    });
 
-  it("closes all 0.15 1400 Calls with expiry October 28th", async () => {
-    let result;
-    const pool = await dhedge.loadPool(TEST_POOL_OP);
-    try {
-      result = await pool.tradeLyraOption(
-        "eth",
-        1666944000,
-        1400,
-        "call",
-        "sell",
-        utils.parseEther("0.15"),
-        SUSD,
-        "0",
-        false,
-        options
-      );
-    } catch (e) {
-      console.log(e);
-    }
-    result.wait(1);
-    const positions = await pool.getLyraPositions("eth");
-    const call = positions.find(e => e.optionType === 0 && e.state === 1);
-    expect(call).toBe(undefined);
+    it("closes all 0.15 1300 Covered Call with expiry October 28th", async () => {
+      let result;
+      const pool = await dhedge.loadPool(TEST_POOL[network]);
+      try {
+        result = await pool.tradeLyraOption(
+          "eth",
+          1666944000,
+          1300,
+          "call",
+          "buy",
+          utils.parseEther("0.15"),
+          SUSD,
+          utils.parseEther("0.15"),
+          true,
+          options
+        );
+      } catch (e) {
+        console.log(e);
+      }
+      result.wait(1);
+      const positions = await pool.getLyraPositions("eth");
+      const cCall = positions.find(e => e.optionType === 2 && e.state === 1);
+      expect(cCall).toBe(undefined);
+    });
+
+    it("closes all 0.15 1400 Calls with expiry October 28th", async () => {
+      let result;
+      const pool = await dhedge.loadPool(TEST_POOL[network]);
+      try {
+        result = await pool.tradeLyraOption(
+          "eth",
+          1666944000,
+          1400,
+          "call",
+          "sell",
+          utils.parseEther("0.15"),
+          SUSD,
+          "0",
+          false,
+          options
+        );
+      } catch (e) {
+        console.log(e);
+      }
+      result.wait(1);
+      const positions = await pool.getLyraPositions("eth");
+      const call = positions.find(e => e.optionType === 0 && e.state === 1);
+      expect(call).toBe(undefined);
+    });
   });
+};
+
+testingHelper({
+  network: Network.OPTIMISM,
+  testingRun: testLyra
 });

package/src/test/odos.test.ts

@@ -50,7 +50,7 @@ const testOdos = ({ wallet, network, provider }: TestingRunParams) => {
         routerAddress[network]["odos"]!,
         pool.signer
       );
-      await expect(usdcAllowanceDelta.gt(0));
+      expect(usdcAllowanceDelta.gt(0)).toBe(true);
     });
 
     it("gets gas estimation for 10 USDC into WETH on Odos", async () => {
@@ -82,7 +82,7 @@ const testOdos = ({ wallet, network, provider }: TestingRunParams) => {
         WETH,
         pool.signer
       );
-      expect(wethBalanceDelta.gt(0));
+      expect(wethBalanceDelta.gt(0)).toBe(true);
       const wethBalanceDeltaForFeeRecipient = await balanceDelta(
         OdosSwapFeeRecipient[network],
         WETH,

package/src/test/oneInch.test.ts

@@ -1,20 +1,23 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 
+import BigNumber from "bignumber.js";
+import { ethers } from "ethers";
 import { Dhedge, Pool } from "..";
 
+import { routerAddress } from "../config";
 import { Dapp, Network } from "../types";
 import { CONTRACT_ADDRESS, MAX_AMOUNT, TEST_POOL } from "./constants";
+import { getTxOptions } from "./txOptions";
 import {
   TestingRunParams,
+  fixOracleAggregatorStaleness,
+  runWithImpersonateAccount,
+  setChainlinkTimeout,
   setUSDCAmount,
   testingHelper,
   wait
 } 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";
+import { balanceDelta } from "./utils/token";
 
 const testOneInch = ({ wallet, network, provider }: TestingRunParams) => {
   const USDC = CONTRACT_ADDRESS[network].USDC;
@@ -26,22 +29,30 @@ const testOneInch = ({ wallet, network, provider }: TestingRunParams) => {
 
   describe(`pool on ${network}`, () => {
     beforeAll(async () => {
-      dhedge = new Dhedge(wallet, network);
-      pool = await dhedge.loadPool(TEST_POOL[network]);
-      // top up gas
       await provider.send("hardhat_setBalance", [
         wallet.address,
         "0x10000000000000000"
       ]);
-      await provider.send("evm_mine", []);
+      dhedge = new Dhedge(wallet, network);
+      pool = await dhedge.loadPool(TEST_POOL[network]);
 
-      const newAssets = [
-        { asset: USDC, isDeposit: true },
-        { asset: WETH, isDeposit: true }
-      ];
+      await setChainlinkTimeout({ pool, provider }, 86400 * 365);
+      await fixOracleAggregatorStaleness({ pool, provider });
+
+      await runWithImpersonateAccount(
+        { provider, account: await pool.managerLogic.manager() },
+        async ({ signer }) => {
+          await pool.managerLogic.connect(signer).setTrader(wallet.address);
+          await pool.managerLogic.connect(signer).changeAssets(
+            [
+              [USDC, true],
+              [WETH, true]
+            ],
+            []
+          );
+        }
+      );
 
-      await pool.managerLogic.changeAssets(newAssets, []);
-      // top up USDC
       await setUSDCAmount({
         amount: new BigNumber(2).times(1e6).toFixed(0),
         userAddress: pool.address,
@@ -52,13 +63,16 @@ const testOneInch = ({ wallet, network, provider }: TestingRunParams) => {
 
     it("approves unlimited USDC on 1Inch", async () => {
       await pool.approve(Dapp.ONEINCH, USDC, MAX_AMOUNT);
-      const usdcAllowanceDelta = await allowanceDelta(
-        pool.address,
+      const iERC20 = new ethers.Contract(
         USDC,
-        routerAddress[network]["1inch"]!,
+        ["function allowance(address,address) view returns (uint256)"],
         pool.signer
       );
-      await expect(usdcAllowanceDelta.gt(0));
+      const usdcAllowance = await iERC20.allowance(
+        pool.address,
+        routerAddress[network][Dapp.ONEINCH]!
+      );
+      expect(usdcAllowance.gt(0)).toBe(true);
     });
 
     it("gets gas estimation for 2 USDC into WETH on 1Inch", async () => {
@@ -71,7 +85,7 @@ const testOneInch = ({ wallet, network, provider }: TestingRunParams) => {
         await getTxOptions(network),
         true
       );
-      expect(gasEstimate.gas.gt(0));
+      expect(gasEstimate.gas.gt(0)).toBe(true);
       expect(gasEstimate.minAmountOut).not.toBeNull();
     });
 
@@ -104,13 +118,13 @@ const testOneInch = ({ wallet, network, provider }: TestingRunParams) => {
         WETH,
         pool.signer
       );
-      expect(wethBalanceDelta.gt(0));
+      expect(wethBalanceDelta.gt(0)).toBe(true);
     });
   });
 };
 
 testingHelper({
-  network: Network.OPTIMISM,
+  network: Network.ARBITRUM,
   testingRun: testOneInch
 });