Skip to content

Commit 22ccf4e

Browse files
committed
Merge bitcoin/bitcoin#26991: doc: followups to #26471
47c174d doc: NetPermissionFlags for tx relay in blocksonly (willcl-ark) e325e0f doc: Fix comment syntax error (willcl-ark) Pull request description: Fix syntax error and specify `NetPermissionFlags` for whitelisted tx relay ACKs for top commit: w0xlt: ACK bitcoin/bitcoin@47c174d Tree-SHA512: eb579dc599a96a3ea79c01ac3e76160ec59cf71c2486c9401da8fbbd96ae756ba647aa9ba874835946bc76ba02782729da788617f982ae5a852139e10e7dfd75
2 parents 17acbc1 + 47c174d commit 22ccf4e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

doc/reduce-memory.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The size of some in-memory caches can be reduced. As caches trade off memory usa
1818

1919
- Since `0.14.0`, unused memory allocated to the mempool (default: 300MB) is shared with the UTXO cache, so when trying to reduce memory usage you should limit the mempool, with the `-maxmempool` command line argument.
2020

21-
- To disable most of the mempool functionality there is the `-blocksonly` option. This will reduce the default memory usage to 5MB and make the client opt out of receiving (and thus relaying) transactions, except from whitelisted peers and as part of blocks.
21+
- To disable most of the mempool functionality there is the `-blocksonly` option. This will reduce the default memory usage to 5MB and make the client opt out of receiving (and thus relaying) transactions, except from peers who have the `relay` permission set (e.g. whitelisted peers), and as part of blocks.
2222

2323
- Do not use this when using the client to broadcast transactions as any transaction sent will stick out like a sore thumb, affecting privacy. When used with the wallet it should be combined with `-walletbroadcast=0` and `-spendzeroconfchange=0`. Another mechanism for broadcasting outgoing transactions (if any) should be used.
2424

src/kernel/mempool_options.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class CBlockPolicyEstimator;
1818

1919
/** Default for -maxmempool, maximum megabytes of mempool memory usage */
2020
static constexpr unsigned int DEFAULT_MAX_MEMPOOL_SIZE_MB{300};
21-
//** Default for -maxmempool when blocksonly is set */
21+
/** Default for -maxmempool when blocksonly is set */
2222
static constexpr unsigned int DEFAULT_BLOCKSONLY_MAX_MEMPOOL_SIZE_MB{5};
2323
/** Default for -mempoolexpiry, expiration time for mempool transactions in hours */
2424
static constexpr unsigned int DEFAULT_MEMPOOL_EXPIRY_HOURS{336};

0 commit comments

Comments
 (0)