backport: Merge bitcoin#25430, 25394

[vijaydasmp]

bitcoin backport cryptotura

[github-actions]

This pull request has conflicts, please rebase.

[github-actions]

This pull request has conflicts, please rebase.

[coderabbitai]

Walkthrough

The changes modify components in both build configuration and functional testing areas. In the build system, the depends/Makefile has been updated to include the new environment variables C_STANDARD and CXX_STANDARD in the definitions of build_id and $(host_arch)_$(host_os)_id. Correspondingly, the depends/gen_id script has been updated to reflect these additions in its usage comments and echo the values during execution. In the test framework, the MiniWallet class in test/functional/test_framework/wallet.py has been refactored. The constructor now initializes a _mode attribute instead of having separate _priv_key and _address attributes, and the transaction signing logic across methods now uses _mode for conditional checks and behavior modifications.

✨ Finishing Touches

• 📝 Generate Docstrings

---

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ 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.
  • Generate unit testing code for this file.
  • 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 generate unit testing code for this file.
  • @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 generate unit testing code.
  • @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.

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 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 (2)

test/functional/test_framework/wallet.py (2)

196-202: Replace assert False with proper exception

Using assert False is not recommended as it can be removed when running Python with the -O optimization flag.

        elif self._mode == MiniWalletMode.RAW_P2PK:
            vsize = Decimal(168)  # P2PK (73 bytes scriptSig + 35 bytes scriptPubKey + 60 bytes other)
        else:
-            assert False
+            raise AssertionError(f"Unsupported MiniWalletMode: {self._mode}")

🧰 Tools

🪛 Ruff (0.8.2)

201-201: Do not assert False (python -O removes these calls), raise AssertionError()

Replace assert False

(B011)

---

209-217: Streamlined transaction signing logic with better error handling

The refactored code now handles each mode case distinctly, making the logic clearer. However, the same issue with assert False exists here.

        if self._mode == MiniWalletMode.RAW_P2PK:
            self.sign_tx(tx)
        elif self._mode == MiniWalletMode.RAW_OP_TRUE:
            tx.vin[0].scriptSig = CScript([OP_NOP] * 24)  # pad to identical size
        elif self._mode == MiniWalletMode.ADDRESS_OP_TRUE:
            tx.vin[0].scriptSig = CScript([CScript([OP_TRUE])])
        else:
-            assert False
+            raise AssertionError(f"Unsupported MiniWalletMode: {self._mode}")

🧰 Tools

🪛 Ruff (0.8.2)

216-216: Do not assert False (python -O removes these calls), raise AssertionError()

Replace assert False

(B011)

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 26ea618 and af649ce.

📒 Files selected for processing (3)

• depends/Makefile (1 hunks)
• depends/gen_id (2 hunks)
• test/functional/test_framework/wallet.py (4 hunks)

🧰 Additional context used

🪛 Ruff (0.8.2)

test/functional/test_framework/wallet.py

201-201: Do not assert False (python -O removes these calls), raise AssertionError()

Replace assert False

(B011)

---

216-216: Do not assert False (python -O removes these calls), raise AssertionError()

Replace assert False

(B011)

🔇 Additional comments (7)

test/functional/test_framework/wallet.py (3)

77-77: Refactoring to use _mode for internal state management

The change from using separate _priv_key and _address attributes to a single _mode attribute improves the design by centralizing the wallet's operational mode state.

---

115-115: Improved assertion check using the new mode-based approach

Checking against MiniWalletMode.RAW_P2PK is more expressive and consistent with the refactored mode-based design.

---

144-144: Consistent mode-based assertion

This change maintains consistency with the refactoring by checking the mode rather than the presence of an attribute.

depends/gen_id (3)

3-5: Updated documentation to include new variables

The changes to the usage comment properly document the supported environment variables C_STANDARD and CXX_STANDARD that can be provided to the script.

---

43-43: Added C standard output to build ID generation

This change ensures that the C standard version is captured in the build ID, which helps with build reproducibility.

---

50-50: Added C++ standard output to build ID generation

This change ensures that the C++ standard version is captured in the build ID, which helps with build reproducibility.

depends/Makefile (1)

147-148: Updated build ID generation to include language standards

Including C_STANDARD and CXX_STANDARD in the build ID calculation ensures that changes to language standards will trigger appropriate rebuilds of dependencies.

This is a good improvement to the build system as it increases build determinism by capturing more of the build environment configuration in the build ID. It works together with the changes in depends/gen_id to ensure consistent dependency rebuilds when C or C++ standards change.

[UdjinM6]

utACK af649ce

[vijaydasmp]

Hello @PastaPastaPasta , requesting review

[vijaydasmp]

Hello @PastaPastaPasta, requesting review

[knst]

utACK af649ce