mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-21 14:34:49 +01:00
Code Issues Projects Releases Wiki Activity

Merge bitcoin/bitcoin#26208: signet/miner: reduce default interblock interval limit to 30min

Browse source 
51a08f41ff signet/miner: reduce default interblock interval limit to 30min (Anthony Towns)

Pull request description:

  Reduces the cap on the time between blocks from 60 minutes to 30 minutes, and makes it configurable.

Top commit has no ACKs.

Tree-SHA512: 7b880c50e47d055a2737c057fab190017748849d264c6c39dde465959a544d502221d12c6307d4de693f51badb4779b9c147e48775ede6ec6613e808067ab279
This commit is contained in:
fanquake 2022-10-03 09:12:15 +01:00
commit 6c5ef5d460
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
contrib/signet/miner
View file

@ -225,7 +225,7 @@ def seconds_to_hms(s):
out = "-" + out out = "-" + out
return out return out
def next_block_delta(last_nbits, last_hash, ultimate_target, do_poisson): def next_block_delta(last_nbits, last_hash, ultimate_target, do_poisson, max_interval):
# strategy: # strategy:
# 1) work out how far off our desired target we are # 1) work out how far off our desired target we are
# 2) cap it to a factor of 4 since that's the best we can do in a single retarget period # 2) cap it to a factor of 4 since that's the best we can do in a single retarget period
@ -248,7 +248,7 @@ def next_block_delta(last_nbits, last_hash, ultimate_target, do_poisson):
this_interval_variance = 1 this_interval_variance = 1
this_interval = avg_interval * this_interval_variance this_interval = avg_interval * this_interval_variance
this_interval = max(1, min(this_interval, 3600)) this_interval = max(1, min(this_interval, max_interval))
return this_interval return this_interval
@ -308,6 +308,10 @@ def do_generate(args):
return 1 return 1
my_blocks = (start-1, stop, total) my_blocks = (start-1, stop, total)
if args.max_interval < 960:
logging.error("--max-interval must be at least 960 (16 minutes)")
return 1
ultimate_target = nbits_to_target(int(args.nbits,16)) ultimate_target = nbits_to_target(int(args.nbits,16))
mined_blocks = 0 mined_blocks = 0
@ -324,7 +328,7 @@ def do_generate(args):
if lastheader is None: if lastheader is None:
lastheader = bestheader["hash"] lastheader = bestheader["hash"]
elif bestheader["hash"] != lastheader: elif bestheader["hash"] != lastheader:
next_delta = next_block_delta(int(bestheader["bits"], 16), bestheader["hash"], ultimate_target, args.poisson) next_delta = next_block_delta(int(bestheader["bits"], 16), bestheader["hash"], ultimate_target, args.poisson, args.max_interval)
next_delta += bestheader["time"] - time.time() next_delta += bestheader["time"] - time.time()
next_is_mine = next_block_is_mine(bestheader["hash"], my_blocks) next_is_mine = next_block_is_mine(bestheader["hash"], my_blocks)
logging.info("Received new block at height %d; next in %s (%s)", bestheader["height"], seconds_to_hms(next_delta), ("mine" if next_is_mine else "backup")) logging.info("Received new block at height %d; next in %s (%s)", bestheader["height"], seconds_to_hms(next_delta), ("mine" if next_is_mine else "backup"))
@ -338,14 +342,14 @@ def do_generate(args):
action_time = now action_time = now
is_mine = True is_mine = True
elif bestheader["height"] == 0: elif bestheader["height"] == 0:
time_delta = next_block_delta(int(bestheader["bits"], 16), bci["bestblockhash"], ultimate_target, args.poisson) time_delta = next_block_delta(int(bestheader["bits"], 16), bci["bestblockhash"], ultimate_target, args.poisson, args.max_interval)
time_delta *= 100 # 100 blocks time_delta *= 100 # 100 blocks
logging.info("Backdating time for first block to %d minutes ago" % (time_delta/60)) logging.info("Backdating time for first block to %d minutes ago" % (time_delta/60))
mine_time = now - time_delta mine_time = now - time_delta
action_time = now action_time = now
is_mine = True is_mine = True
else: else:
time_delta = next_block_delta(int(bestheader["bits"], 16), bci["bestblockhash"], ultimate_target, args.poisson) time_delta = next_block_delta(int(bestheader["bits"], 16), bci["bestblockhash"], ultimate_target, args.poisson, args.max_interval)
mine_time = bestheader["time"] + time_delta mine_time = bestheader["time"] + time_delta
is_mine = next_block_is_mine(bci["bestblockhash"], my_blocks) is_mine = next_block_is_mine(bci["bestblockhash"], my_blocks)
@ -419,7 +423,7 @@ def do_generate(args):
# report # report
bstr = "block" if is_mine else "backup block" bstr = "block" if is_mine else "backup block"
next_delta = next_block_delta(block.nBits, block.hash, ultimate_target, args.poisson) next_delta = next_block_delta(block.nBits, block.hash, ultimate_target, args.poisson, args.max_interval)
next_delta += block.nTime - time.time() next_delta += block.nTime - time.time()
next_is_mine = next_block_is_mine(block.hash, my_blocks) next_is_mine = next_block_is_mine(block.hash, my_blocks)
@ -497,6 +501,7 @@ def main():
generate.add_argument("--multiminer", default=None, type=str, help="Specify which set of blocks to mine (eg: 1-40/100 for the first 40%%, 2/3 for the second 3rd)") generate.add_argument("--multiminer", default=None, type=str, help="Specify which set of blocks to mine (eg: 1-40/100 for the first 40%%, 2/3 for the second 3rd)")
generate.add_argument("--backup-delay", default=300, type=int, help="Seconds to delay before mining blocks reserved for other miners (default=300)") generate.add_argument("--backup-delay", default=300, type=int, help="Seconds to delay before mining blocks reserved for other miners (default=300)")
generate.add_argument("--standby-delay", default=0, type=int, help="Seconds to delay before mining blocks (default=0)") generate.add_argument("--standby-delay", default=0, type=int, help="Seconds to delay before mining blocks (default=0)")
generate.add_argument("--max-interval", default=1800, type=int, help="Maximum interblock interval (seconds)")
calibrate = cmds.add_parser("calibrate", help="Calibrate difficulty") calibrate = cmds.add_parser("calibrate", help="Calibrate difficulty")
calibrate.set_defaults(fn=do_calibrate) calibrate.set_defaults(fn=do_calibrate)