aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-19 05:44:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

addr: handle P2SH/P2PKH in scriptpubkey encoding

Browse Source 
Previously, returned null if a scriptpubkey was not Segwit; now
handles encoding to Base58 for other types.
This commit is contained in:
lisa neigut
2019-10-29 12:00:18 -05:00
committed by Rusty Russell
parent 6f215a70e5
commit 963a1da958
8 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/Makefile
View File

@@ -12,6 +12,7 @@ PLUGIN_LIB_HEADER := plugins/libplugin.h
PLUGIN_LIB_OBJS := $(PLUGIN_LIB_SRC:.c=.o)
PLUGIN_COMMON_OBJS := \
bitcoin/base58.o \
bitcoin/pubkey.o \
bitcoin/pullpush.o \
bitcoin/script.o \

3
plugins/fundchannel.c
View File

@@ -470,8 +470,7 @@ static void init(struct plugin_conn *rpc,
"network")),
rpc, ".network");
chainparams = chainparams_for_network(network_name);
placeholder_funding_addr = encode_scriptpubkey_to_addr(NULL,
chainparams->bip173_name,
placeholder_funding_addr = encode_scriptpubkey_to_addr(NULL, chainparams,
placeholder);
}