mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-04-05 05:14:51 +02:00
Merge bitcoin/bitcoin#28417: contrib/signet/miner updates
fb6d51eb25signet/miner: Use argparse exclusive groups (Anthony Towns)338a266a9asignet/miner: add support for a poolnum/poolid tag in mined blocks (Anthony Towns)409ab7d35bsignet/miner: add Generate.mine function (Anthony Towns)7b31332370signet/miner: add Generate.gbt function (Anthony Towns)85c5c0bea9signet/miner: add Generate.next_block_time function (Anthony Towns)5540e6ca49signet/miner: move next_block_* functions into new Generator class (Anthony Towns)35f4631196signet/miner: rename do_decode_psbt to decode_psbt (Anthony Towns)aac040b439signet/miner: drop create_coinbase function (Anthony Towns)16951f549esignet/miner: drop do_createpsbt function (Anthony Towns)3aed0a4284signet/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: ACKfb6d51eb25danielabrozzoni: Code review ACKfb6d51eb25Tree-SHA512: d84095c4045ab196685b847e04ce2cdaedf387bc2527430ede918318dc5b70bf3d87b754264016f895f506fac70d4fdea5ef3cd8c3c375fd586afeae01e045e5
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user