backport: trivial commits

[PastaPastaPasta]

Issue being fixed or feature implemented

(extra) small batch of trivial backports

How Has This Been Tested?

CI

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
• I have assigned this pull request to a milestone (for repository code-owners and collaborators only)

[coderabbitai]

Caution

Review failed

The pull request is closed.

Walkthrough

The updates include several targeted changes across build scripts, patches, and test files. In the symbol checking script, a version check was updated to require a newer tool version. The Guix build environment was adjusted by pinning to a new commit hash and introducing a helper function to apply a reproducibility patch to the MinGW winpthreads package, with corresponding updates to the cross-toolchain creation logic. Two patches were added or modified to the GCC and winpthreads Makefiles to append -ffile-prefix-map flags, ensuring debug symbols do not embed architecture-dependent Guix store paths, thereby improving build reproducibility. Additionally, a redundant block of coin selection test code was removed from the wallet test suite.

---

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 257b1b7 and 6a0b179.

📒 Files selected for processing (6)

• contrib/devtools/symbol-check.py (1 hunks)
• contrib/guix/libexec/prelude.bash (1 hunks)
• contrib/guix/manifest.scm (1 hunks)
• contrib/guix/patches/gcc-remap-guix-store.patch (1 hunks)
• contrib/guix/patches/winpthreads-remap-guix-store.patch (1 hunks)
• src/wallet/test/coinselector_tests.cpp (0 hunks)

✨ Finishing Touches

• 📝 Generate Docstrings

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>, please review it.
  • Explain this complex logic.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai explain this code block.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
  • @coderabbitai read src/utils.ts and explain its main purpose.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
  • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai full review to do a full review from scratch and review all the files again.
• @coderabbitai summary to regenerate the summary of the PR.
• @coderabbitai generate docstrings to generate docstrings for this PR.
• @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Other keywords and placeholders

• Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
• Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
• Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.

[coderabbitai]

Actionable comments posted: 0

🧹 Nitpick comments (1)

contrib/devtools/symbol-check.py (1)

254-257: Necessary version update for MACHO tool validation

This update to the expected LLVM linker (LLD) version check makes sense as part of keeping the toolchain requirements current.

Consider simplifying this function by returning the condition directly:

def check_MACHO_lld(binary) -> bool:
-    if binary.build_version.tools[0].version == [18, 1, 8]:
-        return True
-    return False
+    return binary.build_version.tools[0].version == [18, 1, 8]

🧰 Tools

🪛 Ruff (0.11.9)

255-257: Return the condition directly

Inline condition

(SIM103)

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
Cache: Disabled due to data retention organization setting
Knowledge Base: Disabled due to data retention organization setting

📥 Commits

Reviewing files that changed from the base of the PR and between dc6c35b and c97367f.

📒 Files selected for processing (6)

• contrib/devtools/symbol-check.py (1 hunks)
• contrib/guix/libexec/prelude.bash (1 hunks)
• contrib/guix/manifest.scm (1 hunks)
• contrib/guix/patches/gcc-remap-guix-store.patch (1 hunks)
• contrib/guix/patches/winpthreads-remap-guix-store.patch (1 hunks)
• src/wallet/test/coinselector_tests.cpp (0 hunks)

💤 Files with no reviewable changes (1)

• src/wallet/test/coinselector_tests.cpp

🧰 Additional context used

🪛 Ruff (0.11.9)

contrib/devtools/symbol-check.py

255-257: Return the condition directly

Inline condition

(SIM103)

🔇 Additional comments (5)

contrib/guix/libexec/prelude.bash (1)

54-54: Update to newer Guix version looks good

This change updates the pinned Guix commit hash to a newer version, supporting the PR's goal of improving build reproducibility.

contrib/guix/patches/winpthreads-remap-guix-store.patch (1)

1-18: Excellent reproducibility enhancement for debug symbols

This patch improves build reproducibility by ensuring debug symbols don't contain architecture-specific Guix store paths. Instead, all paths under /gnu/store are remapped to /usr using the -ffile-prefix-map compiler flag.

The approach is well-documented in the patch header and consistent with similar changes for other components (like the GCC patch).

contrib/guix/patches/gcc-remap-guix-store.patch (1)

1-21: Excellent reproducibility enhancement for libgcc

This patch correctly implements path remapping for libgcc debug symbols, ensuring that architecture-specific Guix store paths don't affect build reproducibility. The implementation is clean and mirrors the approach used in the winpthreads patch.

The consistent approach across multiple components demonstrates good systematic thinking about the build reproducibility problem.

contrib/guix/manifest.scm (2)

131-133: Well-structured helper function addition

The new winpthreads-patches function follows the same pattern as the existing patch helper functions, providing a clean way to apply the reproducibility patch to the MinGW winpthreads package.

---

139-141: Good integration with existing code

This change properly wraps the make-mingw-w64 call with the newly defined winpthreads-patches function, maintaining the original functionality while adding the reproducibility improvement. This approach improves build reproducibility by ensuring debug symbols don't embed architecture-dependent Guix store paths.

[UdjinM6]

ACK c97367f (works with #6682 applied)