Browse Source
Add paytxfee to getwalletinfo, warnings to getnetworkinfo
v1.0.9-lin
Stephen
9 years ago
committed by
Jack Grigg
No known key found for this signature in database
GPG Key ID: 6A6914DAFBEA00DA
3 changed files with
5 additions and
1 deletions
qa/rpc-tests/README.md
src/rpcnet.cpp
src/wallet/rpcwallet.cpp
@ -21,7 +21,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
@ -409,6 +409,7 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp)
" } \n "
" ,... \n "
" ] \n "
" \" warnings \" : \" ... \" (string) any network warnings (such as alert messages) \n "
" } \n "
" \n Examples: \n "
+ HelpExampleCli ( " getnetworkinfo " , " " )
@ -440,5 +441,6 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp)
}
}
obj . push_back ( Pair ( " localaddresses " , localAddresses ) ) ;
obj . push_back ( Pair ( " warnings " , GetWarnings ( " statusbar " ) ) ) ;
return obj ;
}
@ -2260,6 +2260,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 "
" \n Examples: \n "
+ HelpExampleCli ( " getwalletinfo " , " " )
@ -2278,6 +2279,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 ;
}