diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2014-03-14 12:43:53 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2014-03-14 12:43:53 -0400 |
| commit | a78eed26c59ce30b1395e92db2f033121f2af179 (patch) | |
| tree | f0769f1eb42ca798d3ff6ed88f9ba35a4c2d1029 | |
| parent | 6603b09e77990ea3bd085b3a78dd41db4a1643bd (diff) | |
| parent | 1294cdc43fd7de6cddd1405148f813d95994302f (diff) | |
| download | bitcoin-a78eed26c59ce30b1395e92db2f033121f2af179.tar.xz | |
Merge pull request #3868 from gmaxwell/minfeeinfo
Add a "relayfee" field to getinfo.
| -rw-r--r-- | src/rpcmisc.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index 353fb77b88..aa17590431 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -46,8 +46,9 @@ Value getinfo(const Array& params, bool fHelp) " \"testnet\": true|false, (boolean) if the server is using testnet or not\n" " \"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" - " \"paytxfee\": x.xxxx, (numeric) the transaction fee set in btc\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 set in btc/kb\n" + " \"relayfee\": x.xxxx, (numeric) minimum relay fee for non-free transactions in btc/kb\n" " \"errors\": \"...\" (string) any error messages\n" "}\n" "\nExamples:\n" @@ -78,10 +79,11 @@ Value getinfo(const Array& params, bool fHelp) obj.push_back(Pair("keypoololdest", (boost::int64_t)pwalletMain->GetOldestKeyPoolTime())); obj.push_back(Pair("keypoolsize", (int)pwalletMain->GetKeyPoolSize())); } - obj.push_back(Pair("paytxfee", ValueFromAmount(nTransactionFee))); if (pwalletMain && pwalletMain->IsCrypted()) obj.push_back(Pair("unlocked_until", (boost::int64_t)nWalletUnlockTime)); + obj.push_back(Pair("paytxfee", ValueFromAmount(nTransactionFee))); #endif + obj.push_back(Pair("relayfee", ValueFromAmount(CTransaction::nMinRelayTxFee))); obj.push_back(Pair("errors", GetWarnings("statusbar"))); return obj; } |