diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-02-15 22:22:59 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-02-15 22:33:38 +0100 |
| commit | 3fa556aee2030e3b7e7609d9b11b4d6e5ff3ec2c (patch) | |
| tree | cf5a553a700cfbc4d8478e650f6cda94752cb13b /src/qt/intro.h | |
| parent | 5eff1c748d56a2318d10bf6cd925b6084349e13e (diff) | |
| parent | 5f605e172baee35421eb20736601befdd8cad796 (diff) | |
Merge #12427: Make signrawtransaction accept P2SH-P2WSH redeemscripts
5f605e1 Make signrawtransaction accept P2SH-P2WSH redeemscripts (Pieter Wuille)
Pull request description:
This is a quick fix for #12418, which is a regression in 0.16.
It permits specifying just the inner redeemscript to let `signrawtransaction` succeed. This inner redeemscript is already reported by `addmultisigaddress` & co.
#11708 uses a different approach, where `listunspent` reports both inner & outer redeemscript, but requires both to be provided to `signrawtransaction`. Part of #11708 is still needed even in combination with this PR however, as currently the inner redeemscript isn't reported by `listunspent`.
Tree-SHA512: a6fa2b2661ce04db25cf029dd31da39c0b4811d43692f816dfe0f77b4159b5e2952051664356a579f690ccd58a626e0975708afcd7ad5919366c490944e3a9a5
Diffstat (limited to 'src/qt/intro.h')
0 files changed, 0 insertions, 0 deletions