backport: Merge bitcoin#22622, 22780, 22797, 22755, 22501, 21331 #6133
Merged
PastaPastaPasta merged 5 commits intodashpay:developfrom Jul 23, 2024
Merged
backport: Merge bitcoin#22622, 22780, 22797, 22755, 22501, 21331 #6133PastaPastaPasta merged 5 commits intodashpay:developfrom
PastaPastaPasta merged 5 commits intodashpay:developfrom
Conversation
vijaydasmp
changed the title
vijaydasmp
changed the title
vijaydasmp
changed the title
Author
|
Hello @knst, @PastaPastaPasta for review |
UdjinM6
requested changes
Jul 21, 2024
src/wallet/rpcwallet.cpp
Outdated
There was a problem hiding this comment.
Good catch! 👍 develop is currently broken because of this https://gitlab.com/dashpay/dash/-/pipelines/1381488325
UdjinM6
approved these changes
Jul 22, 2024
UdjinM6
left a comment
UdjinM6
left a comment
There was a problem hiding this comment.
utACK 29720540b349a456cb4b3811d8b7674880bac204
Author
|
Hello @PastaPastaPasta requesting for review |
5 tasks
knst
approved these changes
Jul 23, 2024
Collaborator
knst
left a comment
knst
left a comment
There was a problem hiding this comment.
utACK 29720540b349a456cb4b3811d8b7674880bac204
PastaPastaPasta
added a commit
that referenced
this pull request
Jul 23, 2024
…o wallet bebf391 fix: build with -Wdocumentation - rename param pwallet to wallet (Konstantin Akimov) Pull request description: ## Issue being fixed or feature implemented CI failures like that: https://gitlab.com/dashpay/dash/-/jobs/7400661581 It happened due to 2 PRs merged one after each other without rebasing: - enabling -Wdocumentation in bitcoin#21631 (#6113) - renaming param while doxygen comment is forgotten in #6114 ## What was done? It contains changes from #6133 Thanks Vijay for spotting issue, this PR is DNM if 6133 will get merged faster. ## How Has This Been Tested? See CI ## Breaking Changes N/A ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone ACKs for top commit: UdjinM6: utACK bebf391 PastaPastaPasta: utACK bebf391 Tree-SHA512: 34265f09098c04593a9d52709e5b8aed8460248762655945e5c86a65adb9aa49ab6f0bdb21cd907d353fe6b10e1ff2e07d05528166bf8e2140eb2c9ea1acbd33
…pened 127b460 test: Check if specified config file cannot be opened (nthumann) 6bb5470 util: Check if specified config file cannot be opened (nthumann) Pull request description: Fixes bitcoin#22612. When running e.g. `./src/bitcoind -datadir=/tmp/bitcoin -regtest -conf=/tmp/bitcoin/regtest/bitcoin.conf` and the specified config cannot be opened (doesn't exist, permission denied, ...), the initialization silently uses the default config. As voidburn already noted: > I can't think of a situation in which a config file is specified explicitly (in the startup options, as per service unit linked above), but inaccessible, where the fail condition should be to keep booting using defaults instead. With this patch applied, the initialization will fail immediately, if the specified config file cannot be opened. If no config file is explicitly specified, the behavior is unchanged. This not only affects `bitcoind`, but also `bitcoin-cli` and `bitcoin-qt`. In the example below the datadir is accessible, but the config file is not due to insufficient permissions: ``` $ ./src/bitcoind -datadir=/tmp/bitcoin -regtest --debug=1 -conf=/tmp/bitcoin/regtest/bitcoin.conf Error: Error reading configuration file: specified config file "/tmp/bitcoin/regtest/bitcoin.conf" could not be opened. ``` ACKs for top commit: 0xB10C: ACK 127b460 Zero-1729: tACK 127b460 theStack: Tested ACK 127b460 Tree-SHA512: 4fe487921485426f1d1da8d256c388af517b984b639d776aec7b159b3e23b669824093d3bdd31139d9415ed5f5de405b3e6a51b110c8ab471f12b9c99ac67cc1
…ime comment fa9c075 doc: Remove incorrect INIT_PROTO_VERSION from nTime comment (MarcoFalke) Pull request description: Missed in commit dbcb574 ACKs for top commit: sipa: ACK fa9c075 jnewbery: ACK fa9c075 Tree-SHA512: d086b94658219fadca1a937e64ef5b6a475fbf72661b6008d98e0e2b912cbbdb1f025c531b12a8ed9946fbbd79e1e09fba7c91403fc997158e1170dfbd300b29
…n p2p_invalid_tx.py 0d9fdd3 test, doc: refer to the correct variable names in p2p_invalid_tx.py (aitorjs) Pull request description: _tx_orphan_no_fee_ and _tx_orphan_invalid_ don't exist as transactions. Have been replaced by _tx_orphan_2_no_fee_ and _tx_orphan_2_invalid_ respectively. **Motivation**: Comments are more accurate and easy understandable under the tests context (I think). ACKs for top commit: kristapsk: utACK 0d9fdd3 theStack: ACK 0d9fdd3 📃 Tree-SHA512: a4cafd931e51fe2a67085e10e9c61178c864c14982664d112b76327e040af08cd1de04eca4a8ae980fad57ba7078017ce02fc60e7658f38380e8172c2ae28b77
fa2547f fuzz: Avoid timeout in blockfilter fuzz target (MarcoFalke) Pull request description: Previously it would take 10 seconds to run this input, now it takes 10ms: [clusterfuzz-testcase-blockfilter-5022838196142080.log](https://github.com/bitcoin/bitcoin/files/7021883/clusterfuzz-testcase-blockfilter-5022838196142080.log) The fix is moving the `MatchAny` out of the hot loop. Also, to avoid unlimited runtime, cap the hot loop at 30k iterations. ACKs for top commit: GeneFerneau: Approach ACK [fa2547f](bitcoin@fa2547f) Tree-SHA512: a04e7388856930ec81222da8f05b665a923fe9482aeb4c55c9be4561aa7320a0703dbbf8d438ae92854e877a8e3b46777a29c0b652b8f34c29c2142cc5d63ccb
…relay_enabled} and relaytxes data 218862a Display peers in -netinfo that we don't relay addresses to (Jon Atack) 3834e23 Display peers in -netinfo that request we not relay transactions (Jon Atack) 0a9ee3a Simplify a few conditionals in -netinfo (Jon Atack) 5eeea8e Add addr_processed and addr_rate_limited stats to -netinfo (Jon Atack) Pull request description: Update CLI -netinfo to display the getpeerinfo `addr_processed`, `addr_rate_limited`, `addr_relay_enabled` and `relaytxes` data with auto-adjusting column widths. ``` $ ./src/bitcoin-cli -netinfo help txn Time since last novel transaction received from the peer and accepted into our mempool, in minutes "*" - the peer requested we not relay transactions to it (relaytxes is false) addrp Total number of addresses processed, excluding those dropped due to rate limiting "." - we do not relay addresses to this peer (addr_relay_enabled is false) addrl Total number of addresses dropped due to rate limiting ```  ACKs for top commit: 0xB10C: Code review and tested ACK 218862a Zero-1729: re-tACK 218862a vasild: ACK 218862a jarolrod: tACK 218862a Tree-SHA512: bb9da4bdd71859b234f6e4c2c46257a57ef0d0e0b363d2b8fded128bcaa28132f64a0a4651c622e1de1e3b7c05c7587a4369e9e79799895884fda9745c63409d
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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.
bitcoin backports