@exodus/activity-txs 4.4.1 → 4.4.3

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.
 
+## [4.4.3](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@4.4.1...@exodus/activity-txs@4.4.3) (2025-01-05)
+
+### Bug Fixes
+
+- fix: activity id generation (#10846)
+
+- fix: assume asset.api.getActivity is async (#10848)
+
+### License
+
+- license: re-license under MIT license (#10580)
+
+## [4.4.2](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@4.4.1...@exodus/activity-txs@4.4.2) (2024-11-25)
+
+### License
+
+- license: re-license under MIT license (#10580)
+
 ## [4.4.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@4.4.0...@exodus/activity-txs@4.4.1) (2024-10-04)
 
 ### Bug Fixes

package/LICENSE

@@ -0,0 +1,7 @@
+Copyright (c) 2024 Exodus Movement, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/atoms/activity-txs.js

@@ -1,7 +1,6 @@
 import { combine, compute } from '@exodus/atoms'
 import { createSelector } from 'reselect'
 import { memoize } from 'lodash' // eslint-disable-line @exodus/restricted-imports/prefer-basic-utils -- TODO: fix next time we touch this file
-import { mapValues } from '@exodus/basic-utils'
 import { createDeepEqualOutputSelector } from '@exodus/core-selectors/utils/deep-equal'
 
 const createAssetSourceActivityTxsSelector = memoize(
@@ -92,44 +91,70 @@ const createActivityTxsAtom = ({ txLogsAtom, accountStatesAtom, assetsModule })
     accountStates: accountStatesAtom,
   })
 
-  let prevResult
+  let prevResult = Object.create(null)
 
-  const selector = ({ txLogs, accountStates }) => {
+  const selector = async ({ txLogs, accountStates }) => {
     const { value } = txLogs
     const { value: accountStatesValue } = accountStates
-    const result = mapValues(value, (accountTxLogs, walletAccount) =>
-      mapValues(accountTxLogs, (assetTxSet, assetName) => {
-        const asset = assetsModule.getAsset(assetName)
-        const baseAssetName = asset.baseAsset.name
-
-        if (asset?.api?.getActivityTxs) {
-          let activityOptions
-          if (asset?.api?.getActivityOptions) {
-            const baseAssetAccountState = accountStatesValue?.[walletAccount]?.[baseAssetName]
-
-            activityOptions = createAssetSourceActivityOptionsSelector({
-              assetName,
-              walletAccount,
-            })({
-              accountState: baseAssetAccountState,
-              asset,
-            })
-          }
 
-          return createAssetSourceActivityTxsSelector({ assetName, walletAccount })({
-            asset,
-            txs: createAssetSourceTxsSelector({ assetName, walletAccount })({
+    // Process each wallet account asynchronously
+    const resultEntries = await Promise.all(
+      Object.entries(value).map(async ([walletAccount, accountTxLogs]) => {
+        // Process each asset within the wallet account asynchronously
+        const assetEntries = await Promise.all(
+          Object.entries(accountTxLogs).map(async ([assetName, assetTxSet]) => {
+            const asset = assetsModule.getAsset(assetName)
+            const baseAssetName = asset.baseAsset.name
+
+            if (asset?.api?.getActivityTxs) {
+              let activityOptions
+
+              if (asset?.api?.getActivityOptions) {
+                const baseAssetAccountState = accountStatesValue?.[walletAccount]?.[baseAssetName]
+
+                const getOptionsForAssetSource = createAssetSourceActivityOptionsSelector({
+                  assetName,
+                  walletAccount,
+                })
+
+                activityOptions = await getOptionsForAssetSource({
+                  accountState: baseAssetAccountState,
+                  asset,
+                })
+              }
+
+              const txs = createAssetSourceTxsSelector({ assetName, walletAccount })({
+                txSet: assetTxSet,
+              })
+
+              const getActivityForAssetSource = createAssetSourceActivityTxsSelector({
+                assetName,
+                walletAccount,
+              })
+
+              const activityTxs = await getActivityForAssetSource({
+                asset,
+                txs,
+                activityOptions,
+              })
+
+              return [assetName, activityTxs]
+            }
+
+            const txs = createAssetSourceTxsSelector({ assetName, walletAccount })({
               txSet: assetTxSet,
-            }),
-            activityOptions,
+            })
+
+            return [assetName, txs]
           })
-        }
+        )
 
-        return createAssetSourceTxsSelector({ assetName, walletAccount })({
-          txSet: assetTxSet,
-        })
+        return [walletAccount, Object.fromEntries(assetEntries)]
       })
     )
+
+    const result = Object.fromEntries(resultEntries)
+
     if (areActivitiesEqual(result, prevResult)) {
       return prevResult
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/activity-txs",
-  "version": "4.4.1",
+  "version": "4.4.3",
   "description": "The activity-txs feature",
   "author": "Exodus Movement, Inc.",
   "repository": {
@@ -8,7 +8,7 @@
     "url": "git+https://github.com/ExodusMovement/exodus-hydra.git"
   },
   "homepage": "https://github.com/ExodusMovement/exodus-hydra/tree/master/features/activity-txs",
-  "license": "UNLICENSED",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/ExodusMovement/exodus-hydra/issues?q=is%3Aissue+is%3Aopen+label%3Aactivity-txs"
   },
@@ -43,22 +43,22 @@
   "devDependencies": {
     "@exodus/assets": "^8.0.95",
     "@exodus/assets-base": "^8.1.10",
-    "@exodus/assets-feature": "^5.13.1",
-    "@exodus/available-assets": "^8.6.0",
+    "@exodus/assets-feature": "^6.0.1",
+    "@exodus/available-assets": "^8.7.0",
     "@exodus/bitcoin-plugin": "^1.4.2",
-    "@exodus/blockchain-metadata": "^15.5.0",
-    "@exodus/connected-origins": "^4.0.0",
-    "@exodus/dependency-injection": "^3.1.0",
-    "@exodus/dependency-preprocessors": "^6.3.0",
-    "@exodus/fiat-ramp": "^10.14.2",
-    "@exodus/nfts": "^9.4.0",
-    "@exodus/orders": "^4.12.0",
-    "@exodus/personal-notes": "^3.6.3",
-    "@exodus/redux-dependency-injection": "^4.0.3",
-    "@exodus/storage-memory": "^2.2.1",
-    "@exodus/wallet-accounts": "^17.0.0",
+    "@exodus/connected-origins": "^4.1.1",
+    "@exodus/fiat-ramp": "^11.0.1",
+    "@exodus/logger": "^1.2.3",
+    "@exodus/nfts": "^9.4.2",
+    "@exodus/orders": "^4.13.0",
+    "@exodus/personal-notes": "^3.7.0",
+    "@exodus/redux-dependency-injection": "^4.1.1",
+    "@exodus/wallet-accounts": "^17.1.3",
     "@types/minimalistic-assert": "^1.0.1",
     "redux": "^4.2.1"
   },
-  "gitHead": "56c1dc472499cdc1745b969a2a0ac7ef7c466d3c"
+  "publishConfig": {
+    "access": "public"
+  },
+  "gitHead": "901c220173a58839ad07917f573fe0752d4bbd70"
 }

package/redux/utils/activity-formatters/format-tx-activity.js

@@ -16,8 +16,9 @@ export function isPending(tx, asset) {
 }
 
 const generateTxActivityId = ({ tx, asset }) => {
-  const sentIndex = tx.data?.sentIndex
-  return sentIndex ? `${asset.name}.${tx.txId}_${sentIndex}` : `${asset.name}.${tx.txId}`
+  const index = tx.data?.activityIndex
+
+  return index ? `${asset.name}.${tx.txId}_${index}` : `${asset.name}.${tx.txId}`
 }
 
 export const formatTxActivity = ({ tx, asset, personalNote }) => {