@exodus/assets-feature 7.2.1 → 7.3.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.
 
+## [7.3.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/assets-feature@7.2.2...@exodus/assets-feature@7.3.0) (2025-04-16)
+
+### Features
+
+- feat: support updating combined asset members (#12019)
+
+## [7.2.2](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/assets-feature@7.2.1...@exodus/assets-feature@7.2.2) (2025-04-14)
+
+### Bug Fixes
+
+- fix: provide pageNumber and pageSize to searchTokens (#12006)
+
 ## [7.2.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/assets-feature@7.2.0...@exodus/assets-feature@7.2.1) (2025-04-02)
 
 ### Bug Fixes

package/api/index.d.ts

@@ -26,6 +26,8 @@ declare const assetsApiDefinition: {
         lifecycleStatus?: TokenStatus[]
         query?: string
         excludeTags?: string[]
+        pageNumber?: number
+        pageSize?: number
       })
       updateTokens(): Promise<void>
       addTokens(params: {

package/module/assets-module.js

@@ -1,10 +1,11 @@
+/* eslint-disable @exodus/mutable/no-param-reassign-prop-only */
 import {
   createAssetRegistry,
   CT_DEFAULT_SERVER,
   CT_STATUS as STATUS,
   CT_UPDATEABLE_PROPERTIES,
 } from '@exodus/assets'
-import { keyBy, mapValues, partition, pick, pickBy } from '@exodus/basic-utils'
+import { keyBy, mapValues, partition, pick, pickBy, difference } from '@exodus/basic-utils'
 import lodash from 'lodash'
 import assert from 'minimalistic-assert'
 import { memoizeLruCache } from '@exodus/asset-lib'
@@ -17,7 +18,7 @@ import {
 import { getAssetFromAssetId, getFetchErrorMessage, isDisabledCustomToken } from './utils.js'
 import createFetchival from '@exodus/fetch/create-fetchival'
 
-const { get, isEmpty, once } = lodash
+const { get, isEmpty, once, uniq } = lodash
 
 const FILTERED_FIELDS = [
   'assetId',
@@ -247,13 +248,14 @@ export class AssetsModule {
 
     try {
       const token = await this.fetchToken(assetId, baseAssetName)
-      const { asset, isAdded } = this.#handleFetchedToken(token)
+      const { asset, isAdded, updates } = this.#handleFetchedToken(token)
+      const updated = updates.map(this.getAsset)
 
       if (isAdded) {
         await this.#storeCustomTokens([token])
-        this.#flushChanges({ added: [asset] })
+        this.#flushChanges({ added: [asset], updated })
       } else {
-        this.#flushChanges({ updated: [asset] })
+        this.#flushChanges({ updated: [asset, ...updated] })
       }
 
       return asset
@@ -365,11 +367,20 @@ export class AssetsModule {
       (token) => _isDisabledCustomToken(token) && !isDisabledCustomToken(this.getAsset(token.name))
     )
     const updatedAssets = tokens.map(this.#registry.updateCustomToken)
+    const parentNames = uniq(tokens.flatMap(this.#handleCombinedParents))
+    updatedAssets.push(...parentNames.map(this.getAsset))
 
     this.#flushChanges({ updated: updatedAssets, disabled })
   }
 
-  searchTokens = async ({ baseAssetName, lifecycleStatus, query, excludeTags = ['offensive'] }) => {
+  searchTokens = async ({
+    baseAssetName,
+    lifecycleStatus,
+    query,
+    excludeTags = ['offensive'],
+    pageNumber,
+    pageSize,
+  }) => {
     assert(
       !baseAssetName || typeof baseAssetName === 'string' || Array.isArray(baseAssetName),
       'searchTokens(): baseAssetName must be a string or an array if supplied'
@@ -388,7 +399,7 @@ export class AssetsModule {
 
     const tokens = await this.#fetch(
       'search',
-      { baseAssetName: baseAssetNames, lifecycleStatus, query, excludeTags },
+      { baseAssetName: baseAssetNames, lifecycleStatus, query, excludeTags, pageNumber, pageSize },
       'tokens'
     )
     const validTokens = tokens.filter(this.#validateCustomToken)
@@ -461,33 +472,70 @@ export class AssetsModule {
     }
   }
 
+  #handleCombinedParents = ({ name, parents }) => {
+    if (!parents) return []
+    assert(Array.isArray(parents), 'Array expected')
+
+    const currentParents = this.#getAssetNamesBy(
+      (asset) => asset.isCombined && asset.combinedAssetNames.includes(name)
+    )
+    const updatedCombinedAssetNames = []
+
+    const removedParents = difference(currentParents, parents)
+    removedParents.forEach((parent) => {
+      this.#registry.updateCombinedAsset(parent, { removeMembers: [name] })
+      updatedCombinedAssetNames.push(parent)
+    })
+
+    const addedParents = difference(parents, currentParents)
+    addedParents.forEach((parent) => {
+      const asset = this.getAsset(parent)
+      if (!asset || !asset.isCombined) return
+
+      this.#registry.updateCombinedAsset(parent, { addMembers: [name] })
+      updatedCombinedAssetNames.push(parent)
+    })
+
+    return uniq(updatedCombinedAssetNames)
+  }
+
   #handleFetchedToken = (token) => {
     const asset = this.getAsset(token.name)
-    if (asset) return { asset, isAdded: false }
+    if (asset) return { asset, isAdded: false, updates: [] }
 
     const { name } = this.#registry.addCustomToken(token) // add to registry
+    const updates = this.#handleCombinedParents(token)
+
     this.#logger.log('Custom token added:', name)
-    return { asset: this.getAsset(name), isAdded: true }
+    return { asset: this.getAsset(name), isAdded: true, updates }
   }
 
   #handleFetchedTokens = (tokens) => {
     const fetchedAndHandledTokens = []
     const added = []
     const updated = []
+    const parentNames = []
     for (const token of tokens) {
       try {
-        const { asset, isAdded } = this.#handleFetchedToken(token)
+        const { asset, isAdded, updates } = this.#handleFetchedToken(token)
+
         if (isAdded) {
           added.push(asset)
           fetchedAndHandledTokens.push(token)
         } else {
           updated.push(asset)
         }
+
+        if (updates.length > 0) {
+          parentNames.push(...updates)
+        }
       } catch (err) {
         this.#logger.warn('Handle fetched custom tokens error:', err.message)
       }
     }
 
+    updated.push(...uniq(parentNames).map(this.getAsset))
+
     return { fetchedAndHandledTokens, added, updated }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/assets-feature",
-  "version": "7.2.1",
+  "version": "7.3.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",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@exodus/asset-lib": "^5.3.0",
-    "@exodus/assets": "^11.0.0",
+    "@exodus/assets": "^11.3.0",
     "@exodus/atoms": "^9.0.0",
     "@exodus/basic-utils": "^4.0.0",
     "@exodus/fetch": "^1.3.0",
@@ -54,12 +54,13 @@
     "@exodus/bitcoin-plugin": "^1.29.1",
     "@exodus/bitcoinregtest-plugin": "^1.11.0",
     "@exodus/bitcointestnet-plugin": "^1.13.1",
-    "@exodus/blockchain-metadata": "^15.9.2",
+    "@exodus/blockchain-metadata": "^15.10.0",
     "@exodus/cardano-lib": "^2.2.0",
     "@exodus/combined-assets-meta": "^3.0.0",
     "@exodus/cosmos-plugin": "^1.3.3",
     "@exodus/ethereum-lib": "^5.0.0",
     "@exodus/ethereum-meta": "^2.0.0",
+    "@exodus/ethereum-plugin": "^2.7.4",
     "@exodus/fusion-local": "^2.1.0",
     "@exodus/keychain": "^7.3.0",
     "@exodus/logger": "^1.2.3",
@@ -68,7 +69,7 @@
     "@exodus/public-key-provider": "^4.1.1",
     "@exodus/redux-dependency-injection": "^4.1.1",
     "@exodus/storage-memory": "^2.2.2",
-    "@exodus/wallet-accounts": "^17.5.0",
+    "@exodus/wallet-accounts": "^17.5.1",
     "@exodus/wild-emitter": "^1.0.0",
     "bip39": "^3.1.0",
     "events": "^3.3.0",
@@ -78,5 +79,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "560e85813d18b278485be99bc9905b6e1e06d507"
+  "gitHead": "272804211316a2713c003e48672dc60d8fb919f0"
 }