Merge pull request #3365 from gmaxwell/hexify

gavinandresen · gavinandresen · commit fbbed19b78e3 · 2013-12-06T16:58:15.000-08:00
Restore hex to getrawtransaction vout scriptPubkey.
diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp
@@ -78,7 +78,7 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, Object& entry)
         out.push_back(Pair("value", ValueFromAmount(txout.nValue)));
         out.push_back(Pair("n", (boost::int64_t)i));
         Object o;
-        ScriptPubKeyToJSON(txout.scriptPubKey, o, false);
+        ScriptPubKeyToJSON(txout.scriptPubKey, o, true);
         out.push_back(Pair("scriptPubKey", o));
         vout.push_back(out);
     }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, Object& entry)`
`78`	`78`	`out.push_back(Pair("value", ValueFromAmount(txout.nValue)));`
`79`	`79`	`out.push_back(Pair("n", (boost::int64_t)i));`
`80`	`80`	`Object o;`
`81`		`- ScriptPubKeyToJSON(txout.scriptPubKey, o, false);`
	`81`	`+ ScriptPubKeyToJSON(txout.scriptPubKey, o, true);`
`82`	`82`	`out.push_back(Pair("scriptPubKey", o));`
`83`	`83`	`vout.push_back(out);`
`84`	`84`	`}`