rpc: Correctly compute redeemScript from witnessScript for signrawtransaction #18484
Conversation
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
Member
|
utACK c0f9a61793ffccb6af97ffb6b4a156780e1a4597 After this it seems that |
maflcko
reviewed
Mar 31, 2020
maflcko
changed the title
achow101
force-pushed
the
signrawtx-p2pkh-p2wsh
branch
from
c0f9a61 to
d0deb17
Compare
ParsePrevouts uses GetScriptForWitness on the given witnessScript to find the corresponding redeemScript. This is incorrect when the witnessScript is either a P2PK or P2PKH script as it returns the corresponding P2WPK script instead of turning the witnessScript into a P2WSH script. Instead this should make the script a WitnessV0ScriptHash destination and get the script for that. Test cases are also added.
achow101
force-pushed
the
signrawtx-p2pkh-p2wsh
branch
from
d0deb17 to
cd3b156
Compare
Member
|
weak ACK cd3b156, only checked that the test fails without the code change 🚰 Show signature and timestampSignature: Timestamp of file with hash |
Member
|
Appveyor failure in signrawtransaction: https://ci.appveyor.com/project/DrahtBot/bitcoin/builds/31864368 Open-Close to re-run ci. See #15847 (comment) |
Member
|
utACK cd3b156 |
jonatack
reviewed
Apr 6, 2020
Member
jonatack
left a comment
jonatack
left a comment
There was a problem hiding this comment.
ACK cd3b156
It looks like we are close to being able to remove GetScriptForWitness as per:
src/script/standard.h:202: * TODO: replace calls to GetScriptForWitness with GetScriptForDestination using the various witness-specific CTxDestination subtypes.
| self.nodes[0].generate(1) | ||
| # Now create and sign a transaction spending that output on node[0], which doesn't know the scripts or keys | ||
| spending_tx = self.nodes[0].createrawtransaction([{'txid': txid, 'vout': vout}], {self.nodes[1].getnewaddress(): Decimal("9.999")}) | ||
| spending_tx_signed = self.nodes[0].signrawtransactionwithkey(spending_tx, [embedded_privkey], [{'txid': txid, 'vout': vout, 'scriptPubKey': script_pub_key, 'redeemScript': redeem_script, 'witnessScript': witness_script, 'amount': 10}]) |
Member
There was a problem hiding this comment.
verified that reverting the change in rawtransaction_util.cpp::219 causes the test to fail here with redeemScript does not correspond to witnessScript (-8)
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Apr 8, 2020
…Script for signrawtransaction cd3b156 Correctly compute redeemScript from witnessScript for signrawtransaction (Andrew Chow) Pull request description: `ParsePrevouts` uses `GetScriptForWitness` on the given witnessScript to find the corresponding redeemScript. This is incorrect when the witnessScript is either a P2PK or P2PKH script as it returns the corresponding P2WPK script instead of turning the witnessScript into a P2WSH script. Instead this should make the script a `WitnessV0ScriptHash` destination and get the script for that. Test cases are also added. These will fail on master with a `redeemScript does not correspond to witnessScript` Reported on [Bitcointalk](https://bitcointalk.org/index.php?topic=5236818.0) ACKs for top commit: MarcoFalke: weak ACK cd3b156, only checked that the test fails without the code change 🚰 instagibbs: utACK bitcoin@cd3b156 Tree-SHA512: afac671dbb52ce88bfb4a9ca3dd6065427ad52c9778d0549ad40e9286778f308adad24fb3b3c3089545d7f88c57c53d41224fd7a4bb207550eff2fe06600118f
maflcko
pushed a commit
to maflcko/bitcoin-core
that referenced
this pull request
Apr 13, 2020
…gging 9cdddae test: add rpc_signrawtransaction logging (Jon Atack) 4d6cde3 test: refactor rpc_signrawtransaction witness script tests (Jon Atack) Pull request description: As a follow-up to bitcoin#18484, the new tests are good but bury the one non-duplicate line in each test that sets the witness script, and there is no logging in the testfile. This PR makes it easy to see what is unique to each of the new tests and adds logging. ACKs for top commit: theStack: ACK bitcoin@9cdddae 🥚 🐰 Tree-SHA512: 7b1ca303326658afb90b7635abc9fe8bb65f0be004124d4dcf38702bb6f38bc06ce33c0642be4ad5d511453d003cdefeea691e66e3b963a4feb66f6237a3c241
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.
ParsePrevoutsusesGetScriptForWitnesson the given witnessScript to find the corresponding redeemScript. This is incorrect when the witnessScript is either a P2PK or P2PKH script as it returns the corresponding P2WPK script instead of turning the witnessScript into a P2WSH script. Instead this should make the script aWitnessV0ScriptHashdestination and get the script for that.Test cases are also added. These will fail on master with a
redeemScript does not correspond to witnessScriptReported on Bitcointalk