Browse Source

Add paytxfee to getwalletinfo, warnings to getnetworkinfo

pull/1/head
Stephen 8 years ago
parent
commit
ef2a3de25c
  1. 2
      qa/rpc-tests/README.md
  2. 2
      src/rpcnet.cpp
  3. 2
      src/wallet/rpcwallet.cpp

2
qa/rpc-tests/README.md

@ -25,7 +25,7 @@ Run all possible tests with `qa/pull-tester/rpc-tests.sh -extended`. @@ -25,7 +25,7 @@ Run all possible tests with `qa/pull-tester/rpc-tests.sh -extended`.
Possible options:
````
```
-h, --help show this help message and exit
--nocleanup Leave bitcoinds and test.* datadir on exit or error
--noshutdown Don't stop bitcoinds after the test execution

2
src/rpcnet.cpp

@ -408,6 +408,7 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp) @@ -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) @@ -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;
}

2
src/wallet/rpcwallet.cpp

@ -2195,6 +2195,7 @@ UniValue getwalletinfo(const UniValue& params, bool fHelp) @@ -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) @@ -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;
}

Loading…
Cancel
Save