diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-04-26 14:39:34 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-04-26 14:50:48 +0200 |
commit | eac067ad5962146397f598b5ee7150f07cfaa377 (patch) | |
tree | 8b2e4f1a12d2da5044135af30625ca33cc01cdb6 /src/utilstrencodings.h | |
parent | 6f8b3453f8a3d0b885b17feb78375318277b63ce (diff) | |
parent | 41ff9675a92f6c080a4bb171e286060ef864a803 (diff) | |
download | bitcoin-eac067ad5962146397f598b5ee7150f07cfaa377.tar.xz |
Merge #12321: p2wsh and p2sh-p2wsh address in decodescript
41ff967 list the types of scripts we should consider for a witness program (fivepiece)
4f933b3 p2wpkh, p2wsh and p2sh-nested scripts in decodescript (fivepiece)
Pull request description:
Attempts to address #12244 . `p2wsh` addresses are returned only for scripts that are neither `p2sh` nor any witness program.
Tree-SHA512: eb47f094c1a4c2ad2bcf27a8032307e43cf787d50bf739281aeb4101d97316a2f307b05118bf138298c937fa34e15f91436443a9b313f809fad2c43e94cd1831
Diffstat (limited to 'src/utilstrencodings.h')
0 files changed, 0 insertions, 0 deletions