From 68cecee5580cf41848cc3320dd8a1b21934ae6d1 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Fri, 3 Apr 2020 05:06:09 +0800 Subject: [PATCH] Merge #18464: doc: block-relay-only vs blocksonly fa6e01f2a163511a735088895ab02232b150801b doc: block-relay-only is not blocksonly (MarcoFalke) Pull request description: Those are different concepts, see https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-0.19.0.1.md#p2p-changes for the block-relay-only nodes. ACKs for top commit: jonatack: ACK fa6e01f hebasto: ACK fa6e01f2a163511a735088895ab02232b150801b Tree-SHA512: 6de2c81201b62ed59e504a3a6f164068600182e1bbf63eda7f9db3160507bdba091c13882ee0e75e713f0832bfaf5973a86eba3b94588d5b72196f05ae0a9c9a --- doc/reduce-memory.md | 4 +++- doc/reduce-traffic.md | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/reduce-memory.md b/doc/reduce-memory.md index 18988c1d8d..3c71416434 100644 --- a/doc/reduce-memory.md +++ b/doc/reduce-memory.md @@ -24,7 +24,9 @@ The size of some in-memory caches can be reduced. As caches trade off memory usa ## Number of peers -- `-maxconnections=` - the maximum number of connections, this defaults to `125`. Each active connection takes up some memory. Only significant if incoming connections are enabled, otherwise the number of connections will never be more than `10`. Of the 10 outbound peers, there can be 8 full outgoing connections and 2 -blocksonly peers, in which case they are block/addr peers, but not tx peers. +- `-maxconnections=` - the maximum number of connections, this defaults to 125. Each active connection takes up some + memory. This option applies only if incoming connections are enabled, otherwise the number of connections will never + be more than 10. Of the 10 outbound peers, there can be 8 full-relay connections and 2 block-relay-only ones. ## Thread configuration diff --git a/doc/reduce-traffic.md b/doc/reduce-traffic.md index fd0f44358a..b9527dfbd1 100644 --- a/doc/reduce-traffic.md +++ b/doc/reduce-traffic.md @@ -5,8 +5,8 @@ Some node operators need to deal with bandwidth caps imposed by their ISPs. By default, Dash Core allows up to 125 connections to different peers, 10 of which are outbound. You can therefore, have at most 115 inbound connections. -Of the 10 outbound peers, there can be 8 full outgoing connections and 2 with -the -blocksonly mode turned on. You can therefore, have at most 115 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.