@exodus/assets-feature 5.11.1 → 5.11.3

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.11.3](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/assets-feature@5.11.2...@exodus/assets-feature@5.11.3) (2024-09-09)
+
+**Note:** Version bump only for package @exodus/assets-feature
+
+## [5.11.2](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/assets-feature@5.11.1...@exodus/assets-feature@5.11.2) (2024-09-05)
+
+### Bug Fixes
+
+- addRemoteTokens can add builtIn token as CT ([#8879](https://github.com/ExodusMovement/exodus-hydra/issues/8879)) ([2597011](https://github.com/ExodusMovement/exodus-hydra/commit/2597011ed1cd88755d174953e90afe467ecaa689))
+
 ## [5.11.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/assets-feature@5.11.0...@exodus/assets-feature@5.11.1) (2024-08-26)
 
 ### Bug Fixes

package/client/asset-client-interface.js

@@ -1,7 +1,6 @@
-import { pickBy } from '@exodus/basic-utils'
-import lodash from 'lodash'
+import { pickBy, filterAsync } from '@exodus/basic-utils'
+import lodash from 'lodash' // eslint-disable-line @exodus/restricted-imports/prefer-basic-utils
 import assert from 'minimalistic-assert'
-import { filterAsync } from '@exodus/basic-utils/src/async.js'
 
 const { isEmpty } = lodash
 

package/module/assets-module.js

@@ -1,13 +1,11 @@
-/* eslint-disable unicorn/prefer-spread */
 import {
   createAssetRegistry,
   CT_DEFAULT_SERVER,
   CT_STATUS as STATUS,
   CT_UPDATEABLE_PROPERTIES,
 } from '@exodus/assets'
-import { mapValues, pick, pickBy } from '@exodus/basic-utils'
-// eslint-disable-next-line @exodus/restricted-imports/prefer-basic-utils
-import lodash from 'lodash'
+import { keyBy, mapValues, partition, pick, pickBy } from '@exodus/basic-utils'
+import lodash from 'lodash' // eslint-disable-line @exodus/restricted-imports/prefer-basic-utils
 import assert from 'minimalistic-assert'
 
 import {
@@ -19,7 +17,7 @@ import {
 import { getAssetFromAssetId, getFetchErrorMessage, isDisabledCustomToken } from './utils.js'
 import createFetchival from '@exodus/fetch/create-fetchival'
 
-const { get, isEmpty, keyBy, once } = lodash
+const { get, isEmpty, once } = lodash
 
 const FILTERED_FIELDS = [
   'assetId',
@@ -297,27 +295,34 @@ export class AssetsModule {
 
     this.#flushChanges({ added, updated })
 
-    return added.concat(updated)
+    return [...added, ...updated]
   }
 
   addRemoteTokens = async ({ tokenNames }) => {
     this.#assertCustomTokensStorageSupported()
 
     const assets = this.getAssets()
-    const tokenNamesToFetch = tokenNames.filter((tokenName) => !assets[tokenName])
+    const [tokenNamesToUpdate, tokenNamesToFetch] = partition(
+      tokenNames,
+      (tokenName) => !!assets[tokenName]
+    )
 
-    const tokensToAdd =
+    const fetchedTokens =
       tokenNamesToFetch.length > 0
         ? await this.#fetch('tokens', { tokenNames: tokenNamesToFetch }, 'tokens')
         : []
-    const validTokensToAdd = tokensToAdd.filter(this.#validateCustomToken).map(normalizeToken)
-    if (validTokensToAdd.length !== tokensToAdd.length)
+
+    const validTokens = fetchedTokens.filter(this.#validateCustomToken).map(normalizeToken)
+    if (validTokens.length !== fetchedTokens.length)
       this.#logger.warn('Invalid Custom Token schema')
 
-    const tokensToUpdate = tokenNames
-      .map((tokenName) => assets[tokenName])
-      .filter((token) => !!token)
-    const tokens = [...validTokensToAdd, ...tokensToUpdate]
+    const tokens = tokenNamesToUpdate.map((tokenName) => assets[tokenName])
+
+    validTokens.forEach((token) => {
+      // replace fetched CT with existing built-in token if found by assetId
+      const asset = token.assetId && this.#getAssetFromAssetId(token.assetId, token.baseAssetName)
+      tokens.push(asset ?? token)
+    })
 
     if (isEmpty(tokens)) return
 
@@ -455,7 +460,7 @@ export class AssetsModule {
     const asset = this.getAsset(token.name)
     if (asset) return { asset, isAdded: false }
 
-    const { name } = this.#registry.addCustomToken(token) // add to `#/assets`
+    const { name } = this.#registry.addCustomToken(token) // add to registry
     this.#logger.log('Custom token added:', name)
     return { asset: this.getAsset(name), isAdded: true }
   }

package/module/utils.js

@@ -1,13 +1,16 @@
 import { CT_STATUS as STATUS } from '@exodus/assets'
-import lodash from 'lodash'
+import lodash from 'lodash' // eslint-disable-line @exodus/restricted-imports/prefer-basic-utils
+import assert from 'minimalistic-assert'
 
 const { get } = lodash
 
 const BLACKLISTED_ERRORS = [/Cannot destructure property 'owner'/]
 
 export const getAssetFromAssetId = (assets, assetId, baseAssetName) => {
+  assert(assetId, 'getAssetFromAssetId(): assetId is required')
+  assert(baseAssetName, 'getAssetFromAssetId(): baseAssetName is required')
   // ignore letter-case for assets that support checksummed addresses
-  assetId = assetId?.toLowerCase()
+  assetId = assetId.toLowerCase()
   return Object.values(assets).find(
     (asset) => assetId === asset.assetId?.toLowerCase() && baseAssetName === asset.baseAsset.name
   )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/assets-feature",
-  "version": "5.11.1",
+  "version": "5.11.3",
   "license": "UNLICENSED",
   "description": "Assets module, clients and apis",
   "type": "module",
@@ -8,7 +8,7 @@
   "author": "Exodus Movement, Inc.",
   "scripts": {
     "test": "run -T exodus-test --jest --esbuild",
-    "lint": "run -T eslint . --ignore-path ../../.gitignore",
+    "lint": "run -T eslint .",
     "lint:fix": "yarn lint --fix"
   },
   "files": [
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@exodus/assets": "^11.0.0",
-    "@exodus/atoms": "^8.0.0",
+    "@exodus/atoms": "^8.1.1",
     "@exodus/basic-utils": "^3.0.1",
     "@exodus/fetch": "^1.3.0",
     "@exodus/module": "^1.2.2",
@@ -51,7 +51,7 @@
     "@exodus/bitcoin-plugin": "^1.0.3",
     "@exodus/bitcoinregtest-plugin": "^1.0.3",
     "@exodus/bitcointestnet-plugin": "^1.0.3",
-    "@exodus/blockchain-metadata": "^15.4.0",
+    "@exodus/blockchain-metadata": "^15.5.0",
     "@exodus/cardano-lib": "^2.2.0",
     "@exodus/combined-assets-meta": "^3.0.0",
     "@exodus/cosmos-plugin": "^1.0.0",
@@ -62,14 +62,14 @@
     "@exodus/osmosis-plugin": "^1.0.0",
     "@exodus/public-key-provider": "^2.5.0",
     "@exodus/public-key-store": "^1.2.2",
-    "@exodus/redux-dependency-injection": "^4.0.1",
+    "@exodus/redux-dependency-injection": "^4.0.3",
     "@exodus/storage-memory": "^2.2.0",
-    "@exodus/wallet-accounts": "^16.10.0",
+    "@exodus/wallet-accounts": "^16.10.2",
     "@exodus/wild-emitter": "^1.0.0",
     "bip39": "^3.1.0",
     "events": "^3.3.0",
     "msw": "^2.0.0",
     "redux": "^4.0.0"
   },
-  "gitHead": "08a439da808ec039338b0ca1b448b39267d131fb"
+  "gitHead": "d64de7579b06afe91fbded3d1f7eb29950f82e5a"
 }

package/redux/selectors/index.js

@@ -1,9 +1,9 @@
 import { keyBy } from '@exodus/basic-utils'
 import { createSelector } from 'reselect'
 
-import lodash from 'lodash'
+import lodash from 'lodash' // eslint-disable-line @exodus/restricted-imports/prefer-basic-utils
 
-const { memoize } = lodash // eslint-disable-line @exodus/restricted-imports/prefer-basic-utils -- TODO: fix next time we touch this file
+const { memoize } = lodash
 
 // just a semantic alias for `data`
 const allAssetsSelectorDefinition = {