diff options
| author | Alex Morcos <morcos@chaincode.com> | 2017-01-19 22:07:56 -0500 |
|---|---|---|
| committer | Alex Morcos <morcos@chaincode.com> | 2017-03-03 16:50:19 -0500 |
| commit | f8380054442d8aca4999277fe7617067edf231b9 (patch) | |
| tree | 4902b33ac7885e0445adace815b214d1f18e9ccc /src/rpc | |
| parent | ad727f4eaf1cb3ed7a0e340f690bd804299e698c (diff) | |
| download | bitcoin-f8380054442d8aca4999277fe7617067edf231b9.tar.xz | |
No longer allow "free" transactions
Remove -limitfreerelay and always enforce minRelayTxFee in the mempool (except from disconnected blocks)
Remove -relaypriority, the option was only used for the ability to allow free transactions to be relayed regardless of their priority. Both notions no longer apply.
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/misc.cpp | 2 | ||||
| -rw-r--r-- | src/rpc/net.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index 140cb4840b..3045fa2b53 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -61,7 +61,7 @@ UniValue getinfo(const JSONRPCRequest& request) " \"keypoolsize\": xxxx, (numeric) how many new keys are pre-generated\n" " \"unlocked_until\": ttt, (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n" " \"paytxfee\": x.xxxx, (numeric) the transaction fee set in " + CURRENCY_UNIT + "/kB\n" - " \"relayfee\": x.xxxx, (numeric) minimum relay fee for non-free transactions in " + CURRENCY_UNIT + "/kB\n" + " \"relayfee\": x.xxxx, (numeric) minimum relay fee for transactions in " + CURRENCY_UNIT + "/kB\n" " \"errors\": \"...\" (string) any error messages\n" "}\n" "\nExamples:\n" diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index f590db5efa..a7169749c3 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -417,7 +417,7 @@ UniValue getnetworkinfo(const JSONRPCRequest& request) " }\n" " ,...\n" " ],\n" - " \"relayfee\": x.xxxxxxxx, (numeric) minimum relay fee for non-free transactions in " + CURRENCY_UNIT + "/kB\n" + " \"relayfee\": x.xxxxxxxx, (numeric) minimum relay fee for 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" |