diff options
| author | Gregory Maxwell <[email protected]> | 2012-08-24 00:46:24 -0700 |
|---|---|---|
| committer | Gregory Maxwell <[email protected]> | 2012-08-24 00:46:24 -0700 |
| commit | c68c4bc7a45529735c868428632906d3c20a175a (patch) | |
| tree | 6edd9d67279c0c15729c752c12794cf34864c930 /src/bitcoinrpc.cpp | |
| parent | Avoid leaving return types or function attributes on their own lines. (diff) | |
| parent | Change CWallet addressgrouping to use CTxDestination instead of strings. (diff) | |
| download | discoin-c68c4bc7a45529735c868428632906d3c20a175a.tar.xz discoin-c68c4bc7a45529735c868428632906d3c20a175a.zip | |
Merge pull request #1672 from gmaxwell/filter_listunspent
Listunspent txout address filtering and listaddressgroupings
Diffstat (limited to 'src/bitcoinrpc.cpp')
| -rw-r--r-- | src/bitcoinrpc.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 4aebc2078..2271ff07c 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -230,6 +230,7 @@ static const CRPCCommand vRPCCommands[] = { "getblockhash", &getblockhash, false, false }, { "gettransaction", &gettransaction, false, false }, { "listtransactions", &listtransactions, false, false }, + { "listaddressgroupings", &listaddressgroupings, false, false }, { "signmessage", &signmessage, false, false }, { "verifymessage", &verifymessage, false, false }, { "getwork", &getwork, true, false }, @@ -1138,6 +1139,7 @@ Array RPCConvertValues(const std::string &strMethod, const std::vector<std::stri if (strMethod == "addmultisigaddress" && n > 1) ConvertTo<Array>(params[1]); if (strMethod == "listunspent" && n > 0) ConvertTo<boost::int64_t>(params[0]); if (strMethod == "listunspent" && n > 1) ConvertTo<boost::int64_t>(params[1]); + if (strMethod == "listunspent" && n > 2) ConvertTo<Array>(params[2]); if (strMethod == "getrawtransaction" && n > 1) ConvertTo<boost::int64_t>(params[1]); if (strMethod == "createrawtransaction" && n > 0) ConvertTo<Array>(params[0]); if (strMethod == "createrawtransaction" && n > 1) ConvertTo<Object>(params[1]); |