@exodus/assets-feature 7.2.2 → 7.4.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.4.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/assets-feature@7.3.0...@exodus/assets-feature@7.4.0) (2025-04-17)
+
+### Features
+
+- feat: validate tokens using asset-schema-validation (#12011)
+
+## [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

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'
@@ -16,8 +17,9 @@ import {
 } from './constants.js'
 import { getAssetFromAssetId, getFetchErrorMessage, isDisabledCustomToken } from './utils.js'
 import createFetchival from '@exodus/fetch/create-fetchival'
+import { validateCustomToken, isValidCustomToken } from '@exodus/asset-schema-validation'
 
-const { get, isEmpty, once } = lodash
+const { get, isEmpty, once, uniq } = lodash
 
 const FILTERED_FIELDS = [
   'assetId',
@@ -77,7 +79,7 @@ export class AssetsModule {
   #customTokensServerUrl
   #updateableProps
   #iconsStorage
-  #validateCustomToken
+  #shouldValidateCustomToken
   #assetPlugins
   #combinedAssetsList
   #storageDataKey
@@ -99,7 +101,6 @@ export class AssetsModule {
     assetPlugins,
     assetsAtom,
     combinedAssetsList = [],
-    validateCustomToken = () => true,
     config = {},
     fetch,
     logger,
@@ -114,7 +115,7 @@ export class AssetsModule {
     this.#customTokensServerUrl = config.customTokensServerUrl || CT_DEFAULT_SERVER
     this.#updateableProps = [...CT_UPDATEABLE_PROPERTIES, 'version']
     this.#iconsStorage = iconsStorage
-    this.#validateCustomToken = validateCustomToken
+    this.#shouldValidateCustomToken = config.shouldValidateCustomToken ?? true
     this.#storageDataKey = config.storageDataKey || CT_DATA_KEY
     this.#storageTimestampKey = config.storageTimestampKey || CT_TIMESTAMP_KEY
     this.#customTokenUpdateInterval = config.customTokenUpdateInterval || CT_UPDATE_INTERVAL
@@ -222,11 +223,17 @@ export class AssetsModule {
     }
 
     const _token = await fetchTokenAndCacheError()
-    if (!this.#validateCustomToken(_token)) {
-      this.#logger.warn('Invalid Custom Token schema')
-      const err = new Error('Token did not pass validation')
-      this.#setCache(key, { cachedError: err })
-      throw err
+    if (this.#shouldValidateCustomToken) {
+      try {
+        validateCustomToken(_token)
+      } catch (e) {
+        this.#logger.warn(
+          `Token did not pass validation ${baseAssetName} ${assetId}. Error: ${e.message}`
+        )
+        const err = new Error('Token did not pass validation')
+        this.#setCache(key, { cachedError: err })
+        throw err
+      }
     }
 
     const token = normalizeToken(_token)
@@ -247,13 +254,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
@@ -317,7 +325,7 @@ export class AssetsModule {
         ? await this.#fetch('tokens', { tokenNames: tokenNamesToFetch }, 'tokens')
         : []
 
-    const validTokens = fetchedTokens.filter(this.#validateCustomToken).map(normalizeToken)
+    const validTokens = fetchedTokens.filter(this.#isValidCustomToken).map(normalizeToken)
     if (validTokens.length !== fetchedTokens.length)
       this.#logger.warn('Invalid Custom Token schema')
 
@@ -365,6 +373,8 @@ 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 })
   }
@@ -398,7 +408,7 @@ export class AssetsModule {
       { baseAssetName: baseAssetNames, lifecycleStatus, query, excludeTags, pageNumber, pageSize },
       'tokens'
     )
-    const validTokens = tokens.filter(this.#validateCustomToken)
+    const validTokens = tokens.filter(this.#isValidCustomToken)
 
     if (validTokens.length !== tokens.length) this.#logger.warn('Invalid Custom Token schema')
 
@@ -415,7 +425,7 @@ export class AssetsModule {
 
   #fetchUpdates = async (assetVersions) => {
     const updatedTokens = await this.#fetch('updates', assetVersions, 'tokens')
-    const validatedTokens = updatedTokens.filter(this.#validateCustomToken).map(normalizeToken)
+    const validatedTokens = updatedTokens.filter(this.#isValidCustomToken).map(normalizeToken)
     if (validatedTokens.length !== updatedTokens.length) {
       this.#logger.warn('Invalid Custom Token schema')
     }
@@ -468,33 +478,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 }
   }
 
@@ -585,6 +632,14 @@ export class AssetsModule {
     return !lastUpdateDate || Date.now() - lastUpdateDate > this.#customTokenUpdateInterval
   }
 
+  #isValidCustomToken = (token) => {
+    if (!this.#shouldValidateCustomToken) {
+      return true
+    }
+
+    return isValidCustomToken(token)
+  }
+
   clear = async () =>
     this.#storage &&
     Promise.all([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/assets-feature",
-  "version": "7.2.2",
+  "version": "7.4.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,8 @@
   },
   "dependencies": {
     "@exodus/asset-lib": "^5.3.0",
-    "@exodus/assets": "^11.0.0",
+    "@exodus/asset-schema-validation": "^1.0.1",
+    "@exodus/assets": "^11.3.0",
     "@exodus/atoms": "^9.0.0",
     "@exodus/basic-utils": "^4.0.0",
     "@exodus/fetch": "^1.3.0",
@@ -60,6 +61,7 @@
     "@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 +70,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 +80,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f34be287dba62ba8e3872c90bf6f0973b07ea2d6"
+  "gitHead": "05dfc1fd50441f5b6513eef369476167c3b02c57"
 }