From 35a42c9d458ecd00b911f2f72a875eb3d8134645 Mon Sep 17 00:00:00 2001 From: Danny Ryan Date: Fri, 24 Sep 2021 06:23:59 -0600 Subject: [PATCH] Apply suggestions from code review --- specs/merge/client-settings.md | 2 +- specs/merge/validator.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specs/merge/client-settings.md b/specs/merge/client-settings.md index fdf7a25d5..287e557db 100644 --- a/specs/merge/client-settings.md +++ b/specs/merge/client-settings.md @@ -22,7 +22,7 @@ Except under exceptional scenarios, this setting is expected to not be used. Suf ### Override terminal block hash -To allow for fork coordination around a specific PoW block, clients must also provide `--terminal-block-hash-override` as a configurable setting. +To allow for transition coordination around a specific PoW block, clients must also provide `--terminal-block-hash-override` as a configurable setting. The value provided by this setting takes precedence over the pre-configured `TERMINAL_BLOCK_HASH` parameter. Except under exceptional scenarios, this setting is expected to not be used. Sufficient warning to the user about this exceptional configurable setting should be provided. diff --git a/specs/merge/validator.md b/specs/merge/validator.md index 6b95830cc..1ccd7fe9e 100644 --- a/specs/merge/validator.md +++ b/specs/merge/validator.md @@ -76,7 +76,7 @@ def get_pow_block_at_terminal_total_difficulty(pow_chain: Sequence[PowBlock]) -> def get_terminal_pow_block(pow_chain: Sequence[PowBlock]) -> Optional[PowBlock]: if TERMINAL_BLOCK_HASH != Hash32(): - # Check block hash override prior to total difficulty + # Terminal lock hash override takes precedence over terminal total difficulty pow_block_overrides = [pow_block for pow_block in pow_chain if pow_block.block_hash == TERMINAL_BLOCK_HASH] if len(pow_block_overrides) != 0: return pow_block_overrides[0]