diff options
| author | Gregory Maxwell <[email protected]> | 2013-09-12 20:50:32 -0700 |
|---|---|---|
| committer | Gregory Maxwell <[email protected]> | 2013-09-12 20:50:32 -0700 |
| commit | 4c5969b367d2b8582abc3b0018e18456a7377497 (patch) | |
| tree | 6093f15e6df1d939a1ee746d3f9f9bfb54ee1490 /src/rpcblockchain.cpp | |
| parent | Merge pull request #2979 from luke-jr/autoconf (diff) | |
| parent | Make validateaddress provide redeemScript (diff) | |
| download | discoin-4c5969b367d2b8582abc3b0018e18456a7377497.tar.xz discoin-4c5969b367d2b8582abc3b0018e18456a7377497.zip | |
Merge pull request #2830 from petertodd/p2sh-rpc
P2SH related RPC improvements
Diffstat (limited to 'src/rpcblockchain.cpp')
| -rw-r--r-- | src/rpcblockchain.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index adff708a0..398f33605 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -9,7 +9,7 @@ using namespace json_spirit; using namespace std; -void ScriptPubKeyToJSON(const CScript& scriptPubKey, Object& out); +void ScriptPubKeyToJSON(const CScript& scriptPubKey, Object& out, bool fIncludeHex); double GetDifficulty(const CBlockIndex* blockindex) { @@ -245,7 +245,7 @@ Value gettxout(const Array& params, bool fHelp) ret.push_back(Pair("confirmations", pcoinsTip->GetBestBlock()->nHeight - coins.nHeight + 1)); ret.push_back(Pair("value", ValueFromAmount(coins.vout[n].nValue))); Object o; - ScriptPubKeyToJSON(coins.vout[n].scriptPubKey, o); + ScriptPubKeyToJSON(coins.vout[n].scriptPubKey, o, true); ret.push_back(Pair("scriptPubKey", o)); ret.push_back(Pair("version", coins.nVersion)); ret.push_back(Pair("coinbase", coins.fCoinBase)); |