diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-09-17 13:05:11 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-09-17 13:05:41 +0200 |
| commit | 5b9d1e10a831b6413b0f6ed54017c9d42139282f (patch) | |
| tree | ecccbd64f24d8231662088c8199583f1508d3520 | |
| parent | 69dd8c919aa3a1b88af34265f828fe0a58a55014 (diff) | |
| parent | 1a613963e1567fd6102e783422cc6cad672dd1a5 (diff) | |
Merge pull request #4863
1a61396 fix missing gettransaction entries in rpcclient (Benedict Chan)
57e1716 update rpc help message for gettransaction to add includeWatchonly param (Benedict Chan)
| -rw-r--r-- | src/rpcclient.cpp | 1 | ||||
| -rw-r--r-- | src/rpcwallet.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/rpcclient.cpp b/src/rpcclient.cpp index 0279cd76ec..a9c491cede 100644 --- a/src/rpcclient.cpp +++ b/src/rpcclient.cpp @@ -66,6 +66,7 @@ static const CRPCConvertParam vRPCConvertParams[] = { "listunspent", 1 }, { "listunspent", 2 }, { "getblock", 1 }, + { "gettransaction", 1 }, { "getrawtransaction", 1 }, { "createrawtransaction", 0 }, { "createrawtransaction", 1 }, diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index d9a23b2347..35637362a4 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -1487,7 +1487,7 @@ Value gettransaction(const Array& params, bool fHelp) { if (fHelp || params.size() < 1 || params.size() > 2) throw runtime_error( - "gettransaction \"txid\"\n" + "gettransaction \"txid\" ( includeWatchonly )\n" "\nGet detailed information about in-wallet transaction <txid>\n" "\nArguments:\n" "1. \"txid\" (string, required) The transaction id\n" @@ -1517,6 +1517,7 @@ Value gettransaction(const Array& params, bool fHelp) "\nExamples:\n" + HelpExampleCli("gettransaction", "\"1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d\"") + + HelpExampleCli("gettransaction", "\"1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d\" true") + HelpExampleRpc("gettransaction", "\"1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d\"") ); |