mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-22 22:45:27 +01:00
Code Issues Projects Releases Wiki Activity

psbt_input_add_pubkey: support taproot

Browse source
This commit is contained in:
Greg Sanders 2023-07-11 01:53:43 +09:30 • committed by Rusty Russell
parent 011f3c1e14
commit 0097e2c666
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
bitcoin/psbt.c
View file

@ -211,7 +211,7 @@ void psbt_rm_output(struct wally_psbt *psbt,
} }
void psbt_input_add_pubkey(struct wally_psbt *psbt, size_t in, void psbt_input_add_pubkey(struct wally_psbt *psbt, size_t in,
const struct pubkey *pubkey) const struct pubkey *pubkey, bool is_taproot)
{ {
int wally_err; int wally_err;
u32 empty_path[1] = {0}; u32 empty_path[1] = {0};
@ -233,11 +233,20 @@ void psbt_input_add_pubkey(struct wally_psbt *psbt, size_t in,
pubkey_to_der(pk_der, pubkey); pubkey_to_der(pk_der, pubkey);
tal_wally_start(); tal_wally_start();
wally_err = wally_psbt_input_keypath_add(&psbt->inputs[in], if (is_taproot) {
pk_der, sizeof(pk_der), wally_err = wally_psbt_input_taproot_keypath_add(&psbt->inputs[in],
fingerprint, sizeof(fingerprint), pk_der + 1, 32,
empty_path, ARRAY_SIZE(empty_path)); NULL /* tapleaf_hashes */, 0 /* tapleaf_hashes_len */,
assert(wally_err == WALLY_OK); fingerprint, sizeof(fingerprint),
empty_path, ARRAY_SIZE(empty_path));
assert(wally_err == WALLY_OK);
} else {
wally_err = wally_psbt_input_keypath_add(&psbt->inputs[in],
pk_der, sizeof(pk_der),
fingerprint, sizeof(fingerprint),
empty_path, ARRAY_SIZE(empty_path));
assert(wally_err == WALLY_OK);
}
tal_wally_end(psbt); tal_wally_end(psbt);
} }

2
bitcoin/psbt.h
View file

@ -153,7 +153,7 @@ void psbt_rm_output(struct wally_psbt *psbt,
size_t remove_at); size_t remove_at);
void psbt_input_add_pubkey(struct wally_psbt *psbt, size_t in, void psbt_input_add_pubkey(struct wally_psbt *psbt, size_t in,
const struct pubkey *pubkey); const struct pubkey *pubkey, bool is_taproot);
WARN_UNUSED_RESULT bool psbt_input_set_signature(struct wally_psbt *psbt, size_t in, WARN_UNUSED_RESULT bool psbt_input_set_signature(struct wally_psbt *psbt, size_t in,
const struct pubkey *pubkey, const struct pubkey *pubkey,