@exodus/activity-txs 4.1.1 → 4.1.2

package/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.1.2](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@4.1.1...@exodus/activity-txs@4.1.2) (2024-05-15)
+
+### Bug Fixes
+
+- address security feedback ([#6963](https://github.com/ExodusMovement/exodus-hydra/issues/6963)) ([155bdfe](https://github.com/ExodusMovement/exodus-hydra/commit/155bdfed531685108d828be60c9d1a8be9e785ee))
+- indexless order should be ignored in first loop ([#6965](https://github.com/ExodusMovement/exodus-hydra/issues/6965)) ([83766cd](https://github.com/ExodusMovement/exodus-hydra/commit/83766cd69533d81317ea52ab770541a7ccfde274))
+
 ## [4.1.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/activity-txs@4.1.0...@exodus/activity-txs@4.1.1) (2024-05-15)
 
 ### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/activity-txs",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "description": "The activity-txs feature",
   "author": "Exodus Movement, Inc.",
   "repository": {
@@ -60,5 +60,5 @@
     "@types/minimalistic-assert": "^1.0.1",
     "redux": "^4.2.1"
   },
-  "gitHead": "268f3e822c0d1aadc8a42391b9770b435021e230"
+  "gitHead": "a0c1b2cb7cdd31f455f566879612777c8d46b654"
 }

package/redux/selectors/create-asset-source-base-activity.js

@@ -12,24 +12,36 @@ const generateActivityId = ({ activityItem }) => {
     : `${activityItem.assetName}.${activityItem.txId}`
 }
 
-const groupTxsWithSameOrder = ({ txs, orderSet }) => {
+const groupTxsWithSameOrder = ({ txs, orderSet, isIndexless }) => {
   const getOrder = (tx) => orderSet.getByTxId(tx.txId)
-  const exchangeByOrderId = {}
+  const exchangeByOrderId = new Map()
   const result = []
+
   for (const tx of txs) {
     const order = getOrder(tx)
+    if (isIndexless && order) {
+      // Orders are the source of truth for indexless swaps.
+      // Skip this tx and add it later as exchanged.
+      continue
+    }
+
     if (order) {
-      ;(exchangeByOrderId[order.orderId] ?? (exchangeByOrderId[order.orderId] = [])).push(tx)
+      if (!exchangeByOrderId.has(order.orderId)) {
+        exchangeByOrderId.set(order.orderId, [])
+      }
+
+      exchangeByOrderId.get(order.orderId).push(tx)
     } else {
       result.push({ tx, type: 'tx' })
     }
   }
 
-  Object.values(exchangeByOrderId).forEach((txsGroup) => {
+  exchangeByOrderId.forEach((txsGroup) => {
     const tx = txsGroup.sort((a, b) => b.date.getTime() - a.date.getTime())[0]
     const order = getOrder(tx)
     result.push({ tx, type: 'exchange', order })
   })
+
   return result
 }
 
@@ -50,13 +62,13 @@ const createAssetSourceBaseActivitySelectorDefinition = {
           getPersonalNoteByTxIdSelector,
           (assets, txs = EMPTY, orderSet, getPersonalNoteByTxId) => {
             const activityResult = []
-
-            const groupedTxs = groupTxsWithSameOrder({ txs, orderSet })
+            const isIndexless = assets[assetName]?.baseAsset?.api?.features?.noHistory
+            const groupedTxs = groupTxsWithSameOrder({ txs, orderSet, isIndexless })
 
             for (const group of groupedTxs) {
               const { tx, order, type: formatterType } = group
               const personalNote = getPersonalNoteByTxId(tx.txId)
-              const formattedTx = formattersByType[formatterType]({
+              const formattedTx = formattersByType.get(formatterType)({
                 assets,
                 order,
                 tx,
@@ -67,7 +79,6 @@ const createAssetSourceBaseActivitySelectorDefinition = {
               activityResult.push(formattedTx)
             }
 
-            const isIndexless = assets[assetName]?.baseAsset?.api?.features?.noHistory
             if (isIndexless) {
               const orderIdsFromActivity = new Set(activityResult.map((tx) => tx.orderId))
               const ordersForIndexlessAssets = [...orderSet].filter(
@@ -91,7 +102,7 @@ const createAssetSourceBaseActivitySelectorDefinition = {
                     data: { swapTx: true },
                     selfSend: false,
                     token: null, // TBD
-                    bumpType: {},
+                    bumpType: Object.create(null),
                     coinName: isFromIndexlessAsset ? order.fromAsset : order.toAsset,
                     value: isFromIndexlessAsset ? order.fromAmount : order.toAmount,
                     coinAmount: isFromIndexlessAsset ? order.fromAmount : order.toAmount,

package/redux/selectors/create-full-activity.js

@@ -6,11 +6,14 @@ const selectorFactory =
     createWithConnectionsActivity
   ) =>
   // call this once on client-side
-  (options = {}) => {
+  (options = Object.create(null)) => {
     let createFullSelector = createAssetSourceBaseActivity
     createFullSelector = createWithNftsActivity({
       createActivitySelector: createFullSelector,
-      nftsNetworkNameToAssetName: options.nftsNetworkNameToAssetName || {},
+      nftsNetworkNameToAssetName:
+        (Object.hasOwn(options, 'nftsNetworkNameToAssetName') &&
+          options.nftsNetworkNameToAssetName) ||
+        Object.create(null),
     })
     createFullSelector = createWithFiatActivity({ createActivitySelector: createFullSelector })
     createFullSelector = createWithConnectionsActivity({

package/redux/selectors/create-with-nfts-activity.js

@@ -47,6 +47,7 @@ const selectorFactory =
             ;[...nftsByTxId.values()]
               .filter(
                 (nftTx) =>
+                  Object.hasOwn(nftsNetworkNameToAssetName, nftTx.network) &&
                   assetName === nftsNetworkNameToAssetName[nftTx.network] &&
                   !indexedNftTxIds.has(nftTx.txId)
               )

package/redux/utils/formatters.js

@@ -13,17 +13,17 @@ const EXODEX_TX_TYPES = {
   CLEANUP: 'cleanupTransaction',
 }
 
-const UI_TX_TYPE_FROM_EXODEX = {
-  [EXODEX_TX_TYPES.PRE_SETUP]: TX_TYPES.APPROVAL,
-  [EXODEX_TX_TYPES.SETUP]: TX_TYPES.APPROVAL,
-  [EXODEX_TX_TYPES.SWAP]: TX_TYPES.EXCHANGE,
-  [EXODEX_TX_TYPES.CLEANUP]: TX_TYPES.CLEANUP,
-}
+const UI_TX_TYPE_FROM_EXODEX = new Map([
+  [EXODEX_TX_TYPES.PRE_SETUP, TX_TYPES.APPROVAL],
+  [EXODEX_TX_TYPES.SETUP, TX_TYPES.APPROVAL],
+  [EXODEX_TX_TYPES.SWAP, TX_TYPES.EXCHANGE],
+  [EXODEX_TX_TYPES.CLEANUP, TX_TYPES.CLEANUP],
+])
 
 function getTxType({ tx, order }) {
   if (order) {
     const txInfoFromOrder = order.txIds?.find((txFromOrder) => txFromOrder.txId === tx.txId)
-    return UI_TX_TYPE_FROM_EXODEX[txInfoFromOrder?.txType] || TX_TYPES.EXCHANGE
+    return UI_TX_TYPE_FROM_EXODEX.get(txInfoFromOrder?.txType) || TX_TYPES.EXCHANGE
   }
 
   return tx.sent ? TX_TYPES.SENT : TX_TYPES.RECEIVED
@@ -82,10 +82,10 @@ const formatGroupedTx = ({ tx, assets, personalNote }) =>
     personalNote,
   })
 
-export const formattersByType = {
-  exchange: formatGroupedExchangeTxs,
-  tx: formatGroupedTx,
-}
+export const formattersByType = new Map([
+  ['exchange', formatGroupedExchangeTxs],
+  ['tx', formatGroupedTx],
+])
 
 export const formatUnindexedNftTx = ({ asset, nftTx }) => {
   return {