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/rpcmisc.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/rpcmisc.cpp')
| -rw-r--r-- | src/rpcmisc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index 27d6d61a3..9802445fc 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -81,9 +81,9 @@ Value getinfo(const Array& params, bool fHelp) } if (pwalletMain && pwalletMain->IsCrypted()) obj.push_back(Pair("unlocked_until", nWalletUnlockTime)); - obj.push_back(Pair("paytxfee", ValueFromAmount(nTransactionFee))); + obj.push_back(Pair("paytxfee", ValueFromAmount(payTxFee.GetFeePerK()))); #endif - obj.push_back(Pair("relayfee", ValueFromAmount(CTransaction::nMinRelayTxFee))); + obj.push_back(Pair("relayfee", ValueFromAmount(CTransaction::minRelayTxFee.GetFeePerK()))); obj.push_back(Pair("errors", GetWarnings("statusbar"))); return obj; } |