diff options
| author | glozow <gloriajzhao@gmail.com> | 2023-02-01 11:46:10 +0000 |
|---|---|---|
| committer | glozow <gloriajzhao@gmail.com> | 2023-02-01 11:46:22 +0000 |
| commit | 22ccf4e3603a141e5f9485854ba6294cd6876f1e (patch) | |
| tree | 7a8b80cc08c336afb213c8bdd24ea035425f7ed9 | |
| parent | 17acbc1a5a8d07ad30fc0ef4a726097f5cf9e168 (diff) | |
| parent | 47c174d8ce4c5f36c41203aedde86c5f0da90217 (diff) | |
Merge bitcoin/bitcoin#26991: doc: followups to #26471
47c174d8ce4c5f36c41203aedde86c5f0da90217 doc: NetPermissionFlags for tx relay in blocksonly (willcl-ark)
e325e0fccba4981d28053b79473ddaa44355e6e8 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 https://github.com/bitcoin/bitcoin/pull/26991/commits/47c174d8ce4c5f36c41203aedde86c5f0da90217
Tree-SHA512: eb579dc599a96a3ea79c01ac3e76160ec59cf71c2486c9401da8fbbd96ae756ba647aa9ba874835946bc76ba02782729da788617f982ae5a852139e10e7dfd75
| -rw-r--r-- | doc/reduce-memory.md | 2 | ||||
| -rw-r--r-- | src/kernel/mempool_options.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/reduce-memory.md b/doc/reduce-memory.md index 097cc9f001..25205258b8 100644 --- a/doc/reduce-memory.md +++ b/doc/reduce-memory.md @@ -18,7 +18,7 @@ The size of some in-memory caches can be reduced. As caches trade off memory usa - 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. -- 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. +- 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. - 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. diff --git a/src/kernel/mempool_options.h b/src/kernel/mempool_options.h index a5a0bae86d..beb5fca5e9 100644 --- a/src/kernel/mempool_options.h +++ b/src/kernel/mempool_options.h @@ -18,7 +18,7 @@ class CBlockPolicyEstimator; /** Default for -maxmempool, maximum megabytes of mempool memory usage */ static constexpr unsigned int DEFAULT_MAX_MEMPOOL_SIZE_MB{300}; -//** Default for -maxmempool when blocksonly is set */ +/** Default for -maxmempool when blocksonly is set */ static constexpr unsigned int DEFAULT_BLOCKSONLY_MAX_MEMPOOL_SIZE_MB{5}; /** Default for -mempoolexpiry, expiration time for mempool transactions in hours */ static constexpr unsigned int DEFAULT_MEMPOOL_EXPIRY_HOURS{336}; |