Extract keyAssetsByAddress as a shared util

tahowallet · Feb 14, 2025 · d931b06 · d931b06
1 parent d108f08
commit d931b06
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 23 deletions.
diff --git a/background/assets.ts b/background/assets.ts
@@ -1,3 +1,4 @@
+import { keyBy } from "lodash"
 import { TokenList } from "@uniswap/token-lists"
 import { UNIXTime, HexString } from "./types"
 import {
@@ -226,6 +227,11 @@ export function isSmartContractFungibleAsset<T extends AnyAsset>(
   return "homeNetwork" in asset && isFungibleAsset(asset)
 }
 
+export function keyAssetsByAddress(assets: SmartContractFungibleAsset[]) {
+  const key: keyof SmartContractFungibleAsset = "contractAddress"
+  return keyBy(assets, key)
+}
+
 /**
  * Type guard to check if an AnyAssetAmount is actually a FungibleAssetAmount.
  *

diff --git a/background/services/indexing/index.ts b/background/services/indexing/index.ts
@@ -7,6 +7,7 @@ import {
   AnyAssetMetadata,
   FungibleAsset,
   isSmartContractFungibleAsset,
+  keyAssetsByAddress,
   PricePoint,
   SmartContractAmount,
   SmartContractFungibleAsset,
@@ -95,21 +96,6 @@ interface Events extends ServiceLifecycleEvents {
   removeAssetData: SmartContractFungibleAsset
 }
 
-const indexAssetsByAddress = (assets: SmartContractFungibleAsset[]) => {
-  const activeAssetsByAddress = assets.reduce(
-    (agg, t) => {
-      const newAgg = {
-        ...agg,
-      }
-      newAgg[t.contractAddress.toLowerCase()] = t
-      return newAgg
-    },
-    {} as { [address: string]: SmartContractFungibleAsset },
-  )
-
-  return activeAssetsByAddress
-}
-
 function allowVerifyAssetByManualImport(
   asset: SmartContractFungibleAsset,
   verified?: boolean,
@@ -540,12 +526,7 @@ export default class IndexingService extends BaseService<Events> {
       smartContractAssets?.map(({ contractAddress }) => contractAddress),
     )
 
-    const listedAssetByAddress = (smartContractAssets ?? []).reduce<{
-      [contractAddress: string]: SmartContractFungibleAsset
-    }>((acc, asset) => {
-      acc[normalizeEVMAddress(asset.contractAddress)] = asset
-      return acc
-    }, {})
+    const listedAssetByAddress = keyAssetsByAddress(smartContractAssets ?? [])
 
     const removedCustomAssets = await this.db.getRemovedCustomAssetsByNetworks([
       addressNetwork.network,
@@ -872,11 +853,11 @@ export default class IndexingService extends BaseService<Events> {
       // FIXME networks; instead, the first listed network produces the
       // FIXME final price in those cases.
 
-      const allActiveAssetsByAddress = indexAssetsByAddress(activeAssetsToTrack)
+      const allActiveAssetsByAddress = keyAssetsByAddress(activeAssetsToTrack)
 
       const activeAssetsByNetwork = trackedNetworks
         .map((network) => ({
-          activeAssetsByAddress: indexAssetsByAddress(
+          activeAssetsByAddress: keyAssetsByAddress(
             activeAssetsToTrack.filter(({ homeNetwork }) =>
               sameNetwork(homeNetwork, network),
             ),