Merge branch 'main' of github.com:GaloyMoney/bria into HEAD

src/app/mod.rs

@@ -684,7 +684,7 @@ impl App {
                 &self.wallets,
                 payout_queue,
                 fee_rate,
-                false,
+                true,
             )
             .await?
         };

src/bdk/pg/transactions.rs

@@ -94,6 +94,7 @@ impl Transactions {
         Ok(tx.map(|tx| serde_json::from_value(tx.details_json).unwrap()))
     }
 
+    #[instrument(name = "bdk_transactions.list", skip(self), fields(n_rows))]
     pub async fn list(&self) -> Result<Vec<TransactionDetails>, bdk::Error> {
         let txs = sqlx::query!(
             r#"
@@ -103,6 +104,7 @@ impl Transactions {
         .fetch_all(&self.pool)
         .await
         .map_err(|e| bdk::Error::Generic(e.to_string()))?;
+        tracing::Span::current().record("n_rows", txs.len());
         Ok(txs
             .into_iter()
             .map(|tx| serde_json::from_value(tx.details_json).unwrap())

src/job/process_payout_queue.rs

@@ -75,7 +75,7 @@ pub(super) async fn execute<'a>(
         &wallets,
         payout_queue,
         fee_rate,
-        true,
+        false,
     )
     .await?;
 
@@ -159,7 +159,7 @@ pub async fn construct_psbt(
     wallets: &Wallets,
     payout_queue: PayoutQueue,
     fee_rate: bitcoin::FeeRate,
-    include_cpfp: bool,
+    for_estimation: bool,
 ) -> Result<FinishedPsbtBuild, JobError> {
     let span = tracing::Span::current();
     let PayoutQueue {
@@ -185,7 +185,7 @@ pub async fn construct_psbt(
     );
 
     let mut mandatory_cpfp_utxos = HashMap::new();
-    if include_cpfp {
+    if !for_estimation {
         if let Some(min_age) = queue_cfg.cpfp_payouts_after() {
             let keychain_ids = wallets.values().flat_map(|w| w.keychain_ids());
             mandatory_cpfp_utxos = utxos
@@ -210,6 +210,7 @@ pub async fn construct_psbt(
         mandatory_cpfp_utxos,
         tx_payouts,
         wallets,
+        for_estimation,
     )
     .await?)
 }

src/wallet/psbt_builder.rs

@@ -7,6 +7,7 @@ use std::{
     collections::{HashMap, HashSet},
     marker::PhantomData,
 };
+use tracing::instrument;
 
 use super::{keychain::*, Wallet as WalletEntity};
 use crate::{
@@ -73,6 +74,7 @@ pub struct PsbtBuilder<T> {
     result: FinishedPsbtBuild,
     input_weights: HashMap<OutPoint, usize>,
     all_included_utxos: HashSet<OutPoint>,
+    for_estimation: bool,
     _phantom: PhantomData<T>,
 }
 
@@ -153,6 +155,7 @@ impl Default for PsbtBuilder<InitialPsbtBuilderState> {
 }
 
 impl PsbtBuilder<InitialPsbtBuilderState> {
+    #[instrument(name = "psbt_builder.construct_psbt", skip_all)]
     pub async fn construct_psbt(
         pool: &sqlx::PgPool,
         consolidate_deprecated_keychains: bool,
@@ -161,12 +164,14 @@ impl PsbtBuilder<InitialPsbtBuilderState> {
         cpfp_utxos: HashMap<KeychainId, Vec<CpfpUtxo>>,
         unbatched_payouts: HashMap<WalletId, Vec<TxPayout>>,
         mut wallets: HashMap<WalletId, WalletEntity>,
+        for_estimation: bool,
     ) -> Result<FinishedPsbtBuild, BdkError> {
         let mut outer_builder = PsbtBuilder::new()
             .consolidate_deprecated_keychains(consolidate_deprecated_keychains)
             .fee_rate(fee_rate)
             .reserved_utxos(reserved_utxos)
             .cpfp_utxos(cpfp_utxos)
+            .for_estimation(for_estimation)
             .accept_wallets();
 
         for (wallet_id, payouts) in unbatched_payouts {
@@ -207,6 +212,7 @@ impl PsbtBuilder<InitialPsbtBuilderState> {
                 tx_id: None,
                 psbt: None,
             },
+            for_estimation: false,
             _phantom: PhantomData,
         }
     }
@@ -229,6 +235,11 @@ impl PsbtBuilder<InitialPsbtBuilderState> {
         self
     }
 
+    pub fn for_estimation(mut self, for_estimation: bool) -> Self {
+        self.for_estimation = for_estimation;
+        self
+    }
+
     pub fn fee_rate(mut self, fee_rate: FeeRate) -> Self {
         self.fee_rate = Some(fee_rate);
         self
@@ -275,6 +286,7 @@ impl PsbtBuilder<InitialPsbtBuilderState> {
             all_included_utxos: self.all_included_utxos,
             input_weights: self.input_weights,
             result: self.result,
+            for_estimation: self.for_estimation,
             _phantom: PhantomData,
         }
     }
@@ -301,6 +313,7 @@ impl PsbtBuilder<AcceptingWalletState> {
             all_included_utxos: self.all_included_utxos,
             input_weights: self.input_weights,
             result: self.result,
+            for_estimation: self.for_estimation,
             _phantom: PhantomData,
         }
     }
@@ -325,7 +338,11 @@ impl BdkWalletVisitor for PsbtBuilder<AcceptingDeprecatedKeychainState> {
             .max_satisfaction_weight()
             .expect("Unsupported descriptor");
 
-        let drain_address = wallet.get_internal_address(AddressIndex::LastUnused)?;
+        let drain_address = if self.for_estimation {
+            wallet.get_internal_address(AddressIndex::Peek(0))?
+        } else {
+            wallet.get_internal_address(AddressIndex::LastUnused)?
+        };
 
         let mut builder = wallet.build_tx();
         if let Some(reserved_utxos) = self
@@ -374,6 +391,7 @@ impl PsbtBuilder<AcceptingDeprecatedKeychainState> {
             all_included_utxos: self.all_included_utxos,
             input_weights: self.input_weights,
             result: self.result,
+            for_estimation: self.for_estimation,
             _phantom: PhantomData,
         }
     }
@@ -385,7 +403,11 @@ impl BdkWalletVisitor for PsbtBuilder<AcceptingCurrentKeychainState> {
         current_keychain_id: KeychainId,
         wallet: &Wallet<D>,
     ) -> Result<Self, BdkError> {
-        let change_address = wallet.get_internal_address(AddressIndex::LastUnused)?;
+        let change_address = if self.for_estimation {
+            wallet.get_internal_address(AddressIndex::Peek(0))?
+        } else {
+            wallet.get_internal_address(AddressIndex::LastUnused)?
+        };
         let keychain_satisfaction_weight = wallet
             .get_descriptor_for_keychain(KeychainKind::External)
             .max_satisfaction_weight()
@@ -586,6 +608,7 @@ impl PsbtBuilder<AcceptingCurrentKeychainState> {
             all_included_utxos: self.all_included_utxos,
             input_weights: self.input_weights,
             result: self.result,
+            for_estimation: self.for_estimation,
             _phantom: PhantomData,
         }
     }