@exodus/assets-feature 9.4.0 → 9.6.0

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [9.6.0](https://github.com/ExodusMovement/exodus/compare/@exodus/assets-feature@9.5.0...@exodus/assets-feature@9.6.0) (2026-10-28)
+
+### Features
+
+- **assets-feature:** allow bitcoin testnet and regtest address modes ([#47982](https://github.com/ExodusMovement/exodus/issues/47982)) ([e242c66](https://github.com/ExodusMovement/exodus/commit/e242c6627965e7f1f78a44e1a4538752af16c51b))
+
+## [9.5.0](https://github.com/ExodusMovement/exodus/compare/@exodus/assets-feature@9.4.0...@exodus/assets-feature@9.5.0) (2026-10-12)
+
+### Features
+
+- **assets:** configure dynamic combined asset overrides ([#46749](https://github.com/ExodusMovement/exodus/issues/46749)) ([582f204](https://github.com/ExodusMovement/exodus/commit/582f20416509431e63b2d5a47160e4ff6a5296d1))
+
 ## [9.4.0](https://github.com/ExodusMovement/exodus/compare/@exodus/assets-feature@9.3.3...@exodus/assets-feature@9.4.0) (2026-10-07)
 
 ### Features

package/README.md

@@ -40,6 +40,8 @@ See [api/index.d.ts](./api/index.d.ts) for more details on the API and token val
 
 ### API Side
 
+`assetsModule.dynamicCombinedAssetOverrides` maps a token's asset name to the asset whose name and ticker should identify its dynamic combined group. For example, `{ cbbtc_basemainnet_58df8ab4: 'bitcoin' }` combines Base cbBTC with Bitcoin while preserving cbBTC's metadata and transaction identity. The target is the primary member; both assets must be loaded and eligible for dynamic grouping. Until the target is available and eligible, the token remains available individually and does not fall back to name/ticker grouping. Static grouping is unchanged.
+
 See [using the sdk](../../docs/development/using-the-sdk.md#setup-the-api-side) for more details on how features plug into the SDK and the API interface in the [type declaration](./api/index.d.ts).
 
 ### UI Side

package/atoms/legacy-address-mode.js

@@ -1,19 +1,28 @@
-import { compute } from '@exodus/atoms'
+import { combine, compute, createStorageAtomFactory } from '@exodus/atoms'
 import { createFusionAtom } from '@exodus/fusion-atoms'
 
-const createLegacyAddressModeAtom = ({ fusion }) => {
+const createLegacyAddressModeAtom = ({ storage, fusion, logger }) => {
+  const storageAtom = createStorageAtomFactory({ storage, logger })({
+    key: 'legacyAddressMode',
+    defaultValue: {},
+    isSoleWriter: true,
+  })
+
   const bitcoinFusionAtom = createFusionAtom({
     fusion,
     path: `bitcoinLegacyAddressEnabled`,
   })
 
   const computedAtom = compute({
-    atom: bitcoinFusionAtom,
-    selector: (bitcoin) => (bitcoin === undefined ? {} : { bitcoin }),
+    atom: combine({ storage: storageAtom, bitcoin: bitcoinFusionAtom }),
+    selector: ({ storage, bitcoin }) => (bitcoin === undefined ? storage : { ...storage, bitcoin }),
   })
 
   const set = async (value) => {
-    const { bitcoin } = typeof value === 'function' ? value(await computedAtom.get()) : value
+    const { bitcoin, ...rest } =
+      typeof value === 'function' ? value(await computedAtom.get()) : value
+
+    await storageAtom.set(rest)
 
     const bitcoinPreviousValue = await bitcoinFusionAtom.get()
     if (bitcoinPreviousValue !== bitcoin) {
@@ -28,7 +37,7 @@ const legacyAddressModeAtomDefinition = {
   id: 'legacyAddressModeAtom',
   type: 'atom',
   factory: createLegacyAddressModeAtom,
-  dependencies: ['fusion'],
+  dependencies: ['storage', 'fusion', 'logger'],
   public: true,
 }
 

package/atoms/taproot-address-mode.js

@@ -1,19 +1,28 @@
-import { compute } from '@exodus/atoms'
+import { combine, compute, createStorageAtomFactory } from '@exodus/atoms'
 import { createFusionAtom } from '@exodus/fusion-atoms'
 
-const createTaprootAddressModeAtom = ({ fusion }) => {
+const createTaprootAddressModeAtom = ({ storage, fusion, logger }) => {
+  const storageAtom = createStorageAtomFactory({ storage, logger })({
+    key: 'taprootAddressMode',
+    defaultValue: {},
+    isSoleWriter: true,
+  })
+
   const bitcoinFusionAtom = createFusionAtom({
     fusion,
     path: `bitcoinTaprootAddressEnabled`,
   })
 
   const computedAtom = compute({
-    atom: bitcoinFusionAtom,
-    selector: (bitcoin) => (bitcoin === undefined ? {} : { bitcoin }),
+    atom: combine({ storage: storageAtom, bitcoin: bitcoinFusionAtom }),
+    selector: ({ storage, bitcoin }) => (bitcoin === undefined ? storage : { ...storage, bitcoin }),
   })
 
   const set = async (value) => {
-    const { bitcoin } = typeof value === 'function' ? value(await computedAtom.get()) : value
+    const { bitcoin, ...rest } =
+      typeof value === 'function' ? value(await computedAtom.get()) : value
+
+    await storageAtom.set(rest)
 
     const bitcoinPreviousValue = await bitcoinFusionAtom.get()
     if (bitcoinPreviousValue !== bitcoin) {
@@ -28,7 +37,7 @@ const taprootAddressModeAtomDefinition = {
   id: 'taprootAddressModeAtom',
   type: 'atom',
   factory: createTaprootAddressModeAtom,
-  dependencies: ['fusion'],
+  dependencies: ['storage', 'fusion', 'logger'],
   public: true,
 }
 

package/constants.js

@@ -8,6 +8,7 @@ export const disabledPurposesDefaultConfig = {
 
 export const assetsModuleDefaultConfig = {
   useDynamicCombinedAssets: false,
+  dynamicCombinedAssetOverrides: Object.create(null),
 }
 
 export const defaultConfig = {

package/index.js

@@ -40,8 +40,14 @@ const assets = (config = Object.create(null)) => {
         storage: { namespace: 'assetPreferences' },
         config: multiAddressMode,
       },
-      { definition: legacyAddressModeAtomDefinition },
-      { definition: taprootAddressModeAtomDefinition },
+      {
+        definition: legacyAddressModeAtomDefinition,
+        storage: { namespace: 'assetPreferences' },
+      },
+      {
+        definition: taprootAddressModeAtomDefinition,
+        storage: { namespace: 'assetPreferences' },
+      },
       { definition: assetsAtomDefinition },
       {
         definition: disabledPurposesAtomDefinition,

package/module/asset-preferences.js

@@ -1,24 +1,40 @@
 import { omit } from '@exodus/basic-utils'
 import assert from 'minimalistic-assert'
 
+const supportsLegacyAddressMode = (asset) => asset?.useBip84 === true
+const supportsTaprootAddressMode = (asset) => asset?.useBip86 === true
+
 class AssetPreferences {
+  #assetsModule
   #disabledPurposesAtom
   #multiAddressModeAtom
   #legacyAddressModeAtom
   #taprootAddressModeAtom
 
   constructor({
+    assetsModule,
     disabledPurposesAtom,
     multiAddressModeAtom,
     legacyAddressModeAtom,
     taprootAddressModeAtom,
   }) {
+    this.#assetsModule = assetsModule
     this.#disabledPurposesAtom = disabledPurposesAtom
     this.#multiAddressModeAtom = multiAddressModeAtom
     this.#legacyAddressModeAtom = legacyAddressModeAtom
     this.#taprootAddressModeAtom = taprootAddressModeAtom
   }
 
+  #assertAssetsSupport = ({ assetNames, method, isSupported }) => {
+    assert(assetNames.length > 0, `${method} requires at least one asset`)
+    for (const assetName of assetNames) {
+      assert(
+        isSupported(this.#assetsModule.getAsset(assetName)),
+        `${method} does not support ${assetName}`
+      )
+    }
+  }
+
   enableMultiAddressMode = ({ assetNames }) =>
     this.#multiAddressModeAtom.set((value) => ({
       ...value,
@@ -38,10 +54,11 @@ class AssetPreferences {
     }))
 
   enableLegacyAddressMode = async ({ assetNames }) => {
-    assert(
-      assetNames.length === 1 && assetNames[0] === 'bitcoin',
-      'enableLegacyAddressMode only supports bitcoin'
-    )
+    this.#assertAssetsSupport({
+      assetNames,
+      method: 'enableLegacyAddressMode',
+      isSupported: supportsLegacyAddressMode,
+    })
 
     await this.#legacyAddressModeAtom.set((value) => ({
       ...value,
@@ -53,19 +70,21 @@ class AssetPreferences {
   }
 
   disableLegacyAddressMode = async ({ assetNames }) => {
-    assert(
-      assetNames.length === 1 && assetNames[0] === 'bitcoin',
-      'disableLegacyAddressMode only supports bitcoin'
-    )
+    this.#assertAssetsSupport({
+      assetNames,
+      method: 'disableLegacyAddressMode',
+      isSupported: supportsLegacyAddressMode,
+    })
 
     await this.#legacyAddressModeAtom.set((value) => omit(value, assetNames))
   }
 
   enableTaprootAddressMode = async ({ assetNames }) => {
-    assert(
-      assetNames.length === 1 && assetNames[0] === 'bitcoin',
-      'enableTaprootAddressMode only supports bitcoin'
-    )
+    this.#assertAssetsSupport({
+      assetNames,
+      method: 'enableTaprootAddressMode',
+      isSupported: supportsTaprootAddressMode,
+    })
 
     await this.#taprootAddressModeAtom.set((value) => ({
       ...value,
@@ -77,10 +96,11 @@ class AssetPreferences {
   }
 
   disableTaprootAddressMode = async ({ assetNames }) => {
-    assert(
-      assetNames.length === 1 && assetNames[0] === 'bitcoin',
-      'disableTaprootAddressMode only supports bitcoin'
-    )
+    this.#assertAssetsSupport({
+      assetNames,
+      method: 'disableTaprootAddressMode',
+      isSupported: supportsTaprootAddressMode,
+    })
 
     await this.#taprootAddressModeAtom.set((value) => omit(value, assetNames))
   }
@@ -115,6 +135,7 @@ const assetPreferencesDefinition = {
   type: 'module',
   factory: (opts) => new AssetPreferences(opts),
   dependencies: [
+    'assetsModule',
     'disabledPurposesAtom',
     'multiAddressModeAtom',
     'legacyAddressModeAtom',

package/module/assets-module.js

@@ -4,7 +4,7 @@ import {
   CT_STATUS as STATUS,
   CT_UPDATEABLE_PROPERTIES,
 } from '@exodus/assets'
-import { keyBy, mapValues, partition, pickBy, difference } from '@exodus/basic-utils'
+import { keyBy, mapValues, partition, pickBy, difference, pick } from '@exodus/basic-utils'
 // eslint-disable-next-line no-restricted-imports -- TODO: Fix this the next time the file is edited.
 import lodash from 'lodash'
 import assert from 'minimalistic-assert'
@@ -30,10 +30,10 @@ import {
   createDynamicCombinedAssetDefinitions,
   shouldTokenJoinCombinedAsset,
   findDynamicCombinedAssetForToken,
+  getDynamicCombinedAssetKey,
 } from './dynamic-combined-assets.js'
 
-// oxlint-disable-next-line @exodus/oxlint-plugin-restricted-imports/prefer-basic-utils
-const { get, isEmpty, once, uniq, chunk, pick } = lodash
+const { get, isEmpty, once, uniq, chunk } = lodash
 
 const getFetchCacheKey = (baseAssetName, assetId) => `${assetId}-${baseAssetName}`
 
@@ -85,6 +85,7 @@ export class AssetsModule {
   #logger
   #invalidTokenNames
   #useDynamicCombinedAssets
+  #dynamicCombinedAssetOverrides
 
   constructor({
     storage,
@@ -125,6 +126,8 @@ export class AssetsModule {
       ...(config.invalidTokenNames || []),
     ])
     this.#useDynamicCombinedAssets = config.useDynamicCombinedAssets ?? false
+    this.#dynamicCombinedAssetOverrides =
+      config.dynamicCombinedAssetOverrides ?? Object.create(null)
   }
 
   #setRegistry = (registry) => {
@@ -242,7 +245,9 @@ export class AssetsModule {
 
   #createDynamicCombinedAssets = () => {
     const allAssets = this.getAssets()
-    const definitions = createDynamicCombinedAssetDefinitions(allAssets)
+    const definitions = createDynamicCombinedAssetDefinitions(allAssets, {
+      overrides: this.#dynamicCombinedAssetOverrides,
+    })
 
     const newlyCreatedNames = []
     for (const definition of definitions) {
@@ -671,7 +676,8 @@ export class AssetsModule {
 
     const allAssets = this.getAssets()
     const combinedAssets = Object.values(allAssets).filter((a) => a.isCombined)
-    const matchingCombined = findDynamicCombinedAssetForToken(token, combinedAssets)
+    const options = { assets: allAssets, overrides: this.#dynamicCombinedAssetOverrides }
+    const matchingCombined = findDynamicCombinedAssetForToken(token, combinedAssets, options)
 
     if (matchingCombined) {
       if (!matchingCombined.combinedAssetNames.includes(token.name)) {
@@ -679,16 +685,17 @@ export class AssetsModule {
         return { updated: [matchingCombined.name], created: [], members: [] }
       }
     } else {
+      const tokenKey = getDynamicCombinedAssetKey(token, options)
+      if (!tokenKey) return { updated: [], created: [], members: [] }
       const matchingAssets = Object.values(allAssets).filter(
         (a) =>
           !a.isCombined &&
-          a.displayTicker?.toLowerCase() === token.displayTicker?.toLowerCase() &&
-          a.displayName?.toLowerCase() === token.displayName?.toLowerCase() &&
+          getDynamicCombinedAssetKey(a, options) === tokenKey &&
           shouldTokenJoinCombinedAsset(a)
       )
 
       if (matchingAssets.length >= 2) {
-        const definitions = createDynamicCombinedAssetDefinitions(matchingAssets)
+        const definitions = createDynamicCombinedAssetDefinitions(matchingAssets, options)
         if (definitions.length > 0) {
           const newCombined = this.#registry.addCombinedAsset(definitions[0])
           const memberNames = matchingAssets.map((a) => a.name).filter((n) => n !== token.name)

package/module/dynamic-combined-assets.js

@@ -8,13 +8,29 @@ const normalizeForName = (str) => str.toLowerCase().replace(/[^a-z0-9]/g, '')
 const createGroupKey = (displayTicker, displayName) =>
   `${normalizeForKey(displayTicker)}::${normalizeForKey(displayName)}`
 
-const groupAssetsByTickerAndName = (assets) => {
+const getGroupingAsset = (asset, { assets = {}, overrides = Object.create(null) } = {}) => {
+  if (!Object.hasOwn(overrides, asset.name)) return asset
+
+  const target = assets[overrides[asset.name]]
+  return target && !target.isCombined && shouldTokenJoinCombinedAsset(target) ? target : null
+}
+
+export const getDynamicCombinedAssetKey = (asset, options) => {
+  const groupingAsset = getGroupingAsset(asset, options)
+  if (!groupingAsset) return null
+
+  const { displayTicker, displayName } = groupingAsset
+  return displayTicker && displayName ? createGroupKey(displayTicker, displayName) : null
+}
+
+const groupAssetsByTickerAndName = (assets, options) => {
   const groups = Object.create(null)
 
   for (const asset of assets) {
-    if (asset.isCombined || !asset.displayTicker || !asset.displayName) continue
+    if (asset.isCombined) continue
 
-    const key = createGroupKey(asset.displayTicker, asset.displayName)
+    const key = getDynamicCombinedAssetKey(asset, options)
+    if (!key) continue
     if (!groups[key]) groups[key] = []
     groups[key].push(asset)
   }
@@ -31,9 +47,12 @@ const resolveDecimals = (assets) => {
   return Math.max(...decimals)
 }
 
-const createDynamicCombinedAssetDefinition = (assetGroup) => {
+const createDynamicCombinedAssetDefinition = (assetGroup, { overrides }) => {
   const sortedAssets = [...assetGroup].sort(byName)
-  const [primary] = sortedAssets
+  const targetNames = new Set(Object.values(overrides))
+  const overrideTarget = sortedAssets.find((asset) => targetNames.has(asset.name))
+  const primary = overrideTarget ?? sortedAssets[0]
+  const members = [primary, ...sortedAssets.filter((asset) => asset !== primary)]
 
   const normalizedTicker = normalizeForName(primary.displayTicker)
   const normalizedDisplayName = normalizeForName(primary.displayName)
@@ -53,7 +72,7 @@ const createDynamicCombinedAssetDefinition = (assetGroup) => {
       [`${name}_base`]: 0,
       [ticker]: decimals,
     },
-    combinedAssetNames: sortedAssets.map((a) => a.name),
+    combinedAssetNames: members.map((a) => a.name),
     info: primary.info || { description: '' },
     primaryColor: primary.primaryColor || '#888888',
     gradientColors: primary.gradientColors || ['#888888', '#666666'],
@@ -71,27 +90,33 @@ export const isTrustedAsset = (asset) => {
   return false
 }
 
-export const createDynamicCombinedAssetDefinitions = (assets) => {
+export const createDynamicCombinedAssetDefinitions = (
+  assets,
+  { overrides = Object.create(null) } = {}
+) => {
   const assetList = Array.isArray(assets) ? assets : Object.values(assets)
+  const options = {
+    assets: Object.fromEntries(assetList.map((asset) => [asset.name, asset])),
+    overrides,
+  }
   const trustedAssets = assetList.filter(
     (asset) => isTrustedAsset(asset) && !isTestnetVariant(asset)
   )
-  const groups = groupAssetsByTickerAndName(trustedAssets)
+  const groups = groupAssetsByTickerAndName(trustedAssets, options)
 
   const definitions = []
   for (const assetGroup of Object.values(groups)) {
     if (assetGroup.length >= MIN_ASSETS_TO_COMBINE) {
-      definitions.push(createDynamicCombinedAssetDefinition(assetGroup))
+      definitions.push(createDynamicCombinedAssetDefinition(assetGroup, options))
     }
   }
 
   return definitions
 }
 
-export const findDynamicCombinedAssetForToken = (token, existingCombinedAssets) => {
-  if (!token.displayTicker || !token.displayName) return null
-
-  const tokenKey = createGroupKey(token.displayTicker, token.displayName)
+export const findDynamicCombinedAssetForToken = (token, existingCombinedAssets, options) => {
+  const tokenKey = getDynamicCombinedAssetKey(token, options)
+  if (!tokenKey) return null
 
   for (const combined of existingCombinedAssets) {
     if (!combined.isCombined) continue

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/assets-feature",
-  "version": "9.4.0",
+  "version": "9.6.0",
   "license": "MIT",
   "description": "This Exodus SDK feature provides access to instances of all blockchain asset adapters supported by the wallet, and enables you to search for and add custom tokens at runtime.",
   "type": "module",
@@ -40,11 +40,11 @@
     "@exodus/asset-schema-validation": "^1.2.0",
     "@exodus/asset-types": "^0.5.0",
     "@exodus/assets": "^11.3.0",
-    "@exodus/atoms": "^10.3.4",
-    "@exodus/basic-utils": "^5.2.0",
+    "@exodus/atoms": "^10.3.5",
+    "@exodus/basic-utils": "^5.2.1",
     "@exodus/fetch": "^1.3.0",
-    "@exodus/fusion-atoms": "^1.4.0",
-    "@exodus/timer": "^1.2.2",
+    "@exodus/fusion-atoms": "^1.4.1",
+    "@exodus/timer": "^1.2.3",
     "lodash": "^4.17.21",
     "make-concurrent": "^5.4.0",
     "minimalistic-assert": "^1.0.1",
@@ -53,8 +53,8 @@
   },
   "devDependencies": {
     "@exodus/bip32": "^4.3.1",
-    "@exodus/bip39": "^1.1.0",
-    "@exodus/bip44-constants": "^195.0.2",
+    "@exodus/bip39": "^1.1.1",
+    "@exodus/bip44-constants": "^195.0.3",
     "@exodus/bitcoin-meta": "^2.0.0",
     "@exodus/bitcoin-plugin": "^2.0.0",
     "@exodus/bitcoinregtest-plugin": "^2.0.0",
@@ -64,16 +64,16 @@
     "@exodus/ethereum-lib": "^5.26.0",
     "@exodus/ethereum-meta": "^2.0.0",
     "@exodus/ethereum-plugin": "^3.1.1",
-    "@exodus/fusion-local": "^2.1.0",
+    "@exodus/fusion-local": "^2.1.1",
     "@exodus/keychain": "^12.1.0",
-    "@exodus/logger": "^1.2.3",
-    "@exodus/models": "^13.3.2",
+    "@exodus/logger": "^1.2.4",
+    "@exodus/models": "^13.3.3",
     "@exodus/osmosis-plugin": "^1.3.3",
-    "@exodus/public-key-provider": "^4.3.1",
+    "@exodus/public-key-provider": "^4.3.2",
     "@exodus/redux-dependency-injection": "^5.0.0",
-    "@exodus/storage-memory": "^2.4.0",
+    "@exodus/storage-memory": "^2.4.1",
     "@exodus/wallet-accounts": "^20.4.12",
-    "@exodus/wild-emitter": "^1.1.2",
+    "@exodus/wild-emitter": "^1.1.3",
     "events": "^3.3.0",
     "msw": "^2.0.0",
     "redux": "^4.0.0"
@@ -82,5 +82,5 @@
     "access": "public",
     "provenance": false
   },
-  "gitHead": "a65e66ff61d27471e199419be8b31806f58c6b1b"
+  "gitHead": "dc6d4bfa087c6aaf5bf26a6fbe7f8ebebeb23670"
 }