backport: Merge bitcoin#22530,(partial)21562,22322,22517 #5677
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
knst
reviewed
Nov 6, 2023
vijaydasmp
changed the title
vijaydasmp
force-pushed
the
bp23_3
branch
4 times, most recently
from
a1a56e0 to
dfb4694
Compare
vijaydasmp
changed the title
vijaydasmp
force-pushed
the
bp23_3
branch
3 times, most recently
from
6166962 to
f3387c5
Compare
vijaydasmp
changed the title
vijaydasmp
force-pushed
the
bp23_3
branch
3 times, most recently
from
58417e8 to
da9a26f
Compare
vijaydasmp
changed the title
UdjinM6
requested changes
Nov 9, 2023
vijaydasmp
changed the title
knst
previously approved these changes
Nov 12, 2023
Collaborator
knst
left a comment
knst
left a comment
There was a problem hiding this comment.
utACK
note for further packporting of partial bitcoin#21562: missing changed related to:
|
rebased from GH GUI to fix |
Author
|
Hello @PastaPastaPasta |
UdjinM6
requested changes
Nov 17, 2023
knst
approved these changes
Nov 19, 2023
Collaborator
knst
left a comment
knst
left a comment
There was a problem hiding this comment.
utACK
note for further packporting of partial bitcoin#21562: missing changed related to:
Author
|
Thanks I will add this changes in separate PR , as this change is approved state |
Author
|
@PastaPastaPasta requesting review. |
PastaPastaPasta
approved these changes
Dec 4, 2023
Member
PastaPastaPasta
left a comment
PastaPastaPasta
left a comment
There was a problem hiding this comment.
utACK for merging via merge commit
added 4 commits
December 3, 2023 20:25
d596dba test: assert logging categories are sorted in rpc and help (Jon Atack) 17bbff3 log, refactor: use guard clause in LogCategoriesList() (Jon Atack) 7c57297 log: sort LogCategoriesList and LogCategoriesString alphabetically (Jon Atack) f720cfa test: verify number of categories returned by logging RPC (Jon Atack) Pull request description: Sorting the logging categories seems more user-friendly with the number of categories we now have, allowing CLI users to more quickly find a particular category. before ``` $ bitcoin-cli help logging ... The valid logging categories are: net, tor, mempool, http, bench, zmq, walletdb, rpc, estimatefee, addrman, selectcoins, reindex, cmpctblock, rand, prune, proxy, mempoolrej, libevent, coindb, qt, leveldb, validation, i2p, ipc $ bitcoind -h | grep -A8 "debug=<category>" -debug=<category> ... output all debugging information. <category> can be: net, tor, mempool, http, bench, zmq, walletdb, rpc, estimatefee, addrman, selectcoins, reindex, cmpctblock, rand, prune, proxy, mempoolrej, libevent, coindb, qt, leveldb, validation, i2p, ipc. $ bitcoin-cli logging [] '["addrman"]' { "net": false, "tor": true, "mempool": false, "http": false, "bench": false, "zmq": false, "walletdb": false, "rpc": false, "estimatefee": false, "addrman": false, "selectcoins": false, "reindex": false, "cmpctblock": false, "rand": false, "prune": false, "proxy": true, "mempoolrej": false, "libevent": false, "coindb": false, "qt": false, "leveldb": false, "validation": false, "i2p": true, "ipc": false } ``` after ``` $ bitcoin-cli help logging ... The valid logging categories are: addrman, bench, cmpctblock, coindb, estimatefee, http, i2p, ipc, leveldb, libevent, mempool, mempoolrej, net, proxy, prune, qt, rand, reindex, rpc, selectcoins, tor, validation, walletdb, zmq $ bitcoind -h | grep -A8 "debug=<category>" -debug=<category> ... output all debugging information. <category> can be: addrman, bench, cmpctblock, coindb, estimatefee, http, i2p, ipc, leveldb, libevent, mempool, mempoolrej, net, proxy, prune, qt, rand, reindex, rpc, selectcoins, tor, validation, walletdb, zmq. $ bitcoin-cli logging [] '["addrman"]' { "addrman": false, "bench": false, "cmpctblock": false, "coindb": false, "estimatefee": false, "http": false, "i2p": false, "ipc": false, "leveldb": false, "libevent": false, "mempool": false, "mempoolrej": false, "net": false, "proxy": false, "prune": false, "qt": false, "rand": false, "reindex": false, "rpc": false, "selectcoins": false, "tor": false, "validation": false, "walletdb": false, "zmq": false } ``` ACKs for top commit: theStack: re-ACK d596dba Tree-SHA512: d546257f562b0a288d1b19a028f1a510aaf21bd21da058e7c84653d305ea8662ecb4647ebefd2b97411f845fe5b0b841d40d3fe6814eefcb8ce82df341dfce22
… PeerManagerImpl ctor fde1bf4 [net processing] Default initialize m_recent_confirmed_transactions (John Newbery) 37dcd12 scripted-diff: Rename recentRejects (John Newbery) cd9902a [net processing] Default initialize recentRejects (John Newbery) a28bfd1 [net processing] Default initialize m_stale_tip_check_time (John Newbery) 9190b01 [net processing] Add Orphanage empty consistency check (John Newbery) Pull request description: - Use default initialization of PeerManagerImpl members where possible - Remove unique_ptr indirection where it's not needed ACKs for top commit: MarcoFalke: ACK fde1bf4 👞 theStack: re-ACK fde1bf4 Tree-SHA512: 7ddedcc972df8e933e1fbe5c88b8ea17df89e1e58fc769518512c5540e49dc8eddb3f47e78d1329a6fc5644d2c1d11c981f681fd633f5218bfa4b3e6a86f3d7b
…an fuzz test fa8bed6 fuzz: Temporarily disable failing assert in banman fuzz test (MarcoFalke) Pull request description: Otherwise the remainder of the fuzz test can't be fuzzed without running into crashes ACKs for top commit: practicalswift: cr ACK fa8bed6 Tree-SHA512: ec6606292e2cfd26484c7f6caf1c418c377da54111b332990fce68373f0438defda71d931a42ca34431527fbc172dd2fdf29b260afca15b34910ee137de1c365
PastaPastaPasta
force-pushed
the
bp23_3
branch
from
151da99 to
1231278
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue being fixed or feature implemented
bitcoin backports
What was done?
Backported bitcoin changes
How Has This Been Tested?
CI Run