streamlined the use of include_hex #12541

pull denis2342 wants to merge 2 commits into bitcoin:master from denis2342:master changing 1 files +6 −4

denis2342 commented at 3:27 PM on February 26, 2018: none

ScriptPubKeyToUniv is using include_hex now instead of 'true' the printout of scriptsig is now also in a include_hex condition

streamlined the use of include_hex

ScriptPubKeyToUniv is using include_hex now
the printout of scriptsig is now also in a include_hex condition

f7758502e0

in src/core_write.cpp:177 in f7758502e0 outdated

 173 | @@ -174,7 +174,8 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry,
 174 |              in.pushKV("vout", (int64_t)txin.prevout.n);
 175 |              UniValue o(UniValue::VOBJ);
 176 |              o.pushKV("asm", ScriptToAsmStr(txin.scriptSig, true));
 177 | -            o.pushKV("hex", HexStr(txin.scriptSig.begin(), txin.scriptSig.end()));

promag commented at 3:52 PM on February 26, 2018:

Removing keys can break existing software. Not sure if this needs deprecation a flag.

in src/core_write.cpp:139 in f7758502e0 outdated
```
 135 |      txnouttype type;
 136 |      std::vector<CTxDestination> addresses;
 137 |      int nRequired;
 138 |  
 139 |      out.pushKV("asm", ScriptToAsmStr(scriptPubKey));
 140 | -    if (fIncludeHex)
```
promag commented at 3:53 PM on February 26, 2018:

Nit, since you are updating style here, add { }?

denis2342 commented at 4:15 PM on February 26, 2018:

fixed in the second commit

promag commented at 4:33 PM on February 26, 2018:

Missing here.
promag commented at 3:58 PM on February 26, 2018: member

A test could be added showing that decoderawtransaction response doesn't contains the hex fields.

Requires release note.
added {} to if condition for style ad8ead246b
promag commented at 4:31 PM on February 26, 2018: member

Here https://github.com/bitcoin/bitcoin/blob/228b086b9a3de02b534474027353a80dead2c292/src/rpc/rawtransaction.cpp#L517 include_hex is set to false.
denis2342 closed this on Feb 27, 2018
MarcoFalke locked this on Sep 8, 2021

Contributors

denis2342

promag