Kintsugi on_merge_block tests #2811
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
Merged
paulhauner
force-pushed
the
kintsugi-terminal-block
branch
from
e709e8d to
6b216e2
Compare
paulhauner
changed the title
realbigsean
approved these changes
Nov 16, 2021
|
|
||
| /// Extracts a reference to an execution payload from a block, returning an error if there is a | ||
| /// fork mismatch. | ||
| fn execution_payload_ref<T: EthSpec>( |
There was a problem hiding this comment.
Could move this to the BeaconBlockRef impl
| /// | ||
| /// ## Specification | ||
| /// | ||
| /// Partially equivalent to the `process_execution_payload` function: |
There was a problem hiding this comment.
Seems like this is a copy-paste from partially_verify_execution_payload
| @@ -505,25 +521,31 @@ impl ExecutionLayer { | |||
|
|
|||
| self.execution_blocks().await.put(block.block_hash, block); | |||
|
|
|||
| // TODO(merge): This function can theoretically loop indefinitely, as per the | |||
| // specification. We should consider how to fix this. See discussion: | |||
| // TODO(merge): This implementation assumes that the following PR is merged: | |||
There was a problem hiding this comment.
Looks like this was merged. Unreleased still, so not sure if you want to keep this TODO?
| .runtime() | ||
| .upgrade() | ||
| .ok_or(Error::ShuttingDown)?; | ||
| // TODO(paul): respect the shutdown signal. |
There was a problem hiding this comment.
Do you want this one resolved prior to merge?
|
All comments addressed, thank you! |
paulhauner
added
ready-for-review
paulhauner
added a commit
that referenced
this pull request
Nov 28, 2021
* Start v1.1.5 updates * Implement new payload creation logic * Tidy, add comments * Remove unused error enums * Add validate payload for gossip * Refactor validate_merge_block * Split payload verification in per block processing * Add execute_payload * Tidy * Tidy * Start working on new fork choice tests * Fix failing merge block test * Skip block_lookup_failed test * Fix failing terminal block test * Fixes from self-review * Address review comments
paulhauner
added a commit
that referenced
this pull request
Nov 28, 2021
* Start v1.1.5 updates * Implement new payload creation logic * Tidy, add comments * Remove unused error enums * Add validate payload for gossip * Refactor validate_merge_block * Split payload verification in per block processing * Add execute_payload * Tidy * Tidy * Start working on new fork choice tests * Fix failing merge block test * Skip block_lookup_failed test * Fix failing terminal block test * Fixes from self-review * Address review comments
paulhauner
added a commit
that referenced
this pull request
Dec 2, 2021
* Start v1.1.5 updates * Implement new payload creation logic * Tidy, add comments * Remove unused error enums * Add validate payload for gossip * Refactor validate_merge_block * Split payload verification in per block processing * Add execute_payload * Tidy * Tidy * Start working on new fork choice tests * Fix failing merge block test * Skip block_lookup_failed test * Fix failing terminal block test * Fixes from self-review * Address review comments
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.
Issue Addressed
NA
Proposed Changes
Implements all of the execution-facing parts of the
v1.1.5consensus specification (e.g.,prepare_execution_payload,validate_merge_block, etc).Also, runs the
fork_choice/on_merge_blocktests from the EF tests. We are still ignoring one test, that's because we don't have the ability to retrospectively verify the merge block after an optimistic sync. I did manually disable optimistic sync and observe that test passing. We can pick that test up in the coming weeks as we hone our optimistic sync implementation.TODO