diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-15 09:39:23 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-15 09:39:30 +0200 |
| commit | 5ebe7db6d00df4996f98c8b60b18bfef6222c9b7 (patch) | |
| tree | a3b68ab47e53ffe8b54432e03c138deb885fe7bf /src | |
| parent | f3d4dbb93991f1904a5bff4cf000fce930cbb3c7 (diff) | |
| parent | ef2a3de25c882396e1776b554878d2784b6b7391 (diff) | |
| download | bitcoin-5ebe7db6d00df4996f98c8b60b18bfef6222c9b7.tar.xz | |
Merge pull request #6257
ef2a3de Add paytxfee to getwalletinfo, warnings to getnetworkinfo (Stephen)
Diffstat (limited to 'src')
| -rw-r--r-- | src/rpcnet.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp index a36831de2a..c4e038eebb 100644 --- a/src/rpcnet.cpp +++ b/src/rpcnet.cpp @@ -408,6 +408,7 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp) " }\n" " ,...\n" " ]\n" + " \"warnings\": \"...\" (string) any network warnings (such as alert messages) \n" "}\n" "\nExamples:\n" + HelpExampleCli("getnetworkinfo", "") @@ -439,5 +440,6 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp) } } obj.push_back(Pair("localaddresses", localAddresses)); + obj.push_back(Pair("warnings", GetWarnings("statusbar"))); return obj; } diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 43fcc632f0..5404dd4aa0 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2201,6 +2201,7 @@ UniValue getwalletinfo(const UniValue& params, bool fHelp) " \"keypoololdest\": xxxxxx, (numeric) the timestamp (seconds since GMT epoch) of the oldest pre-generated key in the key pool\n" " \"keypoolsize\": xxxx, (numeric) how many new keys are pre-generated\n" " \"unlocked_until\": ttt, (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n" + " \"paytxfee\": x.xxxx, (numeric) the transaction fee configuration, set in btc/kb\n" "}\n" "\nExamples:\n" + HelpExampleCli("getwalletinfo", "") @@ -2219,6 +2220,7 @@ UniValue getwalletinfo(const UniValue& params, bool fHelp) obj.push_back(Pair("keypoolsize", (int)pwalletMain->GetKeyPoolSize())); if (pwalletMain->IsCrypted()) obj.push_back(Pair("unlocked_until", nWalletUnlockTime)); + obj.push_back(Pair("paytxfee", ValueFromAmount(payTxFee.GetFeePerK()))); return obj; } |