@exodus/assets-feature 3.1.1 → 3.2.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.2.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/assets-feature@3.1.2...@exodus/assets-feature@3.2.0) (2023-10-03)
+
+### Features
+
+- enhance ACI with features from mobile ([#4299](https://github.com/ExodusMovement/exodus-hydra/issues/4299)) ([dcdf2ea](https://github.com/ExodusMovement/exodus-hydra/commit/dcdf2eadd85104460d31837b9300728a85c1c0b8))
+
+### Bug Fixes
+
+- only search supported networks by default ([#4241](https://github.com/ExodusMovement/exodus-hydra/issues/4241)) ([17d2f86](https://github.com/ExodusMovement/exodus-hydra/commit/17d2f8681016c7d260d8905f2d5d8271815486f1))
+
+## [3.1.2](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/assets-feature@3.1.1...@exodus/assets-feature@3.1.2) (2023-09-28)
+
+### Bug Fixes
+
+- factory does not pass all parameters to module ([#4264](https://github.com/ExodusMovement/exodus-hydra/issues/4264)) ([9267fdd](https://github.com/ExodusMovement/exodus-hydra/commit/9267fddeb6e0e53ba519273c6c7d48fb2d574305))
+
 ## [3.1.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/assets-feature@3.1.0...@exodus/assets-feature@3.1.1) (2023-09-20)
 
 ### Bug Fixes

package/client/asset-client-interface.js

@@ -32,6 +32,8 @@ class AssetClientInterface {
     }
   }
 
+  // txHistory interface
+
   getTxHistory = async ({ assetName, walletAccount }) => {
     return this.blockchainMetadata.getTxLog({ assetName, walletAccount })
   }
@@ -45,47 +47,70 @@ class AssetClientInterface {
   }
 
   updateTxLogAndNotifyBatch = ({
+    assetName,
+    walletAccount,
+    txs,
+    refresh = false,
+    batch = this.blockchainMetadata.batch(),
+  }) => {
+    return refresh
+      ? batch.overwriteTxs({ assetName, walletAccount, txs })
+      : batch.updateTxs({ assetName, walletAccount, txs })
+  }
+
+  removeTxLog = async (params) => {
+    return this.removeTxLogBatch(params).commit()
+  }
+
+  removeTxLogBatch = ({
     assetName,
     walletAccount,
     txs,
     batch = this.blockchainMetadata.batch(),
   }) => {
-    return batch.updateTxs({ assetName, walletAccount, txs })
+    return batch.removeTxs({ assetName, walletAccount, txs })
   }
 
+  // accountState interface
+
   async getAccountState({ assetName, walletAccount }) {
     return this.blockchainMetadata.getAccountState({ assetName, walletAccount })
   }
 
-  async updateAccountState(params) {
-    return this.updateAccountStateBatch(params).commit()
+  async updateAccountState({ assetName, walletAccount, ...params }) {
+    let { accountState } = params
+    if (!accountState) {
+      accountState = await this.getAccountState({ assetName, walletAccount })
+    }
+
+    return this.updateAccountStateBatch({
+      ...params,
+      assetName,
+      walletAccount,
+      accountState,
+    }).commit()
   }
 
   updateAccountStateBatch = ({
     assetName,
     walletAccount,
     newData,
+    accountState,
     batch = this.blockchainMetadata.batch(),
   }) => {
     if (!isEmpty(newData)) {
       return batch.updateAccountState({ assetName, walletAccount, newData })
     }
 
-    return batch
-  }
+    // merge mem to keep the previous accountMem behavior
+    if (newData.mem && (!accountState || accountState.mem)) {
+      newData = { ...newData, mem: { ...accountState?.mem, ...newData.mem } }
+    }
 
-  removeTxLog = async (params) => {
-    return this.removeTxLogBatch(params).commit()
+    return batch
   }
 
-  removeTxLogBatch = ({
-    assetName,
-    walletAccount,
-    txs,
-    batch = this.blockchainMetadata.batch(),
-  }) => {
-    return batch.removeTxs({ assetName, walletAccount, txs })
-  }
+  // walletAccounts interface
 
   async getWalletAccounts({ assetName }) {
     // In the future, the list of wallets may be different based on the provided assets
@@ -94,6 +119,8 @@ class AssetClientInterface {
     return Object.keys(await this.#enabledWalletAccountsAtom.get())
   }
 
+  // assets interface
+
   async getAssetsForNetwork({ baseAssetName }) {
     const availableAssetNames = new Set(await this.#availableAssetNamesAtom.get())
     return pickBy(
@@ -102,6 +129,8 @@ class AssetClientInterface {
     )
   }
 
+  // configParams interface
+
   async getConfirmationsNumber({ assetName }) {
     const baseAsset = this.assetsModule.getAsset(assetName).baseAsset
     return baseAsset.api?.getConfirmationsNumber ? baseAsset.api.getConfirmationsNumber() : 1
@@ -116,12 +145,20 @@ class AssetClientInterface {
     return this.feeMonitors.getFeeData({ assetName: baseAssetName })
   }
 
+  getFeeConfig = async ({ 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()
 
   executeOperationsBatch = async (batch) => batch.commit()
 
+  // addresses interface
+
   getPublicKey = async ({ assetName, walletAccount, addressIndex = 0, chainIndex = 0 }) => {
     const walletAccountInstance = await this.#getWalletAccount(walletAccount)
     return this.wallet.getPublicKey({
@@ -159,6 +196,7 @@ class AssetClientInterface {
 
     return [...addresses].map((address) => address.toString())
   }
+
   getChangeAddresses = async (opts) => {
     const addresses = await this.addressProvider.getChangeAddresses({
       ...opts,
@@ -191,13 +229,6 @@ class AssetClientInterface {
     // no op!! getUnusedAddressIndexes loads from tx log, not from storage
   }
 
-  signTransaction = async ({ assetName, unsignedTx, walletAccount }) => {
-    // eslint-disable-next-line unicorn/no-await-expression-member
-    const accountIndex = (await this.#getWalletAccount(walletAccount)).index
-    const baseAssetName = this.assetsModule.getAsset(assetName).baseAsset.name
-    return this.wallet.signTransaction({ baseAssetName, unsignedTx, accountIndex })
-  }
-
   getNextChangeAddress = async ({ assetName, walletAccount }) => {
     return this.addressProvider.getUnusedAddress({
       assetName,
@@ -206,8 +237,13 @@ class AssetClientInterface {
     })
   }
 
-  getFeeConfig = async ({ assetName }) => {
-    return this.feeMonitors.getFeeData({ assetName })
+  // wallet interface
+
+  signTransaction = async ({ assetName, unsignedTx, walletAccount }) => {
+    // eslint-disable-next-line unicorn/no-await-expression-member
+    const accountIndex = (await this.#getWalletAccount(walletAccount)).index
+    const baseAssetName = this.assetsModule.getAsset(assetName).baseAsset.name
+    return this.wallet.signTransaction({ baseAssetName, unsignedTx, accountIndex })
   }
 }
 

package/module/assets-module.js

@@ -74,12 +74,13 @@ export class AssetsModule extends ExodusModule {
     iconsStorage,
     assetRegistry, // temporary
     assetPlugins,
-    combinedAssetsList,
+    combinedAssetsList = [],
     globalAssetRegistry, // temporary
     validateCustomToken = () => true,
     config = {},
   }) {
     super({ name: 'AssetsModule' })
+
     this.#storage = storage
     this.#isExternalRegistry = !!assetRegistry
     this.#registry = this.#isExternalRegistry ? assetRegistry : initialAssetRegistry
@@ -329,11 +330,16 @@ export class AssetsModule extends ExodusModule {
   }
 
   searchTokens = async ({ baseAssetName, lifecycleStatus, query, excludeTags = ['offensive'] }) => {
+    assert(
+      !baseAssetName || typeof baseAssetName === 'string',
+      'searchTokens(): baseAssetName must be a string if supplied'
+    )
     baseAssetName && this.#assertSupportsCustomTokens(baseAssetName)
 
+    const baseAssetNames = baseAssetName ? [baseAssetName] : this.#getCustomTokensNetworkNames()
     const tokens = await this.#fetch(
       'search',
-      { baseAssetName, lifecycleStatus, query, excludeTags },
+      { baseAssetName: baseAssetNames, lifecycleStatus, query, excludeTags },
       'tokens'
     )
     const validTokens = tokens.filter(this.#validateCustomToken).map(normalizeToken)
@@ -343,6 +349,11 @@ export class AssetsModule extends ExodusModule {
     return validTokens
   }
 
+  #getCustomTokensNetworkNames = () =>
+    this.getBaseAssetNames().filter((assetName) =>
+      this.getAsset(assetName).api?.hasFeature?.('customTokens')
+    )
+
   #fetchUpdates = async (assetVersions) => {
     const updatedTokens = await this.#fetch('updates', assetVersions, 'tokens')
     const validatedTokens = updatedTokens.filter(this.#validateCustomToken).map(normalizeToken)

package/module/index.js

@@ -2,23 +2,7 @@
 import globalAssetRegistry from '@exodus/assets' // this is deprecated, do not use for any other purpose. Remove when we have @exodus/models v10.
 import AssetsModule from './assets-module'
 
-const createAssetsModule = ({
-  storage,
-  iconsStorage,
-  assetPlugins,
-  combinedAssetsList = [],
-  validateCustomToken,
-  config,
-}) =>
-  new AssetsModule({
-    storage,
-    iconsStorage,
-    globalAssetRegistry,
-    assetPlugins,
-    combinedAssetsList,
-    validateCustomToken,
-    config,
-  })
+const createAssetsModule = (props) => new AssetsModule({ ...props, globalAssetRegistry })
 
 const assetsModuleDefinition = {
   id: 'assetsModule',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/assets-feature",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "license": "UNLICENSED",
   "description": "Assets module, clients and apis",
   "main": "index.js",
@@ -41,8 +41,8 @@
   },
   "devDependencies": {
     "@exodus/assets": "^8.0.95",
-    "@exodus/atoms": "^5.7.0",
-    "@exodus/available-assets": "^5.1.1",
+    "@exodus/atoms": "^5.7.1",
+    "@exodus/available-assets": "^6.0.0",
     "@exodus/bitcoin-meta": "^1.0.1",
     "@exodus/bitcoin-plugin": "^1.0.3",
     "@exodus/bitcoinregtest-plugin": "^1.0.3",
@@ -55,12 +55,12 @@
     "@exodus/osmosis-plugin": "^1.0.0",
     "@exodus/redux-dependency-injection": "^3.0.0",
     "@exodus/storage-memory": "^2.1.1",
-    "@exodus/wallet-accounts": "^14.0.0",
+    "@exodus/wallet-accounts": "^14.1.0",
     "@exodus/wild-emitter": "^1.0.0",
     "eslint": "^8.44.0",
     "events": "^3.3.0",
     "jest": "^29.1.2",
     "redux": "^4.0.0"
   },
-  "gitHead": "c934b363c277eab13913053034e3e68d15650de9"
+  "gitHead": "423c1e963708c681fe11ad396afe65f9f956336f"
 }