Remove CurrencyUtils.encode

ironfish-cli/src/commands/wallet/burn.ts

@@ -179,11 +179,11 @@ This will destroy tokens and decrease supply for a given asset.`
       burns: [
         {
           assetId,
-          value: CurrencyUtils.encode(amount),
+          value: amount.toString(),
         },
       ],
-      fee: flags.fee ? CurrencyUtils.encode(flags.fee) : null,
-      feeRate: flags.feeRate ? CurrencyUtils.encode(flags.feeRate) : null,
+      fee: flags.fee ? flags.fee.toString() : null,
+      feeRate: flags.feeRate ? flags.feeRate.toString() : null,
       expiration: flags.expiration,
       confirmations: flags.confirmations,
     }

ironfish-cli/src/commands/wallet/chainport/send.ts

@@ -347,8 +347,8 @@ export class BridgeCommand extends IronfishCommand {
           memo: txn.gas_fee_output.memo,
         },
       ],
-      fee: flags.fee ? CurrencyUtils.encode(flags.fee) : null,
-      feeRate: flags.feeRate ? CurrencyUtils.encode(flags.feeRate) : null,
+      fee: flags.fee ? flags.fee.toString() : null,
+      feeRate: flags.feeRate ? flags.feeRate.toString() : null,
       expiration,
     }
 

ironfish-cli/src/commands/wallet/mint.ts

@@ -244,16 +244,16 @@ This will create tokens and increase supply for a given asset.`
       ...(assetData != null ? { assetId } : {}),
       name: name,
       metadata: metadata,
-      value: CurrencyUtils.encode(amount),
+      value: amount.toString(),
       transferOwnershipTo: flags.transferOwnershipTo,
     }
 
     const params: CreateTransactionRequest = {
       account,
       outputs: [],
       mints: [mint],
-      fee: flags.fee ? CurrencyUtils.encode(flags.fee) : null,
-      feeRate: flags.feeRate ? CurrencyUtils.encode(flags.feeRate) : null,
+      fee: flags.fee ? flags.fee.toString() : null,
+      feeRate: flags.feeRate ? flags.feeRate.toString() : null,
       expiration: expiration,
       confirmations: flags.confirmations,
     }

ironfish-cli/src/commands/wallet/notes/combine.ts

@@ -297,12 +297,12 @@ export class CombineNotesCommand extends IronfishCommand {
         {
           publicAddress: to,
           assetId,
-          amount: CurrencyUtils.encode(totalAmount),
+          amount: totalAmount.toString(),
           memo,
         },
       ],
-      fee: flags.fee ? CurrencyUtils.encode(flags.fee) : null,
-      feeRate: flags.feeRate ? CurrencyUtils.encode(flags.feeRate) : null,
+      fee: flags.fee ? flags.fee.toString() : null,
+      feeRate: flags.feeRate ? flags.feeRate.toString() : null,
       notes: notes.map((note) => note.noteHash),
       expiration,
     }
