aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2010-11-10 11:45:51 -0500
committerGavin Andresen <gavinandresen@gmail.com>2010-11-10 11:45:51 -0500
commita0cd439788e30ce4088e2622c11ec88130ab1874 (patch)
tree54f3c8dd87ff8ec1306a54d0373c2a618c2c0106
parent695aa2d5a2468208fa276bb38698283b67592d76 (diff)
parent838e8c91667657f6b4e2353ac3dc908598fc6097 (diff)
downloadbitcoin-a0cd439788e30ce4088e2622c11ec88130ab1874.tar.xz
Merge remote branch 'refs/remotes/svn/trunk' into svn
-rw-r--r--rpc.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/rpc.cpp b/rpc.cpp
index 1df2238c92..0c71993c2c 100644
--- a/rpc.cpp
+++ b/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("testnet", fTestNet));
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")));
return obj;
}