cleaner lookup logic

iron-fish · Sep 25, 2023 · f0c47f8 · f0c47f8
1 parent 872547b
commit f0c47f8
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 21 deletions.
diff --git a/ironfish-cli/src/commands/wallet/balances.ts b/ironfish-cli/src/commands/wallet/balances.ts
@@ -7,8 +7,6 @@ import { IronfishCommand } from '../../command'
 import { RemoteFlags } from '../../flags'
 import { compareAssets, renderAssetNameFromHex } from '../../utils'
 
-type AssetBalancePairs = { asset: RpcAsset; balance: GetBalancesResponse['balances'][number] }
-
 export class BalancesCommand extends IronfishCommand {
   static description = `Display the account's balances for all assets`
 
@@ -45,7 +43,10 @@ export class BalancesCommand extends IronfishCommand {
     })
     this.log(`Account: ${response.content.account}`)
 
-    const assetBalancePairs: AssetBalancePairs[] = []
+    const assetBalancePairs: {
+      asset: RpcAsset
+      balance: GetBalancesResponse['balances'][number]
+    }[] = []
 
     for (const balance of response.content.balances) {
       const asset = await client.wallet.getAsset({

diff --git a/ironfish-cli/src/commands/wallet/transactions.ts b/ironfish-cli/src/commands/wallet/transactions.ts
@@ -7,6 +7,7 @@ import {
   CurrencyUtils,
   GetAccountTransactionsResponse,
   PartialRecursive,
+  RpcAsset,
   RpcClient,
   TransactionType,
 } from '@ironfish/sdk'
@@ -84,9 +85,21 @@ export class TransactionsCommand extends IronfishCommand {
     let hasTransactions = false
 
     for await (const transaction of response.contentStream()) {
-      const transactionRows = flags.notes
-        ? await this.getTransactionRowsByNote(client, transaction, format)
-        : await this.getTransactionRows(client, transaction, format)
+      let transactionRows: PartialRecursive<TransactionRow>[]
+
+      if (flags.notes) {
+        const assetLookup = await this.fetchAssetsFromTransaction(client, transaction, 'notes')
+
+        transactionRows = this.getTransactionRowsByNote(assetLookup, transaction, format)
+      } else {
+        const assetLookup = await this.fetchAssetsFromTransaction(
+          client,
+          transaction,
+          'assetBalanceDeltas',
+        )
+
+        transactionRows = this.getTransactionRows(assetLookup, transaction, format)
+      }
 
       CliUx.ux.table(transactionRows, columns, {
         printLine: this.log.bind(this),
@@ -103,11 +116,11 @@ export class TransactionsCommand extends IronfishCommand {
     }
   }
 
-  async getTransactionRows(
-    client: RpcClient,
+  getTransactionRows(
+    assetLookup: { [key: string]: RpcAsset },
     transaction: GetAccountTransactionsResponse,
     format: Format,
-  ): Promise<PartialRecursive<TransactionRow>[]> {
+  ): PartialRecursive<TransactionRow>[] {
     const nativeAssetId = Asset.nativeId().toString('hex')
 
     const assetBalanceDeltas = transaction.assetBalanceDeltas.sort((d) =>
@@ -121,9 +134,7 @@ export class TransactionsCommand extends IronfishCommand {
     let assetCount = assetBalanceDeltas.length
 
     for (const [index, { assetId, delta }] of assetBalanceDeltas.entries()) {
-      const asset = await client.wallet.getAsset({
-        id: assetId,
-      })
+      const asset = assetLookup[assetId]
 
       let amount = BigInt(delta)
 
@@ -148,15 +159,15 @@ export class TransactionsCommand extends IronfishCommand {
           ...transaction,
           group,
           assetId,
-          assetName: asset.content.name,
+          assetName: asset.name,
           amount,
           feePaid,
         })
       } else {
         transactionRows.push({
           group,
           assetId,
-          assetName: asset.content.name,
+          assetName: asset.name,
           amount,
         })
       }
@@ -165,11 +176,40 @@ export class TransactionsCommand extends IronfishCommand {
     return transactionRows
   }
 
-  async getTransactionRowsByNote(
+  async fetchAssetsFromTransaction(
     client: RpcClient,
     transaction: GetAccountTransactionsResponse,
+    key: 'notes' | 'assetBalanceDeltas',
+  ): Promise<{ [key: string]: RpcAsset }> {
+    const iterate = transaction[key]
+    Assert.isNotUndefined(iterate)
+
+    const assetIdSet = new Set<string>()
+
+    for (const { assetId } of iterate) {
+      assetIdSet.add(assetId)
+    }
+
+    const assetIds = Array.from(assetIdSet)
+
+    const assets: { [key: string]: RpcAsset } = {}
+
+    for (const assetId of assetIds) {
+      const asset = await client.wallet.getAsset({
+        id: assetId,
+      })
+
+      assets[assetId] = asset.content
+    }
+
+    return assets
+  }
+
+  getTransactionRowsByNote(
+    assetLookup: { [key: string]: RpcAsset },
+    transaction: GetAccountTransactionsResponse,
     format: Format,
-  ): Promise<PartialRecursive<TransactionRow>[]> {
+  ): PartialRecursive<TransactionRow>[] {
     Assert.isNotUndefined(transaction.notes)
     const transactionRows = []
 
@@ -185,11 +225,7 @@ export class TransactionsCommand extends IronfishCommand {
       const amount = BigInt(note.value)
       const assetId = note.assetId
 
-      const asset = await client.wallet.getAsset({
-        id: assetId,
-      })
-
-      const assetName = asset.content.name
+      const assetName = assetLookup[note.assetId].name
 
       const sender = note.sender
       const recipient = note.owner