refactor: swap out NewDisplayCurrencyConverter (#2383)

* refactor: in send-lightning swap NewDisplayCurrencyConverter

* refactor: in send-on-chain swap NewDisplayCurrencyConverter

* refactor: in reimburseFee swap NewDisplayCurrencyConverter

* refactor: in send-intraledger swap NewDisplayCurrencyConverter

* chore: remove unused 'NewDisplayCurrencyConverter'

Author: vindard

src/app/payments/send-intraledger.ts

@@ -2,16 +2,11 @@ import { getPubkeysToSkipProbe } from "@config"
 
 import { AccountValidator } from "@domain/accounts"
 import { PaymentSendStatus } from "@domain/bitcoin/lightning"
-import {
-  DisplayCurrency,
-  NewDisplayCurrencyConverter,
-  usdMinorToMajorUnit,
-} from "@domain/fiat"
+import { DisplayCurrency, usdMinorToMajorUnit } from "@domain/fiat"
 import {
   InvalidLightningPaymentFlowBuilderStateError,
   InvalidZeroAmountPriceRatioInputError,
   LightningPaymentFlowBuilder,
-  WalletPriceRatio,
   ZeroAmountForUsdRecipientError,
 } from "@domain/payments"
 import { ErrorLevel, WalletCurrency } from "@domain/shared"
@@ -35,7 +30,11 @@ import {
 import { ResourceExpiredLockServiceError } from "@domain/lock"
 
 import { Accounts } from "@app"
-import { btcFromUsdMidPriceFn, usdFromBtcMidPriceFn } from "@app/prices"
+import {
+  btcFromUsdMidPriceFn,
+  getCurrentPriceAsDisplayPriceRatio,
+  usdFromBtcMidPriceFn,
+} from "@app/prices"
 import { validateIsBtcWallet, validateIsUsdWallet } from "@app/wallets"
 
 import {
@@ -255,13 +254,14 @@ const executePaymentViaIntraledger = async <
     const balanceCheck = paymentFlow.checkBalanceForSend(balance)
     if (balanceCheck instanceof Error) return balanceCheck
 
-    const priceRatio = WalletPriceRatio({
-      usd: paymentFlow.usdPaymentAmount,
-      btc: paymentFlow.btcPaymentAmount,
+    const { displayCurrency } = senderAccount
+    const displayPriceRatio = await getCurrentPriceAsDisplayPriceRatio({
+      currency: displayCurrency,
     })
-    if (priceRatio instanceof Error) return priceRatio
-    const displayCentsPerSat = priceRatio.usdPerSat()
-    const converter = NewDisplayCurrencyConverter(displayCentsPerSat)
+    if (displayPriceRatio instanceof Error) return displayPriceRatio
+    const amountDisplayCurrencyAsNumber = Number(
+      displayPriceRatio.convertFromWallet(paymentFlow.btcPaymentAmount).amountInMinor,
+    ) as DisplayCurrencyBaseAmount
 
     if (signal.aborted) {
       return new ResourceExpiredLockServiceError(signal.error?.message)
@@ -275,9 +275,9 @@ const executePaymentViaIntraledger = async <
       metadata = LedgerFacade.WalletIdTradeIntraAccountLedgerMetadata({
         paymentAmounts: paymentFlow,
 
-        amountDisplayCurrency: converter.fromUsdAmount(paymentFlow.usdPaymentAmount),
+        amountDisplayCurrency: amountDisplayCurrencyAsNumber,
         feeDisplayCurrency: 0 as DisplayCurrencyBaseAmount,
-        displayCurrency: DisplayCurrency.Usd,
+        displayCurrency,
 
         memoOfPayer: memo || undefined,
       })
@@ -286,9 +286,9 @@ const executePaymentViaIntraledger = async <
         LedgerFacade.WalletIdIntraledgerLedgerMetadata({
           paymentAmounts: paymentFlow,
 
-          amountDisplayCurrency: converter.fromUsdAmount(paymentFlow.usdPaymentAmount),
+          amountDisplayCurrency: amountDisplayCurrencyAsNumber,
           feeDisplayCurrency: 0 as DisplayCurrencyBaseAmount,
-          displayCurrency: DisplayCurrency.Usd,
+          displayCurrency,
 
           memoOfPayer: memo || undefined,
           senderUsername: senderAccount.username,

src/app/payments/send-lightning.ts

@@ -7,11 +7,7 @@ import {
   PaymentSendStatus,
 } from "@domain/bitcoin/lightning"
 import { AlreadyPaidError, CouldNotFindLightningPaymentFlowError } from "@domain/errors"
-import {
-  DisplayCurrency,
-  NewDisplayCurrencyConverter,
-  usdMinorToMajorUnit,
-} from "@domain/fiat"
+import { DisplayCurrency, usdMinorToMajorUnit } from "@domain/fiat"
 import {
   checkedToBtcPaymentAmount,
   checkedToUsdPaymentAmount,
@@ -48,6 +44,7 @@ import { addAttributesToCurrentSpan } from "@services/tracing"
 
 import { Wallets } from "@app"
 import { validateIsBtcWallet, validateIsUsdWallet } from "@app/wallets"
+import { getCurrentPriceAsDisplayPriceRatio } from "@app/prices"
 
 import { ResourceExpiredLockServiceError } from "@domain/lock"
 
@@ -94,9 +91,16 @@ export const payInvoiceByWalletId = async ({
         paymentFlow,
         senderWallet,
         senderUsername: senderAccount.username,
+        senderDisplayCurrency: senderAccount.displayCurrency,
+        memo,
+      })
+    : executePaymentViaLn({
+        decodedInvoice,
+        paymentFlow,
+        senderWallet,
+        senderDisplayCurrency: senderAccount.displayCurrency,
         memo,
       })
-    : executePaymentViaLn({ decodedInvoice, paymentFlow, senderWallet, memo })
 }
 
 const payNoAmountInvoiceByWalletId = async ({
@@ -133,9 +137,16 @@ const payNoAmountInvoiceByWalletId = async ({
         paymentFlow,
         senderWallet,
         senderUsername: senderAccount.username,
+        senderDisplayCurrency: senderAccount.displayCurrency,
+        memo,
+      })
+    : executePaymentViaLn({
+        decodedInvoice,
+        paymentFlow,
+        senderWallet,
+        senderDisplayCurrency: senderAccount.displayCurrency,
         memo,
       })
-    : executePaymentViaLn({ decodedInvoice, paymentFlow, senderWallet, memo })
 }
 
 export const payNoAmountInvoiceByWalletIdForBtcWallet = async (
@@ -322,11 +333,13 @@ const executePaymentViaIntraledger = async <
   paymentFlow,
   senderWallet,
   senderUsername,
+  senderDisplayCurrency,
   memo,
 }: {
   paymentFlow: PaymentFlow<S, R>
   senderWallet: WalletDescriptor<S>
   senderUsername: Username | undefined
+  senderDisplayCurrency: DisplayCurrency
   memo: string | null
 }): Promise<PaymentSendStatus | ApplicationError> => {
   addAttributesToCurrentSpan({
@@ -380,14 +393,13 @@ const executePaymentViaIntraledger = async <
     const balanceCheck = paymentFlow.checkBalanceForSend(balance)
     if (balanceCheck instanceof Error) return balanceCheck
 
-    const priceRatio = WalletPriceRatio({
-      usd: paymentFlow.usdPaymentAmount,
-      btc: paymentFlow.btcPaymentAmount,
+    const displayPriceRatio = await getCurrentPriceAsDisplayPriceRatio({
+      currency: senderDisplayCurrency,
     })
-    if (priceRatio instanceof Error) return priceRatio
-    const displayCentsPerSat = priceRatio.usdPerSat()
-
-    const converter = NewDisplayCurrencyConverter(displayCentsPerSat)
+    if (displayPriceRatio instanceof Error) return displayPriceRatio
+    const amountDisplayCurrencyAsNumber = Number(
+      displayPriceRatio.convertFromWallet(paymentFlow.btcPaymentAmount).amountInMinor,
+    ) as DisplayCurrencyBaseAmount
 
     if (signal.aborted) {
       return new ResourceExpiredLockServiceError(signal.error?.message)
@@ -404,9 +416,9 @@ const executePaymentViaIntraledger = async <
           pubkey: recipientPubkey,
           paymentAmounts: paymentFlow,
 
-          amountDisplayCurrency: converter.fromUsdAmount(paymentFlow.usdPaymentAmount),
+          amountDisplayCurrency: amountDisplayCurrencyAsNumber,
           feeDisplayCurrency: 0 as DisplayCurrencyBaseAmount,
-          displayCurrency: DisplayCurrency.Usd,
+          displayCurrency: senderDisplayCurrency,
 
           memoOfPayer: memo || undefined,
         }))
@@ -417,9 +429,9 @@ const executePaymentViaIntraledger = async <
           pubkey: recipientPubkey,
           paymentAmounts: paymentFlow,
 
-          amountDisplayCurrency: converter.fromUsdAmount(paymentFlow.usdPaymentAmount),
+          amountDisplayCurrency: amountDisplayCurrencyAsNumber,
           feeDisplayCurrency: 0 as DisplayCurrencyBaseAmount,
-          displayCurrency: DisplayCurrency.Usd,
+          displayCurrency: senderDisplayCurrency,
 
           memoOfPayer: memo || undefined,
           senderUsername,
@@ -483,11 +495,13 @@ const executePaymentViaLn = async ({
   decodedInvoice,
   paymentFlow,
   senderWallet,
+  senderDisplayCurrency,
   memo,
 }: {
   decodedInvoice: LnInvoice
   paymentFlow: PaymentFlow<WalletCurrency, WalletCurrency>
   senderWallet: Wallet
+  senderDisplayCurrency: DisplayCurrency
   memo: string | null
 }): Promise<PaymentSendStatus | ApplicationError> => {
   addAttributesToCurrentSpan({
@@ -525,22 +539,25 @@ const executePaymentViaLn = async ({
     const lndService = LndService()
     if (lndService instanceof Error) return lndService
 
-    const priceRatio = WalletPriceRatio({
-      usd: paymentFlow.usdPaymentAmount,
-      btc: paymentFlow.btcPaymentAmount,
+    const displayPriceRatio = await getCurrentPriceAsDisplayPriceRatio({
+      currency: senderDisplayCurrency,
     })
-    if (priceRatio instanceof Error) return priceRatio
-    const displayCentsPerSat = priceRatio.usdPerSat()
-
-    const converter = NewDisplayCurrencyConverter(displayCentsPerSat)
+    if (displayPriceRatio instanceof Error) return displayPriceRatio
+    const amountDisplayCurrencyAsNumber = Number(
+      displayPriceRatio.convertFromWallet(paymentFlow.btcPaymentAmount).amountInMinor,
+    ) as DisplayCurrencyBaseAmount
+    const feeDisplayCurrencyAsNumber = Number(
+      displayPriceRatio.convertFromWallet(paymentFlow.btcProtocolAndBankFee)
+        .amountInMinor,
+    ) as DisplayCurrencyBaseAmount
 
     if (signal.aborted) {
       return new ResourceExpiredLockServiceError(signal.error?.message)
     }
 
     const metadata = LedgerFacade.LnSendLedgerMetadata({
-      amountDisplayCurrency: converter.fromUsdAmount(paymentFlow.usdPaymentAmount),
-      feeDisplayCurrency: converter.fromUsdAmount(paymentFlow.usdProtocolAndBankFee),
+      amountDisplayCurrency: amountDisplayCurrencyAsNumber,
+      feeDisplayCurrency: feeDisplayCurrencyAsNumber,
       displayCurrency: DisplayCurrency.Usd,
 
       paymentAmounts: paymentFlow,
@@ -573,6 +590,12 @@ const executePaymentViaLn = async ({
     if (journal instanceof Error) return journal
     const { journalId } = journal
 
+    const walletPriceRatio = WalletPriceRatio({
+      usd: paymentFlow.usdPaymentAmount,
+      btc: paymentFlow.btcPaymentAmount,
+    })
+    if (walletPriceRatio instanceof Error) return walletPriceRatio
+
     let payResult: PayInvoiceResult | LightningServiceError
     if (rawRoute) {
       payResult = await lndService.payInvoiceViaRoutes({
@@ -584,7 +607,7 @@ const executePaymentViaLn = async ({
       const maxFeeCheckArgs = {
         maxFeeAmount: paymentFlow.btcProtocolAndBankFee,
         btcPaymentAmount: paymentFlow.btcPaymentAmount,
-        priceRatio,
+        priceRatio: walletPriceRatio,
         senderWalletCurrency: paymentFlow.senderWalletDescriptor().currency,
       }
       const maxFeeCheck = LnFees().verifyMaxFee(maxFeeCheckArgs)
@@ -638,6 +661,8 @@ const executePaymentViaLn = async ({
     if (!rawRoute) {
       const reimbursed = await Wallets.reimburseFee({
         paymentFlow,
+        senderDisplayAmount: amountDisplayCurrencyAsNumber,
+        senderDisplayCurrency,
         journalId,
         actualFee: payResult.roundedUpFee,
         revealedPreImage: payResult.revealedPreImage,

src/app/payments/update-pending-payments.ts

@@ -230,13 +230,19 @@ const updatePendingPayment = wrapAsyncToRunInSpan({
         })
       if (pendingPayment.feeKnownInAdvance) return true
 
-      const { displayAmount, displayFee } = pendingPayment
-      if (displayAmount === undefined || displayFee === undefined) {
+      const { displayAmount, displayFee, displayCurrency } = pendingPayment
+      if (
+        displayAmount === undefined ||
+        displayFee === undefined ||
+        displayCurrency === undefined
+      ) {
         return new UnknownLedgerError("missing display-related values in transaction")
       }
 
       return Wallets.reimburseFee({
         paymentFlow,
+        senderDisplayAmount: displayAmount,
+        senderDisplayCurrency: displayCurrency,
         journalId: pendingPayment.journalId,
         actualFee: roundedUpFee,
         revealedPreImage,

src/app/wallets/reimburse-fee.ts

@@ -1,20 +1,32 @@
 import { toSats } from "@domain/bitcoin"
-import { DisplayCurrency, NewDisplayCurrencyConverter, toCents } from "@domain/fiat"
+import { MajorExponent, toCents } from "@domain/fiat"
 import { LedgerTransactionType } from "@domain/ledger"
 import { FeeReimbursement } from "@domain/ledger/fee-reimbursement"
-import { WalletPriceRatio } from "@domain/payments"
-import { paymentAmountFromNumber, WalletCurrency } from "@domain/shared"
+import { DisplayPriceRatio, WalletPriceRatio } from "@domain/payments"
+import {
+  displayAmountFromNumber,
+  paymentAmountFromNumber,
+  WalletCurrency,
+} from "@domain/shared"
 
 import * as LedgerFacade from "@services/ledger/facade"
 import { baseLogger } from "@services/logger"
 
-export const reimburseFee = async <S extends WalletCurrency, R extends WalletCurrency>({
+export const reimburseFee = async <
+  S extends WalletCurrency,
+  R extends WalletCurrency,
+  T extends DisplayCurrency,
+>({
   paymentFlow,
+  senderDisplayAmount,
+  senderDisplayCurrency,
   journalId,
   actualFee,
   revealedPreImage,
 }: {
   paymentFlow: PaymentFlow<S, R>
+  senderDisplayAmount: DisplayCurrencyBaseAmount
+  senderDisplayCurrency: T
   journalId: LedgerJournalId
   actualFee: Satoshis
   revealedPreImage?: RevealedPreImage
@@ -51,9 +63,24 @@ export const reimburseFee = async <S extends WalletCurrency, R extends WalletCur
     return true
   }
 
-  const displayCentsPerSat = priceRatio.usdPerSat()
-  const converter = NewDisplayCurrencyConverter(displayCentsPerSat)
-  const reimburseAmountDisplayCurrency = converter.fromUsdAmount(feeDifference.usd)
+  const displayAmount = displayAmountFromNumber({
+    amount: senderDisplayAmount,
+    currency: senderDisplayCurrency,
+  })
+  if (displayAmount instanceof Error) return displayAmount
+
+  const displayPriceRatio = DisplayPriceRatio({
+    displayAmountInMinorUnit: displayAmount,
+    walletAmount: paymentFlow.btcPaymentAmount,
+    displayMajorExponent: MajorExponent.STANDARD,
+  })
+  if (displayPriceRatio instanceof Error) return displayPriceRatio
+  const reimburseAmountDisplayCurrency = displayPriceRatio.convertFromWallet(
+    feeDifference.btc,
+  )
+  const reimburseAmountAsNumber = Number(
+    reimburseAmountDisplayCurrency.amountInMinor,
+  ) as DisplayCurrencyBaseAmount
 
   const paymentHash = paymentFlow.paymentHashForFlow()
   if (paymentHash instanceof Error) return paymentHash
@@ -69,9 +96,9 @@ export const reimburseFee = async <S extends WalletCurrency, R extends WalletCur
     satsFee: toSats(0),
     centsFee: toCents(0),
 
-    displayAmount: reimburseAmountDisplayCurrency,
+    displayAmount: reimburseAmountAsNumber,
     displayFee: 0 as DisplayCurrencyBaseAmount,
-    displayCurrency: DisplayCurrency.Usd,
+    displayCurrency: senderDisplayCurrency,
   }
 
   const txMetadata: LnLedgerTransactionMetadataUpdate = {