clean up exchange configuration handling #4126
Merged
Conversation
This file contains 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
Per spec, we should not be sending our detected terminal block to EL - the EL configuration exchange should only look at values from configuration and report mismatches. * note TODO about usage of terminal block hash configuration
Closed
tersec
reviewed
Sep 16, 2022
beacon_chain/eth1/eth1_monitor.nim
Outdated
| @@ -561,67 +559,46 @@ proc exchangeTransitionConfiguration*(p: Eth1Monitor): Future[EtcStatus] {.async | |||
| if dataProvider.isNil: | |||
| return EtcStatus.exchangeError | |||
|
|
|||
| # https://github.com/ethereum/execution-apis/blob/main/src/engine/specification.md#engine_exchangetransitionconfigurationv1 | |||
There was a problem hiding this comment.
arnetheduck
commented
Sep 16, 2022
tersec
reviewed
Sep 16, 2022
| @@ -38,8 +38,7 @@ type | |||
|
|
|||
| # Transition | |||
| TERMINAL_TOTAL_DIFFICULTY*: UInt256 | |||
| TERMINAL_BLOCK_HASH*: BlockHash | |||
| # TODO TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH*: Epoch | |||
| TERMINAL_BLOCK_HASH*: BlockHash # TODO use in eht1monitor | |||
There was a problem hiding this comment.
Suggested change
| TERMINAL_BLOCK_HASH*: BlockHash # TODO use in eht1monitor | |
| TERMINAL_BLOCK_HASH*: BlockHash # TODO use in eth1monitor |
tersec
approved these changes
Sep 16, 2022
zah
reviewed
Sep 16, 2022
| p.terminalBlockNumber.get | ||
| else: | ||
| (static default Quantity)) | ||
| terminalBlockHash: p.depositsChain.cfg.TERMINAL_BLOCK_HASH, |
There was a problem hiding this comment.
The old code was not fully wrong here I think. We still need to consider the command-line override that the user may supply.
There was a problem hiding this comment.
we consider the command line here:
nimbus-eth2/beacon_chain/nimbus_beacon_node.nim
Line 1830 in 667c3c9
This was referenced Sep 21, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Per spec, we should not be sending our detected terminal block to EL - the EL configuration exchange should only look at values from configuration and report mismatches.