@dhedge/v2-sdk 2.1.8 → 2.2.0

package/src/test/utils/testingHelper.ts

@@ -9,6 +9,8 @@ import {
 } from "../constants";
 import { Pool } from "../../entities";
 import AssetHandler from "../../abi/AssetHandler.json";
+import PoolLogicAbi from "../../abi/PoolLogic.json";
+import PoolManagerLogicAbi from "../../abi/PoolManagerLogic.json";
 
 export type TestingRunParams = {
   network: Network;
@@ -146,6 +148,124 @@ export const runWithImpersonateAccount = async (
   await provider.send("hardhat_stopImpersonatingAccount", [account]);
 };
 
+// Fixes oracle staleness reverts on hardhat forks for ChainlinkPythPriceAggregator and PythPriceAggregator.
+// These aggregators have their own maxAge staleness checks separate from the AssetHandler's chainlinkTimeout.
+// This function dynamically finds all such aggregators for a pool's supported assets and overrides
+// their maxAge fields to max uint32 (0xffffffff, ~136 years).
+//
+// Slot layouts below are written in big-endian hex order (high-order bytes first), matching the 64-char
+// string returned by eth_getStorageAt. Within a packed slot, Solidity lays fields out from the low-order
+// end in declaration order — so the first declared field ends up on the right side of the hex string.
+//
+// ChainlinkPythPriceAggregator storage layout:
+//   slot 0: asset (address)
+//   slot 1: oracleData.onchainOracle = [8 bytes padding][4 bytes maxAge][20 bytes oracleContract]
+//           → maxAge at hex offset 16
+//   slot 2: oracleData.offchainOracle.priceId (bytes32)
+//   slot 3: oracleData.offchainOracle = [24 bytes padding][4 bytes maxAge][4 bytes minConfidenceRatio]
+//           → maxAge at hex offset 48
+//
+// PythPriceAggregator storage layout:
+//   slot 0: asset (address)
+//   slot 1: oracleData.priceId (bytes32)
+//   slot 2: oracleData = [24 bytes padding][4 bytes maxAge][4 bytes minConfidenceRatio]
+//           → maxAge at hex offset 48
+const MAX_UINT32_HEX = "ffffffff";
+
+const overrideMaxAgeInSlot = async (
+  provider: ethers.providers.JsonRpcProvider,
+  contractAddress: string,
+  slotIndex: string,
+  maxAgeHexOffset: number // character offset of maxAge within the 64-char hex string
+): Promise<void> => {
+  const slot: string = await provider.send("eth_getStorageAt", [
+    contractAddress,
+    slotIndex,
+    "latest"
+  ]);
+  const hex = slot.slice(2); // remove 0x
+  const newHex =
+    hex.slice(0, maxAgeHexOffset) +
+    MAX_UINT32_HEX +
+    hex.slice(maxAgeHexOffset + 8);
+  await provider.send("hardhat_setStorageAt", [
+    contractAddress,
+    slotIndex,
+    "0x" + newHex
+  ]);
+};
+
+export const fixOracleAggregatorStaleness = async ({
+  pool,
+  provider
+}: {
+  pool: Pool;
+  provider: ethers.providers.JsonRpcProvider;
+}): Promise<void> => {
+  const assetHandlerAddress = await pool.factory.callStatic.getAssetHandler();
+  const assetHandlerContract = new Contract(
+    assetHandlerAddress,
+    AssetHandler.abi,
+    provider
+  );
+
+  // Resolve managerLogic from poolLogic to support both isDhedge=true and isDhedge=false pools
+  const poolLogic = new Contract(pool.address, PoolLogicAbi.abi, provider);
+  const managerLogicAddress: string = await poolLogic.poolManagerLogic();
+  const managerLogic = new Contract(
+    managerLogicAddress,
+    PoolManagerLogicAbi.abi,
+    provider
+  );
+  const supportedAssets: {
+    asset: string;
+  }[] = await managerLogic.getSupportedAssets();
+
+  // ABI fragments to detect aggregator type
+  const chainlinkPythAbi = [
+    "function oracleData() view returns (address oracleContract, uint32 maxAge)"
+  ];
+  const pythAbi = [
+    "function oracleData() view returns (bytes32 priceId, uint32 maxAge, uint32 minConfidenceRatio)"
+  ];
+
+  for (const { asset } of supportedAssets) {
+    try {
+      const aggregatorAddress: string = await assetHandlerContract.priceAggregators(
+        asset
+      );
+      if (aggregatorAddress === ethers.constants.AddressZero) continue;
+
+      // Try ChainlinkPythPriceAggregator first (has onchainOracle + offchainOracle)
+      const agg = new Contract(aggregatorAddress, chainlinkPythAbi, provider);
+      try {
+        await agg.oracleData();
+        // ChainlinkPythPriceAggregator detected.
+        // Slot 1 layout: [8 bytes padding][4 bytes maxAge][20 bytes oracleContract] → maxAge at offset 16
+        await overrideMaxAgeInSlot(provider, aggregatorAddress, "0x1", 16);
+        // Slot 3 layout: [24 bytes padding][4 bytes maxAge][4 bytes minConfidenceRatio] → maxAge at offset 48
+        await overrideMaxAgeInSlot(provider, aggregatorAddress, "0x3", 48);
+        continue;
+      } catch {
+        // Not a ChainlinkPythPriceAggregator
+      }
+
+      // Try PythPriceAggregator (has only offchainOracle)
+      const pythAgg = new Contract(aggregatorAddress, pythAbi, provider);
+      try {
+        await pythAgg.oracleData();
+        // PythPriceAggregator detected.
+        // Slot 2 layout: [24 bytes padding][4 bytes maxAge][4 bytes minConfidenceRatio] → maxAge at offset 48
+        await overrideMaxAgeInSlot(provider, aggregatorAddress, "0x2", 48);
+      } catch {
+        // Not a PythPriceAggregator either — skip
+      }
+    } catch {
+      // No aggregator set for this asset — skip
+    }
+  }
+};
+
 export const setChainlinkTimeout = async (
   {
     pool,

package/src/test/velodrome.test.ts

@@ -4,111 +4,145 @@ 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,
+  testingHelper
+} from "./utils/testingHelper";
 import { allowanceDelta, balanceDelta } from "./utils/token";
 
-import { wallet } from "./wallet";
-
 const USDC_SUSD_Lp = "0xd16232ad60188b68076a235c65d692090caba155";
 const USDC_SUSD_Gauge = "0xb03f52d2db3e758dd49982defd6aeefea9454e80";
-const network = Network.OPTIMISM;
-const SUSD = CONTRACT_ADDRESS[network].SUSD;
-const USDC = CONTRACT_ADDRESS[network].USDC;
 
-let dhedge: Dhedge;
-let pool: Pool;
-jest.setTimeout(100000);
+const testVelodrome = ({ wallet, network, provider }: TestingRunParams) => {
+  const SUSD = CONTRACT_ADDRESS[network].SUSD;
+  const USDC = CONTRACT_ADDRESS[network].USDC;
 
-describe("pool", () => {
-  beforeAll(async () => {
-    dhedge = new Dhedge(wallet, network);
-    pool = await dhedge.loadPool(TEST_POOL[network]);
-  });
+  let dhedge: Dhedge;
+  let pool: Pool;
+  jest.setTimeout(100000);
 
-  it("approves unlimited sUSD and USDC on for Velodrome", async () => {
-    await pool.approve(Dapp.VELODROME, SUSD, MAX_AMOUNT);
-    await pool.approve(Dapp.VELODROME, USDC, MAX_AMOUNT);
-    const UsdcAllowanceDelta = await allowanceDelta(
-      pool.address,
-      USDC,
-      routerAddress[network].velodrome!,
-      pool.signer
-    );
-    await expect(UsdcAllowanceDelta.gt(0));
-  });
+  describe(`pool on ${network}`, () => {
+    beforeAll(async () => {
+      await provider.send("hardhat_setBalance", [
+        wallet.address,
+        "0x10000000000000000"
+      ]);
+      dhedge = new Dhedge(wallet, network);
+      pool = await dhedge.loadPool(TEST_POOL[network]);
 
-  it("adds USDC and SUSD to a Velodrome stable pool", async () => {
-    await pool.addLiquidityVelodrome(
-      USDC,
-      SUSD,
-      (5 * 1e6).toString(),
-      (5 * 1e18).toString(),
-      true
-    );
+      await setChainlinkTimeout({ pool, provider }, 86400 * 365);
+      await fixOracleAggregatorStaleness({ pool, provider });
 
-    const lpTokenDelta = await balanceDelta(
-      pool.address,
-      USDC_SUSD_Lp,
-      pool.signer
-    );
-    expect(lpTokenDelta.gt(0));
-  });
+      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],
+              [SUSD, true],
+              [USDC_SUSD_Lp, false]
+            ],
+            []
+          );
+        }
+      );
+    });
 
-  it("should stake USDC-sUSD LP in a gauge", async () => {
-    const balance = await dhedge.utils.getBalance(USDC_SUSD_Lp, pool.address);
-    await pool.approveSpender(USDC_SUSD_Gauge, USDC_SUSD_Lp, MAX_AMOUNT);
-    await pool.stakeInGauge(Dapp.VELODROME, USDC_SUSD_Gauge, balance);
-    const gaugeBalance = await balanceDelta(
-      pool.address,
-      USDC_SUSD_Lp,
-      pool.signer
-    );
-    expect(gaugeBalance.gt(0));
-  });
+    it("approves unlimited sUSD and USDC on for Velodrome", async () => {
+      await pool.approve(Dapp.VELODROME, SUSD, MAX_AMOUNT);
+      await pool.approve(Dapp.VELODROME, USDC, MAX_AMOUNT);
+      const UsdcAllowanceDelta = await allowanceDelta(
+        pool.address,
+        USDC,
+        routerAddress[network].velodrome!,
+        pool.signer
+      );
+      expect(UsdcAllowanceDelta.gt(0)).toBe(true);
+    });
 
-  it("should claim rewards from Gauge", async () => {
-    const tx = await pool.claimFees(Dapp.VELODROME, USDC_SUSD_Gauge);
-    expect(tx).not.toBe(null);
-  });
+    it("adds USDC and SUSD to a Velodrome stable pool", async () => {
+      await pool.addLiquidityVelodrome(
+        USDC,
+        SUSD,
+        (5 * 1e6).toString(),
+        (5 * 1e18).toString(),
+        true
+      );
 
-  it("should unStake USDC-sUSD LP from a gauge", async () => {
-    const gaugeBalance = await dhedge.utils.getBalance(
-      USDC_SUSD_Gauge,
-      pool.address
-    );
-    await pool.unstakeFromGauge(USDC_SUSD_Gauge, gaugeBalance);
-    const lpTokenDelta = await balanceDelta(
-      pool.address,
-      USDC_SUSD_Lp,
-      pool.signer
-    );
-    expect(lpTokenDelta.gt(0));
-  });
+      const lpTokenDelta = await balanceDelta(
+        pool.address,
+        USDC_SUSD_Lp,
+        pool.signer
+      );
+      expect(lpTokenDelta.gt(0)).toBe(true);
+    });
 
-  it("approves unlimited wETH/stwETH LP for Velodrome", async () => {
-    await pool.approve(Dapp.VELODROME, USDC_SUSD_Lp, MAX_AMOUNT);
-    const lpAllowanceDelta = await allowanceDelta(
-      pool.address,
-      USDC_SUSD_Lp,
-      routerAddress[network].velodrome!,
-      pool.signer
-    );
-    expect(lpAllowanceDelta.gt(0));
-  });
+    it("should stake USDC-sUSD LP in a gauge", async () => {
+      const balance = await dhedge.utils.getBalance(USDC_SUSD_Lp, pool.address);
+      await pool.approveSpender(USDC_SUSD_Gauge, USDC_SUSD_Lp, MAX_AMOUNT);
+      await pool.stakeInGauge(Dapp.VELODROME, USDC_SUSD_Gauge, balance);
+      const gaugeBalance = await balanceDelta(
+        pool.address,
+        USDC_SUSD_Lp,
+        pool.signer
+      );
+      expect(gaugeBalance.gt(0)).toBe(true);
+    });
+
+    it("should claim rewards from Gauge", async () => {
+      const tx = await pool.claimFees(Dapp.VELODROME, USDC_SUSD_Gauge);
+      expect(tx).not.toBe(null);
+    });
 
-  it("should remove all liquidity from an existing pool ", async () => {
-    const balance = await dhedge.utils.getBalance(USDC_SUSD_Lp, pool.address);
-    await pool.removeLiquidityVelodrome(USDC, SUSD, balance, true);
-    const usdcBalanceDelta = await balanceDelta(
-      pool.address,
-      USDC,
-      pool.signer
-    );
-    const susdBalanceDelta = await balanceDelta(
-      pool.address,
-      SUSD,
-      pool.signer
-    );
-    expect(usdcBalanceDelta.gt(0));
-    expect(susdBalanceDelta.gt(0));
+    it("should unStake USDC-sUSD LP from a gauge", async () => {
+      const gaugeBalance = await dhedge.utils.getBalance(
+        USDC_SUSD_Gauge,
+        pool.address
+      );
+      await pool.unstakeFromGauge(USDC_SUSD_Gauge, gaugeBalance);
+      const lpTokenDelta = await balanceDelta(
+        pool.address,
+        USDC_SUSD_Lp,
+        pool.signer
+      );
+      expect(lpTokenDelta.gt(0)).toBe(true);
+    });
+
+    it("approves unlimited USDC-sUSD LP for Velodrome", async () => {
+      await pool.approve(Dapp.VELODROME, USDC_SUSD_Lp, MAX_AMOUNT);
+      const lpAllowanceDelta = await allowanceDelta(
+        pool.address,
+        USDC_SUSD_Lp,
+        routerAddress[network].velodrome!,
+        pool.signer
+      );
+      expect(lpAllowanceDelta.gt(0)).toBe(true);
+    });
+
+    it("should remove all liquidity from an existing pool ", async () => {
+      const balance = await dhedge.utils.getBalance(USDC_SUSD_Lp, pool.address);
+      await pool.removeLiquidityVelodrome(USDC, SUSD, balance, true);
+      const usdcBalanceDelta = await balanceDelta(
+        pool.address,
+        USDC,
+        pool.signer
+      );
+      const susdBalanceDelta = await balanceDelta(
+        pool.address,
+        SUSD,
+        pool.signer
+      );
+      expect(usdcBalanceDelta.gt(0)).toBe(true);
+      expect(susdBalanceDelta.gt(0)).toBe(true);
+    });
   });
+};
+
+testingHelper({
+  network: Network.OPTIMISM,
+  testingRun: testVelodrome
 });

package/src/test/velodromeCL.test.ts

@@ -1,22 +1,24 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import BigNumber from "bignumber.js";
 import { Dhedge, Pool, ethers } from "..";
 
 import { nonfungiblePositionManagerAddress } from "../config";
-import { AssetEnabled, Dapp, Network } from "../types";
+import { Dapp, Network } from "../types";
 import { CONTRACT_ADDRESS, MAX_AMOUNT, TEST_POOL } from "./constants";
 import {
   TestingRunParams,
   beforeAfterReset,
+  fixOracleAggregatorStaleness,
+  runWithImpersonateAccount,
   setChainlinkTimeout,
   setUSDCAmount,
   setWETHAmount,
   testingHelper
 } from "./utils/testingHelper";
-import { allowanceDelta, balanceDelta } from "./utils/token";
+import { 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
   ]!;
@@ -33,18 +35,33 @@ const testVelodromeCL = ({ wallet, network, provider }: TestingRunParams) => {
   let tokenId: string;
   jest.setTimeout(100000);
 
-  describe(`[${network}] veldorome CL  tests`, () => {
+  describe(`[${network}] velodrome CL tests`, () => {
     beforeAll(async () => {
-      // 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]);
 
-      // setChainlinkTimeout
       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],
+              [VELODROME_POSITION_MANGER, false],
+              [VELO, false]
+            ],
+            []
+          );
+        }
+      );
 
       await setUSDCAmount({
         amount: new BigNumber(10000).times(1e6).toFixed(0),
@@ -59,20 +76,6 @@ const testVelodromeCL = ({ wallet, network, provider }: TestingRunParams) => {
         provider
       });
 
-      const newAssets: AssetEnabled[] = [
-        { asset: USDC, isDeposit: true },
-        { asset: WETH, isDeposit: true },
-        {
-          asset: VELODROME_POSITION_MANGER,
-          isDeposit: false
-        },
-        {
-          asset: VELO,
-          isDeposit: false
-        }
-      ];
-      await pool.changeAssets(newAssets);
-
       velodromePositionManager = new ethers.Contract(
         VELODROME_POSITION_MANGER,
         INonfungiblePositionManager.abi,
@@ -86,13 +89,16 @@ const testVelodromeCL = ({ wallet, network, provider }: TestingRunParams) => {
       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,
+        const iERC20 = new ethers.Contract(
           USDC,
-          VELODROME_POSITION_MANGER,
+          ["function allowance(address,address) view returns (uint256)"],
           pool.signer
         );
-        await expect(UsdcAllowanceDelta.gt(0));
+        const usdcAllowance = await iERC20.allowance(
+          pool.address,
+          VELODROME_POSITION_MANGER
+        );
+        expect(usdcAllowance.gt(0)).toBe(true);
       });
 
       it("adds USDC and WETH to a Velodrome CL (mint position)", async () => {
@@ -114,7 +120,7 @@ const testVelodromeCL = ({ wallet, network, provider }: TestingRunParams) => {
         tokenId = (
           await velodromePositionManager.tokenOfOwnerByIndex(pool.address, 0)
         ).toString();
-        expect(tokenId).not.toBe(null);
+        expect(tokenId).toBeDefined();
       });
 
       it("increases liquidity in a CL position", async () => {
@@ -130,7 +136,7 @@ const testVelodromeCL = ({ wallet, network, provider }: TestingRunParams) => {
           wethBalance.div(2)
         );
         const positionAfter = await velodromePositionManager.positions(tokenId);
-        expect(positionAfter.liquidity.gt(positionBefore.liquidity));
+        expect(positionAfter.liquidity.gt(positionBefore.liquidity)).toBe(true);
       });
 
       it("decreases liquidity from a CL position", async () => {
@@ -139,14 +145,17 @@ const testVelodromeCL = ({ wallet, network, provider }: TestingRunParams) => {
         );
         await pool.decreaseLiquidity(Dapp.VELODROMECL, tokenId, 50);
         const positionAfter = await velodromePositionManager.positions(tokenId);
-        expect(positionAfter.liquidity.lt(positionBefore.liquidity));
+        expect(positionAfter.liquidity.lt(positionBefore.liquidity)).toBe(true);
       });
 
       it("collects fess of a CL position", async () => {
-        await provider.send("evm_increaseTime", [24 * 3600 * 3]); // 1 day
+        await provider.send("evm_increaseTime", [24 * 3600 * 3]); // 3 days
         await provider.send("evm_mine", []);
         await pool.claimFees(Dapp.VELODROMECL, tokenId);
-        expect((await balanceDelta(pool.address, USDC, pool.signer)).gt(0));
+        // Fork has no trading activity during evm_increaseTime so no fees accrue — assert gte(0) to verify the call succeeds
+        expect(
+          (await balanceDelta(pool.address, USDC, pool.signer)).gte(0)
+        ).toBe(true);
       });
     });
     describe("Liquidity staking", () => {
@@ -186,7 +195,10 @@ const testVelodromeCL = ({ wallet, network, provider }: TestingRunParams) => {
         await provider.send("evm_increaseTime", [24 * 3600]); // 1 day
         await provider.send("evm_mine", []);
         await pool.claimFees(Dapp.VELODROMECL, tokenId);
-        expect((await balanceDelta(pool.address, VELO, pool.signer)).gt(0));
+        // Fork has no gauge emissions during evm_increaseTime so no VELO rewards — assert gte(0) to verify the call succeeds
+        expect(
+          (await balanceDelta(pool.address, VELO, pool.signer)).gte(0)
+        ).toBe(true);
       });
 
       it("unstakes a CL position from a gauge", async () => {