/bitcoin

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Add witness data output to TxInError messages #8384

Merged
merged 2 commits into from May 18, 2017

Conversation

Reviewers

@sipa sipa

@jnewbery jnewbery

@mchrostowski mchrostowski

Assignees
No one assigned
Labels
RPC/REST/ZMQ
Projects
None yet
Milestone
No milestone
9 participants
@instagibbs @mcelrath @NicolasDorier @laanwj @jtimon @sipa @jnewbery @mchrostowski @MarcoFalke
@instagibbs
Member

instagibbs commented Jul 20, 2016

Makes for easier debugging.

@MarcoFalke MarcoFalke added the RPC/REST/ZMQ label Jul 20, 2016

@mcelrath

mcelrath commented Jul 20, 2016

Tested ACK

Works fine with signrawtransaction that fails to fully sign the transaction. (empty witness)
@NicolasDorier
Member

NicolasDorier commented Jul 21, 2016

utACK 73c5eb1
@laanwj
Owner

laanwj commented Aug 3, 2016

Does this need to be tested in the RPC tests?
@instagibbs
Member

instagibbs commented Aug 3, 2016

@laanwj added basic test check for new field

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Oct 20, 2016

@instagibbs @luke-jr
Add witness data output to TxInError messages 
Github-Pull: #8384
Rebased-From: 73c5eb1
c0631fa

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Oct 20, 2016

@instagibbs @luke-jr
Expand signrawtransaction.py to cover error witness checking 
Github-Pull: #8384
Rebased-From: 464c826
34bbc0d
@jtimon
Member

jtimon commented Jan 25, 2017

utACK 34bbc0d Needs rebase.
@instagibbs
Member

instagibbs commented Jan 25, 2017

Rebased
@laanwj
Owner

laanwj commented Jan 26, 2017

utACK cb70b74
src/rpc/rawtransaction.cpp
@@ -582,11 +582,16 @@ UniValue decodescript(const JSONRPCRequest& request)
}
/** Pushes a JSON object for script verification or signing errors to vErrorsRet. */
-static void TxInErrorToJSON(const CTxIn& txin, UniValue& vErrorsRet, const std::string& strMessage)
+static void TxInErrorToJSON(const CTxIn& txin, const CScriptWitness witness, UniValue& vErrorsRet, const std::string& strMessage)
@sipa

sipa Jan 26, 2017

Owner

Pass CScriptWitness by reference?

@jtimon
Member

jtimon commented Feb 3, 2017

ACK squashing b69789a into ef8726c
@jtimon
Member

jtimon commented Feb 18, 2017

Squash?
@instagibbs
Member

instagibbs commented Feb 21, 2017

squashed
@instagibbs
Member

instagibbs commented Mar 3, 2017

This need anything for merge?
src/rpc/rawtransaction.cpp
@@ -820,9 +825,13 @@ UniValue signrawtransaction(const JSONRPCRequest& request)
// Sign what we can:
for (unsigned int i = 0; i < mergedTx.vin.size(); i++) {
CTxIn& txin = mergedTx.vin[i];
+ CScriptWitness witness;
+ if (txin.scriptWitness.stack.size() >= i + 1) {
@jnewbery

jnewbery Mar 3, 2017

Member

I think this is the wrong check. You're testing the size of the witness stack for this particular CTxIn, but I think what you intend is to check for the existence of a witness for this CTxIn. I think the test you need is:

if (!txin.scriptWitness.IsNull()) {

Your test will fail if (for example) TxIn in postion 3 has only 2 items on its witness stack.

@instagibbs
Member

instagibbs commented Mar 4, 2017

@jnewbery you're right, bad rebase. Sorry for not being careful. Check isn't even needed.
@mchrostowski

mchrostowski suggested changes May 16, 2017
View changes

Minor change suggestions to make the PR smaller and its changes more consistent with existing code.

src/rpc/rawtransaction.cpp
@@ -582,11 +582,16 @@ UniValue decodescript(const JSONRPCRequest& request)
}
/** Pushes a JSON object for script verification or signing errors to vErrorsRet. */
-static void TxInErrorToJSON(const CTxIn& txin, UniValue& vErrorsRet, const std::string& strMessage)
+static void TxInErrorToJSON(const CTxIn& txin, const CScriptWitness& witness, UniValue& vErrorsRet, const std::string& strMessage)
@mchrostowski

mchrostowski May 16, 2017

Why take an extra argument here?
In all use cases witness is txin.witness. More concise change if the method simply references txin.witness rather than changing code for each call.

src/rpc/rawtransaction.cpp
+ for (unsigned int i = 0; i < witness.stack.size(); i++) {
+ txinwitness.push_back(HexStr(witness.stack[i].begin(), witness.stack[i].end()));
+ }
+ entry.push_back(Pair("txinwitness", txinwitness));
@mchrostowski

mchrostowski May 16, 2017

"txinwitness" here seems derived from the variable name, in the context of the entry object it is understood the entry represents a transaction input error, using "witness" instead matches the other entries closer. That is, the error has a "sequence" not a "txinnsequence" or similar.

@instagibbs
Member

instagibbs commented May 17, 2017

@mchrostowski thanks, that was leftover from previous structure of code. Nits addressed.
@sipa
Owner

sipa commented May 17, 2017

utACK 6e9e026

@sipa sipa merged commit 6e9e026 into bitcoin:master May 18, 2017
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

sipa added a commit that referenced this pull request May 18, 2017

@sipa
Merge #8384: Add witness data output to TxInError messages 
6e9e026 Expand signrawtransaction.py to cover error witness checking (Gregory Sanders)
9f7341b Add witness data output to TxInError messages (Gregory Sanders)

Tree-SHA512: 6f2a758544fa2657f3a57051bdb80fb14cb10501c8ef4ccbab7a62d4b6a823e74f40991c8796248865def24619b620b859dc2bb08dc2cc72511c1cf3897ab1a9
This commit was signed with a verified signature.
@sipa sipa Pieter Wuille
GPG key ID: A636E97631F767E0 Learn about signing commits
e317c0d

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@instagibbs @luke-jr
Add witness data output to TxInError messages 
Github-Pull: #8384
Rebased-From: 9f7341b
0daa720

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 15, 2017

@instagibbs @luke-jr
Expand signrawtransaction.py to cover error witness checking 
Github-Pull: #8384
Rebased-From: 6e9e026
2dee676
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment