backport: Merge bitcoin#22530,(partial)21562,22322,22517 by vijaydasmp · Pull Request #5677 · dashpay/dash

vijaydasmp · 2023-11-06T10:56:27Z

Issue being fixed or feature implemented

bitcoin backports

What was done?

Backported bitcoin changes

How Has This Been Tested?

CI Run

UdjinM6

utACK

knst

utACK

note for further packporting of partial bitcoin#21562: missing changed related to:

ogabrielides

utACK

UdjinM6 · 2023-11-16T18:31:47Z

rebased from GH GUI to fix Merge Fast-Forward Only check

vijaydasmp · 2023-11-17T10:35:21Z

Hello @PastaPastaPasta

UdjinM6

utACK

knst

utACK

note for further packporting of partial bitcoin#21562: missing changed related to:

vijaydasmp · 2023-11-20T05:58:14Z

p2p: don't add AlreadyHave transactions to recentRejects bitcoin/bitcoin#19753

Split orphan handling from net_processing into txorphanage bitcoin/bitcoin#21148

Thanks I will add this changes in separate PR , as this change is approved state

vijaydasmp · 2023-11-28T06:15:35Z

@PastaPastaPasta requesting review.

PastaPastaPasta

utACK for merging via merge commit

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

fa485d0 fuzz: Check banman roundtrip (MarcoFalke) Pull request description: ACKs for top commit: practicalswift: cr ACK fa485d0 vasild: ACK fa485d0 Tree-SHA512: 84e297c0b90ef68d72afd2053bfda2888496c1b180233516a8caaf76d6c03403f1e4ed59f1eb32d799873fc34009634b4ce372244b9d546d04626af41ac4d1d7

…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

knst reviewed Nov 6, 2023

View reviewed changes

Comment thread doc/managing-wallets.md Outdated

vijaydasmp changed the title ~~Bp23 3~~ backport: Merge bitcoin#22523,22739,23500,22530,21562 Nov 6, 2023

vijaydasmp force-pushed the bp23_3 branch 4 times, most recently from a1a56e0 to dfb4694 Compare November 7, 2023 11:33

vijaydasmp changed the title ~~backport: Merge bitcoin#22523,22739,23500,22530,21562~~ backport: Merge bitcoin#22739,23500,22530,21562,22492,21934 Nov 7, 2023

vijaydasmp force-pushed the bp23_3 branch 3 times, most recently from 6166962 to f3387c5 Compare November 7, 2023 13:20

vijaydasmp changed the title ~~backport: Merge bitcoin#22739,23500,22530,21562,22492,21934~~ backport: Merge bitcoin#22739,23500,22530,21562,21934 Nov 7, 2023

vijaydasmp force-pushed the bp23_3 branch 3 times, most recently from 58417e8 to da9a26f Compare November 8, 2023 09:22

vijaydasmp changed the title ~~backport: Merge bitcoin#22739,23500,22530,21562,21934~~ backport: Merge bitcoin#22739,23500,22530,21562,22322,22517 Nov 8, 2023

vijaydasmp marked this pull request as ready for review November 9, 2023 06:09

UdjinM6 requested changes Nov 9, 2023

View reviewed changes

Comment thread doc/README.md Outdated

Comment thread depends/Makefile Outdated

Comment thread src/logging.cpp Outdated

Comment thread test/functional/rpc_misc.py Outdated

Comment thread src/net_processing.cpp Outdated

vijaydasmp force-pushed the bp23_3 branch from da9a26f to 49a65fc Compare November 10, 2023 13:59

vijaydasmp changed the title ~~backport: Merge bitcoin#22739,23500,22530,21562,22322,22517~~ backport: Merge bitcoin#22530,(partial)21562,22322,22517 Nov 10, 2023

vijaydasmp marked this pull request as draft November 10, 2023 16:14

vijaydasmp force-pushed the bp23_3 branch from 49a65fc to 05f9b94 Compare November 10, 2023 16:21

vijaydasmp marked this pull request as ready for review November 10, 2023 18:21

UdjinM6 added this to the 21 milestone Nov 12, 2023

UdjinM6 approved these changes Nov 12, 2023

View reviewed changes

knst previously approved these changes Nov 12, 2023

View reviewed changes

UdjinM6 modified the milestones: 21, 20.1 Nov 14, 2023

UdjinM6 requested review from PastaPastaPasta and ogabrielides November 15, 2023 14:06

ogabrielides previously approved these changes Nov 15, 2023

View reviewed changes

UdjinM6 force-pushed the bp23_3 branch from 05f9b94 to ecaf49f Compare November 16, 2023 18:31

UdjinM6 requested changes Nov 17, 2023

View reviewed changes

Comment thread test/functional/rpc_misc.py Outdated

UdjinM6 mentioned this pull request Nov 17, 2023

backport: Merge bitcoin#(partial) 21940,(partial) 22232,22505,22407,22510,22383,13533,22528,22538,22139 #5663

Merged

vijaydasmp dismissed stale reviews from knst and ogabrielides via 9e2cf85 November 18, 2023 02:30

vijaydasmp force-pushed the bp23_3 branch from ecaf49f to 9e2cf85 Compare November 18, 2023 02:30

UdjinM6 force-pushed the bp23_3 branch from 9e2cf85 to 151da99 Compare November 18, 2023 13:20

vijaydasmp requested a review from UdjinM6 November 19, 2023 04:00

UdjinM6 approved these changes Nov 19, 2023

View reviewed changes

knst approved these changes Nov 19, 2023

View reviewed changes

PastaPastaPasta approved these changes Dec 4, 2023

View reviewed changes

MarcoFalke added 4 commits December 3, 2023 20:25

PastaPastaPasta force-pushed the bp23_3 branch from 151da99 to 1231278 Compare December 4, 2023 02:25

PastaPastaPasta merged commit 5783743 into dashpay:develop Dec 4, 2023

Conversation

vijaydasmp commented Nov 6, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Issue being fixed or feature implemented

What was done?

How Has This Been Tested?

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

knst left a comment

Choose a reason for hiding this comment

Uh oh!

ogabrielides left a comment

Choose a reason for hiding this comment

Uh oh!

UdjinM6 commented Nov 16, 2023

Uh oh!

vijaydasmp commented Nov 17, 2023

Uh oh!

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

knst left a comment

Choose a reason for hiding this comment

Uh oh!

vijaydasmp commented Nov 20, 2023

Uh oh!

vijaydasmp commented Nov 28, 2023

Uh oh!

PastaPastaPasta left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

vijaydasmp commented Nov 6, 2023 •

edited

Loading