f Make temporary estimation a bit more precise

Author: tnull

src/wallet.rs

@@ -256,11 +256,21 @@ where
 						.enable_rbf();
 				},
 				OnchainSendType::SendAllRetainingReserve { cur_anchor_reserve_sats } => {
+					let change_address_info =
+						locked_wallet.get_internal_address(AddressIndex::Peek(0)).map_err(|e| {
+							log_error!(self.logger, "Unable to retrieve address: {}", e);
+							e
+						})?;
 					let spendable_amount_sats =
 						self.get_spendable_amount_sats(cur_anchor_reserve_sats).unwrap_or(0);
 					let mut tmp_tx_builder = locked_wallet.build_tx();
 					tmp_tx_builder
-						.add_recipient(address.script_pubkey(), spendable_amount_sats)
+						.drain_wallet()
+						.drain_to(address.script_pubkey())
+						.add_recipient(
+							change_address_info.address.script_pubkey(),
+							cur_anchor_reserve_sats,
+						)
 						.fee_rate(fee_rate)
 						.enable_rbf();
 					let tmp_tx_details = match tmp_tx_builder.finish() {
@@ -275,8 +285,7 @@ where
 						},
 					};
 
-					let estimated_tx_fee_sats =
-						tmp_tx_details.fee.unwrap_or(0).max(FEERATE_FLOOR_SATS_PER_KW as u64);
+					let estimated_tx_fee_sats = tmp_tx_details.fee.unwrap_or(0);
 					let estimated_spendable_amount_sats =
 						spendable_amount_sats.saturating_sub(estimated_tx_fee_sats);