@metamask-previews/perps-controller 4.0.0-preview-e0eba6dbb → 4.0.0-preview-56dd1249f

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';\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"]}
+{"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): InternalAccount | PerpsInternalAccount | 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\nexport type AddSpotBalanceOptions = {\n  /**\n   * Whether the user's abstraction mode folds spot balances into perps\n   * collateral. Standard / DEX abstraction keep spot separate.\n   */\n  foldIntoCollateral?: boolean;\n};\n\n// The release-branch balance bridge is USDC-only. Non-USDC spot assets must\n// not inflate the balances shown or validated by withdraw/payment flows.\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  options?: AddSpotBalanceOptions,\n): AccountState {\n  // Fail-closed default: align with `hyperLiquidModeFoldsSpot(null) → false`.\n  // A caller that omits `options` should NOT silently fold spot — that would\n  // over-report withdrawable funds for Standard / dexAbstraction users.\n  const foldIntoCollateral = options?.foldIntoCollateral ?? false;\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  // Folding is gated strictly on the resolved abstraction mode. Standard /\n  // DEX-abstraction users keep perps and spot independent, so spot must NOT\n  // surface as a perps-withdrawable balance for them — withdraw3 only draws\n  // from the perps ledger in those modes. Unified / portfolio-margin users\n  // get the fold; live callers fail-CLOSED via `hyperLiquidModeFoldsSpot`\n  // when mode is unresolved (avoids over-reporting funds withdraw3 cannot\n  // actually draw during the initial subscription window).\n  let availableToTrade = accountState.availableBalance;\n  if (foldIntoCollateral) {\n    availableToTrade = Number.isFinite(currentAvailable)\n      ? (currentAvailable + freeSpot).toString()\n      : freeSpot.toString();\n  }\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

@@ -5,10 +5,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;
-} | null;
+export declare function findEvmAccount(accounts: (InternalAccount | PerpsInternalAccount)[]): InternalAccount | PerpsInternalAccount | null;
 export declare function getEvmAccountFromAccountGroup(accounts: (InternalAccount | PerpsInternalAccount)[]): {
     address: string;
 } | undefined;
@@ -20,9 +17,16 @@ export type ReturnOnEquityInput = {
     returnOnEquity: string | number;
 };
 export declare function calculateWeightedReturnOnEquity(accounts: ReturnOnEquityInput[]): string;
+export type AddSpotBalanceOptions = {
+    /**
+     * Whether the user's abstraction mode folds spot balances into perps
+     * collateral. Standard / DEX abstraction keep spot separate.
+     */
+    foldIntoCollateral?: boolean;
+};
 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;
+export declare function addSpotBalanceToAccountState(accountState: AccountState, spotState?: SpotClearinghouseStateResponse | null, options?: AddSpotBalanceOptions): 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;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"}
+{"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,eAAe,GAAG,oBAAoB,GAAG,IAAI,CAM/C;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,MAAM,MAAM,qBAAqB,GAAG;IAClC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AAMF,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,EACjD,OAAO,CAAC,EAAE,qBAAqB,GAC9B,YAAY,CAmDd;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,YAAY,CA8D3E"}

package/dist/utils/accountUtils.d.mts

@@ -5,10 +5,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;
-} | null;
+export declare function findEvmAccount(accounts: (InternalAccount | PerpsInternalAccount)[]): InternalAccount | PerpsInternalAccount | null;
 export declare function getEvmAccountFromAccountGroup(accounts: (InternalAccount | PerpsInternalAccount)[]): {
     address: string;
 } | undefined;
@@ -20,9 +17,16 @@ export type ReturnOnEquityInput = {
     returnOnEquity: string | number;
 };
 export declare function calculateWeightedReturnOnEquity(accounts: ReturnOnEquityInput[]): string;
+export type AddSpotBalanceOptions = {
+    /**
+     * Whether the user's abstraction mode folds spot balances into perps
+     * collateral. Standard / DEX abstraction keep spot separate.
+     */
+    foldIntoCollateral?: boolean;
+};
 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;
+export declare function addSpotBalanceToAccountState(accountState: AccountState, spotState?: SpotClearinghouseStateResponse | null, options?: AddSpotBalanceOptions): 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;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"}
+{"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,eAAe,GAAG,oBAAoB,GAAG,IAAI,CAM/C;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,MAAM,MAAM,qBAAqB,GAAG;IAClC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AAMF,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,EACjD,OAAO,CAAC,EAAE,qBAAqB,GAC9B,YAAY,CAmDd;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,YAAY,CA8D3E"}

package/dist/utils/accountUtils.mjs

