standardizes currency output information for currency prompting, for …

…verified and unverified (#5594)
iron-fish · Oct 29, 2024 · 78d5ad0 · 78d5ad0
1 parent 569de29
commit 78d5ad0
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 42 deletions.
diff --git a/ironfish-cli/src/commands/wallet/burn.ts b/ironfish-cli/src/commands/wallet/burn.ts
@@ -151,11 +151,10 @@ This will destroy tokens and decrease supply for a given asset.`
       amount = await promptCurrency({
         client: client,
         required: true,
-        text: 'Enter the amount of the custom asset to burn',
+        text: 'Enter the amount to burn',
         minimum: 1n,
         logger: this.logger,
-        assetId: assetId,
-        assetVerification: assetData.verification,
+        assetData,
         balance: {
           account,
           confirmations: flags.confirmations,

diff --git a/ironfish-cli/src/commands/wallet/chainport/send.ts b/ironfish-cli/src/commands/wallet/chainport/send.ts
@@ -296,11 +296,10 @@ export class BridgeCommand extends IronfishCommand {
       amount = await promptCurrency({
         client: client,
         required: true,
-        text: 'Enter the amount in the major denomination',
+        text: 'Enter the amount',
         minimum: 1n,
         logger: this.logger,
-        assetId: assetId,
-        assetVerification: assetData.verification,
+        assetData,
         balance: {
           account: from,
         },

diff --git a/ironfish-cli/src/commands/wallet/mint.ts b/ironfish-cli/src/commands/wallet/mint.ts
@@ -209,11 +209,10 @@ This will create tokens and increase supply for a given asset.`
       amount = await promptCurrency({
         client: client,
         required: true,
-        text: 'Enter the amount',
+        text: 'Enter the amount to mint',
         minimum: 0n,
         logger: this.logger,
-        assetId: assetId,
-        assetVerification: assetData?.verification,
+        assetData,
       })
     }
 

diff --git a/ironfish-cli/src/commands/wallet/send.ts b/ironfish-cli/src/commands/wallet/send.ts
@@ -172,11 +172,10 @@ export class Send extends IronfishCommand {
       amount = await promptCurrency({
         client: client,
         required: true,
-        text: 'Enter the amount in the major denomination',
+        text: 'Enter the amount',
         minimum: 1n,
         logger: this.logger,
-        assetId: assetId,
-        assetVerification: assetData.verification,
+        assetData,
         balance: {
           account: from,
           confirmations: flags.confirmations,

diff --git a/ironfish-cli/src/utils/currency.ts b/ironfish-cli/src/utils/currency.ts
@@ -3,54 +3,46 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 import { Asset } from '@ironfish/rust-nodejs'
-import { Assert, CurrencyUtils, Logger, RpcAssetVerification, RpcClient } from '@ironfish/sdk'
+import { Assert, CurrencyUtils, Logger, RpcAsset, RpcClient } from '@ironfish/sdk'
 import { inputPrompt } from '../ui'
+import { renderAssetWithVerificationStatus } from './asset'
 
 /**
  * This prompts the user to enter an amount of currency in the major
  * denomination and returns the value in the minor denomination
  */
-export async function promptCurrency(options: {
-  client: Pick<RpcClient, 'wallet'>
-  text: string
-  logger: Logger
-  required: true
-  minimum?: bigint
-  assetId?: string
-  assetVerification?: RpcAssetVerification
-  balance?: {
-    account?: string
-    confirmations?: number
-  }
-}): Promise<bigint>
-
 export async function promptCurrency(options: {
   client: Pick<RpcClient, 'wallet'>
   text: string
   logger: Logger
   required?: boolean
   minimum?: bigint
-  assetId?: string
-  assetVerification?: RpcAssetVerification
+  assetData?: RpcAsset
   balance?: {
     account?: string
     confirmations?: number
   }
-}): Promise<bigint | null> {
+}): Promise<bigint> {
   let text = options.text
+  if (options.assetData) {
+    const assetName = Buffer.from(options.assetData.name, 'hex').toString('utf-8')
+    text += ` in ${renderAssetWithVerificationStatus(assetName, {
+      verification: options.assetData.verification,
+    })}`
+  }
 
   if (options.balance) {
     const balance = await options.client.wallet.getAccountBalance({
       account: options.balance.account,
-      assetId: options.assetId ?? Asset.nativeId().toString('hex'),
+      assetId: options.assetData?.id ?? Asset.nativeId().toString('hex'),
       confirmations: options.balance.confirmations,
     })
 
     const renderedAvailable = CurrencyUtils.render(
       balance.content.available,
       false,
-      options.assetId,
-      options.assetVerification,
+      options.assetData?.id,
+      options.assetData?.verification,
     )
     text += ` (balance ${renderedAvailable})`
   }
@@ -59,14 +51,10 @@ export async function promptCurrency(options: {
   while (true) {
     const input = await inputPrompt(text, options.required)
 
-    if (!input) {
-      return null
-    }
-
     const [amount, error] = CurrencyUtils.tryMajorToMinor(
       input,
-      options.assetId,
-      options.assetVerification,
+      options.assetData?.id,
+      options.assetData?.verification,
     )
 
     if (error) {
@@ -80,8 +68,8 @@ export async function promptCurrency(options: {
       const renderedMinimum = CurrencyUtils.render(
         options.minimum,
         false,
-        options.assetId,
-        options.assetVerification,
+        options.assetData?.id,
+        options.assetData?.verification,
       )
       options.logger.error(`Error: Minimum is ${renderedMinimum}`)
       continue

diff --git a/ironfish-cli/src/utils/fees.ts b/ironfish-cli/src/utils/fees.ts
@@ -75,7 +75,7 @@ export async function selectFee(options: {
     const fee = await promptCurrency({
       client: options.client,
       required: true,
-      text: 'Enter the fee amount in $IRON',
+      text: 'Enter the fee in $IRON',
       logger: options.logger,
       balance: {
         account: options.account,