Backports 15747, 15532, 14556, 14594, 15136, 20491, 14715 #4482
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
UdjinM6
requested changes
Oct 4, 2021
Sounds reasonable 👍 |
christiancfifi
force-pushed
the
backports_pr2
branch
from
a2ba7af to
1703d26
Compare
Author
|
Finally figured out it isn't my branch that is causing p2p_addrv2_relay.py to fail 10% of the time. Must be because I am running Ubuntu 21 instead of the supported 18. It's not important but if anyone knows how I might fix that test taking a random amount of time from 5s to the max allowed 60s, that would be great. When it fails, in the log there are 10 lines that say "connection to 123.123.123.(# from 1-10) timeout". Anyway, this batch is ready. Let me know if you want me to squash any commits. |
UdjinM6
reviewed
Oct 10, 2021
PastaPastaPasta
requested changes
Oct 11, 2021
Member
PastaPastaPasta
left a comment
PastaPastaPasta
left a comment
There was a problem hiding this comment.
Agree, the "extend" ones are likely fine, but fixes should be squashed
69ca487 Implement prevector::fill once (Ben Woosley) 7bad78c Drop defunct IS_TRIVIALLY_CONSTRUCTIBLE handling from prevector.h (Ben Woosley) Pull request description: This is clean-up post bitcoin#14651: * Use one implementation of `prevector::fill`, as it's possible now that the implementations are identical. * Only apply the `IS_TRIVIALLY_CONSTRUCTIBLE` handling to the bench file where it is used, and drop the now-unnecessary associated compat includes. Tree-SHA512: 5930b3a17fccd39af10add40202ad97a297aebecc049af72ca920d0d55b3e4c3c30ce864c8a683355895f0196396d4ea56ba9f9637bdc7d16964cdf66c195485
830ddf4 Drop noop gcc version checks (Hennadii Stepanov) Pull request description: Since bitcoin#20413 the minimum required GCC version is 7. ACKs for top commit: fanquake: ACK 830ddf4 Tree-SHA512: 36264661d6ced1683a0c907efba7c700502acaf8e9fd50d9066bc9c7b877b25165b0684c2d7fe74bd58e500a77d7702bdbdd53691c274f29e4abccd241c10964
3537c83 Do not deselect peer when switching away from tab (Hennadii Stepanov) b0037c5 Improve Peers tab layout (Hennadii Stepanov) Pull request description: This is an alternative to bitcoin#14798. The "Peers" tab of the "Debug" window improved to address comments bitcoin#6209 (comment) (by @jonasschnelli) and bitcoin#14798 (comment) (by @promag). This allows to keep the peer selection while navigating to other places and effectively reverts e059726. Screenshots with this PR:    Tree-SHA512: 3d086007f6d72930bc2fc3c395175adda0f1a7722de3842bc246ee4f3bfc5ebda4b9a626fb68a7ee8663a88d0842deb37c0c460ad84cc58e22f138acf8bc71ea
a88640e Fix minimized window bug on Linux (Hennadii Stepanov) Pull request description: Fix bitcoin#14591 On some Linux systems the minimized to the taskbar (iconified) main window cannot be restored properly using actions from the systray icon menu when `QSystemTrayIcon::contextMenu()` is a child of the main window. Tree-SHA512: 05c9f724fc2278d45dac6fe72b09859f12b5d71f54659bb779403c8cd81b55e610fb7b5aa912ac273d3cd19bf953b0405bbc6451feb00d1827c95dd9f0876aa4
christiancfifi
force-pushed
the
backports_pr2
branch
from
1703d26 to
68555cf
Compare
Author
|
Looks like a CI check failed, but I rebased before pushing and it is the develop branch that has a failing test. Will check back later |
|
test failure looks unrelated, restarted it |
|
LGTM, will test it a bit |
PastaPastaPasta
requested changes
Oct 13, 2021
…tcoin#13299) fb3ce75 Don't label transactions "Open" while catching up (Hennadii Stepanov) Pull request description: Fix bitcoin#13299. Since the default `nSequence` is `0xFFFFFFFE` and locktime is enabled, the checking `wtx.is_final` is meaningless until the syncing has completed (ref: dashpay#1026). This PR makes the wallet mark a transaction "Unconfirmed" instead of misleading "Open for NNN more blocks" when syncing after a period of being offline. Before this PR (with the issue):  With this PR (the issue has been resolved):  Tree-SHA512: 358ec83b43c266a4d32a37a79dda80e80d40a2b77ad38261c84a095e613399f674aa7184805b3f6310e51ddb83ae2636b8849fcc7c4333e1b3ecbb0f70ad86d3
… compiler-generated ctor for BlockFilter 82c3b3f Remove sharp edge (uninitialized m_filter_type) when using the compiler-generated constructor for BlockFilter (practicalswift) Pull request description: Remove sharp edge (uninitialised member `m_filter_type`) when using the compiler-generated constructor for `BlockFilter`. Before (but after added test): ``` $ src/test/test_bitcoin -t blockfilter_tests/blockfilter_basic_test Running 1 test case... test/blockfilter_tests.cpp(118): error: in "blockfilter_tests/blockfilter_basic_test": check default_ctor_block_filter_1.GetFilterType() == default_ctor_block_filter_2.GetFilterType() has failed [ != ] *** 1 failure is detected in the test module "Bitcoin Test Suite" ``` After: ``` $ src/test/test_bitcoin -t blockfilter_tests/blockfilter_basic_test Running 1 test case... *** No errors detected ``` Tree-SHA512: 21d41f036b0bf12adcf1a788d84747353f2023cb85fd8ea6c97222967032e8bf54e7910cadb45dfcecd78e5b5dca86685f78cad0596b6d1a08f910ebf20d90aa
fa57411 wallet: Get all balances in one call (MarcoFalke) Pull request description: The wallet provides a getter for each "type" of balance. However, a single iteration over `mapWallet` is sufficient to calculate all types of balances. ACKs for commit fa5741: Empact: utACK bitcoin@fa57411 promag: utACK fa57411. MeshCollider: utACK bitcoin@fa57411 Tree-SHA512: 38b7f346ec95d2604a4d32f4caef2841b8fe59511d2d23890ba3dc497bb2f45eb6be87d12eb004005cad16e9fea83ae6e3000f2197c7a677a07debdb457064a2
christiancfifi
force-pushed
the
backports_pr2
branch
from
68555cf to
14e2ff8
Compare
Author
|
Unfortunately there's no clang-format rule for adding brackets to the one-liner if's (only for adding unsafe newlines), but I added it to the docs. |
UdjinM6
requested changes
Oct 14, 2021
christiancfifi
force-pushed
the
backports_pr2
branch
from
14e2ff8 to
941eff8
Compare
christiancfifi
force-pushed
the
backports_pr2
branch
from
941eff8 to
fa8300f
Compare
PastaPastaPasta
approved these changes
Oct 15, 2021
Member
PastaPastaPasta
left a comment
PastaPastaPasta
left a comment
There was a problem hiding this comment.
utACK for merging via merge commit
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#14715 moves around a gcc4.8 specific fix, which is removed in bitcoin#20491, but bitcoin#20491 also removes some gcc5 specific code from the not yet backported bitcoin#18565 and bitcoin#18353 so it is partial.
bitcoin#15136: The change makes it look a tad worse imo, but it makes it possible to see all the info at 800x600 with scrollbars. It could look better if the ScrollArea used the same style as its surroundings instead of the tan background, but I'm not sure how to do that.
Partial bitcoin#15747: Makes small missed changes to bitcoin#14957 (VM_Staged). Also, I can make analagous changes for the dash specific Get*Balance functions if that sounds like a good addition.