diff --git a/doc/reduce-traffic.md b/doc/reduce-traffic.md index b2f0e2601..de7b77d49 100644 --- a/doc/reduce-traffic.md +++ b/doc/reduce-traffic.md @@ -1,56 +1,56 @@ Reduce Traffic ============== Some node operators need to deal with bandwidth caps imposed by their ISPs. By default, Bitcoin ABC allows up to 4096 connections to different peers, 10 of which are outbound. You can therefore, have at most 4086 inbound connections. Of the 10 outbound peers, there can be 8 full-relay connections and 2 block-relay-only ones. The default settings can result in relatively significant traffic consumption. Ways to reduce traffic: ## 1. Use `-maxuploadtarget=` A major component of the traffic is caused by serving historic blocks to other nodes during the initial blocks download phase (syncing up a new node). This option can be specified in MiB per day and is turned off by default. This is *not* a hard limit; only a threshold to minimize the outbound traffic. When the limit is about to be reached, the uploaded data is cut by no longer serving historic blocks (blocks older than one week). Keep in mind that new nodes require other nodes that are willing to serve historic blocks. -Peers with the `noban` permission will never be disconnected, although their traffic counts for +Peers with the `download` permission will never be disconnected, although their traffic counts for calculating the target. ## 2. Disable "listening" (`-listen=0`) Disabling listening will result in fewer nodes connected (remember the maximum of 10 outbound peers). Fewer nodes will result in less traffic usage as you are relaying blocks and transactions to fewer nodes. ## 3. Reduce maximum connections (`-maxconnections=`) Reducing the maximum connected nodes to a minimum could be desirable if traffic limits are tiny. Keep in mind that bitcoin's trustless model works best if you are connected to a handful of nodes. ## 4. Turn off transaction relay (`-blocksonly`) Forwarding transactions to peers increases the P2P traffic. To only sync blocks with other peers, you can disable transaction relay. Be reminded of the effects of this setting. - Fee estimation will no longer work. - It sets the flag "-walletbroadcast" to be "0", only if it is currently unset. Doing so disables the automatic broadcasting of transactions from wallet. Not relaying other's transactions could hurt your privacy if used while a wallet is loaded or if you use the node to broadcast transactions. - If a peer is whitelisted and "-whitelistforcerelay" is set to "1" (which will also set "whitelistrelay" to "1"), we will still receive and relay their transactions. - It makes block propagation slower because compact block relay can only be used when transaction relay is enabled. diff --git a/doc/release-notes.md b/doc/release-notes.md index d0574ab89..9e0af2de3 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -1,7 +1,11 @@ # Bitcoin ABC 0.23.0 Release Notes Bitcoin ABC version 0.23.0 is now available from: This release includes the following features and fixes: + - A `download` permission has been extracted from the `noban` permission. For + compatibility, `noban` implies the `download` permission, but this may change + in future releases. Refer to the help of the affected settings `-whitebind` + and `-whitelist` for more details. diff --git a/src/init.cpp b/src/init.cpp index 452549993..55cbdd036 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1,2963 +1,2965 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) #include #endif #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include