backport: trivial 2024 02 12 #5870
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
UdjinM6
requested changes
Feb 13, 2024
PastaPastaPasta
force-pushed
the
develop-trivial-2024-02-12
branch
from
53b51ae to
86d8aeb
Compare
|
Guix Automation has began to build this PR tagged as v20.1.0-devpr5870.86d8aeb2. A new comment will be made when the image is pushed. |
knst
requested changes
Feb 14, 2024
| @@ -367,6 +387,11 @@ void Intro::UpdatePruneLabels(bool prune_checked) | |||
| storageRequiresMsg = tr("Approximately %1 GB of data will be stored in this directory."); | |||
| } | |||
| ui->lblExplanation3->setVisible(prune_checked); | |||
| ui->pruneGB->setEnabled(prune_checked); | |||
| static constexpr uint64_t nPowTargetSpacing = 2.5 * 60; // from chainparams, which we don't have at this stage | |||
There was a problem hiding this comment.
gui-125:
we should not use float here, should we?
let's hard-code better here 150
There was a problem hiding this comment.
meh; it's done at compile time, I think we can trust the compiler here
There was a problem hiding this comment.
Also; this is exactly how it's set in chainparams; so it least if there's a compiler bug we will be consistent. :D
PastaPastaPasta
force-pushed
the
develop-trivial-2024-02-12
branch
from
86d8aeb to
f57f5d6
Compare
|
Guix Automation has began to build this PR tagged as v20.1.0-devpr5870.f57f5d66. A new comment will be made when the image is pushed. |
PastaPastaPasta
force-pushed
the
develop-trivial-2024-02-12
branch
from
f57f5d6 to
4c6f8d3
Compare
|
Guix Automation has began to build this PR tagged as v20.1.0-devpr5870.4c6f8d3b. A new comment will be made when the image is pushed. |
PastaPastaPasta
force-pushed
the
develop-trivial-2024-02-12
branch
from
4c6f8d3 to
e70d494
Compare
|
Guix Automation has began to build this PR tagged as v20.1.0-devpr5870.e70d4942. A new comment will be made when the image is pushed. |
PastaPastaPasta
force-pushed
the
develop-trivial-2024-02-12
branch
from
e70d494 to
8bb2beb
Compare
|
Guix Automation has began to build this PR tagged as v20.1.0-devpr5870.8bb2beb4. A new comment will be made when the image is pushed. |
|
Guix Automation has completed; a release should be present here: https://github.com/dashpay/dash-dev-branches/releases/tag/v20.1.0-devpr5870.8bb2beb4. The image should be on dockerhub soon. |
PastaPastaPasta
force-pushed
the
develop-trivial-2024-02-12
branch
from
8bb2beb to
bf3d2d4
Compare
|
Guix Automation has began to build this PR tagged as v20.1.0-devpr5870.bf3d2d44. A new comment will be made when the image is pushed. |
|
Guix Automation has completed; a release should be present here: https://github.com/dashpay/dash-dev-branches/releases/tag/v20.1.0-devpr5870.bf3d2d44. The image should be on dockerhub soon. |
UdjinM6
approved these changes
Feb 14, 2024
There was a problem hiding this comment.
re-utACK, CI failure https://gitlab.com/dashpay/dash/-/jobs/6173511888 looks unrelated (restarted it just in case)
…ed for faa94cb test: Check that invalid peer traffic is accounted for (MarcoFalke) fae243f test: Remove confusing cast to same type (int to int) (MarcoFalke) Pull request description: Couldn't find a test for this and it seems something we should test, so I wrote one. ACKs for top commit: vasild: ACK faa94cb practicalswift: ACK faa94cb: patch looks correct Tree-SHA512: efcdd35960045cdfbd14480e16e0d1d09e81eb01670ac541ac2b105e1a63818a157c95853270242234a224880873e79957832bf4231374d7fe81de30f35e3abf
7ff0535 [mempool] Remove error suppression on upgrade (Amiti Uttarwar) Pull request description: In 0.21, we added unbroadcast txids to mempool.dat (bitcoin#18038). When users upgraded from 0.21 to 0.22, this would throw a misleading "failed to deserialize mempool data" error even though everything actually loaded properly. So, commit 9c8a55d added a try-block to prevent throwing the error. After upgrading to 0.22, this exception handling is no longer useful, so now we can remove it. ACKs for top commit: MarcoFalke: review ACK 7ff0535 theStack: Code review ACK 7ff0535 Tree-SHA512: 0444eea2b1326904f9855fd0af6669a4990f0427cf7c9293252a5b7049cdcc785bdf9398fd08ed8dedacfdd78e75039ddf1087b3654c558ff52498df15f05daf
…nt signs bedb8d8 Avoid comparision of integers with different signs (Jonas Schnelli) Pull request description: Fixes an integer comparison of different signs (which errors out on `-Werror,-Wsign-compare`). Introduced in bitcoin#21121. See https://bitcoinbuilds.org/index.php?ansilog=982c61cf-6969-4001-bebc-dc215e5d29a4.log ACKs for top commit: MarcoFalke: review ACK bedb8d8 amitiuttarwar: ACK bedb8d8 vasild: ACK bedb8d8 Tree-SHA512: cb22a6239a1fc9d0be5573bf6ae4ec379eb7398c88edc8fa2ae4fd721f37f9ca3724896c1ac16de14a5286888a0b631813da32cb62d177ffbf9b2c31e716a7aa
cc3971c GUI: Write PSBTs to file with binary mode (Andrew Chow) Pull request description: As noted in bitcoin#20959, PSBT files should be opened in binary mode as on windows, all newlines are turned into CRLF which produces invalid PSBTs. Fixes bitcoin#20959 ACKs for top commit: Talkless: utACK cc3971c. Tree-SHA512: fee62b66da844017a44d7d6da6d2d2794b097a7dec33fb07711615df1e94dccc76f987ffcbb325ad1f8db2a2dd6eaf514b6cbd2453e7658b9f6c9fb5c4c41dab
… size in intro dialog 415fb2e GUI/Intro: Move prune setting below explanation (Luke Dashjr) 2a84c6b GUI/Intro: Estimate max age of backups that can be restored with pruning (Luke Dashjr) e2dcd95 GUI/Intro: Rework UI flow to let the user set prune size in GBs (Luke Dashjr) f2e5a6b GUI/Intro: Abstract GUI-to-option into Intro::getPrune (Luke Dashjr) 62932cc GUI/Intro: Return actual prune setting from showIfNeeded (Luke Dashjr) Pull request description:  Moved from bitcoin#18728 ACKs for top commit: ryanofsky: Code review ACK 415fb2e. Changes since last review: mb/gib suffixes, constexpr QOverload expected_backup_days tweaks, new moveonly layout commit jarolrod: Tested ACK 415fb2e. Talkless: tACK 415fb2e, tested on Debian Sid with Qt 5.15.2. hebasto: ACK 415fb2e, my unresolved comments are not blockers, and they could be resolved in follow ups. Tree-SHA512: bd4882a9c08e6a6eb14b7fb6366983db8581425b4949fea212785d34d8fad9e32fb81ca8c8cdbfb2c05ea394aaf5a746ba2cf16623795c7252c3bdb61d455f00
…lator comments 8b77133 qt: Replace disambiguation strings with translator comments (Hennadii Stepanov) Pull request description: Since bitcoin#21694 is merged, translator comments is the right way to pass context to translators. This PR fixes changes were made: - in dashpay#220 before bitcoin#21694 - in bitcoin#21694 on testing purpose - in dashpay#125 Closes dashpay#288. ACKs for top commit: jarolrod: ACK 8b77133 Tree-SHA512: 466ade35f4969a41fbf3196780b1ae9fa810bab5d2f09077f8631604636cc63b24a901c719f6b5797366d2aa307993d0aa419ce35200c8d0a741a3d81cad3e6b
…in fuzzing harness `coins_view`. 3737126 Mark `CheckTxInputs` `[[nodiscard]]` (out-param `txfee` only set if call is successful). Avoid UUM in fuzzing harness `coins_view`. (practicalswift) Pull request description: Mark `CheckTxInputs` `[[nodiscard]]` (out-param `txfee` only set if call is successful). Avoid use of uninitialised memory (UUM) in fuzzing harness `coins_view`. ACKs for top commit: MarcoFalke: review ACK 3737126 Tree-SHA512: edada5b2e80ce9ad3bd57b4c445bedefffa0a2d1cc880957d6848e4b7d9fc1ce036cd17f8b18bc03a36fbf84fc29c166cd6ac3dfbfe03e69d6fdbda13697754d
057750c ci: Upgrading pip version in macos environment (Tushar Singla) Pull request description: During each CI run, in macos native environment, python packages lief and zmq are rebuilt everytime which wastes a lot of resources and time and fixes bitcoin#22206. The latest version of pip directly fetches pre-built binaries. Through this commit pip version is upgraded in macos environment before installation of these packages. ACKs for top commit: MarcoFalke: cr ACK 057750c Tree-SHA512: e61d02e46c8fe6a89119014d025a26aba090f9507d725315680893290f5bbc20a375ef408c71fa8db2f485b44ec91cfa0c140198ca44a9d3e0a57055b6bb9582
fa33ed4 fuzz: Limit max ops in tx_pool fuzz targets (MarcoFalke) Pull request description: Without a size limit on the input data, the runtime is unbounded. Fix this by picking an upper bound on the maximum number of fuzz operations. Reproducer from OSS-Fuzz (without bug report): [clusterfuzz-testcase-tx_pool_standard-5963992253202432.log](https://github.com/bitcoin/bitcoin/files/6822465/clusterfuzz-testcase-tx_pool_standard-5963992253202432.log) ACKs for top commit: practicalswift: cr ACK fa33ed4 Tree-SHA512: 32098d573880afba12d510ac83519dc886a6c65d5207edb810f92c7c61edf5e2fc9c57e7b7a1ae656c02ce14e3595707dd6b93caf7956beb2bc817609e14d23d
…on cannot be read 1ee6d0b gui: Prompt to reset settings when settings.json cannot be read (Russell Yanofsky) Pull request description: Currently the GUI shows confusing error messages when `settings.json` can't be read or written on startup. This causes the unrecoverable read error described in bitcoin#21340 and write error described bitcoin#21974. Current error read message looks like:  This PR tries to clarify the error dialog, and adds an option to just clear the settings and reset them to default:   Additionally the PR also shows a slightly better error message when there is an error trying to write the settings file. This error probably should occur less frequently, but it is easy to improve, and it should be good to make the write error consistent with the read error. The new write error dialog looks like:   ACKs for top commit: jarolrod: ACK 1ee6d0b Zero-1729: ACK 1ee6d0b hebasto: ACK 1ee6d0b, tested on Linux Mint 20.2 (Qt 5.12.8). Tree-SHA512: fb57a0a0d032e3f8219fff49a4de69b4c962bf0b448544ccf9d8d4d45c5bd209e23653d4f13300b9e534b9c03de159498bef1658e95defe3ab6a8ecac57d592c
470c6aa doc: Update GitHub documentation links (Suriyaa Rocky Sundararuban) Pull request description: Removing URL redirecting for GitHub documentation links. ACKs for top commit: fanquake: ACK 470c6aa - updates look correct. Tree-SHA512: 5359aaddf1a1adabd0dc0e36cffcdb7b1ed83d9022314804655e010c84bf6143b7a2c8553a4e6c7793f02973868ad4b7554431ad61df82130ce47af74ebf0e99
fa35efa ci: Run arm task on arm64 hardware (MarcoFalke) Pull request description: It will still run cross-compilation to armhf, but run the binaries on the hardware itself, not qemu. There shouldn't be any significant difference, other than maybe a slight speedup. ACKs for top commit: hebasto: re-ACK fa35efa Tree-SHA512: d03bb2b55d0a6b5021243eedff6e143f4fad03a1a8913000c2c5c74665e4bb1c77cb30aa112dbddbc0bb7c645bec18f6b8b8ba91049587b464bbe5ec07dd46bd
faa5fa9 fuzz: Use LIMITED_WHILE instead of limit_max_ops (MarcoFalke) Pull request description: This avoids the local stack variable `limit_max_ops` and makes it easier to grep for limited loops. Also, it is less code. ACKs for top commit: theStack: Code-review ACK faa5fa9 🍷 Zero-1729: crACK faa5fa9 🥤 Tree-SHA512: b10d89f4ce57bac0d6e9de9db7d4db85bae81bc02536d46a910be8c0e77333f2d9a547c7fe03df57f5ff9fd90b6994b09996d8e148573fb7ecd840d08b5c0c7d
edd0313 test: Improve "invalid_command" subtest in system_tests for Windows (Hennadii Stepanov) fb1b059 test: Fix "non-zero exit code" subtest in system_tests for Windows (Hennadii Stepanov) 0aad33d test: Fix "false" subtest in system_tests for Windows (Hennadii Stepanov) 507c009 test: Fix "echo" subtest in the system_tests for Windows (Hennadii Stepanov) Pull request description: An attempt to fix bitcoin#23775. With this PR on Windows 10 Pro 21H1 (build 19043.1348): ``` C:\Users\hebasto\bitcoin>src\test_bitcoin.exe --run_test=system_tests/run_command Running 1 test case... *** No errors detected C:\Users\hebasto\bitcoin>src\test_bitcoin.exe Running 482 test cases... *** No errors detected ``` ACKs for top commit: sipsorcery: tACK edd0313 Tru3Nrg: tACK bitcoin@edd0313 Tree-SHA512: 66a4f2372858011ff862b71c6530bedb8bc731b18595636fac9affc9189d9320f212c68b62498f2b57ee7a07f59e842dbec085b76a7419791d1a06c8e80e7744
PastaPastaPasta
force-pushed
the
develop-trivial-2024-02-12
branch
from
bf3d2d4 to
09e2a9e
Compare
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
Batch of trivial backports
What was done?
How Has This Been Tested?
Built; ran functional tests
Breaking Changes
Checklist: