diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-02-14 22:16:48 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-02-14 22:17:52 +0100 |
| commit | 3facd9fdc4dd3a41ee668a2540ccf47751ce6cbc (patch) | |
| tree | ed3ca85df3a7750ea08a42b9593d3c3a0fca4dd7 /src/qt/walletcontroller.cpp | |
| parent | cd8ca8be31ab921967fc4d74d8643d0e36f48c31 (diff) | |
| parent | 6ca836ab3abef5a90df0c3c4e4983f328b1afe00 (diff) | |
Merge #14481: Add P2SH-P2WSH support to listunspent RPC
6ca836ab3abef5a90df0c3c4e4983f328b1afe00 Add release note for listunspent P2WSH change (MeshCollider)
928beae007fc2f951e79ea307a5e983af4cb3acf Add test for P2SH-P2WSH in signrawtransactionwithkey and listunspent (MeshCollider)
314784a60f18424b004e935aa6e41b824e9645b3 Make listunspent and signrawtransaction RPCs support witnessScript (MeshCollider)
Pull request description:
This is a reworked version of #11708 after #12427 and the `signrawtransaction` split.
For a P2WSH address, listunspent should return the witness script, and for a P2SH-P2WSH address, it should also return the inner witness script (because SignTransaction will automatically wrap it in P2SH if required).
Includes a test which also tests the behaviour of #12427, and release note.
Tree-SHA512: a8e72cf16930312bf48ec47e44a68f8d7e26664043c1b4cc0983eb25aec4087e511188ff9a0f181cd7b8a0c068c60d7f1e7e3f226b79e8c48890039dcf57f7b7
Diffstat (limited to 'src/qt/walletcontroller.cpp')
0 files changed, 0 insertions, 0 deletions