@exodus/assets-feature 3.1.2 → 3.3.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.3.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/assets-feature@3.2.0...@exodus/assets-feature@3.3.0) (2023-10-05)
+
+### Features
+
+- use transaction signer ([#3751](https://github.com/ExodusMovement/exodus-hydra/issues/3751)) ([0e60e89](https://github.com/ExodusMovement/exodus-hydra/commit/0e60e8963a799435c5528f596447813b9e012ead))
+
+## [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

package/client/asset-client-interface.js

@@ -6,6 +6,7 @@ class AssetClientInterface {
   #availableAssetNamesAtom
   #walletAccountsAtom
   #enabledWalletAccountsAtom
+  #transactionSigner
 
   constructor({
     blockchainMetadata,
@@ -16,6 +17,7 @@ class AssetClientInterface {
     availableAssetNamesAtom,
     addressProvider,
     feeMonitors,
+    transactionSigner,
   }) {
     this.blockchainMetadata = blockchainMetadata
     this.wallet = wallet
@@ -25,6 +27,7 @@ class AssetClientInterface {
     this.addressProvider = addressProvider
     this.feeMonitors = feeMonitors
     this.#availableAssetNamesAtom = availableAssetNamesAtom
+    this.#transactionSigner = transactionSigner
 
     // TODO: remove conditional when clients updated
     if (assetsModule.initialize) {
@@ -50,9 +53,12 @@ class AssetClientInterface {
     assetName,
     walletAccount,
     txs,
+    refresh = false,
     batch = this.blockchainMetadata.batch(),
   }) => {
-    return batch.updateTxs({ assetName, walletAccount, txs })
+    return refresh
+      ? batch.overwriteTxs({ assetName, walletAccount, txs })
+      : batch.updateTxs({ assetName, walletAccount, txs })
   }
 
   removeTxLog = async (params) => {
@@ -74,20 +80,36 @@ class AssetClientInterface {
     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 })
     }
 
+    // merge mem to keep the previous accountMem behavior
+    if (newData.mem && (!accountState || accountState.mem)) {
+      newData = { ...newData, mem: { ...accountState?.mem, ...newData.mem } }
+    }
+
     return batch
   }
 
@@ -220,11 +242,10 @@ class AssetClientInterface {
 
   // wallet interface
 
-  signTransaction = async ({ assetName, unsignedTx, walletAccount }) => {
-    // eslint-disable-next-line unicorn/no-await-expression-member
-    const accountIndex = (await this.#getWalletAccount(walletAccount)).index
+  signTransaction = async ({ assetName, unsignedTx, walletAccount: walletAccountName }) => {
     const baseAssetName = this.assetsModule.getAsset(assetName).baseAsset.name
-    return this.wallet.signTransaction({ baseAssetName, unsignedTx, accountIndex })
+    const walletAccount = await this.#getWalletAccount(walletAccountName)
+    return this.#transactionSigner.signTransaction({ baseAssetName, unsignedTx, walletAccount })
   }
 }
 

package/client/index.js

@@ -13,6 +13,7 @@ const assetsClientInterfaceDefinition = {
     'availableAssetNamesAtom',
     'addressProvider',
     'feeMonitors',
+    'transactionSigner',
   ],
 }
 

package/module/assets-module.js

@@ -330,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)
@@ -344,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/assets-feature",
-  "version": "3.1.2",
+  "version": "3.3.0",
   "license": "UNLICENSED",
   "description": "Assets module, clients and apis",
   "main": "index.js",
@@ -62,5 +62,5 @@
     "jest": "^29.1.2",
     "redux": "^4.0.0"
   },
-  "gitHead": "ce4e99ff4dba391f43f279d90e5514f727a62063"
+  "gitHead": "791e546a70c1e544e7bb0e64502e431670b9bb86"
 }