@@ -326,8 +326,8 @@ export class CombineNotesCommand extends IronfishCommand {
     if (assetId === Asset.nativeId().toString('hex')) {
       amount = totalAmount - raw.fee
     }
-    params.outputs[0].amount = CurrencyUtils.encode(amount)
-    params.fee = CurrencyUtils.encode(raw.fee)
+    params.outputs[0].amount = amount.toString()
+    params.fee = raw.fee.toString()
 
     const createTransactionResponse = await client.wallet.createTransaction(params)
     const createTransactionBytes = Buffer.from(

ironfish-cli/src/commands/wallet/send.ts

@@ -210,13 +210,13 @@ export class Send extends IronfishCommand {
       outputs: [
         {
           publicAddress: to,
-          amount: CurrencyUtils.encode(amount),
+          amount: amount.toString(),
           memo,
           assetId,
         },
       ],
-      fee: flags.fee ? CurrencyUtils.encode(flags.fee) : null,
-      feeRate: flags.feeRate ? CurrencyUtils.encode(flags.feeRate) : null,
+      fee: flags.fee ? flags.fee.toString() : null,
+      feeRate: flags.feeRate ? flags.feeRate.toString() : null,
       expiration: expiration,
       confirmations: flags.confirmations,
       notes: flags.note,

ironfish-cli/src/utils/fees.ts

@@ -85,7 +85,7 @@ export async function selectFee(options: {
 
     const custom = await options.client.wallet.createTransaction({
       ...options.transaction,
-      fee: CurrencyUtils.encode(fee),
+      fee: fee.toString(),
     })
 
     const bytes = Buffer.from(custom.content.transaction, 'hex')
@@ -103,7 +103,7 @@ async function getTxWithFee(
 ): Promise<RawTransaction | null> {
   const promise = client.wallet.createTransaction({
     ...params,
-    feeRate: CurrencyUtils.encode(feeRate),
+    feeRate: feeRate.toString(),
   })
 
   const response = await promise.catch((e) => {

ironfish-cli/src/utils/spendPostTime.ts

@@ -5,7 +5,6 @@ import { Asset } from '@ironfish/rust-nodejs'
 import {
   BenchUtils,
   CreateTransactionRequest,
-  CurrencyUtils,
   EstimateFeeRatesResponse,
   IronfishSdk,
   RawTransaction,
@@ -79,7 +78,7 @@ export async function benchmarkSpendPostTime(
     outputs: [
       {
         publicAddress: publicKey,
-        amount: CurrencyUtils.encode(BigInt(notes[0].value)),
+        amount: BigInt(notes[0].value).toString(),
         memo: '',
       },
     ],
@@ -95,7 +94,7 @@ export async function benchmarkSpendPostTime(
     outputs: [
       {
         publicAddress: publicKey,
-        amount: CurrencyUtils.encode(BigInt(notes[0].value) + BigInt(notes[1].value)),
+        amount: (BigInt(notes[0].value) + BigInt(notes[1].value)).toString(),
         memo: '',
       },
     ],

ironfish/src/mining/poolShares.ts

@@ -6,7 +6,7 @@ import { Assert } from '../assert'
 import { Config } from '../fileStores/config'
 import { Logger } from '../logger'
 import { RpcClient } from '../rpc/clients/client'
-import { CurrencyUtils, ErrorUtils } from '../utils'
+import { ErrorUtils } from '../utils'
 import { PoolDatabase } from './poolDatabase'
 import { DatabaseBlock, DatabasePayoutTransaction } from './poolDatabase/database'
 import { WebhookNotifier } from './webhooks'
@@ -236,7 +236,7 @@ export class MiningPoolShares {
       const amount = amountPerShare * BigInt(payout.shareCount)
       outputs.push({
         publicAddress: payout.publicAddress,
-        amount: CurrencyUtils.encode(amount),
+        amount: amount.toString(),
         memo: `${this.poolName} payout ${payoutPeriod.id}`,
         assetId,
       })

ironfish/src/rpc/routes/chain/estimateFeeRate.ts

@@ -5,7 +5,6 @@ import * as yup from 'yup'
 import { Assert } from '../../../assert'
 import { PRIORITY_LEVELS, PriorityLevel } from '../../../memPool/feeEstimator'
 import { FullNode } from '../../../node'
-import { CurrencyUtils } from '../../../utils'
 import { ApiNamespace } from '../namespaces'
 import { routes } from '../router'
 
@@ -35,6 +34,6 @@ routes.register<typeof EstimateFeeRateRequestSchema, EstimateFeeRateResponse>(
 
     const priority = request.data?.priority ?? 'average'
     const rate = node.memPool.feeEstimator.estimateFeeRate(priority)
-    request.end({ rate: CurrencyUtils.encode(rate) })
+    request.end({ rate: rate.toString() })
   },
 )

ironfish/src/rpc/routes/chain/estimateFeeRates.ts

@@ -4,7 +4,6 @@
 import * as yup from 'yup'
 import { Assert } from '../../../assert'
 import { FullNode } from '../../../node'
-import { CurrencyUtils } from '../../../utils'
 import { ApiNamespace } from '../namespaces'
 import { routes } from '../router'
 
@@ -36,9 +35,9 @@ routes.register<typeof EstimateFeeRatesRequestSchema, EstimateFeeRatesResponse>(
     const rates = node.memPool.feeEstimator.estimateFeeRates()
 
     request.end({
-      slow: CurrencyUtils.encode(rates.slow),
-      average: CurrencyUtils.encode(rates.average),
-      fast: CurrencyUtils.encode(rates.fast),
+      slow: rates.slow.toString(),
+      average: rates.average.toString(),
+      fast: rates.fast.toString(),
     })
   },
 )

ironfish/src/rpc/routes/chain/getAsset.test.ts

@@ -6,7 +6,6 @@ import '../../../testUtilities/matchers'
 import { Asset } from '@ironfish/rust-nodejs'
 import { Assert } from '../../../assert'
 import { createRouteTest } from '../../../testUtilities/routeTest'
-import { CurrencyUtils } from '../../../utils'
 
 describe('Route chain.getAsset', () => {
   const routeTest = createRouteTest()
@@ -24,7 +23,7 @@ describe('Route chain.getAsset', () => {
     expect(response.content.nonce).toBe(asset.nonce)
     expect(response.content.creator).toBe(asset.creator.toString('hex'))
     expect(response.content.owner).toBe(asset.owner.toString('hex'))
-    expect(response.content.supply).toBe(CurrencyUtils.encode(asset.supply))
+    expect(response.content.supply).toBe(asset.supply.toString())
     expect(response.content.createdTransactionHash).toBe(
       asset.createdTransactionHash.toString('hex'),
     )

ironfish/src/rpc/routes/chain/getAsset.ts

@@ -6,7 +6,6 @@ import * as yup from 'yup'
 import { Assert } from '../../../assert'
 import { AssetValue } from '../../../blockchain/database/assetValue'
 import { FullNode } from '../../../node'
-import { CurrencyUtils } from '../../../utils'
 import { AssetStatus } from '../../../wallet'
 import { RpcNotFoundError, RpcValidationError } from '../../adapters'
 import { ApiNamespace } from '../namespaces'
@@ -81,7 +80,7 @@ routes.register<typeof GetAssetRequestSchema, GetAssetResponse>(
       nonce: asset.nonce,
       creator: asset.creator.toString('hex'),
       owner: asset.owner.toString('hex'),
-      supply: CurrencyUtils.encode(asset.supply),
+      supply: asset.supply.toString(),
       status: await getAssetStatus(node, asset),
       verification: node.assetsVerifier.verify(asset.id),
     })

ironfish/src/rpc/routes/chain/getTransactionStream.ts

@@ -7,7 +7,7 @@ import { ChainProcessor } from '../../../chainProcessor'
 import { FullNode } from '../../../node'
 import { Block } from '../../../primitives/block'
 import { BlockHeader } from '../../../primitives/blockheader'
-import { BufferUtils, CurrencyUtils } from '../../../utils'
+import { BufferUtils } from '../../../utils'
 import { PromiseUtils } from '../../../utils/promise'
 import { isValidIncomingViewKey, isValidOutgoingViewKey } from '../../../wallet/validator'
 import { RpcValidationError } from '../../adapters/errors'
@@ -158,7 +158,7 @@ routes.register<typeof GetTransactionStreamRequestSchema, GetTransactionStreamRe
 
             const assetValue = await node.chain.getAssetById(decryptedNote.assetId())
             notes.push({
-              value: CurrencyUtils.encode(decryptedNote.value()),
+              value: decryptedNote.value().toString(),
               memo,
               assetId: decryptedNote.assetId().toString('hex'),
               assetName: assetValue?.name.toString('hex') || '',
@@ -171,7 +171,7 @@ routes.register<typeof GetTransactionStreamRequestSchema, GetTransactionStreamRe
         for (const burn of tx.burns) {
           const assetValue = await node.chain.getAssetById(burn.assetId)
           burns.push({
-            value: CurrencyUtils.encode(burn.value),
+            value: burn.value.toString(),
             id: burn.assetId.toString('hex'),
             assetId: burn.assetId.toString('hex'),
             assetName: assetValue?.name.toString('hex') || '',
@@ -180,7 +180,7 @@ routes.register<typeof GetTransactionStreamRequestSchema, GetTransactionStreamRe
 
         for (const mint of tx.mints) {
           mints.push({
-            value: CurrencyUtils.encode(mint.value),
+            value: mint.value.toString(),
             assetId: mint.asset.id().toString('hex'),
             assetName: mint.asset.name().toString('hex'),
             id: mint.asset.id().toString('hex'),

ironfish/src/rpc/routes/wallet/burnAsset.test.ts

@@ -10,7 +10,6 @@ import {
   usePostTxFixture,
 } from '../../../testUtilities'
 import { createRouteTest } from '../../../testUtilities/routeTest'
-import { CurrencyUtils } from '../../../utils'
 import { serializeRpcWalletTransaction } from './serializers'
 
 describe('Route wallet/burnAsset', () => {
@@ -84,7 +83,7 @@ describe('Route wallet/burnAsset', () => {
         account: account.name,
         assetId: assetId.toString('hex'),
         fee: '1',
-        value: CurrencyUtils.encode(value),
+        value: value.toString(),
       })
 
       const walletTransaction = await account.getTransaction(burnTransaction.hash())

ironfish/src/rpc/routes/wallet/burnAsset.ts

@@ -123,7 +123,7 @@ routes.register<typeof BurnAssetRequestSchema, BurnAssetResponse>(
       hash: transaction.hash().toString('hex'),
       name: asset.name.toString('hex'),
       assetName: asset.name.toString('hex'),
-      value: CurrencyUtils.encode(burn.value),
+      value: burn.value.toString(),
     })
   },
 )

ironfish/src/rpc/routes/wallet/getAccountNotesStream.test.ts

@@ -5,7 +5,7 @@ import { BufferMap } from 'buffer-map'
 import { Assert } from '../../../assert'
 import { useAccountFixture, useBlockWithTx } from '../../../testUtilities'
 import { createRouteTest } from '../../../testUtilities/routeTest'
-import { AsyncUtils, BufferUtils, CurrencyUtils } from '../../../utils'
+import { AsyncUtils, BufferUtils } from '../../../utils'
 import { DecryptedNoteValue } from '../../../wallet/walletdb/decryptedNoteValue'
 
 describe('Route wallet/getAccountNotesStream', () => {
@@ -44,7 +44,7 @@ describe('Route wallet/getAccountNotesStream', () => {
 
       Assert.isNotUndefined(expectedNote)
 
-      expect(note.value).toEqual(CurrencyUtils.encode(expectedNote.note.value()))
+      expect(note.value).toEqual(expectedNote.note.value().toString())
       expect(note.assetId).toEqual(expectedNote.note.assetId().toString('hex'))
       expect(note.memo).toEqual(BufferUtils.toHuman(expectedNote.note.memo()))
       expect(note.sender).toEqual(expectedNote.note.sender())

ironfish/src/rpc/routes/wallet/getAccountNotesStream.ts

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 import * as yup from 'yup'
-import { BufferUtils, CurrencyUtils } from '../../../utils'
+import { BufferUtils } from '../../../utils'
 import { ApiNamespace } from '../namespaces'
 import { routes } from '../router'
 import { AssertHasRpcContext } from '../rpcContext'
@@ -46,7 +46,7 @@ routes.register<typeof GetAccountNotesStreamRequestSchema, GetAccountNotesStream
         const asset = await account.getAsset(note.assetId())
 
         request.stream({
-          value: CurrencyUtils.encode(note.value()),
+          value: note.value().toString(),
           assetId: note.assetId().toString('hex'),
           assetName: asset?.name.toString('hex') || '',
           memo: BufferUtils.toHuman(note.memo()),

ironfish/src/rpc/routes/wallet/getAsset.ts

@@ -3,7 +3,6 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 import { ASSET_ID_LENGTH } from '@ironfish/rust-nodejs'
 import * as yup from 'yup'
-import { CurrencyUtils } from '../../../utils'
 import { RpcNotFoundError, RpcValidationError } from '../../adapters'
 import { RpcAsset, RpcAssetSchema } from '../chain/types'
 import { ApiNamespace } from '../namespaces'
@@ -62,7 +61,7 @@ routes.register<typeof GetWalletAssetRequestSchema, GetWalletAssetResponse>(
       status: await node.wallet.getAssetStatus(account, asset, {
         confirmations: request.data.confirmations,
       }),
-      supply: asset.supply ? CurrencyUtils.encode(asset.supply) : undefined,
+      supply: asset.supply ? asset.supply.toString() : undefined,
       verification: node.assetsVerifier.verify(asset.id),
     })
   },

ironfish/src/rpc/routes/wallet/getAssets.ts

@@ -2,7 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 import * as yup from 'yup'
-import { CurrencyUtils } from '../../../utils'
 import { RpcAsset, RpcAssetSchema } from '../chain'
 import { ApiNamespace } from '../namespaces'
 import { routes } from '../router'
@@ -50,7 +49,7 @@ routes.register<typeof GetAssetsRequestSchema, GetAssetsResponse>(
         status: await node.wallet.getAssetStatus(account, asset, {
           confirmations: request.data.confirmations,
         }),
-        supply: asset.supply !== null ? CurrencyUtils.encode(asset.supply) : undefined,
+        supply: asset.supply !== null ? asset.supply.toString() : undefined,
         createdTransactionHash: asset.createdTransactionHash.toString('hex'),
         verification: node.assetsVerifier.verify(asset.id),
       })

ironfish/src/rpc/routes/wallet/getBalances.ts

@@ -3,7 +3,6 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 import * as yup from 'yup'
 import { AssetVerification } from '../../../assets'
-import { CurrencyUtils } from '../../../utils'
 import { ApiNamespace } from '../namespaces'
 import { routes } from '../router'
 import { AssertHasRpcContext } from '../rpcContext'
@@ -113,13 +112,13 @@ routes.register<typeof GetBalancesRequestSchema, GetBalancesResponse>(
         assetOwner: asset?.owner.toString('hex') ?? '',
         assetVerification: { status: context.assetsVerifier.verify(balance.assetId).status },
         blockHash: balance.blockHash?.toString('hex') ?? null,
-        confirmed: CurrencyUtils.encode(balance.confirmed),
+        confirmed: balance.confirmed.toString(),
         sequence: balance.sequence,
-        unconfirmed: CurrencyUtils.encode(balance.unconfirmed),
+        unconfirmed: balance.unconfirmed.toString(),
         unconfirmedCount: balance.unconfirmedCount,
-        pending: CurrencyUtils.encode(balance.pending),
+        pending: balance.pending.toString(),
         pendingCount: balance.pendingCount,
-        available: CurrencyUtils.encode(balance.available),
+        available: balance.available.toString(),
         availableNoteCount: balance.availableNoteCount,
       })
     }

ironfish/src/rpc/routes/wallet/mintAsset.test.ts

@@ -5,7 +5,6 @@ import { Asset } from '@ironfish/rust-nodejs'
 import { Assert } from '../../../assert'
 import { useAccountFixture, useMinerBlockFixture, useTxFixture } from '../../../testUtilities'
 import { createRouteTest } from '../../../testUtilities/routeTest'
-import { CurrencyUtils } from '../../../utils'
 import { serializeRpcWalletTransaction } from './serializers'
 
 describe('Route wallet/mintAsset', () => {
@@ -112,7 +111,7 @@ describe('Route wallet/mintAsset', () => {
         fee: '1',
         metadata: asset.metadata().toString('utf8'),
         name: asset.name().toString('utf8'),
-        value: CurrencyUtils.encode(mintData.value),
+        value: mintData.value.toString(),
         transferOwnershipTo: newOwner,
       })