diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-01-30 10:07:21 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-01-30 10:38:56 +0100 |
| commit | d2c9e4d4229174225ad0c3ed9dc366324ed5dd3b (patch) | |
| tree | 4aec2a7be4890d08e514f0b115f9e3ec53d3331c /src/rpc | |
| parent | 720b5794803444f7afd965490975f46bc23fdab2 (diff) | |
| parent | 4b189c13401bcd350c05cf8194beaeb3d18b3ebc (diff) | |
| download | bitcoin-d2c9e4d4229174225ad0c3ed9dc366324ed5dd3b.tar.xz | |
Merge #9615: Wallet incremental fee
4b189c1 Change bumpfee result value from 'oldfee' to 'origfee'. (Alex Morcos)
0c0c63f Introduce WALLET_INCREMENTAL_RELAY_FEE (Alex Morcos)
e8021ec Use CWallet::GetMinimumFee in bumpfee (Alex Morcos)
ae9719a Refactor GetMinimumFee to give option of providing targetFee (Alex Morcos)
fe8e8ef [rpc] Add incremental relay fee to getnetworkinfo (Alex Morcos)
6b331e6 Fix to have miner test aware of new separate block min tx fee (Alex Morcos)
de6400d Fix missing use of dustRelayFee (Alex Morcos)
5b15870 Use incrementalRelayFee for BIP 125 replacement (Alex Morcos)
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/net.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index 35747552fe..f590db5efa 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -10,6 +10,7 @@ #include "net.h" #include "net_processing.h" #include "netbase.h" +#include "policy/policy.h" #include "protocol.h" #include "sync.h" #include "timedata.h" @@ -417,6 +418,7 @@ UniValue getnetworkinfo(const JSONRPCRequest& request) " ,...\n" " ],\n" " \"relayfee\": x.xxxxxxxx, (numeric) minimum relay fee for non-free transactions in " + CURRENCY_UNIT + "/kB\n" + " \"incrementalfee\": x.xxxxxxxx, (numeric) minimum fee increment for mempool limiting or BIP 125 replacement in " + CURRENCY_UNIT + "/kB\n" " \"localaddresses\": [ (array) list of local addresses\n" " {\n" " \"address\": \"xxxx\", (string) network address\n" @@ -447,6 +449,7 @@ UniValue getnetworkinfo(const JSONRPCRequest& request) } obj.push_back(Pair("networks", GetNetworksInfo())); obj.push_back(Pair("relayfee", ValueFromAmount(::minRelayTxFee.GetFeePerK()))); + obj.push_back(Pair("incrementalfee", ValueFromAmount(::incrementalRelayFee.GetFeePerK()))); UniValue localAddresses(UniValue::VARR); { LOCK(cs_mapLocalHost); |