aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2017-06-24 10:11:18 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2017-06-24 10:16:32 +0200
commit8c841a31a91ffe7e449c4733d14664b79cb39378 (patch)
tree2ffff29482272c1ee577c5500a32ab9c557f9534 /src
parente2921405dff1331d0a1ba6a2e97b2cc23992e72a (diff)
parentfab9b60fbd44cf6af4ada7baa987ad7ef268bd27 (diff)
downloadbitcoin-8c841a31a91ffe7e449c4733d14664b79cb39378.tar.xz
Merge #10626: doc: Remove outdated minrelaytxfee comment
fab9b60 doc: Remove outdated minrelaytxfee comment (MarcoFalke) Tree-SHA512: e36c5a554a9773f034c2d358c52a772688009a5a71dfd3f664d9b5566c98378f44ef7c6dc0902b42d69ab5fd54b60d4850a2903823d0b2309c7ae063d1923f7f
Diffstat (limited to 'src')
-rw-r--r--src/init.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/init.cpp b/src/init.cpp
index e213958893..686a31b0f4 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1028,14 +1028,7 @@ bool AppInitParameterInteraction()
if (nConnectTimeout <= 0)
nConnectTimeout = DEFAULT_CONNECT_TIMEOUT;
- // Fee-per-kilobyte amount required for mempool acceptance and relay
- // If you are mining, be careful setting this:
- // if you set it to zero then
- // a transaction spammer can cheaply fill blocks using
- // 0-fee transactions. It should be set above the real
- // cost to you of processing a transaction.
- if (IsArgSet("-minrelaytxfee"))
- {
+ if (IsArgSet("-minrelaytxfee")) {
CAmount n = 0;
if (!ParseMoney(GetArg("-minrelaytxfee", ""), n)) {
return InitError(AmountErrMsg("minrelaytxfee", GetArg("-minrelaytxfee", "")));