nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commands: update next deriv index for any spend output address

Browse Source 
It's basically free to do now, so we might as well do it.
This commit is contained in:
Antoine Poinsot 2023-11-30 11:34:29 +01:00
parent 5d50155532
commit 0523f0047f
No known key found for this signature in database
GPG Key ID: E13FC145CD3F4304
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/commands/mod.rs
View File

@ -479,8 +479,8 @@ impl DaemonControl {
};
// Create the PSBT. If there was no error in doing so make sure to update our next
// derivation index in case the change address which we generated or was provided to us was
// for a future derivation index.
// derivation index in case any address in the transaction outputs was ours and from the
// future.
let change_info = change_address.info;
let CreateSpendRes { psbt, has_change } = create_spend(
&self.config.main_descriptor,
@ -492,6 +492,9 @@ impl DaemonControl {
0, // No min fee required.
change_address,
)?;
for (addr, _) in destinations_checked {
self.maybe_increase_next_deriv_index(&mut db_conn, &addr.info);
}
if has_change {
self.maybe_increase_next_deriv_index(&mut db_conn, &change_info);
}
@ -840,8 +843,11 @@ impl DaemonControl {
if rbf_psbt.fee().expect("has already been sanity checked")
>= descendant_fees + bitcoin::Amount::from_sat(replacement_vsize)
{
// In case of success, make sure to update our next derivation index if the change
// address used was from the future.
// In case of success, make sure to update our next derivation index if any address
// used in the transaction outputs was from the future.
for (addr, _) in destinations {
self.maybe_increase_next_deriv_index(&mut db_conn, &addr.info);
}
if has_change {
self.maybe_increase_next_deriv_index(&mut db_conn, &change_address.info);
}