Merge remote branch 'refs/remotes/svn/trunk' into svn
This commit is contained in:
commit
a0cd439788
1 changed files with 1 additions and 0 deletions
1
rpc.cpp
1
rpc.cpp
|
@ -263,6 +263,7 @@ Value getinfo(const Array& params, bool fHelp)
|
||||||
obj.push_back(Pair("hashespersec", gethashespersec(params, false)));
|
obj.push_back(Pair("hashespersec", gethashespersec(params, false)));
|
||||||
obj.push_back(Pair("testnet", fTestNet));
|
obj.push_back(Pair("testnet", fTestNet));
|
||||||
obj.push_back(Pair("keypoololdest", (boost::int64_t)CWalletDB().GetOldestKeyPoolTime()));
|
obj.push_back(Pair("keypoololdest", (boost::int64_t)CWalletDB().GetOldestKeyPoolTime()));
|
||||||
|
obj.push_back(Pair("paytxfee", (double)nTransactionFee / (double)COIN));
|
||||||
obj.push_back(Pair("errors", GetWarnings("statusbar")));
|
obj.push_back(Pair("errors", GetWarnings("statusbar")));
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue