diff options
| author | Stephen <scmorse@colby.edu> | 2015-06-11 16:12:34 -0400 |
|---|---|---|
| committer | Stephen <scmorse@colby.edu> | 2015-06-11 16:12:34 -0400 |
| commit | ef2a3de25c882396e1776b554878d2784b6b7391 (patch) | |
| tree | caab0736ccab0b0576413d6bfcee37810ae74587 /src | |
| parent | 55294a9fb673ab0a7c99b9c18279fe12a5a07890 (diff) | |
| download | bitcoin-ef2a3de25c882396e1776b554878d2784b6b7391.tar.xz | |
Add paytxfee to getwalletinfo, warnings to getnetworkinfo
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 e44940993e..479b7d606b 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2195,6 +2195,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", "") @@ -2213,6 +2214,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; } |