aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 07:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

is_segwit_output: properly detect all known segwit script types

Browse Source
This commit is contained in:
Greg Sanders
2023-07-11 01:56:43 +09:30
committed by Rusty Russell
parent fa046ab80f
commit fdbb31e4d0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/interactivetx.c
View File

@@ -83,13 +83,13 @@ static bool is_segwit_output(const tal_t *ctx,
struct wally_tx_output *output,
const u8 *redeemscript)
{
const u8 *wit_prog;
const u8 *maybe_witness;
if (tal_bytelen(redeemscript) > 0)
wit_prog = redeemscript;
maybe_witness = redeemscript;
else
wit_prog = wally_tx_output_get_script(ctx, output);
maybe_witness = wally_tx_output_get_script(ctx, output);
return is_p2wsh(wit_prog, NULL) || is_p2wpkh(wit_prog, NULL);
return is_known_segwit_scripttype(maybe_witness);
}
/* Return first non-handled message or NULL if connection is aborted */