Make signrawtransaction accept P2SH-P2WSH redeemscripts#12427
Merged
laanwj merged 1 commit intobitcoin:masterfrom Feb 15, 2018
Merged
Make signrawtransaction accept P2SH-P2WSH redeemscripts#12427laanwj merged 1 commit intobitcoin:masterfrom
laanwj merged 1 commit intobitcoin:masterfrom
Conversation
sipa
force-pushed
the
201802_signrawp2shp2wsh
branch
2 times, most recently
from
19d27c0 to
3fcdcc1
Compare
sipa
force-pushed
the
201802_signrawp2shp2wsh
branch
from
3fcdcc1 to
5f605e1
Compare
Member
|
Manually tested Also tested with a native P2WSH multisig for good measure. This already worked on master. |
Member
|
utACK 5f605e1 |
Member
|
I do think this needs a test, but that can be done later (no need to hold up 0.16.0 for it), thanks @Sjors for doing a manual test. |
laanwj
added a commit
that referenced
this pull request
Feb 15, 2018
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
Member
|
post-merge utACK |
HashUnlimited
pushed a commit
to chaincoin/chaincoin
that referenced
this pull request
Mar 16, 2018
Github-Pull: bitcoin#12427 Rebased-From: 5f605e1 Tree-SHA512: caf8c4e1806757d705493de30eea4f6a146a334ca6f6c93bc74cda43abda391b8406dd8ed6765fcde8eb86b3fb55689547ab69a30f34fca0d7896ea8c4e1db67
This was referenced Oct 15, 2018
laanwj
added a commit
that referenced
this pull request
Feb 14, 2019
6ca836a Add release note for listunspent P2WSH change (MeshCollider) 928beae Add test for P2SH-P2WSH in signrawtransactionwithkey and listunspent (MeshCollider) 314784a 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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is a quick fix for #12418, which is a regression in 0.16.
It permits specifying just the inner redeemscript to let
signrawtransactionsucceed. This inner redeemscript is already reported byaddmultisigaddress& co.#11708 uses a different approach, where
listunspentreports both inner & outer redeemscript, but requires both to be provided tosignrawtransaction. Part of #11708 is still needed even in combination with this PR however, as currently the inner redeemscript isn't reported bylistunspent.