feat(core): using feeRate from bria service

Author: esaugomez31

core/api/src/app/wallets/get-on-chain-fee.ts

@@ -164,14 +164,14 @@ export const getMinerFeeAndPaymentFlow = async <
   const address = await builder.addressForFlow()
   if (address instanceof Error) return address
 
-  const minerFee = await onChainService.estimateFeeForPayout({
+  const estimateRes = await onChainService.estimateFeeForPayout({
     amount: proposedBtcAmount,
     address,
     speed,
   })
-  if (minerFee instanceof Error) return minerFee
+  if (estimateRes instanceof Error) return estimateRes
 
-  return builder.withMinerFee(minerFee, speed)
+  return builder.withMinerFee(estimateRes.fee, estimateRes.feeRate, speed)
 }
 
 export const getOnChainFeeForBtcWallet = async <S extends WalletCurrency>(

core/api/src/domain/bitcoin/onchain/index.types.d.ts

@@ -135,7 +135,7 @@ interface IOnChainService {
   }): Promise<PayoutId | OnChainServiceError>
   estimateFeeForPayout(
     args: EstimatePayoutFeeArgs,
-  ): Promise<BtcPaymentAmount | OnChainServiceError>
+  ): Promise<EstimateFeeForPayoutRes | OnChainServiceError>
   listPayoutQueues(): Promise<PayoutQueue[] | OnChainServiceError>
 }
 

core/api/src/domain/payments/index.types.d.ts

@@ -328,6 +328,7 @@ type OPFBWithAmount<S extends WalletCurrency, R extends WalletCurrency> = {
 type OPFBWithConversion<S extends WalletCurrency, R extends WalletCurrency> = {
   withMinerFee(
     minerFee: BtcPaymentAmount,
+    feeRate: number,
     speed: PayoutSpeed,
   ): Promise<OnChainPaymentFlow<S, R> | ValidationError | DealerPriceServiceError>
   withoutMinerFee(): Promise<

core/api/src/domain/payments/onchain-payment-flow-builder.ts

@@ -425,6 +425,7 @@ const OPFBWithConversion = <S extends WalletCurrency, R extends WalletCurrency>(
 
   const withMinerFee = async (
     minerFee: BtcPaymentAmount,
+    feeRate: number,
     speed: PayoutSpeed,
   ): Promise<OnChainPaymentFlow<S, R> | ValidationError | DealerPriceServiceError> => {
     const state = await stateFromPromise(statePromise)
@@ -440,7 +441,7 @@ const OPFBWithConversion = <S extends WalletCurrency, R extends WalletCurrency>(
       minerFee,
       amount: state.btcProposedAmount,
       speed,
-      feeRate: 5,
+      feeRate,
     })
 
     // Calculate amounts & fees

core/api/src/domain/wallets/withdrawal-fee-calculator.ts

@@ -20,6 +20,13 @@ export const OnChainFees = ({
   }) => {
     const satoshis = Number(amount.amount)
 
+    if (feeRate <= 0) {
+      return {
+        totalFee: calc.add(minerFee, ZERO_SATS),
+        bankFee: ZERO_SATS,
+      }
+    }
+
     const dynamicRate = calculateDynamicFeeRate(satoshis, speed, feeRate)
     const baseMultiplier = calculateBaseMultiplier(speed, feeRate)
     const bankCost = calculateCostToBank(satoshis, speed, feeRate)

core/api/src/services/bria/index.ts

@@ -439,7 +439,7 @@ export const OnChainService = (): IOnChainService => {
     address,
     amount,
     speed,
-  }: EstimatePayoutFeeArgs): Promise<BtcPaymentAmount | OnChainServiceError> => {
+  }: EstimatePayoutFeeArgs): Promise<EstimateFeeForPayoutRes | OnChainServiceError> => {
     const estimate = async ({
       speed,
       address,
@@ -448,7 +448,7 @@ export const OnChainService = (): IOnChainService => {
       speed: PayoutSpeed
       address: OnChainAddress
       amount: BtcPaymentAmount
-    }): Promise<BtcPaymentAmount | BriaEventError> => {
+    }): Promise<EstimateFeeForPayoutRes | BriaEventError> => {
       try {
         const queueName = queueNameForSpeed(speed)
         if (queueName instanceof Error) return queueName
@@ -460,10 +460,19 @@ export const OnChainService = (): IOnChainService => {
         request.setSatoshis(Number(amount.amount))
 
         const response = await estimatePayoutFee(request, metadata)
-        return paymentAmountFromNumber({
+
+        const estimateFee = paymentAmountFromNumber({
           amount: response.getSatoshis(),
           currency: WalletCurrency.Btc,
         })
+        if (estimateFee instanceof Error) {
+          return new UnknownOnChainServiceError(estimateFee)
+        }
+
+        return {
+          fee: estimateFee,
+          feeRate: response.getFeeRate(),
+        }
       } catch (error) {
         return new UnknownOnChainServiceError(error)
       }

core/api/src/services/bria/index.types.d.ts

@@ -50,6 +50,12 @@ type UtxoSettled = {
   address: OnChainAddress
   blockNumber: number
 }
+
+type EstimateFeeForPayoutRes = {
+  fee: BtcPaymentAmount
+  feeRate: number
+}
+
 type PayoutSubmitted = {
   type: "payout_submitted"
   id: PayoutId