@metamask-previews/perps-controller 3.2.0-preview-6ce5d58fa → 4.0.0-preview-1e2fe74a0

package/dist/utils/accountUtils.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aggregateAccountStates = exports.calculateWeightedReturnOnEquity = exports.getSelectedEvmAccount = exports.getEvmAccountFromAccountGroup = exports.findEvmAccount = void 0;
+exports.aggregateAccountStates = exports.addSpotBalanceToAccountState = exports.getSpotHold = exports.getSpotBalance = exports.calculateWeightedReturnOnEquity = exports.getSelectedEvmAccount = exports.getEvmAccountFromAccountGroup = exports.findEvmAccount = void 0;
 const perpsConfig_1 = require("../constants/perpsConfig.cjs");
 const EVM_ACCOUNT_TYPES = new Set(['eip155:eoa', 'eip155:erc4337']);
 function isEvmAccountType(type) {
@@ -54,6 +54,70 @@ function calculateWeightedReturnOnEquity(accounts) {
     return weightedROE.toString();
 }
 exports.calculateWeightedReturnOnEquity = calculateWeightedReturnOnEquity;
+// Spot coins counted toward currently supported funded-state gating.
+// Today the in-app HyperLiquid market surface is USDC-collateralized only,
+// so USDH must not inflate the shared funded-state path that hides Add Funds.
+// Non-stablecoin spot assets (HYPE, PURR, …) also remain excluded.
+const SPOT_COLLATERAL_COINS = new Set(['USDC']);
+function getSpotBalance(spotState) {
+    if (!spotState?.balances || !Array.isArray(spotState.balances)) {
+        return 0;
+    }
+    return spotState.balances.reduce((sum, balance) => {
+        if (!balance.coin || !SPOT_COLLATERAL_COINS.has(balance.coin)) {
+            return sum;
+        }
+        const value = parseFloat(balance.total ?? '0');
+        return Number.isFinite(value) ? sum + value : sum;
+    }, 0);
+}
+exports.getSpotBalance = getSpotBalance;
+function getSpotHold(spotState) {
+    if (!spotState?.balances || !Array.isArray(spotState.balances)) {
+        return 0;
+    }
+    return spotState.balances.reduce((sum, balance) => {
+        if (!balance.coin || !SPOT_COLLATERAL_COINS.has(balance.coin)) {
+            return sum;
+        }
+        const value = parseFloat(balance.hold ?? '0');
+        return Number.isFinite(value) ? sum + value : sum;
+    }, 0);
+}
+exports.getSpotHold = getSpotHold;
+function addSpotBalanceToAccountState(accountState, spotState) {
+    const spotBalance = getSpotBalance(spotState);
+    const spotHold = getSpotHold(spotState);
+    const freeSpot = Math.max(0, spotBalance - spotHold);
+    const currentTotal = parseFloat(accountState.totalBalance);
+    const currentAvailable = parseFloat(accountState.availableBalance);
+    // Preserve sentinel totals (e.g. PERPS_CONSTANTS.FallbackDataDisplay '--')
+    // rather than coercing them to NaN.
+    if (!Number.isFinite(currentTotal)) {
+        return accountState;
+    }
+    if (spotBalance === 0) {
+        return {
+            ...accountState,
+            availableToTradeBalance: Number.isFinite(currentAvailable)
+                ? currentAvailable.toString()
+                : accountState.availableBalance,
+        };
+    }
+    const availableToTrade = Number.isFinite(currentAvailable)
+        ? (currentAvailable + freeSpot).toString()
+        : freeSpot.toString();
+    // Subtract spotHold to avoid double-counting on Unified/PM accounts:
+    // marginSummary.accountValue already includes the margin that HL
+    // surfaces via spot.hold. Standard mode has spotHold = 0, no-op.
+    const nextTotal = currentTotal + spotBalance - spotHold;
+    return {
+        ...accountState,
+        totalBalance: nextTotal.toString(),
+        availableToTradeBalance: availableToTrade,
+    };
+}
+exports.addSpotBalanceToAccountState = addSpotBalanceToAccountState;
 /**
  * Aggregate multiple per-DEX AccountState objects into one by summing numeric fields.
  * ROE is recalculated as (totalUnrealizedPnl / totalMarginUsed) * 100.
@@ -76,8 +140,17 @@ function aggregateAccountStates(states) {
         if (index === 0) {
             return { ...state };
         }
+        const accAvailableToTrade = parseFloat(acc.availableToTradeBalance ?? acc.availableBalance);
+        const stateAvailableToTrade = parseFloat(state.availableToTradeBalance ?? state.availableBalance);
+        const availableToTradeSum = Number.isFinite(accAvailableToTrade) &&
+            Number.isFinite(stateAvailableToTrade)
+            ? (accAvailableToTrade + stateAvailableToTrade).toString()
+            : undefined;
         return {
             availableBalance: (parseFloat(acc.availableBalance) + parseFloat(state.availableBalance)).toString(),
+            ...(availableToTradeSum !== undefined && {
+                availableToTradeBalance: availableToTradeSum,
+            }),
             totalBalance: (parseFloat(acc.totalBalance) + parseFloat(state.totalBalance)).toString(),
             marginUsed: (parseFloat(acc.marginUsed) + parseFloat(state.marginUsed)).toString(),
             unrealizedPnl: (parseFloat(acc.unrealizedPnl) + parseFloat(state.unrealizedPnl)).toString(),

package/dist/utils/accountUtils.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"accountUtils.cjs","sourceRoot":"","sources":["../../src/utils/accountUtils.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Account utilities for Perps components\n * Handles account selection and EVM account filtering\n */\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport { PERPS_CONSTANTS } from '../constants/perpsConfig';\nimport type { AccountState, PerpsInternalAccount } from '../types';\n\nconst EVM_ACCOUNT_TYPES = new Set(['eip155:eoa', 'eip155:erc4337']);\n\nfunction isEvmAccountType(type: string): boolean {\n  return EVM_ACCOUNT_TYPES.has(type);\n}\n\nexport function findEvmAccount(\n  accounts: (InternalAccount | PerpsInternalAccount)[],\n): { address: string; type: string } | null {\n  const evmAccount = accounts.find(\n    (account) =>\n      account && isEvmAccountType(account.type as InternalAccount['type']),\n  );\n  return evmAccount ?? null;\n}\n\nexport function getEvmAccountFromAccountGroup(\n  accounts: (InternalAccount | PerpsInternalAccount)[],\n): { address: string } | undefined {\n  const evmAccount = findEvmAccount(accounts);\n  return evmAccount ? { address: evmAccount.address } : undefined;\n}\n\nexport function getSelectedEvmAccount(\n  accounts: (InternalAccount | PerpsInternalAccount)[],\n): { address: string } | undefined {\n  return getEvmAccountFromAccountGroup(accounts);\n}\n\nexport type ReturnOnEquityInput = {\n  unrealizedPnl: string | number;\n  returnOnEquity: string | number;\n};\n\nexport function calculateWeightedReturnOnEquity(\n  accounts: ReturnOnEquityInput[],\n): string {\n  if (accounts.length === 0) {\n    return '0';\n  }\n\n  let totalWeightedROE = 0;\n  let totalMarginUsed = 0;\n\n  for (const account of accounts) {\n    const unrealizedPnl =\n      typeof account.unrealizedPnl === 'string'\n        ? Number.parseFloat(account.unrealizedPnl)\n        : account.unrealizedPnl;\n    const returnOnEquity =\n      typeof account.returnOnEquity === 'string'\n        ? Number.parseFloat(account.returnOnEquity)\n        : account.returnOnEquity;\n\n    if (Number.isNaN(unrealizedPnl) || Number.isNaN(returnOnEquity)) {\n      continue;\n    }\n\n    if (returnOnEquity === 0) {\n      continue;\n    }\n\n    const marginUsed = (unrealizedPnl / returnOnEquity) * 100;\n\n    if (Number.isNaN(marginUsed) || marginUsed <= 0) {\n      continue;\n    }\n\n    const roeDecimal = returnOnEquity / 100;\n\n    totalWeightedROE += roeDecimal * marginUsed;\n    totalMarginUsed += marginUsed;\n  }\n\n  if (totalMarginUsed <= 0) {\n    return '0';\n  }\n\n  const weightedROE = (totalWeightedROE / totalMarginUsed) * 100;\n  return weightedROE.toString();\n}\n\n/**\n * Aggregate multiple per-DEX AccountState objects into one by summing numeric fields.\n * ROE is recalculated as (totalUnrealizedPnl / totalMarginUsed) * 100.\n *\n * @param states - The array of per-DEX account states to aggregate.\n * @returns The combined account state with summed balances and recalculated ROE.\n */\nexport function aggregateAccountStates(states: AccountState[]): AccountState {\n  const fallback: AccountState = {\n    availableBalance: PERPS_CONSTANTS.FallbackDataDisplay,\n    totalBalance: PERPS_CONSTANTS.FallbackDataDisplay,\n    marginUsed: PERPS_CONSTANTS.FallbackDataDisplay,\n    unrealizedPnl: PERPS_CONSTANTS.FallbackDataDisplay,\n    returnOnEquity: PERPS_CONSTANTS.FallbackDataDisplay,\n  };\n\n  if (states.length === 0) {\n    return fallback;\n  }\n\n  const aggregated = states.reduce<AccountState>((acc, state, index) => {\n    if (index === 0) {\n      return { ...state };\n    }\n    return {\n      availableBalance: (\n        parseFloat(acc.availableBalance) + parseFloat(state.availableBalance)\n      ).toString(),\n      totalBalance: (\n        parseFloat(acc.totalBalance) + parseFloat(state.totalBalance)\n      ).toString(),\n      marginUsed: (\n        parseFloat(acc.marginUsed) + parseFloat(state.marginUsed)\n      ).toString(),\n      unrealizedPnl: (\n        parseFloat(acc.unrealizedPnl) + parseFloat(state.unrealizedPnl)\n      ).toString(),\n      returnOnEquity: '0',\n    };\n  }, fallback);\n\n  // Recalculate ROE across all DEXs\n  const totalMarginUsed = parseFloat(aggregated.marginUsed);\n  const totalUnrealizedPnl = parseFloat(aggregated.unrealizedPnl);\n  if (totalMarginUsed > 0) {\n    aggregated.returnOnEquity = (\n      (totalUnrealizedPnl / totalMarginUsed) *\n      100\n    ).toString();\n  } else {\n    aggregated.returnOnEquity = '0';\n  }\n\n  return aggregated;\n}\n"]}
+{"version":3,"file":"accountUtils.cjs","sourceRoot":"","sources":["../../src/utils/accountUtils.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Account utilities for Perps components\n * Handles account selection and EVM account filtering\n */\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport { PERPS_CONSTANTS } from '../constants/perpsConfig';\nimport type { AccountState, PerpsInternalAccount } from '../types';\nimport type { SpotClearinghouseStateResponse } from '../types/hyperliquid-types';\n\nconst EVM_ACCOUNT_TYPES = new Set(['eip155:eoa', 'eip155:erc4337']);\n\nfunction isEvmAccountType(type: string): boolean {\n  return EVM_ACCOUNT_TYPES.has(type);\n}\n\nexport function findEvmAccount(\n  accounts: (InternalAccount | PerpsInternalAccount)[],\n): { address: string; type: string } | null {\n  const evmAccount = accounts.find(\n    (account) =>\n      account && isEvmAccountType(account.type as InternalAccount['type']),\n  );\n  return evmAccount ?? null;\n}\n\nexport function getEvmAccountFromAccountGroup(\n  accounts: (InternalAccount | PerpsInternalAccount)[],\n): { address: string } | undefined {\n  const evmAccount = findEvmAccount(accounts);\n  return evmAccount ? { address: evmAccount.address } : undefined;\n}\n\nexport function getSelectedEvmAccount(\n  accounts: (InternalAccount | PerpsInternalAccount)[],\n): { address: string } | undefined {\n  return getEvmAccountFromAccountGroup(accounts);\n}\n\nexport type ReturnOnEquityInput = {\n  unrealizedPnl: string | number;\n  returnOnEquity: string | number;\n};\n\nexport function calculateWeightedReturnOnEquity(\n  accounts: ReturnOnEquityInput[],\n): string {\n  if (accounts.length === 0) {\n    return '0';\n  }\n\n  let totalWeightedROE = 0;\n  let totalMarginUsed = 0;\n\n  for (const account of accounts) {\n    const unrealizedPnl =\n      typeof account.unrealizedPnl === 'string'\n        ? Number.parseFloat(account.unrealizedPnl)\n        : account.unrealizedPnl;\n    const returnOnEquity =\n      typeof account.returnOnEquity === 'string'\n        ? Number.parseFloat(account.returnOnEquity)\n        : account.returnOnEquity;\n\n    if (Number.isNaN(unrealizedPnl) || Number.isNaN(returnOnEquity)) {\n      continue;\n    }\n\n    if (returnOnEquity === 0) {\n      continue;\n    }\n\n    const marginUsed = (unrealizedPnl / returnOnEquity) * 100;\n\n    if (Number.isNaN(marginUsed) || marginUsed <= 0) {\n      continue;\n    }\n\n    const roeDecimal = returnOnEquity / 100;\n\n    totalWeightedROE += roeDecimal * marginUsed;\n    totalMarginUsed += marginUsed;\n  }\n\n  if (totalMarginUsed <= 0) {\n    return '0';\n  }\n\n  const weightedROE = (totalWeightedROE / totalMarginUsed) * 100;\n  return weightedROE.toString();\n}\n\n// Spot coins counted toward currently supported funded-state gating.\n// Today the in-app HyperLiquid market surface is USDC-collateralized only,\n// so USDH must not inflate the shared funded-state path that hides Add Funds.\n// Non-stablecoin spot assets (HYPE, PURR, …) also remain excluded.\nconst SPOT_COLLATERAL_COINS = new Set<string>(['USDC']);\n\nexport function getSpotBalance(\n  spotState?: SpotClearinghouseStateResponse | null,\n): number {\n  if (!spotState?.balances || !Array.isArray(spotState.balances)) {\n    return 0;\n  }\n\n  return spotState.balances.reduce(\n    (sum: number, balance: { coin?: string; total?: string }) => {\n      if (!balance.coin || !SPOT_COLLATERAL_COINS.has(balance.coin)) {\n        return sum;\n      }\n      const value = parseFloat(balance.total ?? '0');\n      return Number.isFinite(value) ? sum + value : sum;\n    },\n    0,\n  );\n}\n\nexport function getSpotHold(\n  spotState?: SpotClearinghouseStateResponse | null,\n): number {\n  if (!spotState?.balances || !Array.isArray(spotState.balances)) {\n    return 0;\n  }\n\n  return spotState.balances.reduce(\n    (sum: number, balance: { coin?: string; hold?: string }) => {\n      if (!balance.coin || !SPOT_COLLATERAL_COINS.has(balance.coin)) {\n        return sum;\n      }\n      const value = parseFloat(balance.hold ?? '0');\n      return Number.isFinite(value) ? sum + value : sum;\n    },\n    0,\n  );\n}\n\nexport function addSpotBalanceToAccountState(\n  accountState: AccountState,\n  spotState?: SpotClearinghouseStateResponse | null,\n): AccountState {\n  const spotBalance = getSpotBalance(spotState);\n  const spotHold = getSpotHold(spotState);\n  const freeSpot = Math.max(0, spotBalance - spotHold);\n\n  const currentTotal = parseFloat(accountState.totalBalance);\n  const currentAvailable = parseFloat(accountState.availableBalance);\n\n  // Preserve sentinel totals (e.g. PERPS_CONSTANTS.FallbackDataDisplay '--')\n  // rather than coercing them to NaN.\n  if (!Number.isFinite(currentTotal)) {\n    return accountState;\n  }\n\n  if (spotBalance === 0) {\n    return {\n      ...accountState,\n      availableToTradeBalance: Number.isFinite(currentAvailable)\n        ? currentAvailable.toString()\n        : accountState.availableBalance,\n    };\n  }\n\n  const availableToTrade = Number.isFinite(currentAvailable)\n    ? (currentAvailable + freeSpot).toString()\n    : freeSpot.toString();\n\n  // Subtract spotHold to avoid double-counting on Unified/PM accounts:\n  // marginSummary.accountValue already includes the margin that HL\n  // surfaces via spot.hold. Standard mode has spotHold = 0, no-op.\n  const nextTotal = currentTotal + spotBalance - spotHold;\n\n  return {\n    ...accountState,\n    totalBalance: nextTotal.toString(),\n    availableToTradeBalance: availableToTrade,\n  };\n}\n\n/**\n * Aggregate multiple per-DEX AccountState objects into one by summing numeric fields.\n * ROE is recalculated as (totalUnrealizedPnl / totalMarginUsed) * 100.\n *\n * @param states - The array of per-DEX account states to aggregate.\n * @returns The combined account state with summed balances and recalculated ROE.\n */\nexport function aggregateAccountStates(states: AccountState[]): AccountState {\n  const fallback: AccountState = {\n    availableBalance: PERPS_CONSTANTS.FallbackDataDisplay,\n    totalBalance: PERPS_CONSTANTS.FallbackDataDisplay,\n    marginUsed: PERPS_CONSTANTS.FallbackDataDisplay,\n    unrealizedPnl: PERPS_CONSTANTS.FallbackDataDisplay,\n    returnOnEquity: PERPS_CONSTANTS.FallbackDataDisplay,\n  };\n\n  if (states.length === 0) {\n    return fallback;\n  }\n\n  const aggregated = states.reduce<AccountState>((acc, state, index) => {\n    if (index === 0) {\n      return { ...state };\n    }\n    const accAvailableToTrade = parseFloat(\n      acc.availableToTradeBalance ?? acc.availableBalance,\n    );\n    const stateAvailableToTrade = parseFloat(\n      state.availableToTradeBalance ?? state.availableBalance,\n    );\n    const availableToTradeSum =\n      Number.isFinite(accAvailableToTrade) &&\n      Number.isFinite(stateAvailableToTrade)\n        ? (accAvailableToTrade + stateAvailableToTrade).toString()\n        : undefined;\n\n    return {\n      availableBalance: (\n        parseFloat(acc.availableBalance) + parseFloat(state.availableBalance)\n      ).toString(),\n      ...(availableToTradeSum !== undefined && {\n        availableToTradeBalance: availableToTradeSum,\n      }),\n      totalBalance: (\n        parseFloat(acc.totalBalance) + parseFloat(state.totalBalance)\n      ).toString(),\n      marginUsed: (\n        parseFloat(acc.marginUsed) + parseFloat(state.marginUsed)\n      ).toString(),\n      unrealizedPnl: (\n        parseFloat(acc.unrealizedPnl) + parseFloat(state.unrealizedPnl)\n      ).toString(),\n      returnOnEquity: '0',\n    };\n  }, fallback);\n\n  // Recalculate ROE across all DEXs\n  const totalMarginUsed = parseFloat(aggregated.marginUsed);\n  const totalUnrealizedPnl = parseFloat(aggregated.unrealizedPnl);\n  if (totalMarginUsed > 0) {\n    aggregated.returnOnEquity = (\n      (totalUnrealizedPnl / totalMarginUsed) *\n      100\n    ).toString();\n  } else {\n    aggregated.returnOnEquity = '0';\n  }\n\n  return aggregated;\n}\n"]}

package/dist/utils/accountUtils.d.cts

@@ -4,6 +4,7 @@
  */
 import type { InternalAccount } from "@metamask/keyring-internal-api";
 import type { AccountState, PerpsInternalAccount } from "../types/index.cjs";
+import type { SpotClearinghouseStateResponse } from "../types/hyperliquid-types.cjs";
 export declare function findEvmAccount(accounts: (InternalAccount | PerpsInternalAccount)[]): {
     address: string;
     type: string;
@@ -19,6 +20,9 @@ export type ReturnOnEquityInput = {
     returnOnEquity: string | number;
 };
 export declare function calculateWeightedReturnOnEquity(accounts: ReturnOnEquityInput[]): string;
+export declare function getSpotBalance(spotState?: SpotClearinghouseStateResponse | null): number;
+export declare function getSpotHold(spotState?: SpotClearinghouseStateResponse | null): number;
+export declare function addSpotBalanceToAccountState(accountState: AccountState, spotState?: SpotClearinghouseStateResponse | null): AccountState;
 /**
  * Aggregate multiple per-DEX AccountState objects into one by summing numeric fields.
  * ROE is recalculated as (totalUnrealizedPnl / totalMarginUsed) * 100.

package/dist/utils/accountUtils.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"accountUtils.d.cts","sourceRoot":"","sources":["../../src/utils/accountUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAGtE,OAAO,KAAK,EAAE,YAAY,EAAE,oBAAoB,EAAE,2BAAiB;AAQnE,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,CAAC,eAAe,GAAG,oBAAoB,CAAC,EAAE,GACnD;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAM1C;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,CAAC,eAAe,GAAG,oBAAoB,CAAC,EAAE,GACnD;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAGjC;AAED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,CAAC,eAAe,GAAG,oBAAoB,CAAC,EAAE,GACnD;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAEjC;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,cAAc,EAAE,MAAM,GAAG,MAAM,CAAC;CACjC,CAAC;AAEF,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,mBAAmB,EAAE,GAC9B,MAAM,CA4CR;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,YAAY,CA+C3E"}
+{"version":3,"file":"accountUtils.d.cts","sourceRoot":"","sources":["../../src/utils/accountUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAGtE,OAAO,KAAK,EAAE,YAAY,EAAE,oBAAoB,EAAE,2BAAiB;AACnE,OAAO,KAAK,EAAE,8BAA8B,EAAE,uCAAmC;AAQjF,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,CAAC,eAAe,GAAG,oBAAoB,CAAC,EAAE,GACnD;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAM1C;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,CAAC,eAAe,GAAG,oBAAoB,CAAC,EAAE,GACnD;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAGjC;AAED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,CAAC,eAAe,GAAG,oBAAoB,CAAC,EAAE,GACnD;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAEjC;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,cAAc,EAAE,MAAM,GAAG,MAAM,CAAC;CACjC,CAAC;AAEF,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,mBAAmB,EAAE,GAC9B,MAAM,CA4CR;AAQD,wBAAgB,cAAc,CAC5B,SAAS,CAAC,EAAE,8BAA8B,GAAG,IAAI,GAChD,MAAM,CAeR;AAED,wBAAgB,WAAW,CACzB,SAAS,CAAC,EAAE,8BAA8B,GAAG,IAAI,GAChD,MAAM,CAeR;AAED,wBAAgB,4BAA4B,CAC1C,YAAY,EAAE,YAAY,EAC1B,SAAS,CAAC,EAAE,8BAA8B,GAAG,IAAI,GAChD,YAAY,CAqCd;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,YAAY,CA8D3E"}

package/dist/utils/accountUtils.d.mts

@@ -4,6 +4,7 @@
  */
 import type { InternalAccount } from "@metamask/keyring-internal-api";
 import type { AccountState, PerpsInternalAccount } from "../types/index.mjs";
+import type { SpotClearinghouseStateResponse } from "../types/hyperliquid-types.mjs";
 export declare function findEvmAccount(accounts: (InternalAccount | PerpsInternalAccount)[]): {
     address: string;
     type: string;
@@ -19,6 +20,9 @@ export type ReturnOnEquityInput = {
     returnOnEquity: string | number;
 };
 export declare function calculateWeightedReturnOnEquity(accounts: ReturnOnEquityInput[]): string;
+export declare function getSpotBalance(spotState?: SpotClearinghouseStateResponse | null): number;
+export declare function getSpotHold(spotState?: SpotClearinghouseStateResponse | null): number;
+export declare function addSpotBalanceToAccountState(accountState: AccountState, spotState?: SpotClearinghouseStateResponse | null): AccountState;
 /**
  * Aggregate multiple per-DEX AccountState objects into one by summing numeric fields.
  * ROE is recalculated as (totalUnrealizedPnl / totalMarginUsed) * 100.

package/dist/utils/accountUtils.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"accountUtils.d.mts","sourceRoot":"","sources":["../../src/utils/accountUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAGtE,OAAO,KAAK,EAAE,YAAY,EAAE,oBAAoB,EAAE,2BAAiB;AAQnE,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,CAAC,eAAe,GAAG,oBAAoB,CAAC,EAAE,GACnD;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAM1C;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,CAAC,eAAe,GAAG,oBAAoB,CAAC,EAAE,GACnD;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAGjC;AAED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,CAAC,eAAe,GAAG,oBAAoB,CAAC,EAAE,GACnD;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAEjC;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,cAAc,EAAE,MAAM,GAAG,MAAM,CAAC;CACjC,CAAC;AAEF,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,mBAAmB,EAAE,GAC9B,MAAM,CA4CR;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,YAAY,CA+C3E"}
+{"version":3,"file":"accountUtils.d.mts","sourceRoot":"","sources":["../../src/utils/accountUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAGtE,OAAO,KAAK,EAAE,YAAY,EAAE,oBAAoB,EAAE,2BAAiB;AACnE,OAAO,KAAK,EAAE,8BAA8B,EAAE,uCAAmC;AAQjF,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,CAAC,eAAe,GAAG,oBAAoB,CAAC,EAAE,GACnD;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAM1C;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,CAAC,eAAe,GAAG,oBAAoB,CAAC,EAAE,GACnD;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAGjC;AAED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,CAAC,eAAe,GAAG,oBAAoB,CAAC,EAAE,GACnD;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAEjC;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,cAAc,EAAE,MAAM,GAAG,MAAM,CAAC;CACjC,CAAC;AAEF,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,mBAAmB,EAAE,GAC9B,MAAM,CA4CR;AAQD,wBAAgB,cAAc,CAC5B,SAAS,CAAC,EAAE,8BAA8B,GAAG,IAAI,GAChD,MAAM,CAeR;AAED,wBAAgB,WAAW,CACzB,SAAS,CAAC,EAAE,8BAA8B,GAAG,IAAI,GAChD,MAAM,CAeR;AAED,wBAAgB,4BAA4B,CAC1C,YAAY,EAAE,YAAY,EAC1B,SAAS,CAAC,EAAE,8BAA8B,GAAG,IAAI,GAChD,YAAY,CAqCd;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,YAAY,CA8D3E"}

package/dist/utils/accountUtils.mjs

@@ -47,6 +47,67 @@ export function calculateWeightedReturnOnEquity(accounts) {
     const weightedROE = (totalWeightedROE / totalMarginUsed) * 100;
     return weightedROE.toString();
 }
+// Spot coins counted toward currently supported funded-state gating.
+// Today the in-app HyperLiquid market surface is USDC-collateralized only,
+// so USDH must not inflate the shared funded-state path that hides Add Funds.
+// Non-stablecoin spot assets (HYPE, PURR, …) also remain excluded.
+const SPOT_COLLATERAL_COINS = new Set(['USDC']);
+export function getSpotBalance(spotState) {
+    if (!spotState?.balances || !Array.isArray(spotState.balances)) {
+        return 0;
+    }
+    return spotState.balances.reduce((sum, balance) => {
+        if (!balance.coin || !SPOT_COLLATERAL_COINS.has(balance.coin)) {
+            return sum;
+        }
+        const value = parseFloat(balance.total ?? '0');
+        return Number.isFinite(value) ? sum + value : sum;
+    }, 0);
+}
+export function getSpotHold(spotState) {
+    if (!spotState?.balances || !Array.isArray(spotState.balances)) {
+        return 0;
+    }
+    return spotState.balances.reduce((sum, balance) => {
+        if (!balance.coin || !SPOT_COLLATERAL_COINS.has(balance.coin)) {
+            return sum;
+        }
+        const value = parseFloat(balance.hold ?? '0');
+        return Number.isFinite(value) ? sum + value : sum;
+    }, 0);
+}
+export function addSpotBalanceToAccountState(accountState, spotState) {
+    const spotBalance = getSpotBalance(spotState);
+    const spotHold = getSpotHold(spotState);
+    const freeSpot = Math.max(0, spotBalance - spotHold);
+    const currentTotal = parseFloat(accountState.totalBalance);
+    const currentAvailable = parseFloat(accountState.availableBalance);
+    // Preserve sentinel totals (e.g. PERPS_CONSTANTS.FallbackDataDisplay '--')
+    // rather than coercing them to NaN.
+    if (!Number.isFinite(currentTotal)) {
+        return accountState;
+    }
+    if (spotBalance === 0) {
+        return {
+            ...accountState,
+            availableToTradeBalance: Number.isFinite(currentAvailable)
+                ? currentAvailable.toString()
+                : accountState.availableBalance,
+        };
+    }
+    const availableToTrade = Number.isFinite(currentAvailable)
+        ? (currentAvailable + freeSpot).toString()
+        : freeSpot.toString();
+    // Subtract spotHold to avoid double-counting on Unified/PM accounts:
+    // marginSummary.accountValue already includes the margin that HL
+    // surfaces via spot.hold. Standard mode has spotHold = 0, no-op.
+    const nextTotal = currentTotal + spotBalance - spotHold;
+    return {
+        ...accountState,
+        totalBalance: nextTotal.toString(),
+        availableToTradeBalance: availableToTrade,
+    };
+}
 /**
  * Aggregate multiple per-DEX AccountState objects into one by summing numeric fields.
  * ROE is recalculated as (totalUnrealizedPnl / totalMarginUsed) * 100.
@@ -69,8 +130,17 @@ export function aggregateAccountStates(states) {
         if (index === 0) {
             return { ...state };
         }
+        const accAvailableToTrade = parseFloat(acc.availableToTradeBalance ?? acc.availableBalance);
+        const stateAvailableToTrade = parseFloat(state.availableToTradeBalance ?? state.availableBalance);
+        const availableToTradeSum = Number.isFinite(accAvailableToTrade) &&
+            Number.isFinite(stateAvailableToTrade)
+            ? (accAvailableToTrade + stateAvailableToTrade).toString()
+            : undefined;
         return {
             availableBalance: (parseFloat(acc.availableBalance) + parseFloat(state.availableBalance)).toString(),
+            ...(availableToTradeSum !== undefined && {
+                availableToTradeBalance: availableToTradeSum,
+            }),
             totalBalance: (parseFloat(acc.totalBalance) + parseFloat(state.totalBalance)).toString(),
             marginUsed: (parseFloat(acc.marginUsed) + parseFloat(state.marginUsed)).toString(),
             unrealizedPnl: (parseFloat(acc.unrealizedPnl) + parseFloat(state.unrealizedPnl)).toString(),

package/dist/utils/accountUtils.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"accountUtils.mjs","sourceRoot":"","sources":["../../src/utils/accountUtils.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Account utilities for Perps components\n * Handles account selection and EVM account filtering\n */\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport { PERPS_CONSTANTS } from '../constants/perpsConfig';\nimport type { AccountState, PerpsInternalAccount } from '../types';\n\nconst EVM_ACCOUNT_TYPES = new Set(['eip155:eoa', 'eip155:erc4337']);\n\nfunction isEvmAccountType(type: string): boolean {\n  return EVM_ACCOUNT_TYPES.has(type);\n}\n\nexport function findEvmAccount(\n  accounts: (InternalAccount | PerpsInternalAccount)[],\n): { address: string; type: string } | null {\n  const evmAccount = accounts.find(\n    (account) =>\n      account && isEvmAccountType(account.type as InternalAccount['type']),\n  );\n  return evmAccount ?? null;\n}\n\nexport function getEvmAccountFromAccountGroup(\n  accounts: (InternalAccount | PerpsInternalAccount)[],\n): { address: string } | undefined {\n  const evmAccount = findEvmAccount(accounts);\n  return evmAccount ? { address: evmAccount.address } : undefined;\n}\n\nexport function getSelectedEvmAccount(\n  accounts: (InternalAccount | PerpsInternalAccount)[],\n): { address: string } | undefined {\n  return getEvmAccountFromAccountGroup(accounts);\n}\n\nexport type ReturnOnEquityInput = {\n  unrealizedPnl: string | number;\n  returnOnEquity: string | number;\n};\n\nexport function calculateWeightedReturnOnEquity(\n  accounts: ReturnOnEquityInput[],\n): string {\n  if (accounts.length === 0) {\n    return '0';\n  }\n\n  let totalWeightedROE = 0;\n  let totalMarginUsed = 0;\n\n  for (const account of accounts) {\n    const unrealizedPnl =\n      typeof account.unrealizedPnl === 'string'\n        ? Number.parseFloat(account.unrealizedPnl)\n        : account.unrealizedPnl;\n    const returnOnEquity =\n      typeof account.returnOnEquity === 'string'\n        ? Number.parseFloat(account.returnOnEquity)\n        : account.returnOnEquity;\n\n    if (Number.isNaN(unrealizedPnl) || Number.isNaN(returnOnEquity)) {\n      continue;\n    }\n\n    if (returnOnEquity === 0) {\n      continue;\n    }\n\n    const marginUsed = (unrealizedPnl / returnOnEquity) * 100;\n\n    if (Number.isNaN(marginUsed) || marginUsed <= 0) {\n      continue;\n    }\n\n    const roeDecimal = returnOnEquity / 100;\n\n    totalWeightedROE += roeDecimal * marginUsed;\n    totalMarginUsed += marginUsed;\n  }\n\n  if (totalMarginUsed <= 0) {\n    return '0';\n  }\n\n  const weightedROE = (totalWeightedROE / totalMarginUsed) * 100;\n  return weightedROE.toString();\n}\n\n/**\n * Aggregate multiple per-DEX AccountState objects into one by summing numeric fields.\n * ROE is recalculated as (totalUnrealizedPnl / totalMarginUsed) * 100.\n *\n * @param states - The array of per-DEX account states to aggregate.\n * @returns The combined account state with summed balances and recalculated ROE.\n */\nexport function aggregateAccountStates(states: AccountState[]): AccountState {\n  const fallback: AccountState = {\n    availableBalance: PERPS_CONSTANTS.FallbackDataDisplay,\n    totalBalance: PERPS_CONSTANTS.FallbackDataDisplay,\n    marginUsed: PERPS_CONSTANTS.FallbackDataDisplay,\n    unrealizedPnl: PERPS_CONSTANTS.FallbackDataDisplay,\n    returnOnEquity: PERPS_CONSTANTS.FallbackDataDisplay,\n  };\n\n  if (states.length === 0) {\n    return fallback;\n  }\n\n  const aggregated = states.reduce<AccountState>((acc, state, index) => {\n    if (index === 0) {\n      return { ...state };\n    }\n    return {\n      availableBalance: (\n        parseFloat(acc.availableBalance) + parseFloat(state.availableBalance)\n      ).toString(),\n      totalBalance: (\n        parseFloat(acc.totalBalance) + parseFloat(state.totalBalance)\n      ).toString(),\n      marginUsed: (\n        parseFloat(acc.marginUsed) + parseFloat(state.marginUsed)\n      ).toString(),\n      unrealizedPnl: (\n        parseFloat(acc.unrealizedPnl) + parseFloat(state.unrealizedPnl)\n      ).toString(),\n      returnOnEquity: '0',\n    };\n  }, fallback);\n\n  // Recalculate ROE across all DEXs\n  const totalMarginUsed = parseFloat(aggregated.marginUsed);\n  const totalUnrealizedPnl = parseFloat(aggregated.unrealizedPnl);\n  if (totalMarginUsed > 0) {\n    aggregated.returnOnEquity = (\n      (totalUnrealizedPnl / totalMarginUsed) *\n      100\n    ).toString();\n  } else {\n    aggregated.returnOnEquity = '0';\n  }\n\n  return aggregated;\n}\n"]}
+{"version":3,"file":"accountUtils.mjs","sourceRoot":"","sources":["../../src/utils/accountUtils.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Account utilities for Perps components\n * Handles account selection and EVM account filtering\n */\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport { PERPS_CONSTANTS } from '../constants/perpsConfig';\nimport type { AccountState, PerpsInternalAccount } from '../types';\nimport type { SpotClearinghouseStateResponse } from '../types/hyperliquid-types';\n\nconst EVM_ACCOUNT_TYPES = new Set(['eip155:eoa', 'eip155:erc4337']);\n\nfunction isEvmAccountType(type: string): boolean {\n  return EVM_ACCOUNT_TYPES.has(type);\n}\n\nexport function findEvmAccount(\n  accounts: (InternalAccount | PerpsInternalAccount)[],\n): { address: string; type: string } | null {\n  const evmAccount = accounts.find(\n    (account) =>\n      account && isEvmAccountType(account.type as InternalAccount['type']),\n  );\n  return evmAccount ?? null;\n}\n\nexport function getEvmAccountFromAccountGroup(\n  accounts: (InternalAccount | PerpsInternalAccount)[],\n): { address: string } | undefined {\n  const evmAccount = findEvmAccount(accounts);\n  return evmAccount ? { address: evmAccount.address } : undefined;\n}\n\nexport function getSelectedEvmAccount(\n  accounts: (InternalAccount | PerpsInternalAccount)[],\n): { address: string } | undefined {\n  return getEvmAccountFromAccountGroup(accounts);\n}\n\nexport type ReturnOnEquityInput = {\n  unrealizedPnl: string | number;\n  returnOnEquity: string | number;\n};\n\nexport function calculateWeightedReturnOnEquity(\n  accounts: ReturnOnEquityInput[],\n): string {\n  if (accounts.length === 0) {\n    return '0';\n  }\n\n  let totalWeightedROE = 0;\n  let totalMarginUsed = 0;\n\n  for (const account of accounts) {\n    const unrealizedPnl =\n      typeof account.unrealizedPnl === 'string'\n        ? Number.parseFloat(account.unrealizedPnl)\n        : account.unrealizedPnl;\n    const returnOnEquity =\n      typeof account.returnOnEquity === 'string'\n        ? Number.parseFloat(account.returnOnEquity)\n        : account.returnOnEquity;\n\n    if (Number.isNaN(unrealizedPnl) || Number.isNaN(returnOnEquity)) {\n      continue;\n    }\n\n    if (returnOnEquity === 0) {\n      continue;\n    }\n\n    const marginUsed = (unrealizedPnl / returnOnEquity) * 100;\n\n    if (Number.isNaN(marginUsed) || marginUsed <= 0) {\n      continue;\n    }\n\n    const roeDecimal = returnOnEquity / 100;\n\n    totalWeightedROE += roeDecimal * marginUsed;\n    totalMarginUsed += marginUsed;\n  }\n\n  if (totalMarginUsed <= 0) {\n    return '0';\n  }\n\n  const weightedROE = (totalWeightedROE / totalMarginUsed) * 100;\n  return weightedROE.toString();\n}\n\n// Spot coins counted toward currently supported funded-state gating.\n// Today the in-app HyperLiquid market surface is USDC-collateralized only,\n// so USDH must not inflate the shared funded-state path that hides Add Funds.\n// Non-stablecoin spot assets (HYPE, PURR, …) also remain excluded.\nconst SPOT_COLLATERAL_COINS = new Set<string>(['USDC']);\n\nexport function getSpotBalance(\n  spotState?: SpotClearinghouseStateResponse | null,\n): number {\n  if (!spotState?.balances || !Array.isArray(spotState.balances)) {\n    return 0;\n  }\n\n  return spotState.balances.reduce(\n    (sum: number, balance: { coin?: string; total?: string }) => {\n      if (!balance.coin || !SPOT_COLLATERAL_COINS.has(balance.coin)) {\n        return sum;\n      }\n      const value = parseFloat(balance.total ?? '0');\n      return Number.isFinite(value) ? sum + value : sum;\n    },\n    0,\n  );\n}\n\nexport function getSpotHold(\n  spotState?: SpotClearinghouseStateResponse | null,\n): number {\n  if (!spotState?.balances || !Array.isArray(spotState.balances)) {\n    return 0;\n  }\n\n  return spotState.balances.reduce(\n    (sum: number, balance: { coin?: string; hold?: string }) => {\n      if (!balance.coin || !SPOT_COLLATERAL_COINS.has(balance.coin)) {\n        return sum;\n      }\n      const value = parseFloat(balance.hold ?? '0');\n      return Number.isFinite(value) ? sum + value : sum;\n    },\n    0,\n  );\n}\n\nexport function addSpotBalanceToAccountState(\n  accountState: AccountState,\n  spotState?: SpotClearinghouseStateResponse | null,\n): AccountState {\n  const spotBalance = getSpotBalance(spotState);\n  const spotHold = getSpotHold(spotState);\n  const freeSpot = Math.max(0, spotBalance - spotHold);\n\n  const currentTotal = parseFloat(accountState.totalBalance);\n  const currentAvailable = parseFloat(accountState.availableBalance);\n\n  // Preserve sentinel totals (e.g. PERPS_CONSTANTS.FallbackDataDisplay '--')\n  // rather than coercing them to NaN.\n  if (!Number.isFinite(currentTotal)) {\n    return accountState;\n  }\n\n  if (spotBalance === 0) {\n    return {\n      ...accountState,\n      availableToTradeBalance: Number.isFinite(currentAvailable)\n        ? currentAvailable.toString()\n        : accountState.availableBalance,\n    };\n  }\n\n  const availableToTrade = Number.isFinite(currentAvailable)\n    ? (currentAvailable + freeSpot).toString()\n    : freeSpot.toString();\n\n  // Subtract spotHold to avoid double-counting on Unified/PM accounts:\n  // marginSummary.accountValue already includes the margin that HL\n  // surfaces via spot.hold. Standard mode has spotHold = 0, no-op.\n  const nextTotal = currentTotal + spotBalance - spotHold;\n\n  return {\n    ...accountState,\n    totalBalance: nextTotal.toString(),\n    availableToTradeBalance: availableToTrade,\n  };\n}\n\n/**\n * Aggregate multiple per-DEX AccountState objects into one by summing numeric fields.\n * ROE is recalculated as (totalUnrealizedPnl / totalMarginUsed) * 100.\n *\n * @param states - The array of per-DEX account states to aggregate.\n * @returns The combined account state with summed balances and recalculated ROE.\n */\nexport function aggregateAccountStates(states: AccountState[]): AccountState {\n  const fallback: AccountState = {\n    availableBalance: PERPS_CONSTANTS.FallbackDataDisplay,\n    totalBalance: PERPS_CONSTANTS.FallbackDataDisplay,\n    marginUsed: PERPS_CONSTANTS.FallbackDataDisplay,\n    unrealizedPnl: PERPS_CONSTANTS.FallbackDataDisplay,\n    returnOnEquity: PERPS_CONSTANTS.FallbackDataDisplay,\n  };\n\n  if (states.length === 0) {\n    return fallback;\n  }\n\n  const aggregated = states.reduce<AccountState>((acc, state, index) => {\n    if (index === 0) {\n      return { ...state };\n    }\n    const accAvailableToTrade = parseFloat(\n      acc.availableToTradeBalance ?? acc.availableBalance,\n    );\n    const stateAvailableToTrade = parseFloat(\n      state.availableToTradeBalance ?? state.availableBalance,\n    );\n    const availableToTradeSum =\n      Number.isFinite(accAvailableToTrade) &&\n      Number.isFinite(stateAvailableToTrade)\n        ? (accAvailableToTrade + stateAvailableToTrade).toString()\n        : undefined;\n\n    return {\n      availableBalance: (\n        parseFloat(acc.availableBalance) + parseFloat(state.availableBalance)\n      ).toString(),\n      ...(availableToTradeSum !== undefined && {\n        availableToTradeBalance: availableToTradeSum,\n      }),\n      totalBalance: (\n        parseFloat(acc.totalBalance) + parseFloat(state.totalBalance)\n      ).toString(),\n      marginUsed: (\n        parseFloat(acc.marginUsed) + parseFloat(state.marginUsed)\n      ).toString(),\n      unrealizedPnl: (\n        parseFloat(acc.unrealizedPnl) + parseFloat(state.unrealizedPnl)\n      ).toString(),\n      returnOnEquity: '0',\n    };\n  }, fallback);\n\n  // Recalculate ROE across all DEXs\n  const totalMarginUsed = parseFloat(aggregated.marginUsed);\n  const totalUnrealizedPnl = parseFloat(aggregated.unrealizedPnl);\n  if (totalMarginUsed > 0) {\n    aggregated.returnOnEquity = (\n      (totalUnrealizedPnl / totalMarginUsed) *\n      100\n    ).toString();\n  } else {\n    aggregated.returnOnEquity = '0';\n  }\n\n  return aggregated;\n}\n"]}

package/dist/utils/coalescePerpsRestRequest.cjs

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resetPerpsRestCacheForTests = exports.coalescePerpsRestRequest = void 0;
+const perpsConfig_1 = require("../constants/perpsConfig.cjs");
+const inflight = new Map();
+const cache = new Map();
+/**
+ * Coalesce an idempotent perps REST call.
+ *
+ * - If a fresh cached value exists for `key`, it is returned immediately.
+ * - If an in-flight promise exists for `key`, it is shared with the caller.
+ * - Otherwise, `fetcher` runs once; the result populates the cache for `ttlMs`.
+ *
+ * `forceRefresh` skips both cache and in-flight dedup.
+ *
+ * @param key - Stable cache key identifying this logical REST call.
+ * @param fetcher - Thunk that performs the REST call when no cache/inflight hit.
+ * @param options - Optional overrides for TTL and forceRefresh behavior.
+ * @returns The fetched (or cached) value.
+ */
+function coalescePerpsRestRequest(key, fetcher, options = {}) {
+    const ttlMs = options.ttlMs ?? perpsConfig_1.PERFORMANCE_CONFIG.PerpsRestCoalesceTtlMs;
+    const forceRefresh = options.forceRefresh ?? false;
+    if (forceRefresh) {
+        cache.delete(key);
+    }
+    else {
+        const now = Date.now();
+        const cached = cache.get(key);
+        if (cached) {
+            if (cached.expiresAt > now) {
+                return Promise.resolve(cached.value);
+            }
+            // Evict expired entry so callers with per-call-unique keys (e.g.
+            // CandleStreamChannel historical paging with per-page endTime) do
+            // not accumulate dead blobs for the life of the process.
+            cache.delete(key);
+        }
+        const existing = inflight.get(key);
+        if (existing !== undefined) {
+            return existing;
+        }
+    }
+    const run = fetcher().then((value) => {
+        // Only the currently-tracked in-flight promise writes to cache. A stale
+        // in-flight (e.g. one that was racing a later forceRefresh=true caller)
+        // must not clobber the fresh value once it finally resolves.
+        if (inflight.get(key) === run) {
+            cache.set(key, { value, expiresAt: Date.now() + ttlMs });
+            inflight.delete(key);
+        }
+        return value;
+    }, (error) => {
+        if (inflight.get(key) === run) {
+            inflight.delete(key);
+        }
+        throw error;
+    });
+    inflight.set(key, run);
+    return run;
+}
+exports.coalescePerpsRestRequest = coalescePerpsRestRequest;
+/**
+ * Test-only: wipe all cached entries and in-flight promises.
+ */
+function resetPerpsRestCacheForTests() {
+    cache.clear();
+    inflight.clear();
+}
+exports.resetPerpsRestCacheForTests = resetPerpsRestCacheForTests;
+//# sourceMappingURL=coalescePerpsRestRequest.cjs.map

package/dist/utils/coalescePerpsRestRequest.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"coalescePerpsRestRequest.cjs","sourceRoot":"","sources":["../../src/utils/coalescePerpsRestRequest.ts"],"names":[],"mappings":";;;AAAA,8DAA8D;AAkB9D,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA4B,CAAC;AACrD,MAAM,KAAK,GAAG,IAAI,GAAG,EAA+B,CAAC;AAerD;;;;;;;;;;;;;GAaG;AACH,SAAgB,wBAAwB,CACtC,GAAW,EACX,OAA8B,EAC9B,UAA2B,EAAE;IAE7B,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,gCAAkB,CAAC,sBAAsB,CAAC;IACzE,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,KAAK,CAAC;IAEnD,IAAI,YAAY,EAAE,CAAC;QACjB,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAmC,CAAC;QAChE,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,MAAM,CAAC,SAAS,GAAG,GAAG,EAAE,CAAC;gBAC3B,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvC,CAAC;YACD,iEAAiE;YACjE,kEAAkE;YAClE,yDAAyD;YACzD,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACpB,CAAC;QACD,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAgC,CAAC;QAClE,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC;IAED,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC,IAAI,CACxB,CAAC,KAAK,EAAE,EAAE;QACR,wEAAwE;QACxE,wEAAwE;QACxE,6DAA6D;QAC7D,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC;YAC9B,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;YACzD,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvB,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,EACD,CAAC,KAAK,EAAE,EAAE;QACR,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC;YAC9B,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvB,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC,CACF,CAAC;IAEF,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACvB,OAAO,GAAG,CAAC;AACb,CAAC;AAjDD,4DAiDC;AAED;;GAEG;AACH,SAAgB,2BAA2B;IACzC,KAAK,CAAC,KAAK,EAAE,CAAC;IACd,QAAQ,CAAC,KAAK,EAAE,CAAC;AACnB,CAAC;AAHD,kEAGC","sourcesContent":["import { PERFORMANCE_CONFIG } from '../constants/perpsConfig';\n\n// Rapid perps market switching (candle bridge + activity tab burst) drives\n// duplicate REST calls against api.hyperliquid.xyz and occasionally trips 429.\n// This helper collapses concurrent identical calls into one in-flight promise\n// and serves a short TTL cache to absorb the burst. Explicit refresh bypasses\n// the cache so user-initiated refetch still re-runs.\n//\n// Lives at the service layer (MarketDataService) rather than per-hook so every\n// current and future caller — hooks, controller, aggregated provider — is\n// deduped automatically. Centralized at MarketDataService because it is\n// already a single choke point.\n\ntype CacheEntry<TValue> = {\n  value: TValue;\n  expiresAt: number;\n};\n\nconst inflight = new Map<string, Promise<unknown>>();\nconst cache = new Map<string, CacheEntry<unknown>>();\n\nexport type CoalesceOptions = {\n  /**\n   * Cache TTL in milliseconds. Defaults to\n   * {@link PERFORMANCE_CONFIG.PerpsRestCoalesceTtlMs}.\n   */\n  ttlMs?: number;\n  /**\n   * Bypass the cache and any in-flight promise. The fresh result will be\n   * written back to the cache under the same key.\n   */\n  forceRefresh?: boolean;\n};\n\n/**\n * Coalesce an idempotent perps REST call.\n *\n * - If a fresh cached value exists for `key`, it is returned immediately.\n * - If an in-flight promise exists for `key`, it is shared with the caller.\n * - Otherwise, `fetcher` runs once; the result populates the cache for `ttlMs`.\n *\n * `forceRefresh` skips both cache and in-flight dedup.\n *\n * @param key - Stable cache key identifying this logical REST call.\n * @param fetcher - Thunk that performs the REST call when no cache/inflight hit.\n * @param options - Optional overrides for TTL and forceRefresh behavior.\n * @returns The fetched (or cached) value.\n */\nexport function coalescePerpsRestRequest<TValue>(\n  key: string,\n  fetcher: () => Promise<TValue>,\n  options: CoalesceOptions = {},\n): Promise<TValue> {\n  const ttlMs = options.ttlMs ?? PERFORMANCE_CONFIG.PerpsRestCoalesceTtlMs;\n  const forceRefresh = options.forceRefresh ?? false;\n\n  if (forceRefresh) {\n    cache.delete(key);\n  } else {\n    const now = Date.now();\n    const cached = cache.get(key) as CacheEntry<TValue> | undefined;\n    if (cached) {\n      if (cached.expiresAt > now) {\n        return Promise.resolve(cached.value);\n      }\n      // Evict expired entry so callers with per-call-unique keys (e.g.\n      // CandleStreamChannel historical paging with per-page endTime) do\n      // not accumulate dead blobs for the life of the process.\n      cache.delete(key);\n    }\n    const existing = inflight.get(key) as Promise<TValue> | undefined;\n    if (existing !== undefined) {\n      return existing;\n    }\n  }\n\n  const run = fetcher().then(\n    (value) => {\n      // Only the currently-tracked in-flight promise writes to cache. A stale\n      // in-flight (e.g. one that was racing a later forceRefresh=true caller)\n      // must not clobber the fresh value once it finally resolves.\n      if (inflight.get(key) === run) {\n        cache.set(key, { value, expiresAt: Date.now() + ttlMs });\n        inflight.delete(key);\n      }\n      return value;\n    },\n    (error) => {\n      if (inflight.get(key) === run) {\n        inflight.delete(key);\n      }\n      throw error;\n    },\n  );\n\n  inflight.set(key, run);\n  return run;\n}\n\n/**\n * Test-only: wipe all cached entries and in-flight promises.\n */\nexport function resetPerpsRestCacheForTests(): void {\n  cache.clear();\n  inflight.clear();\n}\n"]}

package/dist/utils/coalescePerpsRestRequest.d.cts

@@ -0,0 +1,32 @@
+export type CoalesceOptions = {
+    /**
+     * Cache TTL in milliseconds. Defaults to
+     * {@link PERFORMANCE_CONFIG.PerpsRestCoalesceTtlMs}.
+     */
+    ttlMs?: number;
+    /**
+     * Bypass the cache and any in-flight promise. The fresh result will be
+     * written back to the cache under the same key.
+     */
+    forceRefresh?: boolean;
+};
+/**
+ * Coalesce an idempotent perps REST call.
+ *
+ * - If a fresh cached value exists for `key`, it is returned immediately.
+ * - If an in-flight promise exists for `key`, it is shared with the caller.
+ * - Otherwise, `fetcher` runs once; the result populates the cache for `ttlMs`.
+ *
+ * `forceRefresh` skips both cache and in-flight dedup.
+ *
+ * @param key - Stable cache key identifying this logical REST call.
+ * @param fetcher - Thunk that performs the REST call when no cache/inflight hit.
+ * @param options - Optional overrides for TTL and forceRefresh behavior.
+ * @returns The fetched (or cached) value.
+ */
+export declare function coalescePerpsRestRequest<TValue>(key: string, fetcher: () => Promise<TValue>, options?: CoalesceOptions): Promise<TValue>;
+/**
+ * Test-only: wipe all cached entries and in-flight promises.
+ */
+export declare function resetPerpsRestCacheForTests(): void;
+//# sourceMappingURL=coalescePerpsRestRequest.d.cts.map

package/dist/utils/coalescePerpsRestRequest.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"coalescePerpsRestRequest.d.cts","sourceRoot":"","sources":["../../src/utils/coalescePerpsRestRequest.ts"],"names":[],"mappings":"AAqBA,MAAM,MAAM,eAAe,GAAG;IAC5B;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAC7C,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAC9B,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,MAAM,CAAC,CA6CjB;AAED;;GAEG;AACH,wBAAgB,2BAA2B,IAAI,IAAI,CAGlD"}

package/dist/utils/coalescePerpsRestRequest.d.mts

@@ -0,0 +1,32 @@
+export type CoalesceOptions = {
+    /**
+     * Cache TTL in milliseconds. Defaults to
+     * {@link PERFORMANCE_CONFIG.PerpsRestCoalesceTtlMs}.
+     */
+    ttlMs?: number;
+    /**
+     * Bypass the cache and any in-flight promise. The fresh result will be
+     * written back to the cache under the same key.
+     */
+    forceRefresh?: boolean;
+};
+/**
+ * Coalesce an idempotent perps REST call.
+ *
+ * - If a fresh cached value exists for `key`, it is returned immediately.
+ * - If an in-flight promise exists for `key`, it is shared with the caller.
+ * - Otherwise, `fetcher` runs once; the result populates the cache for `ttlMs`.
+ *
+ * `forceRefresh` skips both cache and in-flight dedup.
+ *
+ * @param key - Stable cache key identifying this logical REST call.
+ * @param fetcher - Thunk that performs the REST call when no cache/inflight hit.
+ * @param options - Optional overrides for TTL and forceRefresh behavior.
+ * @returns The fetched (or cached) value.
+ */
+export declare function coalescePerpsRestRequest<TValue>(key: string, fetcher: () => Promise<TValue>, options?: CoalesceOptions): Promise<TValue>;
+/**
+ * Test-only: wipe all cached entries and in-flight promises.
+ */
+export declare function resetPerpsRestCacheForTests(): void;
+//# sourceMappingURL=coalescePerpsRestRequest.d.mts.map

package/dist/utils/coalescePerpsRestRequest.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"coalescePerpsRestRequest.d.mts","sourceRoot":"","sources":["../../src/utils/coalescePerpsRestRequest.ts"],"names":[],"mappings":"AAqBA,MAAM,MAAM,eAAe,GAAG;IAC5B;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAC7C,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAC9B,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,MAAM,CAAC,CA6CjB;AAED;;GAEG;AACH,wBAAgB,2BAA2B,IAAI,IAAI,CAGlD"}

package/dist/utils/coalescePerpsRestRequest.mjs

@@ -0,0 +1,66 @@
+import { PERFORMANCE_CONFIG } from "../constants/perpsConfig.mjs";
+const inflight = new Map();
+const cache = new Map();
+/**
+ * Coalesce an idempotent perps REST call.
+ *
+ * - If a fresh cached value exists for `key`, it is returned immediately.
+ * - If an in-flight promise exists for `key`, it is shared with the caller.
+ * - Otherwise, `fetcher` runs once; the result populates the cache for `ttlMs`.
+ *
+ * `forceRefresh` skips both cache and in-flight dedup.
+ *
+ * @param key - Stable cache key identifying this logical REST call.
+ * @param fetcher - Thunk that performs the REST call when no cache/inflight hit.
+ * @param options - Optional overrides for TTL and forceRefresh behavior.
+ * @returns The fetched (or cached) value.
+ */
+export function coalescePerpsRestRequest(key, fetcher, options = {}) {
+    const ttlMs = options.ttlMs ?? PERFORMANCE_CONFIG.PerpsRestCoalesceTtlMs;
+    const forceRefresh = options.forceRefresh ?? false;
+    if (forceRefresh) {
+        cache.delete(key);
+    }
+    else {
+        const now = Date.now();
+        const cached = cache.get(key);
+        if (cached) {
+            if (cached.expiresAt > now) {
+                return Promise.resolve(cached.value);
+            }
+            // Evict expired entry so callers with per-call-unique keys (e.g.
+            // CandleStreamChannel historical paging with per-page endTime) do
+            // not accumulate dead blobs for the life of the process.
+            cache.delete(key);
+        }
+        const existing = inflight.get(key);
+        if (existing !== undefined) {
+            return existing;
+        }
+    }
+    const run = fetcher().then((value) => {
+        // Only the currently-tracked in-flight promise writes to cache. A stale
+        // in-flight (e.g. one that was racing a later forceRefresh=true caller)
+        // must not clobber the fresh value once it finally resolves.
+        if (inflight.get(key) === run) {
+            cache.set(key, { value, expiresAt: Date.now() + ttlMs });
+            inflight.delete(key);
+        }
+        return value;
+    }, (error) => {
+        if (inflight.get(key) === run) {
+            inflight.delete(key);
+        }
+        throw error;
+    });
+    inflight.set(key, run);
+    return run;
+}
+/**
+ * Test-only: wipe all cached entries and in-flight promises.
+ */
+export function resetPerpsRestCacheForTests() {
+    cache.clear();
+    inflight.clear();
+}
+//# sourceMappingURL=coalescePerpsRestRequest.mjs.map

package/dist/utils/coalescePerpsRestRequest.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"coalescePerpsRestRequest.mjs","sourceRoot":"","sources":["../../src/utils/coalescePerpsRestRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,qCAAiC;AAkB9D,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA4B,CAAC;AACrD,MAAM,KAAK,GAAG,IAAI,GAAG,EAA+B,CAAC;AAerD;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,wBAAwB,CACtC,GAAW,EACX,OAA8B,EAC9B,UAA2B,EAAE;IAE7B,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,kBAAkB,CAAC,sBAAsB,CAAC;IACzE,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,KAAK,CAAC;IAEnD,IAAI,YAAY,EAAE,CAAC;QACjB,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAmC,CAAC;QAChE,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,MAAM,CAAC,SAAS,GAAG,GAAG,EAAE,CAAC;gBAC3B,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvC,CAAC;YACD,iEAAiE;YACjE,kEAAkE;YAClE,yDAAyD;YACzD,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACpB,CAAC;QACD,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAgC,CAAC;QAClE,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC;IAED,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC,IAAI,CACxB,CAAC,KAAK,EAAE,EAAE;QACR,wEAAwE;QACxE,wEAAwE;QACxE,6DAA6D;QAC7D,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC;YAC9B,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;YACzD,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvB,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,EACD,CAAC,KAAK,EAAE,EAAE;QACR,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC;YAC9B,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvB,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC,CACF,CAAC;IAEF,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACvB,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,2BAA2B;IACzC,KAAK,CAAC,KAAK,EAAE,CAAC;IACd,QAAQ,CAAC,KAAK,EAAE,CAAC;AACnB,CAAC","sourcesContent":["import { PERFORMANCE_CONFIG } from '../constants/perpsConfig';\n\n// Rapid perps market switching (candle bridge + activity tab burst) drives\n// duplicate REST calls against api.hyperliquid.xyz and occasionally trips 429.\n// This helper collapses concurrent identical calls into one in-flight promise\n// and serves a short TTL cache to absorb the burst. Explicit refresh bypasses\n// the cache so user-initiated refetch still re-runs.\n//\n// Lives at the service layer (MarketDataService) rather than per-hook so every\n// current and future caller — hooks, controller, aggregated provider — is\n// deduped automatically. Centralized at MarketDataService because it is\n// already a single choke point.\n\ntype CacheEntry<TValue> = {\n  value: TValue;\n  expiresAt: number;\n};\n\nconst inflight = new Map<string, Promise<unknown>>();\nconst cache = new Map<string, CacheEntry<unknown>>();\n\nexport type CoalesceOptions = {\n  /**\n   * Cache TTL in milliseconds. Defaults to\n   * {@link PERFORMANCE_CONFIG.PerpsRestCoalesceTtlMs}.\n   */\n  ttlMs?: number;\n  /**\n   * Bypass the cache and any in-flight promise. The fresh result will be\n   * written back to the cache under the same key.\n   */\n  forceRefresh?: boolean;\n};\n\n/**\n * Coalesce an idempotent perps REST call.\n *\n * - If a fresh cached value exists for `key`, it is returned immediately.\n * - If an in-flight promise exists for `key`, it is shared with the caller.\n * - Otherwise, `fetcher` runs once; the result populates the cache for `ttlMs`.\n *\n * `forceRefresh` skips both cache and in-flight dedup.\n *\n * @param key - Stable cache key identifying this logical REST call.\n * @param fetcher - Thunk that performs the REST call when no cache/inflight hit.\n * @param options - Optional overrides for TTL and forceRefresh behavior.\n * @returns The fetched (or cached) value.\n */\nexport function coalescePerpsRestRequest<TValue>(\n  key: string,\n  fetcher: () => Promise<TValue>,\n  options: CoalesceOptions = {},\n): Promise<TValue> {\n  const ttlMs = options.ttlMs ?? PERFORMANCE_CONFIG.PerpsRestCoalesceTtlMs;\n  const forceRefresh = options.forceRefresh ?? false;\n\n  if (forceRefresh) {\n    cache.delete(key);\n  } else {\n    const now = Date.now();\n    const cached = cache.get(key) as CacheEntry<TValue> | undefined;\n    if (cached) {\n      if (cached.expiresAt > now) {\n        return Promise.resolve(cached.value);\n      }\n      // Evict expired entry so callers with per-call-unique keys (e.g.\n      // CandleStreamChannel historical paging with per-page endTime) do\n      // not accumulate dead blobs for the life of the process.\n      cache.delete(key);\n    }\n    const existing = inflight.get(key) as Promise<TValue> | undefined;\n    if (existing !== undefined) {\n      return existing;\n    }\n  }\n\n  const run = fetcher().then(\n    (value) => {\n      // Only the currently-tracked in-flight promise writes to cache. A stale\n      // in-flight (e.g. one that was racing a later forceRefresh=true caller)\n      // must not clobber the fresh value once it finally resolves.\n      if (inflight.get(key) === run) {\n        cache.set(key, { value, expiresAt: Date.now() + ttlMs });\n        inflight.delete(key);\n      }\n      return value;\n    },\n    (error) => {\n      if (inflight.get(key) === run) {\n        inflight.delete(key);\n      }\n      throw error;\n    },\n  );\n\n  inflight.set(key, run);\n  return run;\n}\n\n/**\n * Test-only: wipe all cached entries and in-flight promises.\n */\nexport function resetPerpsRestCacheForTests(): void {\n  cache.clear();\n  inflight.clear();\n}\n"]}

package/dist/utils/hyperLiquidAdapter.cjs

@@ -183,7 +183,11 @@ function adaptMarketFromSDK(sdkMarket) {
     };
 }
 exports.adaptMarketFromSDK = adaptMarketFromSDK;
-function adaptAccountStateFromSDK(perpsState, spotState) {
+// Perps-only account adapter. Spot balances are layered on afterwards by
+// addSpotBalanceToAccountState, which enforces the USDC-only policy via
+// SPOT_COLLATERAL_COINS. Keeping spot logic out of here preserves a single
+// source of truth for spot balance math.
+function adaptAccountStateFromSDK(perpsState) {
     const { totalUnrealizedPnl, weightedReturnOnEquity } = perpsState.assetPositions.reduce((acc, assetPos) => {
         const unrealizedPnl = parseFloat(assetPos.position.unrealizedPnl || '0');
         const marginUsed = parseFloat(assetPos.position.marginUsed || '0');
@@ -200,14 +204,10 @@ function adaptAccountStateFromSDK(perpsState, spotState) {
         ? ((weightedReturnOnEquity / totalMarginUsed) * 100).toString()
         : '0';
     const perpsBalance = parseFloat(perpsState.marginSummary.accountValue);
-    let spotBalance = 0;
-    if (spotState?.balances && Array.isArray(spotState.balances)) {
-        spotBalance = spotState.balances.reduce((sum, balance) => sum + parseFloat(balance.total ?? '0'), 0);
-    }
-    const totalBalance = (spotBalance + perpsBalance).toString();
     const accountState = {
         availableBalance: perpsState.withdrawable || '0',
-        totalBalance: totalBalance || '0',
+        availableToTradeBalance: perpsState.withdrawable || '0',
+        totalBalance: perpsBalance.toString() || '0',
         marginUsed: perpsState.marginSummary.totalMarginUsed || '0',
         unrealizedPnl: totalUnrealizedPnl.toString() || '0',
         returnOnEquity: totalReturnOnEquityPercentage || '0',