aboutsummaryrefslogtreecommitdiff
path: root/src/rpcrawtransaction.cpp
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2013-11-01 12:06:03 +1000
committerGavin Andresen <gavinandresen@gmail.com>2013-11-01 12:13:38 +1000
commit837369806ac39717b3294e5b698307f0f0011a6d (patch)
tree66ea7ef00247c589ac7ebf9e3466e892f730b8a0 /src/rpcrawtransaction.cpp
parent1dffbf0060912674df2b045de1c2f3691787298a (diff)
parent005609539b2184a474ffe9ebfe883984c900a3fb (diff)
Merge pull request #3128
0056095 Show short scriptPubKeys correctly (Peter Todd) 22de68d Relay OP_RETURN TxOut as standard transaction type (Peter Todd) Signed-off-by: Gavin Andresen <gavinandresen@gmail.com>
Diffstat (limited to 'src/rpcrawtransaction.cpp')
-rw-r--r--src/rpcrawtransaction.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp
index 4d1381bc20..49987ecc47 100644
--- a/src/rpcrawtransaction.cpp
+++ b/src/rpcrawtransaction.cpp
@@ -29,7 +29,7 @@ void ScriptPubKeyToJSON(const CScript& scriptPubKey, Object& out, bool fIncludeH
if (!ExtractDestinations(scriptPubKey, type, addresses, nRequired))
{
- out.push_back(Pair("type", GetTxnOutputType(TX_NONSTANDARD)));
+ out.push_back(Pair("type", GetTxnOutputType(type)));
return;
}