@dhedge/v2-sdk 2.1.8 → 2.2.0

package/src/test/flatmoney.test.ts

@@ -1,7 +1,6 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import BigNumber from "bignumber.js";
 import { Dhedge, Pool } from "../entities";
-import { AssetEnabled, Network } from "../types";
+import { Network } from "../types";
 import {
   TestingRunParams,
   runWithImpersonateAccount,
@@ -12,7 +11,6 @@ import { Contract, ethers } from "ethers";
 import { CONTRACT_ADDRESS, MAX_AMOUNT, TEST_POOL } from "./constants";
 import { flatMoneyContractAddresses } from "../config";
 import DelayedOrderAbi from "../abi/flatmoney/DelayedOrder.json";
-import { allowanceDelta } from "./utils/token";
 import { getKeeperFee } from "../services/flatmoney/keeperFee";
 
 const COLLATERAL_SLOT = 0; // same for RETH(base) and WBTC(optimism)
@@ -32,19 +30,15 @@ const testFlatMoney = ({
   let delayOrderContract: Contract;
   let COLLATERAL: string;
   jest.setTimeout(200000);
+  // FlatMoney's OracleModule reverts with ETHPriceStale() when the forked block's
+  // Chainlink ETH/USD price is older than maxAge. Re-run the fork before this suite
+  // so the oracle timestamp is fresh (there is no helper to override maxAge here).
   describe(`flatmoney on ${network}`, () => {
     beforeAll(async () => {
       await provider.send("evm_mine", []);
       dhedge = new Dhedge(wallet, network);
       pool = await dhedge.loadPool(TEST_POOL[network]);
 
-      await runWithImpersonateAccount(
-        { provider, account: await pool.managerLogic.manager() },
-        async ({ signer }) => {
-          await pool.managerLogic.connect(signer).setTrader(wallet.address);
-        }
-      );
-
       const flatMoneyContracts = flatMoneyContractAddresses[pool.network];
       if (!flatMoneyContracts) {
         throw new Error("testFlatMoney: network not supported");
@@ -56,7 +50,20 @@ const testFlatMoney = ({
         pool.signer
       );
 
-      // top up gas
+      await runWithImpersonateAccount(
+        { provider, account: await pool.managerLogic.manager() },
+        async ({ signer }) => {
+          await pool.managerLogic.connect(signer).setTrader(wallet.address);
+          await pool.managerLogic.connect(signer).changeAssets(
+            [
+              [COLLATERAL, false],
+              [CONTRACT_ADDRESS[network].UNIT, false]
+            ],
+            []
+          );
+        }
+      );
+
       await provider.send("hardhat_setBalance", [
         wallet.address,
         "0x10000000000000000"
@@ -77,45 +84,24 @@ const testFlatMoney = ({
         slot: UNIT_SLOT,
         userAddress: pool.address
       });
-
-      const currentAssets: any[] = await pool.managerLogic.getSupportedAssets();
-      const exisitingAssets = currentAssets.map(item => {
-        return {
-          asset: item[0],
-          isDeposit: item[1]
-        };
-      });
-
-      const newAssets: AssetEnabled[] = [
-        ...exisitingAssets,
-        { asset: CONTRACT_ADDRESS[network].USDC, isDeposit: true },
-        { asset: CONTRACT_ADDRESS[network].WETH, isDeposit: true },
-        {
-          asset: CONTRACT_ADDRESS[network].UNIT,
-          isDeposit: false
-        },
-        {
-          asset: COLLATERAL,
-          isDeposit: false
-        }
-      ];
-      await pool.changeAssets(newAssets);
     });
 
     it("mint UNIT", async () => {
-      //approve
       await pool.approveSpender(
         delayOrderContract.address,
         COLLATERAL,
         MAX_AMOUNT
       );
-      const collateralAllowanceDelta = await allowanceDelta(
-        pool.address,
+      const iERC20 = new ethers.Contract(
         COLLATERAL,
-        delayOrderContract.address,
+        ["function allowance(address,address) view returns (uint256)"],
         pool.signer
       );
-      await expect(collateralAllowanceDelta.gt(0));
+      const collateralAllowance = await iERC20.allowance(
+        pool.address,
+        delayOrderContract.address
+      );
+      expect(collateralAllowance.gt(0)).toBe(true);
 
       const depositAmountStr = new BigNumber(1).times(1e18).toString();
       const estimateData = await pool.mintUnitViaFlatMoney(

package/src/test/fluid.test.ts

@@ -1,19 +1,20 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import BigNumber from "bignumber.js";
+import { ethers } from "ethers";
 import { Dhedge, Pool } from "..";
-import { AssetEnabled, Network } from "../types";
+import { Network } from "../types";
 import { CONTRACT_ADDRESS, MAX_AMOUNT, TEST_POOL } from "./constants";
 import {
   TestingRunParams,
   beforeAfterReset,
   setWETHAmount,
+  runWithImpersonateAccount,
   testingHelper
 } from "./utils/testingHelper";
-import { allowanceDelta, balanceDelta } from "./utils/token";
-import { getWalletData } from "./wallet";
+import { balanceDelta } from "./utils/token";
 
-const testFluid = ({ network, provider }: TestingRunParams) => {
+const testFluid = ({ wallet, network, provider }: TestingRunParams) => {
   const WETH = CONTRACT_ADDRESS[network].WETH;
   const FLUID_WETH = CONTRACT_ADDRESS[network].FLUID_WETH;
 
@@ -21,16 +22,15 @@ const testFluid = ({ network, provider }: TestingRunParams) => {
   let pool: Pool;
   jest.setTimeout(100000);
 
-  describe(`[${network}] compound V3 tests`, () => {
+  describe(`[${network}] fluid tests`, () => {
     beforeAll(async () => {
-      const { wallet } = getWalletData(network);
-      // top up ETH (gas)
       await provider.send("hardhat_setBalance", [
         wallet.address,
-        "0x100000000000000"
+        "0x10000000000000000"
       ]);
       dhedge = new Dhedge(wallet, network);
       pool = await dhedge.loadPool(TEST_POOL[network]);
+
       await setWETHAmount({
         amount: new BigNumber(1e18).toFixed(0),
         userAddress: pool.address,
@@ -38,26 +38,31 @@ const testFluid = ({ network, provider }: TestingRunParams) => {
         provider
       });
 
-      const newAssets: AssetEnabled[] = [
-        { asset: WETH, isDeposit: true },
-        {
-          asset: FLUID_WETH,
-          isDeposit: false
+      // Impersonate pool manager to set trader and configure assets
+      await runWithImpersonateAccount(
+        { provider, account: await pool.managerLogic.manager() },
+        async ({ signer }) => {
+          await pool.managerLogic.connect(signer).setTrader(wallet.address);
+          const newAssets = [
+            [WETH, true],
+            [FLUID_WETH, false]
+          ];
+          await pool.managerLogic.connect(signer).changeAssets(newAssets, []);
         }
-      ];
-      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,
+      const tx = await pool.approveSpender(FLUID_WETH, WETH, MAX_AMOUNT);
+      await tx.wait(1);
+      const iERC20 = new ethers.Contract(
         WETH,
-        FLUID_WETH,
+        ["function allowance(address,address) view returns (uint256)"],
         pool.signer
       );
-      await expect(wethAllowanceDelta.gt(0));
+      const wethAllowance = await iERC20.allowance(pool.address, FLUID_WETH);
+      expect(wethAllowance.gt(0)).toBe(true);
     });
 
     it("lends WETH to Fluid WETH market", async () => {
@@ -69,17 +74,21 @@ const testFluid = ({ network, provider }: TestingRunParams) => {
         FLUID_WETH,
         pool.signer
       );
-      expect(fWETHTokenDelta.gt(0));
+      expect(fWETHTokenDelta.gt(0)).toBe(true);
     });
 
-    it("withdraw WETH from Fluid WETH market", async () => {
+    it("withdraws 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));
+      const wethBalanceDelta = await balanceDelta(
+        pool.address,
+        WETH,
+        pool.signer
+      );
+      expect(wethBalanceDelta.gt(0)).toBe(true);
     });
   });
 };

package/src/test/hyperliquid.onchain.test.ts

@@ -0,0 +1,131 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
+/**
+ * Hyperliquid on-chain tests for deposit/withdraw/perp-spot/open/close flows.
+ * These require a live chain connection (onFork: false) because Hyperliquid
+ * precompile and CoreWriter state cannot be faithfully forked.
+ *
+ * Prerequisites:
+ *   - PRIVATE_KEY in .env (must be the pool manager or trader)
+ *   - HYPERLIQUID_URL in .env
+ *   - The test pool must hold USDC and an existing ETH perp position
+ *   - Spot wallet must hold the amount expected by the withdraw test
+ */
+
+import { ethers } from "ethers";
+import { Dhedge, Pool } from "..";
+
+import { Dapp, Network } from "../types";
+import { CONTRACT_ADDRESS, MAX_AMOUNT, TEST_POOL } from "./constants";
+import { routerAddress } from "../config";
+import { getTxOptions } from "./txOptions";
+
+import { TestingRunParams, testingHelper } from "./utils/testingHelper";
+
+const testHyperliquid = ({ wallet, network }: TestingRunParams) => {
+  const USDC = CONTRACT_ADDRESS[network].USDC;
+
+  let dhedge: Dhedge;
+  let pool: Pool;
+  jest.setTimeout(200000);
+
+  describe(`pool on ${network}`, () => {
+    beforeAll(async () => {
+      if (!process.env.PRIVATE_KEY || !process.env.HYPERLIQUID_URL) {
+        console.warn(
+          "Skipping hyperliquid on-chain tests: PRIVATE_KEY and HYPERLIQUID_URL env vars required"
+        );
+        return;
+      }
+      dhedge = new Dhedge(wallet, network);
+      pool = await dhedge.loadPool(TEST_POOL[network]);
+    });
+
+    it("approves unlimited USDC on Hyperliquid Core Wallet", async () => {
+      if (!process.env.PRIVATE_KEY || !process.env.HYPERLIQUID_URL) return;
+      const tx = await pool.approve(
+        Dapp.HYPERLIQUID,
+        USDC,
+        MAX_AMOUNT,
+        await getTxOptions(network)
+      );
+      await tx.wait(1);
+      const iERC20 = new ethers.Contract(
+        USDC,
+        ["function allowance(address,address) view returns (uint256)"],
+        pool.signer
+      );
+      const allowance = await iERC20.allowance(
+        pool.address,
+        routerAddress[network][Dapp.HYPERLIQUID]!
+      );
+      expect(allowance.gt(0)).toBe(true);
+    });
+
+    it("deposits 30 USDC into Hyperliquid Core Wallet", async () => {
+      if (!process.env.PRIVATE_KEY || !process.env.HYPERLIQUID_URL) return;
+      const usdcBefore = await pool.utils.getBalance(USDC, pool.address);
+      const tx = await pool.depositHyperliquid(
+        "30000000", // 30 USDC (6 decimals)
+        4294967295,
+        await getTxOptions(network)
+      );
+      await tx.wait(1);
+      const usdcAfter = await pool.utils.getBalance(USDC, pool.address);
+      expect(usdcBefore.sub(usdcAfter).eq("30000000")).toBe(true);
+    });
+
+    it("moves 5 USDC from Perp (dex 0) to Spot wallet", async () => {
+      if (!process.env.PRIVATE_KEY || !process.env.HYPERLIQUID_URL) return;
+      const tx = await pool.perpToSpotHyperliquid(
+        0,
+        "5000000", // 5 USDC (6 decimals)
+        await getTxOptions(network)
+      );
+      await tx.wait(1);
+      expect(tx).toBeDefined();
+    });
+
+    it("withdraws USDC from Hyperliquid Spot Wallet", async () => {
+      if (!process.env.PRIVATE_KEY || !process.env.HYPERLIQUID_URL) return;
+      const tx = await pool.withdrawHyperliquid(
+        "784577548", // 784.577548 USDC (6 decimals)
+        await getTxOptions(network)
+      );
+      await tx.wait(1);
+      expect(tx).toBeDefined();
+    });
+
+    it("opens a XAUT0 spot buy order", async () => {
+      if (!process.env.PRIVATE_KEY || !process.env.HYPERLIQUID_URL) return;
+      const tx = await pool.openMarketOrderHyperliquid(
+        10182, // XAUT0/USDC spot asset id (10000 + spot index 182)
+        true, // long
+        25, // $25 notional
+        1, // 1% slippage
+        await getTxOptions(network)
+      );
+      await tx.wait(1);
+      expect(tx).toBeDefined();
+    });
+
+    it("closes 50% of ETH perp position", async () => {
+      if (!process.env.PRIVATE_KEY || !process.env.HYPERLIQUID_URL) return;
+      const tx = await pool.closePositionHyperliquid(
+        1, // ETH Perp asset id
+        50, // 50% to close
+        1, // 1% slippage
+        await getTxOptions(network)
+      );
+      await tx.wait(1);
+      expect(tx).toBeDefined();
+    });
+  });
+};
+
+// Requires live chain — cannot run on fork
+testingHelper({
+  network: Network.HYPERLIQUID,
+  testingRun: testHyperliquid,
+  onFork: false
+});

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
 // });