diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-06-06 18:50:32 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-06-06 18:51:00 +0200 |
| commit | 95d68c48d7ae45cb2a7303152816e9391cfbd0c9 (patch) | |
| tree | 0a25f1f328ca66177c79afcf4422ea99d221f981 /src/rpcnet.cpp | |
| parent | Merge pull request #4297 (diff) | |
| parent | estimatefee / estimatepriority RPC methods (diff) | |
| download | discoin-95d68c48d7ae45cb2a7303152816e9391cfbd0c9.tar.xz discoin-95d68c48d7ae45cb2a7303152816e9391cfbd0c9.zip | |
Merge pull request #3959
171ca77 estimatefee / estimatepriority RPC methods (Gavin Andresen)
0193fb8 Allow multiple regression tests to run at once (Gavin Andresen)
c6cb21d Type-safe CFeeRate class (Gavin Andresen)
Diffstat (limited to 'src/rpcnet.cpp')
| -rw-r--r-- | src/rpcnet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp index 63eed09b6..0eca55a47 100644 --- a/src/rpcnet.cpp +++ b/src/rpcnet.cpp @@ -368,7 +368,7 @@ Value getnetworkinfo(const Array& params, bool fHelp) obj.push_back(Pair("timeoffset", GetTimeOffset())); obj.push_back(Pair("connections", (int)vNodes.size())); obj.push_back(Pair("proxy", (proxy.first.IsValid() ? proxy.first.ToStringIPPort() : string()))); - obj.push_back(Pair("relayfee", ValueFromAmount(CTransaction::nMinRelayTxFee))); + obj.push_back(Pair("relayfee", ValueFromAmount(CTransaction::minRelayTxFee.GetFeePerK()))); Array localAddresses; { LOCK(cs_mapLocalHost); |