backport: merge bitcoin#21089, #27670, #24031, #26470, #27296, #27179, #27813, #27811, #28069, #28294, #28324, #28328, #29987 (guix backports: part 4) #6382
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
Collaborator
Author
Expected hashes for 45f3b34 |
|
Guix Automation has failed due to the HEAD commit not being signed by an authorized core-team member. Please rebase and sign or push a new empty signed commit to allow Guix build to happen. |
5 tasks
kwvg
changed the title
Collaborator
Author
Expected hashes for 6536c79567a7 |
|
Guix Automation has failed due to the HEAD commit not being signed by an authorized core-team member. Please rebase and sign or push a new empty signed commit to allow Guix build to happen. |
Collaborator
Author
Expected hashes for c960aaa |
|
Guix Automation has began to build this PR tagged as v22.0.0-devpr6382.c960aaa8. 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/v22.0.0-devpr6382.c960aaa8. The image should be on dockerhub soon. |
|
Guix CI is broken, pls try applying 056b91d (my results https://github.com/UdjinM6/dash/actions/runs/11699788621) |
continuation of 9c8f5f7 from dash#5237
Should help upcoming commits render their diffs correctly
…ion from upstream
reverts: - 8535830 We're going to be updating to glibc 2.31 in the next commit
Collaborator
Author
Expected hashes for 1edd121 |
UdjinM6
approved these changes
Nov 7, 2024
|
|
||
| # Default to building for all supported HOSTs (overridable by environment) | ||
| export HOSTS="${HOSTS:-x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu | ||
| export HOSTS="${HOSTS:-x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu powerpc64-linux-gnu powerpc64le-linux-gnu |
Member
There was a problem hiding this comment.
sooo maybe I'm architecture-ist, but I don't really want to support power... I don't think there are really any production level consumer devices that run on power, besides maybe really old MacBooks. And this will significantly increase space and time needed for guix builds... I'm okay with being ABLE to build guix for power, but I don't think we should ship, test, or support it. Open to being convinced...
(Unrelated, but I also would want to drop 32 bit arm linux I think... Very unlikely many people actually run on arm32 linux imo)
There was a problem hiding this comment.
Default to building for all supported HOSTs (overridable by environment)
we can simply just adjust our build scripts (HOSTS="whatever archs we want" /contrib/guix/guix-build) 🤷♂️
Member
There was a problem hiding this comment.
I think I would prefer that guix-build only builds the HOSTS we ship by default.
There was a problem hiding this comment.
Well, yeah, you could do smth like that I guess to avoid accidental unnecessary builds. Let's maybe do it in a separate PR though?
Collaborator
Author
There was a problem hiding this comment.
I don't mind modifying guix-start to exclude PowerPC, we can even go so far as building only on platforms we actively support (dropping 32-bit ARM and maybe, RISC-V), because it's our solution and won't conflict with upstream but I think that should be a separate PR.
This was referenced Nov 10, 2024
PastaPastaPasta
added a commit
that referenced
this pull request
Nov 12, 2024
, bitcoin#28786, bitcoin#29078, bitcoin#27897, bitcoin#29651, bitcoin#29695, bitcoin#29673, bitcoin#29828, bitcoin#29846, bitcoin#30231, bitcoin#30438, partial bitcoin#30511 (guix backports: part 5) 91b7ef8 merge bitcoin#30438: build Linux GCC with --enable-cet (Kittywhiskers Van Gogh) cfc6cba partial bitcoin#30511: GCC 12 consolidation (Kittywhiskers Van Gogh) 06f5431 merge bitcoin#30231: bump time-machine to f0bb724211872cd6158fce6162e0b8c73efed126 (Kittywhiskers Van Gogh) 5b292ee merge bitcoin#29846: replace GCC unaligned VMOV patch with binutils patch (Kittywhiskers Van Gogh) 4d1f7dc merge bitcoin#29828: remove `gcc-toolchain static` from Windows build (Kittywhiskers Van Gogh) f321d3d merge bitcoin#29673: use GCC 11 in macOS build env (Kittywhiskers Van Gogh) d570e2d merge bitcoin#29695: build GCC with --enable-standard-branch-protection (Kittywhiskers Van Gogh) c965943 merge bitcoin#29651: bump time-machine to dc4842797bfdc5f9f3f5f725bf189c2b68bd6b5a (Kittywhiskers Van Gogh) 59a125a merge bitcoin#27897: use GCC 12.3.0 to build releases (Kittywhiskers Van Gogh) a701b06 merge bitcoin#29078: Bump guix time-machine to unlock riscv64 metal (Kittywhiskers Van Gogh) d4b10a3 merge bitcoin#28786: switch to 6.1 kernel headers over 5.15 (Kittywhiskers Van Gogh) c371870 merge bitcoin#28580: update time-machine (Kittywhiskers Van Gogh) d36c9b6 merge bitcoin#28759: update signapple to latest master (Kittywhiskers Van Gogh) 38c71d8 merge bitcoin#28370: remove GCC 10 workaround from NSIS (Kittywhiskers Van Gogh) Pull request description: ## Additional Information * Dependent on #6382 * Dependency for #6384 ## Breaking Changes None expected ## Checklist - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests **(note: N/A)** - [x] I have made corresponding changes to the documentation **(note: N/A)** - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK 91b7ef8 Tree-SHA512: 0cfb436a430cf4b624a48a9928ecac9cd5c50e88e51ed04e7d1d0100968af8be1183364f035ac75153781a5e1616aa2f6fadabf0a1c03ec4b66dedea544b77ad
PastaPastaPasta
added a commit
that referenced
this pull request
Nov 14, 2024
…pdate `guix-start` and `guix-check` to work correctly outside of containers c5d482e chore: suppress `git config` output (UdjinM6) 8ce9bfe chore: tweak error message (UdjinM6) f4d879a guix: more sanity checks for `WORKSPACE_PATH` (UdjinM6) 07f056a guix: Let `XCODE_SOURCE` be specified via env (UdjinM6) 74489dc chore: Log when preparing macOS SDK or adding `safe.directory` option (UdjinM6) 3ac5739 guix: "Invert" `guix-start`/`guix-check` cmd-line argument behaviour, defaults to `pwd` (UdjinM6) 187a4f1 guix: Avoid adding duplicate `safe.directory` option (UdjinM6) 87c9786 guix: `guix-start` should respect `SDK_PATH` (UdjinM6) ee5f62b guix: build only supported targets using Guix container (Kittywhiskers Van Gogh) Pull request description: ## Issue being fixed or feature implemented #6382 (comment) #6388 (comment) alternative to #6388 ## What was done? ## How Has This Been Tested? ## Breaking Changes ## Checklist: - [ ] 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 - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: kwvg: ACK c5d482e Tree-SHA512: c0271f243f5912f55276fcb371a135f443f23cc1f29480f303ea77deeadb6fd7d3d97e07e6a1fa323a2b2bad1d65aa6298da33978832eb68a0a6303db3e0063c
knst
added a commit
to knst/dash
that referenced
this pull request
Dec 26, 2024
, bitcoin#24031, bitcoin#26470, bitcoin#27296, bitcoin#27179, bitcoin#27813, bitcoin#27811, bitcoin#28069, bitcoin#28294, bitcoin#28324, bitcoin#28328, bitcoin#29987 (guix backports: part 4)" This reverts commit f155ecf, reversing changes made to a8e2316.
PastaPastaPasta
added a commit
that referenced
this pull request
Nov 4, 2025
, bitcoin#25748, bitcoin#25863, bitcoin#24051, bitcoin#25315, bitcoin#26624, bitcoin#26894, bitcoin#26673, bitcoin#24462, bitcoin#25815, bitcoin#22949, bitcoin#26723, bitcoin#23395, bitcoin#27016, bitcoin#27189, bitcoin#27317 (auxiliary backports: part 28) 2eef89c merge bitcoin#27317: Check that the timestamp string is non-empty to avoid undefined behavior (Kittywhiskers Van Gogh) de6c0ae merge bitcoin#27189: Use steady clock in SeedStrengthen, FindBestImplementation, FlushStateToDisk (Kittywhiskers Van Gogh) 5bed6ea merge bitcoin#27016: require miniupnpc API version 17 or later (Kittywhiskers Van Gogh) 51a9f24 merge bitcoin#23395: Add -shutdownnotify option (Kittywhiskers Van Gogh) af0e14d merge bitcoin#26723: call `keypoolrefill` with priv key disabled should throw an error (Kittywhiskers Van Gogh) b91c5b9 merge bitcoin#22949: Round up fee calculation to avoid a lower than expected feerate (Kittywhiskers Van Gogh) 05fb900 merge bitcoin#25815: Use existing {Chainstate,Block}Man (Kittywhiskers Van Gogh) 945798c merge bitcoin#24462: For descriptor pubkey parse errors, include context information (Kittywhiskers Van Gogh) 033e060 merge bitcoin#26673: Remove confusing getBool method (Kittywhiskers Van Gogh) 37ca4b4 merge bitcoin#26894: Remove redundant key_to_p2pkh call (Kittywhiskers Van Gogh) 2b3f925 merge bitcoin#26624: Rename local variable to distinguish it from type alias (Kittywhiskers Van Gogh) 3a58533 merge bitcoin#25315: Add warning on first startup if free disk space is less than necessary (Kittywhiskers Van Gogh) adeebb0 merge bitcoin#24051: bitcoin-{cli,tx,util} don't need UPnP, NAT-PMP, or ZMQ (Kittywhiskers Van Gogh) 55a474f merge bitcoin#25863: remove unused norm_prv parameter in `descriptor_tests.cpp` (Kittywhiskers Van Gogh) 65299a0 merge bitcoin#25748: Avoid copies in FlatSigningProvider Merge (Kittywhiskers Van Gogh) 5d69d18 merge bitcoin#15936: Expose settings.json methods to GUI (Kittywhiskers Van Gogh) bdf5e92 merge bitcoin#24410: Split hashing/index `GetUTXOStats` codepaths, decouple from `coinstatsindex` (Kittywhiskers Van Gogh) 43e2a19 merge bitcoin#23345: Drop unneeded dependencies for bitcoin-wallet tool (Kittywhiskers Van Gogh) Pull request description: ## Additional Information * The minimum acceptable prune height in [bitcoin#25315](bitcoin#25315) is higher than upstream (`945` vs `550`) because minimum height is calculated using `MIN_DISK_SPACE_FOR_BLOCK_FILES` which was bumped in [dash#1621](#1621), this has been reflected in functional tests. * [bitcoin#27016](bitcoin#27016) raises the minimum miniupnpc version to v2.1. This is acceptable as depends already uses version v2.2.2 ([source](https://github.com/dashpay/dash/blob/f7dad69eab573c179060ff9eb1bbaccb317de6d3/depends/packages/miniupnpc.mk#L2)) and our minimum supported target based on glibc version (see description of [dash#6382](#6382)), Ubuntu 20.04 LTS ([source](https://launchpad.net/ubuntu/+source/miniupnpc/2.1.20190824-0ubuntu2)) and RHEL 9 ([source](https://rpmfind.net/linux/RPM/epel/9/x86_64/Packages/m/miniupnpc-2.2.4-2.el9.x86_64.html)) ship with the minimum required miniupnpc version or higher. * [bitcoin#24462](bitcoin#24462) includes changes that SegWit and Taproot-oriented that have been omitted from the backport. * In [bitcoin#22949](bitcoin#22949), `rpc_fundrawtransaction.py`'s `restart_node()` needs to be passed an empty set of `extra_args` to avoid the following test failure (see below) ``` $ python3 ./test/functional/rpc_fundrawtransaction.py --descriptors 2025-11-03T11:19:02.448000Z TestFramework (INFO): PRNG seed is: 4253671634984506297 2025-11-03T11:19:02.448000Z TestFramework (INFO): Initializing test directory /var/folders/gt/rf6wpfx963x__7wg283kwnxc0000gp/T/dash_func_test_gylr91av 2025-11-03T11:19:04.236000Z TestFramework (INFO): Connect nodes, set fees, generate blocks, and sync [...] 2025-11-03T11:19:24.065000Z TestFramework (INFO): Test issue 22670 ApproximateBestSubset bug 2025-11-03T11:20:02.261000Z TestFramework (ERROR): Unexpected exception caught during testing Traceback (most recent call last): File "/src/dash/test/functional/test_framework/test_framework.py", line 163, in main self.run_test() File "/src/dash/./test/functional/rpc_fundrawtransaction.py", line 134, in run_test self.test_22670() File "/src/dash/./test/functional/rpc_fundrawtransaction.py", line 1084, in test_22670 self.restart_node(0) File "/src/dash/test/functional/test_framework/test_framework.py", line 697, in restart_node self.start_node(i, extra_args) File "/src/dash/test/functional/test_framework/test_framework.py", line 655, in start_node node.wait_for_rpc_connection() File "/src/dash/test/functional/test_framework/test_node.py", line 271, in wait_for_rpc_connection raise FailedToStartError(self._node_msg( test_framework.test_node.FailedToStartError: [node 0] dashd exited with status 1 during initialization. Error: Error loading default_wallet: You can't disable HD on an already existing HD wallet ************************ ``` * ~~To deal with frequent functional test failures due to `rpc_mempool_entry_fee_fields_deprecation.py` experiencing port conflicts ([build](https://github.com/dashpay/dash/actions/runs/19031966785/job/54350070090#step:6:1117), [build](https://github.com/dashpay/dash/actions/runs/19031966785/job/54350107927#step:6:1128)) retries will modify the port seed to try again with a different set of likely non-conflicting ports.~~ Superseded by [dash#6937](#6937). ## Breaking Changes Building with UPnP enabled requires miniupnpc API version 17 (raising the minimum version from v1.9 to v2.1). ## Checklist - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests - [x] 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)_ ACKs for top commit: UdjinM6: utACK 2eef89c Tree-SHA512: 8814ff6b01ac096107d0a78c89806ea1902653c0444db84c476698af4ff5cf1c7fc42b09fce4c3c62f16adce26f1e10cec15ca4c96078c58cdcce7b640a5163d
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Motivation
In preparation for migrating to C++20 and bumping our minimum required compiler to ensure that we have access to greater portions of the C++20 spec, this pull request first of two pull requests aiming to upgrade our Guix setup to use GCC 12 (and GCC 11 for the macOS toolchain).
Upgrades to the Clang toolchain for macOS and moving to GCC 12 for the macOS toolchain will be addressed in a separate pull request as the latter requires bitcoin#21778, which is well outside the scope of this PR.
Additional Notes
Dependency for backport: merge bitcoin#28370, #28759, #28580, #28786, #29078, #27897, #29651, #29695, #29673, #29828, #29846, #30231, #30438, partial bitcoin#30511 (guix backports: part 5) #6383
Newer versions of GCC will not behave as expected with
test-security-check.pyas the stack protector (listed asCanaryin the test) now behaves as expected and no longer fails. This causes an error when running it as the test expects failure (see below). This isn't an issue upstream as they backported bitcoin#29987, which gets rid of those tests (source).Therefore, we have backported that pull request as well.
Build failure:
bionic) (i.e. our Guix binaries won't run on these distros anymore, users running those distros will have to compile it themselves).This shouldn't be a problem as full support for RHEL 8 ended May 31, 2024 (source) and standard support for
bionicended April 2023 (source).Dash Core will still work on Ubuntu 20.04 LTS (
focal) as it ships with glibc 2.31 (source)Breaking Changes
None expected
Checklist: