streamlined the use of include_hex #12541
Closed
Conversation
This file contains 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
ScriptPubKeyToUniv is using include_hex now the printout of scriptsig is now also in a include_hex condition
promag
reviewed
Feb 26, 2018
| @@ -174,7 +174,8 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry, | |||
| in.pushKV("vout", (int64_t)txin.prevout.n); | |||
| UniValue o(UniValue::VOBJ); | |||
| o.pushKV("asm", ScriptToAsmStr(txin.scriptSig, true)); | |||
| o.pushKV("hex", HexStr(txin.scriptSig.begin(), txin.scriptSig.end())); | |||
There was a problem hiding this comment.
Removing keys can break existing software. Not sure if this needs deprecation a flag.
| { | ||
| txnouttype type; | ||
| std::vector<CTxDestination> addresses; | ||
| int nRequired; | ||
|
|
||
| out.pushKV("asm", ScriptToAsmStr(scriptPubKey)); | ||
| if (fIncludeHex) |
There was a problem hiding this comment.
Nit, since you are updating style here, add { }?
|
Here bitcoin/src/rpc/rawtransaction.cpp Line 517 in 228b086 include_hex is set to false.
|
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
ScriptPubKeyToUniv is using include_hex now instead of 'true'
the printout of scriptsig is now also in a include_hex condition