diff options
| author | Ava Chow <github@achow101.com> | 2024-09-04 13:16:26 -0400 |
|---|---|---|
| committer | Ava Chow <github@achow101.com> | 2024-09-04 13:16:26 -0400 |
| commit | b0c3de684795f7f5e54b59e810d1bc57433d476e (patch) | |
| tree | 0505b537fb75f3802885036573a5b51c80056d9e /test | |
| parent | cb65ac469a50f4883d32c224122c2e64428ea578 (diff) | |
| parent | fb6d51eb25a2bb69a3ecdfc4796a88d4d1aacc65 (diff) | |
| download | bitcoin-b0c3de684795f7f5e54b59e810d1bc57433d476e.tar.xz | |
Merge bitcoin/bitcoin#28417: contrib/signet/miner updates
fb6d51eb25a2bb69a3ecdfc4796a88d4d1aacc65 signet/miner: Use argparse exclusive groups (Anthony Towns)
338a266a9a08e47bc6dd02175c8fa649f701515d signet/miner: add support for a poolnum/poolid tag in mined blocks (Anthony Towns)
409ab7d35b3cfa255a83e1004c55691515e4e3f5 signet/miner: add Generate.mine function (Anthony Towns)
7b3133237072a77231b38e59d619fd50fa769a6f signet/miner: add Generate.gbt function (Anthony Towns)
85c5c0bea9d45e93a9fb20988457480798d68637 signet/miner: add Generate.next_block_time function (Anthony Towns)
5540e6ca4930f99a1c0a1ee7b6e1c6ed75f95b55 signet/miner: move next_block_* functions into new Generator class (Anthony Towns)
35f46311969261f42727de4faac38dd9651f8d78 signet/miner: rename do_decode_psbt to decode_psbt (Anthony Towns)
aac040b439fd917274eabfc81b89eb6ed2fee325 signet/miner: drop create_coinbase function (Anthony Towns)
16951f549eba8540311d52c4ee387714ea9f7d4c signet/miner: drop do_createpsbt function (Anthony Towns)
3aed0a4284d1d44144649140e947aef6943d2967 signet/miner: drop get_reward_address function (Anthony Towns)
Pull request description:
Refactors the code a bunch, and adds `--poolnum` / `--poolid` options so that signers can tag their coinbases in a way that explorers can recognise (see also https://github.com/bitcoin-data/mining-pools/pull/82 and https://github.com/mempool/mempool/issues/2903).
The refactoring in particular helps enable the "try using inquisition's getblocktemplate, and if that doesn't work fall back to core's getblocktemplate" logic, as described/implemented in https://github.com/bitcoin-inquisition/bitcoin/pull/7
ACKs for top commit:
achow101:
ACK fb6d51eb25a2bb69a3ecdfc4796a88d4d1aacc65
danielabrozzoni:
Code review ACK fb6d51eb25a2bb69a3ecdfc4796a88d4d1aacc65
Tree-SHA512: d84095c4045ab196685b847e04ce2cdaedf387bc2527430ede918318dc5b70bf3d87b754264016f895f506fac70d4fdea5ef3cd8c3c375fd586afeae01e045e5
Diffstat (limited to 'test')
| -rwxr-xr-x | test/functional/tool_signet_miner.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/functional/tool_signet_miner.py b/test/functional/tool_signet_miner.py index bdefb92ae6..67fb5c9f94 100755 --- a/test/functional/tool_signet_miner.py +++ b/test/functional/tool_signet_miner.py @@ -57,6 +57,7 @@ class SignetMinerTest(BitcoinTestFramework): f'--grind-cmd={self.options.bitcoinutil} grind', '--nbits=1d00ffff', f'--set-block-time={int(time.time())}', + '--poolnum=99', ], check=True, stderr=subprocess.STDOUT) assert_equal(node.getblockcount(), 1) |