@exodus/assets-feature 6.1.0 → 7.0.1

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.0.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/assets-feature@7.0.0...@exodus/assets-feature@7.0.1) (2025-02-18)
+
+### Bug Fixes
+
+- fix: 'assets' and 'assets-add' race condition (#11521)
+
+## [7.0.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/assets-feature@6.1.0...@exodus/assets-feature@7.0.0) (2025-02-17)
+
+### ⚠ BREAKING CHANGES
+
+- make ACI fields private (#11460)
+
+### Features
+
+- feat: assets-feature report (#11496)
+
+- refactor!: make ACI fields private (#11460)
+
 ## [6.1.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/assets-feature@6.0.4...@exodus/assets-feature@6.1.0) (2025-02-10)
 
 ### Features

package/client/asset-client-interface.js

@@ -5,57 +5,61 @@ import assert from 'minimalistic-assert'
 const { isEmpty } = lodash
 
 class AssetClientInterface {
+  #addressProvider
+  #assetsModule
   #availableAssetNamesAtom
-  #walletAccountsAtom
-  #enabledWalletAccountsAtom
-  #transactionSigner
-  #publicKeyProvider
+  #blockchainMetadata
   #config
   #createLogger
+  #enabledWalletAccountsAtom
+  #feeMonitors
+  #publicKeyProvider
+  #transactionSigner
+  #walletAccountsAtom
 
   constructor({
+    addressProvider,
+    assetsModule,
+    availableAssetNamesAtom,
     blockchainMetadata,
     createLogger,
-    walletAccountsAtom,
+    config,
     enabledWalletAccountsAtom,
-    assetsModule,
-    availableAssetNamesAtom,
-    addressProvider,
     feeMonitors,
-    transactionSigner,
     publicKeyProvider,
-    config,
+    transactionSigner,
+    walletAccountsAtom,
   }) {
-    this.blockchainMetadata = blockchainMetadata
-    this.#walletAccountsAtom = walletAccountsAtom
-    this.#enabledWalletAccountsAtom = enabledWalletAccountsAtom
-    this.assetsModule = assetsModule
-    this.addressProvider = addressProvider
-    this.feeMonitors = feeMonitors
+    this.#addressProvider = addressProvider
+    this.#assetsModule = assetsModule
     this.#availableAssetNamesAtom = availableAssetNamesAtom
-    this.#transactionSigner = transactionSigner
-    this.#publicKeyProvider = publicKeyProvider
+    this.#blockchainMetadata = blockchainMetadata
     this.#config = config
     this.#createLogger = createLogger || (() => console)
+    this.#enabledWalletAccountsAtom = enabledWalletAccountsAtom
+    this.#feeMonitors = feeMonitors
+    this.#publicKeyProvider = publicKeyProvider
+    this.#transactionSigner = transactionSigner
+    this.#walletAccountsAtom = walletAccountsAtom
 
     assetsModule.initialize({ assetClientInterface: this })
   }
 
-  createLogger(namespace) {
+  createLogger = (namespace) => {
     return this.#createLogger(namespace)
   }
 
   // txHistory interface
 
   getTxHistory = async ({ assetName, walletAccount }) => {
-    return this.blockchainMetadata.getTxLog({ assetName, walletAccount })
+    return this.#blockchainMetadata.getTxLog({ assetName, walletAccount })
   }
 
-  async getTxLog({ assetName, walletAccount }) {
-    return this.blockchainMetadata.getTxLog({ assetName, walletAccount })
+  getTxLog = async ({ assetName, walletAccount }) => {
+    return this.#blockchainMetadata.getTxLog({ assetName, walletAccount })
   }
 
-  async updateTxLogAndNotify(params) {
+  updateTxLogAndNotify = async (params) => {
     return this.updateTxLogAndNotifyBatch(params).commit()
   }
 
@@ -64,7 +68,7 @@ class AssetClientInterface {
     walletAccount,
     txs,
     refresh = false,
-    batch = this.blockchainMetadata.batch(),
+    batch = this.#blockchainMetadata.batch(),
   }) => {
     return refresh
       ? batch.overwriteTxs({ assetName, walletAccount, txs })
@@ -79,18 +83,18 @@ class AssetClientInterface {
     assetName,
     walletAccount,
     txs,
-    batch = this.blockchainMetadata.batch(),
+    batch = this.#blockchainMetadata.batch(),
   }) => {
     return batch.removeTxs({ assetName, walletAccount, txs })
   }
 
   // accountState interface
 
-  async getAccountState({ assetName, walletAccount }) {
-    return this.blockchainMetadata.getAccountState({ assetName, walletAccount })
+  getAccountState = async ({ assetName, walletAccount }) => {
+    return this.#blockchainMetadata.getAccountState({ assetName, walletAccount })
   }
 
-  async updateAccountState({ assetName, walletAccount, ...params }) {
+  updateAccountState = async ({ assetName, walletAccount, ...params }) => {
     let { accountState } = params
     if (!accountState) {
       accountState = await this.getAccountState({ assetName, walletAccount })
@@ -109,7 +113,7 @@ class AssetClientInterface {
     walletAccount,
     newData,
     accountState,
-    batch = this.blockchainMetadata.batch(),
+    batch = this.#blockchainMetadata.batch(),
   }) => {
     // merge mem to keep the previous accountMem behavior
     if (!isEmpty(newData?.mem) && (!accountState || accountState.mem)) {
@@ -125,9 +129,9 @@ class AssetClientInterface {
 
   // walletAccounts interface
 
-  async getWalletAccounts({ assetName }) {
+  getWalletAccounts = async ({ assetName }) => {
     // In the future, the list of wallets may be different based on the provided assets
-    const asset = this.assetsModule.getAsset(assetName)
+    const asset = this.#assetsModule.getAsset(assetName)
     assert(asset, `${assetName} is not supported`)
     const enabledWalletAccounts = await this.#enabledWalletAccountsAtom.get()
     return filterAsync(Object.keys(enabledWalletAccounts), async (walletAccount) => {
@@ -143,19 +147,19 @@ class AssetClientInterface {
 
   // assets interface
 
-  async getAssetsForNetwork({ baseAssetName }) {
+  getAssetsForNetwork = async ({ baseAssetName }) => {
     const availableAssetNames = new Set(await this.#availableAssetNamesAtom.get())
     return pickBy(
-      this.assetsModule.getAssets(),
+      this.#assetsModule.getAssets(),
       (asset) => asset.baseAsset.name === baseAssetName && availableAssetNames.has(asset.name)
     )
   }
 
   // configParams interface
 
-  async getAssetConfig({ assetName, walletAccount }) {
+  getAssetConfig = async ({ assetName, walletAccount }) => {
     const walletAccountInstance = await this.#getWalletAccount(walletAccount)
-    const asset = this.assetsModule.getAsset(assetName)
+    const asset = this.#assetsModule.getAsset(assetName)
     assert(asset, `assetName ${assetName} is not supported`)
     assert(walletAccountInstance, `walletAccountInstance ${walletAccount} is not available`)
 
@@ -181,29 +185,29 @@ class AssetClientInterface {
     return out
   }
 
-  async getConfirmationsNumber({ assetName }) {
-    const baseAsset = this.assetsModule.getAsset(assetName).baseAsset
+  getConfirmationsNumber = async ({ assetName }) => {
+    const baseAsset = this.#assetsModule.getAsset(assetName).baseAsset
     return baseAsset.api?.getConfirmationsNumber ? baseAsset.api.getConfirmationsNumber() : 1
   }
 
-  async updateFeeConfig({ assetName, feeConfig }) {
-    await this.feeMonitors.updateFee({ assetName, feeData: feeConfig })
+  updateFeeConfig = async ({ assetName, feeConfig }) => {
+    await this.#feeMonitors.updateFee({ assetName, feeData: feeConfig })
   }
 
-  async getFeeData({ assetName }) {
-    const baseAssetName = this.assetsModule.getAsset(assetName).baseAsset.name
-    return this.feeMonitors.getFeeData({ assetName: baseAssetName })
+  getFeeData = async ({ assetName }) => {
+    const baseAssetName = this.#assetsModule.getAsset(assetName).baseAsset.name
+    return this.#feeMonitors.getFeeData({ assetName: baseAssetName })
   }
 
   getFeeConfig = async ({ assetName }) => {
-    return this.feeMonitors.getFeeData({ assetName })
+    return this.#feeMonitors.getFeeData({ assetName })
   }
 
   // batch interface
 
   // The interface consumer does not need to know the structure of the returned batch object, just
   // that it needs to be passed along wherever operations need to be batched.
-  createOperationsBatch = () => this.blockchainMetadata.batch()
+  createOperationsBatch = () => this.#blockchainMetadata.batch()
 
   executeOperationsBatch = async (batch) => batch.commit()
 
@@ -220,7 +224,7 @@ class AssetClientInterface {
       ;[purpose] = await this.getSupportedPurposes({ assetName, walletAccount })
     }
 
-    const asset = this.assetsModule.getAsset(assetName)
+    const asset = this.#assetsModule.getAsset(assetName)
     const walletAccountInstance = await this.#getWalletAccount(walletAccount)
     const keyIdentifier = asset.baseAsset.api.getKeyIdentifier({
       purpose,
@@ -237,7 +241,7 @@ class AssetClientInterface {
   }
 
   getExtendedPublicKey = async ({ assetName, walletAccount, purpose }) => {
-    const asset = this.assetsModule.getAsset(assetName)
+    const asset = this.#assetsModule.getAsset(assetName)
     const [walletAccountInstance, purposes] = await Promise.all([
       this.#getWalletAccount(walletAccount),
       purpose === undefined
@@ -262,7 +266,7 @@ class AssetClientInterface {
   }
 
   getAddress = async (opts) => {
-    return this.addressProvider.getAddress({
+    return this.#addressProvider.getAddress({
       ...opts,
       walletAccount: await this.#getWalletAccount(opts.walletAccount),
     })
@@ -274,14 +278,14 @@ class AssetClientInterface {
   }
 
   getReceiveAddressObject = async (opts) => {
-    return this.addressProvider.getReceiveAddress({
+    return this.#addressProvider.getReceiveAddress({
       ...opts,
       walletAccount: await this.#getWalletAccount(opts.walletAccount),
     })
   }
 
   getReceiveAddresses = async (opts) => {
-    const addresses = await this.addressProvider.getReceiveAddresses({
+    const addresses = await this.#addressProvider.getReceiveAddresses({
       ...opts,
       walletAccount: await this.#getWalletAccount(opts.walletAccount),
     })
@@ -290,7 +294,7 @@ class AssetClientInterface {
   }
 
   getChangeAddresses = async (opts) => {
-    const addresses = await this.addressProvider.getChangeAddresses({
+    const addresses = await this.#addressProvider.getChangeAddresses({
       ...opts,
       walletAccount: await this.#getWalletAccount(opts.walletAccount),
     })
@@ -304,14 +308,14 @@ class AssetClientInterface {
   }
 
   getSupportedPurposes = async ({ assetName, walletAccount }) => {
-    return this.addressProvider.getSupportedPurposes({
+    return this.#addressProvider.getSupportedPurposes({
       assetName,
       walletAccount: await this.#getWalletAccount(walletAccount),
     })
   }
 
   getUnusedAddressIndexes = async ({ assetName, walletAccount, highestUnusedIndexes }) => {
-    return this.addressProvider.getUnusedAddressIndexes({
+    return this.#addressProvider.getUnusedAddressIndexes({
       assetName,
       walletAccount: await this.#getWalletAccount(walletAccount),
       highestUnusedIndexes,
@@ -323,7 +327,7 @@ class AssetClientInterface {
   }
 
   getNextChangeAddress = async ({ assetName, walletAccount }) => {
-    return this.addressProvider.getUnusedAddress({
+    return this.#addressProvider.getUnusedAddress({
       assetName,
       walletAccount: await this.#getWalletAccount(walletAccount),
       chainIndex: 1,
@@ -333,7 +337,7 @@ class AssetClientInterface {
   // wallet interface
 
   signTransaction = async ({ assetName, unsignedTx, walletAccount: walletAccountName }) => {
-    const baseAssetName = this.assetsModule.getAsset(assetName).baseAsset.name
+    const baseAssetName = this.#assetsModule.getAsset(assetName).baseAsset.name
     const walletAccount = await this.#getWalletAccount(walletAccountName)
     return this.#transactionSigner.signTransaction({ baseAssetName, unsignedTx, walletAccount })
   }

package/index.js

@@ -9,6 +9,7 @@ import assetModuleDefinition from './module/index.js'
 import customTokensMonitorDefinition from './monitor/index.js'
 import assetPreferencesDefinition from './module/asset-preferences.js'
 import assetsAtomDefinition from './atoms/assets.js'
+import assetsReportDefinition from './report/index.js'
 import { defaultConfig } from './constants.js'
 
 const assets = (config = Object.create(null)) => {
@@ -53,6 +54,7 @@ const assets = (config = Object.create(null)) => {
       },
       { definition: assetPreferencesDefinition },
       { if: { registered: ['customTokensStorage'] }, definition: customTokensMonitorDefinition },
+      { definition: assetsReportDefinition },
     ],
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/assets-feature",
-  "version": "6.1.0",
+  "version": "7.0.1",
   "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",
@@ -19,6 +19,7 @@
     "monitor",
     "plugin",
     "redux",
+    "report",
     "constants.js",
     "index.d.ts",
     "CHANGELOG.md",
@@ -52,7 +53,7 @@
     "@exodus/bitcoin-plugin": "^1.29.1",
     "@exodus/bitcoinregtest-plugin": "^1.11.0",
     "@exodus/bitcointestnet-plugin": "^1.13.1",
-    "@exodus/blockchain-metadata": "^15.7.1",
+    "@exodus/blockchain-metadata": "^15.8.3",
     "@exodus/cardano-lib": "^2.2.0",
     "@exodus/combined-assets-meta": "^3.0.0",
     "@exodus/cosmos-plugin": "^1.3.3",
@@ -61,12 +62,12 @@
     "@exodus/fusion-local": "^2.1.0",
     "@exodus/keychain": "^7.3.0",
     "@exodus/logger": "^1.2.3",
-    "@exodus/models": "^12.5.0",
+    "@exodus/models": "^12.7.0",
     "@exodus/osmosis-plugin": "^1.3.3",
     "@exodus/public-key-provider": "^4.1.0",
     "@exodus/redux-dependency-injection": "^4.1.1",
     "@exodus/storage-memory": "^2.2.2",
-    "@exodus/wallet-accounts": "^17.2.1",
+    "@exodus/wallet-accounts": "^17.3.0",
     "@exodus/wild-emitter": "^1.0.0",
     "bip39": "^3.1.0",
     "events": "^3.3.0",
@@ -76,5 +77,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "390f1af0583b9fb4adb6bdc5be2190b3635ffa95"
+  "gitHead": "1ff0aaa12cb83e9c68aa10e111714f9c5760ab16"
 }

package/plugin/index.js

@@ -1,5 +1,5 @@
-import { mapValues, pickBy } from '@exodus/basic-utils'
 import { createAtomObserver } from '@exodus/atoms'
+import { mapValues, pickBy } from '@exodus/basic-utils'
 
 const createAssetsPlugin = ({
   port,
@@ -11,8 +11,11 @@ const createAssetsPlugin = ({
   legacyAddressModeAtom,
   taprootAddressModeAtom,
 }) => {
-  const emitAssets = async () => {
-    const { value: assets } = await assetsAtom.get()
+  const emitAssets = async (assets) => {
+    if (!assets) {
+      ;({ value: assets } = await assetsAtom.get())
+    }
+
     const payload = {
       assets,
       defaultAccountStates: mapValues(
@@ -34,8 +37,14 @@ const createAssetsPlugin = ({
   const subscribers = []
 
   const onStart = async () => {
+    let emittedInitialAssets = false
     subscribers.push(
-      assetsAtom.observe(({ added, updated, disabled }) => {
+      assetsAtom.observe(async ({ value, added, updated, disabled }) => {
+        if (!emittedInitialAssets) {
+          await emitAssets(value)
+          emittedInitialAssets = true
+        }
+
         if (added.length > 0) {
           port.emit('assets-add', added)
         }
@@ -51,14 +60,11 @@ const createAssetsPlugin = ({
     )
 
     observers.forEach((observer) => observer.register())
-
     await assetsModule.load()
-    await emitAssets()
   }
 
   const onLoad = async () => {
     observers.forEach((observer) => observer.start())
-
     await assetsModule.load()
     await emitAssets()
   }

package/report/index.js

@@ -0,0 +1,50 @@
+const createAssetsReport = ({
+  wallet,
+  assetsModule,
+  assetPreferences,
+  disabledPurposesAtom,
+  multiAddressModeAtom,
+  legacyAddressModeAtom,
+  taprootAddressModeAtom,
+}) => ({
+  namespace: 'assets',
+  export: async () => {
+    if (!(await wallet.exists())) {
+      return {}
+    }
+
+    const [disabledBipPurposes, multiAddressMode, legacyAddressMode, taprootAddressMode] =
+      Promise.all([
+        disabledPurposesAtom.get(),
+        multiAddressModeAtom.get(),
+        legacyAddressModeAtom.get(),
+        taprootAddressModeAtom.get(),
+      ])
+
+    return {
+      preferences: {
+        disabledBipPurposes,
+        multiAddressMode,
+        legacyAddressMode,
+        taprootAddressMode,
+      },
+    }
+  },
+})
+
+const assetsReportDefinition = {
+  id: 'assetsReport',
+  type: 'report',
+  factory: createAssetsReport,
+  dependencies: [
+    'assetsModule',
+    'assetPreferences',
+    'disabledPurposesAtom',
+    'multiAddressModeAtom',
+    'legacyAddressModeAtom',
+    'taprootAddressModeAtom',
+    'wallet',
+  ],
+}
+
+export default assetsReportDefinition