@exodus/activity-txs 2.0.0 → 3.1.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.1.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@3.0.0...@exodus/activity-txs@3.1.0) (2023-10-18)
+
+### Features
+
+- call hasOwnProperty on prototype for security ([#4461](https://github.com/ExodusMovement/exodus-hydra/issues/4461)) ([f257407](https://github.com/ExodusMovement/exodus-hydra/commit/f2574075dbf2855301b9fc14d7fc7eaeb35f2455))
+
+## [3.0.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@2.0.0...@exodus/activity-txs@3.0.0) (2023-10-06)
+
+### ⚠ BREAKING CHANGES
+
+- return array from activity txs (#4370)
+
+### Bug Fixes
+
+- return array from activity txs ([#4370](https://github.com/ExodusMovement/exodus-hydra/issues/4370)) ([ba00cff](https://github.com/ExodusMovement/exodus-hydra/commit/ba00cfffa72a4264e311a13d609ec865174a54c0))
+
 ## [2.0.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@1.1.0...@exodus/activity-txs@2.0.0) (2023-09-28)
 
 ### ⚠ BREAKING CHANGES

package/atoms/activity-txs.js

@@ -1,11 +1,10 @@
 import { combine, compute } from '@exodus/atoms'
+import { createSelector } from 'reselect'
 import { memoize } from 'lodash'
 import { mapValues } from '@exodus/basic-utils'
 import { createDeepEqualOutputSelector } from '@exodus/core-selectors/utils/deep-equal'
-import { TxSet } from '@exodus/models'
-import { createSelector } from 'reselect'
 
-const _createAssetSourceActivityTxsSelector = memoize(
+const createAssetSourceActivityTxsSelector = memoize(
   ({ assetName, walletAccount }) =>
     createDeepEqualOutputSelector(
       (args) => args.txSet,
@@ -21,10 +20,13 @@ const _createAssetSourceActivityTxsSelector = memoize(
   ({ assetName, walletAccount }) => `${assetName}_${walletAccount}`
 )
 
-const createAssetSourceActivityTxsSelector = memoize(
+const createAssetSourceTxsSelector = memoize(
   ({ assetName, walletAccount }) =>
-    createSelector(_createAssetSourceActivityTxsSelector({ assetName, walletAccount }), (txLog) =>
-      TxSet.fromArray(txLog)
+    createSelector(
+      (args) => args.txSet,
+      (txSet) => {
+        return [...txSet]
+      }
     ),
   ({ assetName, walletAccount }) => `${assetName}_${walletAccount}`
 )
@@ -42,7 +44,7 @@ const areActivitiesEqual = (obj1 = {}, obj2 = {}) => {
   // Iterate over each wallet account in obj1
   for (const walletAccount of obj1WalletAccounts) {
     // Check if obj2 has the same wallet account
-    if (!obj2.hasOwnProperty(walletAccount)) {
+    if (!Object.prototype.hasOwnProperty.call(obj2, walletAccount)) {
       return false
     }
 
@@ -71,6 +73,8 @@ const areActivitiesEqual = (obj1 = {}, obj2 = {}) => {
   return true
 }
 
+const EMPTY = []
+
 const createActivityTxsAtom = ({ txLogsAtom, accountStatesAtom, assetsModule }) => {
   const inputAtom = combine({
     txLogs: txLogsAtom,
@@ -87,17 +91,19 @@ const createActivityTxsAtom = ({ txLogsAtom, accountStatesAtom, assetsModule })
         const asset = assetsModule.getAsset(assetName)
         const baseAssetName = asset.baseAsset.name
         if (asset?.baseAsset?.api?.features?.noHistory) {
-          return TxSet.EMPTY
+          return EMPTY
         }
 
         if (asset?.api?.getActivityTxs) {
-          return createAssetSourceActivityTxsSelector(assetName)({
+          return createAssetSourceActivityTxsSelector({ assetName, walletAccount })({
             asset,
             txSet: assetTxSet,
             baseAssetAccountState: accountStatesValue?.[walletAccount]?.[baseAssetName],
           })
         } else {
-          return assetTxSet
+          return createAssetSourceTxsSelector({ assetName, walletAccount })({
+            txSet: assetTxSet,
+          })
         }
       })
     )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/activity-txs",
-  "version": "2.0.0",
+  "version": "3.1.0",
   "description": "The activity-txs feature",
   "author": "Exodus Movement Inc.",
   "repository": {
@@ -30,7 +30,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@exodus/atoms": "^5.7.1",
+    "@exodus/atoms": "^5.7.2",
     "@exodus/basic-utils": "^2.1.0",
     "@exodus/core-selectors": "^1.5.0",
     "@exodus/module": "^1.2.0",
@@ -41,8 +41,9 @@
   "devDependencies": {
     "@exodus/assets": "^8.0.95",
     "@exodus/assets-base": "^8.1.10",
-    "@exodus/assets-feature": "^3.1.2",
-    "@exodus/blockchain-metadata": "^14.0.0",
+    "@exodus/assets-feature": "^3.5.0",
+    "@exodus/bitcoin-plugin": "^1.4.2",
+    "@exodus/blockchain-metadata": "^14.1.0",
     "@exodus/dependency-injection": "^2.0.1",
     "@exodus/dependency-preprocessors": "^3.1.1",
     "@exodus/models": "^10.1.0",
@@ -54,5 +55,5 @@
     "jest": "^29.1.2",
     "redux": "^4.2.1"
   },
-  "gitHead": "621be8f3e152cbf6660480778bb5c335d65b2958"
+  "gitHead": "19011c0e956a4d74000965b2c83d01f5c2ddd143"
 }

package/redux/selectors/create-batched-asset-source-by-id.js

@@ -0,0 +1,20 @@
+import { memoize } from 'lodash'
+import { createSelector } from 'reselect'
+
+const createBatchedAssetSourceActivityByIdSelector = {
+  id: 'createBatchedAssetSourceActivityById',
+  dependencies: [{ selector: 'createBatchedAssetSourceSelector' }],
+  selectorFactory: (createBatchedAssetSourceSelector) =>
+    memoize(({ assetName, walletAccount, limit }) =>
+      createSelector(
+        createBatchedAssetSourceSelector({ assetName, walletAccount, limit }),
+        (transformedTxs) =>
+          transformedTxs.reduce((acc, tx) => {
+            ;(acc[tx.txId] || (acc[tx.txId] = [])).push(tx)
+            return acc
+          }, Object.create(null))
+      )
+    ),
+}
+
+export default createBatchedAssetSourceActivityByIdSelector

package/redux/selectors/create-batched-asset-source.js

@@ -29,8 +29,7 @@ const collapseBatch = ({ batch, assets }) => {
           batchedIds,
         },
       }),
-    }),
-    { assets }
+    })
   )
 }
 

package/redux/selectors/create-limited-asset-source.js

@@ -6,8 +6,8 @@ const createLimitedAssetSourceSelectorDefinition = {
   dependencies: [{ selector: 'createAssetSourceSelector' }],
   selectorFactory: (createAssetSourceSelector) =>
     memoize(({ assetName, walletAccount, limit }) =>
-      createSelector(createAssetSourceSelector({ assetName, walletAccount }), (txSet) =>
-        limit ? [...txSet].slice(-limit) : [...txSet]
+      createSelector(createAssetSourceSelector({ assetName, walletAccount }), (txs) =>
+        limit ? txs.slice(-limit) : txs
       )
     ),
 }

package/redux/selectors/index.js

@@ -1,4 +1,9 @@
 import createLimitedAssetSourceSelectorDefinition from './create-limited-asset-source'
 import createBatchedAssetSourceSelector from './create-batched-asset-source'
+import createBatchedAssetSourceActivityByIdSelector from './create-batched-asset-source-by-id'
 
-export default [createLimitedAssetSourceSelectorDefinition, createBatchedAssetSourceSelector]
+export default [
+  createLimitedAssetSourceSelectorDefinition,
+  createBatchedAssetSourceSelector,
+  createBatchedAssetSourceActivityByIdSelector,
+]