@@ -47,10 +47,8 @@ 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.
+// The release-branch balance bridge is USDC-only. Non-USDC spot assets must
+// not inflate the balances shown or validated by withdraw/payment flows.
 const SPOT_COLLATERAL_COINS = new Set(['USDC']);
 export function getSpotBalance(spotState) {
     if (!spotState?.balances || !Array.isArray(spotState.balances)) {
@@ -76,7 +74,11 @@ export function getSpotHold(spotState) {
         return Number.isFinite(value) ? sum + value : sum;
     }, 0);
 }
-export function addSpotBalanceToAccountState(accountState, spotState) {
+export function addSpotBalanceToAccountState(accountState, spotState, options) {
+    // Fail-closed default: align with `hyperLiquidModeFoldsSpot(null) → false`.
+    // A caller that omits `options` should NOT silently fold spot — that would
+    // over-report withdrawable funds for Standard / dexAbstraction users.
+    const foldIntoCollateral = options?.foldIntoCollateral ?? false;
     const spotBalance = getSpotBalance(spotState);
     const spotHold = getSpotHold(spotState);
     const freeSpot = Math.max(0, spotBalance - spotHold);
@@ -95,9 +97,19 @@ export function addSpotBalanceToAccountState(accountState, spotState) {
                 : accountState.availableBalance,
         };
     }
-    const availableToTrade = Number.isFinite(currentAvailable)
-        ? (currentAvailable + freeSpot).toString()
-        : freeSpot.toString();
+    // Folding is gated strictly on the resolved abstraction mode. Standard /
+    // DEX-abstraction users keep perps and spot independent, so spot must NOT
+    // surface as a perps-withdrawable balance for them — withdraw3 only draws
+    // from the perps ledger in those modes. Unified / portfolio-margin users
+    // get the fold; live callers fail-CLOSED via `hyperLiquidModeFoldsSpot`
+    // when mode is unresolved (avoids over-reporting funds withdraw3 cannot
+    // actually draw during the initial subscription window).
+    let availableToTrade = accountState.availableBalance;
+    if (foldIntoCollateral) {
+        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.

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';\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"]}
+{"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): InternalAccount | PerpsInternalAccount | 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\nexport type AddSpotBalanceOptions = {\n  /**\n   * Whether the user's abstraction mode folds spot balances into perps\n   * collateral. Standard / DEX abstraction keep spot separate.\n   */\n  foldIntoCollateral?: boolean;\n};\n\n// The release-branch balance bridge is USDC-only. Non-USDC spot assets must\n// not inflate the balances shown or validated by withdraw/payment flows.\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  options?: AddSpotBalanceOptions,\n): AccountState {\n  // Fail-closed default: align with `hyperLiquidModeFoldsSpot(null) → false`.\n  // A caller that omits `options` should NOT silently fold spot — that would\n  // over-report withdrawable funds for Standard / dexAbstraction users.\n  const foldIntoCollateral = options?.foldIntoCollateral ?? false;\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  // Folding is gated strictly on the resolved abstraction mode. Standard /\n  // DEX-abstraction users keep perps and spot independent, so spot must NOT\n  // surface as a perps-withdrawable balance for them — withdraw3 only draws\n  // from the perps ledger in those modes. Unified / portfolio-margin users\n  // get the fold; live callers fail-CLOSED via `hyperLiquidModeFoldsSpot`\n  // when mode is unresolved (avoids over-reporting funds withdraw3 cannot\n  // actually draw during the initial subscription window).\n  let availableToTrade = accountState.availableBalance;\n  if (foldIntoCollateral) {\n    availableToTrade = Number.isFinite(currentAvailable)\n      ? (currentAvailable + freeSpot).toString()\n      : freeSpot.toString();\n  }\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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/perps-controller",
-  "version": "4.0.0-preview-e0eba6dbb",
+  "version": "4.0.0-preview-56dd1249f",
   "description": "Controller for perpetual trading functionality in MetaMask",
   "keywords": [
     "Ethereum",
@@ -61,7 +61,7 @@
     "@metamask/controller-utils": "^11.20.0",
     "@metamask/messenger": "^1.2.0",
     "@metamask/utils": "^11.9.0",
-    "@nktkas/hyperliquid": "^0.30.2",
+    "@nktkas/hyperliquid": "^0.32.2",
     "bignumber.js": "^9.1.2",
     "reselect": "^5.1.1",
     "uuid": "^8.3.2"
@@ -71,7 +71,7 @@
     "@metamask/auto-changelog": "^6.1.0",
     "@metamask/geolocation-controller": "^0.1.2",
     "@metamask/keyring-controller": "^25.3.0",
-    "@metamask/keyring-internal-api": "^11.0.0",
+    "@metamask/keyring-internal-api": "^11.0.1",
     "@metamask/network-controller": "^30.1.0",
     "@metamask/profile-sync-controller": "^28.0.2",
     "@metamask/remote-feature-flag-controller": "^4.2.0",