@dhedge/v2-sdk 2.2.3 → 2.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhedge/v2-sdk",
-  "version": "2.2.3",
+  "version": "2.2.5",
   "license": "MIT",
   "description": "🛠 An SDK for building applications on top of dHEDGE V2",
   "main": "dist/index.js",

package/src/config.ts

@@ -62,7 +62,7 @@ export const routerAddress: AddressDappNetworkMap = {
     [Dapp.ODOS]: "0x0D05a7D3448512B78fa8A9e46c4872C88C4a0D05",
     [Dapp.PENDLE]: "0x888888888889758F76e7103c6CbF23ABbF58F946",
     [Dapp.KYBERSWAP]: "0x6131B5fae19EA4f9D964eAc0408E4408b66337b5",
-    [Dapp.DYTM]: "0x0fF1CEE337d7af25eEF4c1a7A2CaF83f98d80001"
+    [Dapp.DYTM]: ""
   },
   [Network.BASE]: {
     [Dapp.ONEINCH]: "0x111111125421ca6dc452d289314280a0f8842a65",
@@ -80,7 +80,7 @@ export const routerAddress: AddressDappNetworkMap = {
     [Dapp.ONEINCH]: "0x111111125421ca6dc452d289314280a0f8842a65",
     [Dapp.KYBERSWAP]: "0x6131B5fae19EA4f9D964eAc0408E4408b66337b5",
     [Dapp.ONDO]: "0xde41399145F23936b03dD1474eC16c1519c0DC2a",
-    [Dapp.DYTM]: "0x0ff1ce991105DD1a8e26bC8a974Fd0154398Df0f"
+    [Dapp.DYTM]: "0x0ff1ceB93DbADfB13722058D60c4B8cD122b06ea"
   },
   [Network.PLASMA]: {
     [Dapp.AAVEV3]: "0x925a2A7214Ed92428B5b1B090F80b25700095e12",
@@ -269,16 +269,6 @@ export const limitOrderAddress: AddressNetworkMap = {
   [Network.HYPERLIQUID]: ""
 };
 
-export const OdosSwapFeeRecipient = {
-  [Network.POLYGON]: "0x090e7fbD87A673eE3D0B6ccACf0e1d94fB90DA59",
-  [Network.OPTIMISM]: "0x813123A13d01d3F07d434673Fdc89cBBA523f14d",
-  [Network.ARBITRUM]: "0xfbD2B4216f422DC1eEe1Cff4Fb64B726F099dEF5",
-  [Network.BASE]: "0x5619AD05b0253a7e647Bd2E4C01c7f40CEaB0879",
-  [Network.ETHEREUM]: "0xfbD2B4216f422DC1eEe1Cff4Fb64B726F099dEF5",
-  [Network.PLASMA]: "",
-  [Network.HYPERLIQUID]: ""
-};
-
 export const dytmContractAddresses: Readonly<Partial<
   Record<
     Network,
@@ -288,9 +278,9 @@ export const dytmContractAddresses: Readonly<Partial<
   >
 >> = {
   [Network.ARBITRUM]: {
-    Periphery: "0x1FBe7Bb394BE505C08e9ee419Dd166c71004e51B"
+    Periphery: ""
   },
   [Network.ETHEREUM]: {
-    Periphery: "0xbc632a1A4bD878D7e7D14ea6CfE0DDe3Fc291D1a"
+    Periphery: "0xfA03F9Ce907006133a0E77796a31c40AC22151d5"
   }
 };

package/src/services/odos/index.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import axios from "axios";
 import { ApiError, ethers } from "../..";
-import { networkChainIdMap, OdosSwapFeeRecipient } from "../../config";
+import { networkChainIdMap } from "../../config";
 import { Pool } from "../../entities";
 import OdosRouterV3Abi from "../../abi/odos/OdosRouterV3.json";
 import BigNumber from "bignumber.js";
@@ -37,8 +37,6 @@ export async function getOdosSwapTxData(
   }
   const ODOS_API_KEY = process.env.ODOS_API_KEY;
 
-  const referralFeeBips = 2; // 2 basis points = 0.02%
-
   const quoteParams = {
     chainId: networkChainIdMap[pool.network],
     inputTokens: [
@@ -56,8 +54,8 @@ export async function getOdosSwapTxData(
     slippageLimitPercent: slippage,
     userAddr: pool.address,
     compact: false,
-    referralFeeRecipient: OdosSwapFeeRecipient[pool.network],
-    referralFee: referralFeeBips // 0.02% fee
+    // OdosV3ContractGuard requires referral fee == 0
+    referralFee: 0
   };
   try {
     const quoteResult = await axios.post(
@@ -98,20 +96,9 @@ export async function getOdosSwapTxData(
     const executor = decodedData.args[2] as string;
     const referralInfo = decodedData.args[3] as SwapReferralInfo;
 
-    if (
-      referralInfo.fee.lte(
-        ethers.BigNumber.from((referralFeeBips * 1e18) / 10000)
-      )
-    ) {
-      // Referral fee is already correct, return original txData
-      return {
-        swapTxData: assembleResult.data.transaction.data,
-        minAmountOut: assembleResult.data.outputTokens[0].amount
-      };
-    }
-
+    // Force referral fee to 0 and scale outputQuote up accordingly.
     const FEE_DENOM = new BigNumber(1e18);
-    const correctedFee = new BigNumber((referralFeeBips * 1e18) / 10000);
+    const correctedFee = new BigNumber(0);
     const factor = 1.1;
     const correctedOutputQuote = new BigNumber(tokenInfo.outputQuote.toString())
       .times(
@@ -121,8 +108,6 @@ export async function getOdosSwapTxData(
       )
       .times(factor);
 
-    // example referralInfo.fee could be 0.0005 * 1e18 = 500000000000000, which is 0.05%
-    // Create corrected referral info
     const correctedTxData = iface.encodeFunctionData(decodedData.name, [
       {
         ...tokenInfo,
@@ -132,7 +117,7 @@ export async function getOdosSwapTxData(
       executor,
       {
         code: referralInfo.code,
-        fee: correctedFee.toFixed(0), // align with referralFeeBips
+        fee: correctedFee.toFixed(0),
         feeRecipient: referralInfo.feeRecipient
       }
     ]);

package/src/test/constants.ts

@@ -229,7 +229,7 @@ export const MAX_AMOUNT = ethers.constants.MaxUint256;
 export const USDC_BALANCEOF_SLOT = {
   [Network.OPTIMISM]: 9,
   [Network.ARBITRUM]: 9,
-  [Network.POLYGON]: 0,
+  [Network.POLYGON]: 9,
   [Network.BASE]: 9,
   [Network.ETHEREUM]: 9,
   [Network.PLASMA]: 9,

package/src/test/dytm.test.ts

@@ -230,11 +230,6 @@ const testDytm = ({ network, wallet, provider }: TestingRunParams) => {
   });
 };
 
-testingHelper({
-  network: Network.ARBITRUM,
-  testingRun: testDytm
-});
-
 testingHelper({
   network: Network.ETHEREUM,
   testingRun: testDytm

package/src/test/odos.test.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 
-import { Dhedge, Pool } from "..";
+import { Dhedge, Pool, ethers } from "..";
 
 import { Dapp, Network } from "../types";
 import { CONTRACT_ADDRESS, MAX_AMOUNT, TEST_POOL } from "./constants";
@@ -8,12 +8,17 @@ import {
   TestingRunParams,
   setUSDCAmount,
   testingHelper,
-  wait
+  wait,
+  runWithImpersonateAccount
 } from "./utils/testingHelper";
 import { allowanceDelta, balanceDelta } from "./utils/token";
 import { getTxOptions } from "./txOptions";
 import BigNumber from "bignumber.js";
-import { OdosSwapFeeRecipient, routerAddress } from "../config";
+import { routerAddress } from "../config";
+import { getOdosSwapTxData } from "../services/odos";
+import OdosRouterV3Abi from "../abi/odos/OdosRouterV3.json";
+import PoolLogicAbi from "../abi/PoolLogic.json";
+import PoolManagerLogicAbi from "../abi/PoolManagerLogic.json";
 
 const testOdos = ({ wallet, network, provider }: TestingRunParams) => {
   const USDC = CONTRACT_ADDRESS[network].USDC;
@@ -27,6 +32,36 @@ const testOdos = ({ wallet, network, provider }: TestingRunParams) => {
     beforeAll(async () => {
       dhedge = new Dhedge(wallet, network);
       pool = await dhedge.loadPool(TEST_POOL[network]);
+      // fork-only: authorize the test wallet by impersonating the pool manager
+      // and setting the wallet as trader (avoids dh24 unauthorized executor)
+      const poolLogic = new ethers.Contract(
+        pool.address,
+        PoolLogicAbi.abi,
+        provider
+      );
+      const pmlAddress: string = await poolLogic.poolManagerLogic();
+      const poolManagerLogic = new ethers.Contract(
+        pmlAddress,
+        PoolManagerLogicAbi.abi,
+        provider
+      );
+      const manager: string = await poolManagerLogic.manager();
+      const wethSupported: boolean = await poolManagerLogic.isSupportedAsset(
+        WETH
+      );
+      await runWithImpersonateAccount(
+        { account: manager, provider },
+        async ({ signer }) => {
+          await poolManagerLogic.connect(signer).setTrader(wallet.address);
+          // fork-only: ensure WETH is a supported (destination) asset so the
+          // Odos guard's isSupportedAsset check passes
+          if (!wethSupported) {
+            await poolManagerLogic
+              .connect(signer)
+              .changeAssets([{ asset: WETH, isDeposit: false }], []);
+          }
+        }
+      );
       // top up gas
       await provider.send("hardhat_setBalance", [
         wallet.address,
@@ -69,6 +104,20 @@ const testOdos = ({ wallet, network, provider }: TestingRunParams) => {
 
     it("trades 10 USDC into WETH on Odos", async () => {
       await wait(1);
+      // inspect the swap txData: referral fee must be 0 (OdosV3ContractGuard)
+      const { swapTxData } = await getOdosSwapTxData(
+        pool,
+        USDC,
+        WETH,
+        "10000000",
+        0.5
+      );
+      const referralInfo = new ethers.utils.Interface(
+        OdosRouterV3Abi.abi
+      ).parseTransaction({ data: swapTxData }).args[3];
+      expect(referralInfo.fee.isZero()).toBe(true);
+      const feeRecipient: string = referralInfo.feeRecipient;
+
       await pool.trade(
         Dapp.ODOS,
         USDC,
@@ -83,37 +132,20 @@ const testOdos = ({ wallet, network, provider }: TestingRunParams) => {
         pool.signer
       );
       expect(wethBalanceDelta.gt(0)).toBe(true);
-      const wethBalanceDeltaForFeeRecipient = await balanceDelta(
-        OdosSwapFeeRecipient[network],
+      // no WETH skimmed to the Odos router
+      const wethBalanceDeltaForRouter = await balanceDelta(
+        routerAddress[network]["odos"]!,
         WETH,
         pool.signer
       );
-
-      // diffRatio  = (1 - fee) / (0.8 * fee)
-      // 0.8 is the split percentage for fee recipient
-      // e.g. for 0.02% fee, diffRatio = 0.9998 / 0.00016 = 6248.75
-      // e.g. for 0.03% fee, diffRatio = 0.9997 / 0.00024 = 4165.42
-      // e.g. for 0.04% fee, diffRatio = 0.9996 / 0.00032 = 3123.75
-      // e.g. for 0.05% fee, diffRatio = 0.9995 / 0.00040 = 2498.75
-      const diffRatio = wethBalanceDelta.div(wethBalanceDeltaForFeeRecipient);
-      console.log("diff ratio:", diffRatio.toString());
-      expect(diffRatio.gt(6200)).toBe(true);
-      expect(diffRatio.lt(6260)).toBe(true);
-      const wethBalanceDeltaForRouter = await balanceDelta(
-        routerAddress[network]["odos"]!,
+      expect(wethBalanceDeltaForRouter.eq(0)).toBe(true);
+      // no WETH skimmed to the referral fee recipient encoded in the txData
+      const wethBalanceDeltaForFeeRecipient = await balanceDelta(
+        feeRecipient,
         WETH,
         pool.signer
       );
-      // diffRatio  = (1 - fee) / (0.2 * fee)
-      // 0.2 is the split percentage for router
-      // e.g. for 0.02% fee, diffRatio = 0.9998 / 0.00004 = 24995
-      // e.g. for 0.03% fee, diffRatio = 0.9997 / 0.00006 = 16661.67
-      // e.g. for 0.04% fee, diffRatio = 0.9996 / 0.00008 = 12495
-      // e.g. for 0.05% fee, diffRatio = 0.9995 / 0.00010 = 9995
-      const diffRatioRouter = wethBalanceDelta.div(wethBalanceDeltaForRouter);
-      console.log("diff ratio router:", diffRatioRouter.toString());
-      expect(diffRatioRouter.gt(24000)).toBe(true);
-      expect(diffRatioRouter.lt(26000)).toBe(true);
+      expect(wethBalanceDeltaForFeeRecipient.eq(0)).toBe(true);
     });
   });
 };
@@ -123,19 +155,27 @@ const testOdos = ({ wallet, network, provider }: TestingRunParams) => {
 //   testingRun: testOdos
 // });
 
-testingHelper({
-  network: Network.ARBITRUM,
-  testingRun: testOdos
-});
+// testingHelper({
+//   network: Network.ARBITRUM,
+//   testingRun: testOdos
+// });
 
 // testingHelper({
 //   network: Network.POLYGON,
-//   onFork: false,
 //   testingRun: testOdos
 // });
 
 // testingHelper({
 //   network: Network.BASE,
-//   onFork: false,
+//   testingRun: testOdos
+// });
+
+testingHelper({
+  network: Network.ETHEREUM,
+  testingRun: testOdos
+});
+
+// testingHelper({
+//   network: Network.BASE,
 //   testingRun: testOdos
 // });