Merged
Conversation
Allows pointing the miner at a preferred bitcoin-cli for generating templates, while still using the main bitcoin-cli for submitting blocks, while automatically defaulting back to the main bitcoin-cli if the preferred one encounters problems. Primarily useful for experimenting with new consensus/policy rules.
Adds a --wallets option for specifying one or more wallets to be used when signing the block PSBT. Mainly useful for the multisig process where different wallets are needed for resolving the multisig address and then signing for it.
f8ddfc7 to
ae6ce5b
Compare
Author
|
Been running this on my signet miner for a little while now and it seems to work as expected; would be ideal to get some independent confirmation prior to merging though. Believe these commits should be reasonable for upstreaming. |
|
in commit ae6ce5b for mutinynet i set the |
Author
It only conflicts if you add the |
arminsabouri
pushed a commit
to arminsabouri/bitcoin
that referenced
this pull request
Nov 30, 2025
c40dbbb test: Move `script_assets_tests` into its own suite (Hennadii Stepanov) Pull request description: This PR ensures that the `script_assets_tests` test case is explicitly reported as "Skipped" when it is not run, making it clearer when running the test suite with `ctest`: - on the master branch @ 9355578: ``` $ env -u DIR_UNIT_TEST_DATA ctest --test-dir build -j 16 -R "^script_" Internal ctest changing into directory: /home/hebasto/git/bitcoin/build Test project /home/hebasto/git/bitcoin/build Start 87: script_tests Start 83: script_p2sh_tests Start 85: script_segwit_tests Start 86: script_standard_tests Start 84: script_parse_tests 1/5 Test bitcoin-inquisition#84: script_parse_tests ............... Passed 0.11 sec 2/5 Test bitcoin-inquisition#86: script_standard_tests ............ Passed 0.11 sec 3/5 Test bitcoin-inquisition#85: script_segwit_tests .............. Passed 0.12 sec 4/5 Test bitcoin-inquisition#83: script_p2sh_tests ................ Passed 0.12 sec 5/5 Test bitcoin-inquisition#87: script_tests ..................... Passed 0.36 sec 100% tests passed, 0 tests failed out of 5 Total Test time (real) = 0.37 sec ``` - with this PR: ``` $ env -u DIR_UNIT_TEST_DATA ctest --test-dir build -j 16 -R "^script_" Internal ctest changing into directory: /home/hebasto/git/bitcoin/build Test project /home/hebasto/git/bitcoin/build Start 83: script_assets_tests Start 88: script_tests Start 84: script_p2sh_tests Start 86: script_segwit_tests Start 87: script_standard_tests Start 85: script_parse_tests 1/6 Test bitcoin-inquisition#85: script_parse_tests ............... Passed 0.11 sec 2/6 Test bitcoin-inquisition#83: script_assets_tests ..............***Skipped 0.12 sec 3/6 Test bitcoin-inquisition#86: script_segwit_tests .............. Passed 0.11 sec 4/6 Test bitcoin-inquisition#87: script_standard_tests ............ Passed 0.11 sec 5/6 Test bitcoin-inquisition#84: script_p2sh_tests ................ Passed 0.12 sec 6/6 Test bitcoin-inquisition#88: script_tests ..................... Passed 0.36 sec 100% tests passed, 0 tests failed out of 6 Total Test time (real) = 0.37 sec The following tests did not run: 83 - script_assets_tests (Skipped) $ env DIR_UNIT_TEST_DATA=/home/hebasto/git/bitcoin/qa-assets/unit_test_data ctest --test-dir build -j 16 -R "^script_" Internal ctest changing into directory: /home/hebasto/git/bitcoin/build Test project /home/hebasto/git/bitcoin/build Start 83: script_assets_tests Start 88: script_tests Start 84: script_p2sh_tests Start 86: script_segwit_tests Start 87: script_standard_tests Start 85: script_parse_tests 1/6 Test bitcoin-inquisition#85: script_parse_tests ............... Passed 0.11 sec 2/6 Test bitcoin-inquisition#87: script_standard_tests ............ Passed 0.11 sec 3/6 Test bitcoin-inquisition#86: script_segwit_tests .............. Passed 0.11 sec 4/6 Test bitcoin-inquisition#84: script_p2sh_tests ................ Passed 0.12 sec 5/6 Test bitcoin-inquisition#88: script_tests ..................... Passed 0.35 sec 6/6 Test bitcoin-inquisition#83: script_assets_tests .............. Passed 1.58 sec 100% tests passed, 0 tests failed out of 6 Total Test time (real) = 1.58 sec ``` ACKs for top commit: maflcko: re-ACK c40dbbb 👈 ajtowns: ACK c40dbbb achow101: ACK c40dbbb Tree-SHA512: 25713e1c3b507b6f2a5fecc7b1ea285a6642b906c248769238a58fc0df48489ac5f7606778f9e3653b407b7f1d06563e1554d04321303b350c80eb888500cc5d
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Adds
--prefer-gbt-*options for inquisition fallback support,--walletsoption for using multiple wallets to sign the block PSBT, and--nversionfor overriding the block version (eg, in order to activate/abandon deployments).