backport: Merge bitcoin#18452, 19111, 19104 #5737
Merged
Conversation
This file contains 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
|
dependent upon bitcoin#18814, will proceed after merging #5152 |
|
This pull request has conflicts, please rebase. |
@vijaydasmp 5152 is merged, please, continue. |
UdjinM6
requested changes
Feb 21, 2024
vijaydasmp
force-pushed
the
bp21_21
branch
2 times, most recently
from
2209bf9 to
5845917
Compare
UdjinM6
requested changes
Feb 22, 2024
PastaPastaPasta
added a commit
to vijaydasmp/dash
that referenced
this pull request
Feb 23, 2024
9402024 Merge bitcoin#19104: gui, refactor: Register Qt meta types in application constructor (Jonas Schnelli) c8d1d0f Merge bitcoin#19111: Limit scope of all global std::once_flag (MarcoFalke) 11df4d0 Merge bitcoin#18452: qt: Fix shutdown when waitfor* cmds are called from RPC console (Jonas Schnelli) Pull request description: ## Issue being fixed or feature implemented ## What was done? ## How Has This Been Tested? CI passing ## Breaking Changes None ## Checklist: _Go over all the following points, and put an `x` in all the boxes that apply._ - [ ] 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 _(for repository code-owners and collaborators only)_ Top commit has no ACKs. Tree-SHA512: a1a9d18674b7c55549edd684211bb9de983a67876ed292d90ef3dccb126122af9b5d8c887608bbce74b7fa92c020a542d2ea1acdc693d85eba889aa8c56ac8df
PastaPastaPasta
force-pushed
the
bp21_21
branch
2 times, most recently
from
d89fef7 to
df934c8
Compare
|
Whoops! That didn't work quite as expected... :/ Re-force pushed to the initial commit |
PastaPastaPasta
force-pushed
the
bp21_21
branch
2 times, most recently
from
94a5498 to
df934c8
Compare
…rom RPC console da73f15 qt: Fix shutdown when waitfor* cmds are called from RPC console (Hennadii Stepanov) Pull request description: On master (7eed413), if the GUI has been started with`-server=1`, `bitcoin-qt` hangs on shutdown during calling any of the `waitfor*` commands in the GUI RPC console. This PR suggests minimal changes to fix this bug. Fix bitcoin#17495 ACKs for top commit: jonasschnelli: utACK da73f15 Tree-SHA512: 469f5332945a5f2c57d19336cda5df79b123ccc494aea6d58a85eb1293be52708b2b9c5bb6bc2c402a90b7b4e9e8d7ab8fe84cf201cf7ce612c9290c57e43681
fa9c675 Limit scope of all global std::once_flag (MarcoFalke) Pull request description: `once_flag` is a helper (as the name might suggest) to execute a callable only once. Thus, the scope of the flag does never need to extend beyond where the callable is called. Typically this is function scope. Move all the flags to function scope to * simplify code review * avoid mistakes where similarly named flags are accidentally exchanged * avoid polluting the global scope ACKs for top commit: hebasto: ACK fa9c675, tested on Linux Mint 19.3 (x86_64). promag: Code review ACK fa9c675. Tree-SHA512: 095a0c11d93d0ddcb82b3c71676090ecc7e3de3d5e7a2a63ab2583093be279242acac43523bbae2060b4dcfa8f92b54256a0e91fbbae78fa92d2d49e9db62e57
…tion constructor 4f49d52 gui, refactor: Register Qt meta types in application constructor (João Barbosa) Pull request description: Removes a warning when running `QT_QPA_PLATFORM=cocoa src/qt/test/test_bitcoin-qt`. ACKs for top commit: jonasschnelli: Re utACK 4f49d52 hebasto: ACK 4f49d52, tested on macOS 10.15.5. Tree-SHA512: e931a022ba83cb0ef04d82544ebd9b18242f8fc2b41443afce4d5c4222f222e8b3517bdb484a1a4f61377c5dceca067d8ccf250da3a727299448e54bec33ed6e
PastaPastaPasta
force-pushed
the
bp21_21
branch
from
df934c8 to
96ac317
Compare
PastaPastaPasta
closed this pull request by merging all changes
into
dashpay:develop
in
37f43e4
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
What was done?
How Has This Been Tested?
CI passing
Breaking Changes
None
Checklist:
Go over all the following points, and put an
xin all the boxes that apply.