mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-15 11:59:16 +01:00
Code Issues Projects Releases Wiki Activity

wallet: perform wallet_can_spend exit logic only once

Browse source 
Signed-off-by: Jon Griffiths <jon_p_griffiths@yahoo.com>
This commit is contained in:
Jon Griffiths 2024-02-22 10:04:26 +13:00 • committed by Rusty Russell
parent 156a16e7e6
commit fbd8e8b571
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
wallet/wallet.c
View file

@ -828,28 +828,22 @@ bool wallet_can_spend(struct wallet *w, const u8 *script,
tal_free(s);
s = p2sh;
}
if (scripteq(s, script)) {
if (!scripteq(s, script)) {
/* Try taproot output now */
tal_free(s);
s = scriptpubkey_p2tr_derkey(w, ext.pub_key);
if (!scripteq(s, script))
s = tal_free(s);
}
tal_free(s);
if (s) {
/* If we found a used key in the keyscan_gap we should
* remember that. */
if (i > bip32_max_index)
db_set_intvar(w->db, "bip32_max_index", i);
tal_free(s);
*index = i;
return true;
}
tal_free(s);
/* Try taproot output now */
s = scriptpubkey_p2tr_derkey(w, ext.pub_key);
if (scripteq(s, script)) {
/* If we found a used key in the keyscan_gap we should
* remember that. */
if (i > bip32_max_index)
db_set_intvar(w->db, "bip32_max_index", i);
tal_free(s);
*index = i;
return true;
}
tal_free(s);
}
return false;
}