-
Notifications
You must be signed in to change notification settings - Fork 283
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Merge] Implement engine_consensusValidated EE API function #4401
Merged
Nashatyrev
merged 23 commits into
Consensys:merge-interop
from
Nashatyrev:merge/ee-api-consensus-validated
Sep 23, 2021
Merged
[Merge] Implement engine_consensusValidated EE API function #4401
Nashatyrev
merged 23 commits into
Consensys:merge-interop
from
Nashatyrev:merge/ee-api-consensus-validated
Sep 23, 2021
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
…ds (initial refactor)
…cution-service-refactor # Conflicts: # ethereum/core/src/testFixtures/java/tech/pegasys/teku/core/BlockProposalTestUtil.java # ethereum/spec/src/main/java/tech/pegasys/teku/spec/executionengine/ExecutionEngineService.java # ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/common/util/ExecutionPayloadUtil.java # validator/coordinator/src/main/java/tech/pegasys/teku/validator/coordinator/BlockFactory.java
…urrounding code where appropriate
…g ExecutionEngineChannel via params
…utionEngineService and incorporate events listening logic there
…api-fork-choice-updated # Conflicts: # ethereum/spec/src/main/java/tech/pegasys/teku/spec/executionengine/ExecutionEngineChannel.java # services/powchain/src/main/java/tech/pegasys/teku/services/powchain/execution/ExecutionEngineChannelImpl.java # services/powchain/src/main/java/tech/pegasys/teku/services/powchain/execution/ExecutionEngineService.java
…en headBlock and finalizedBlock
tbenr
reviewed
Sep 22, 2021
ethereum/spec/src/main/java/tech/pegasys/teku/spec/executionengine/ExecutionEngineChannel.java
Show resolved
Hide resolved
tbenr
reviewed
Sep 22, 2021
.../src/main/java/tech/pegasys/teku/services/powchain/execution/ExecutionEngineChannelImpl.java
Outdated
Show resolved
Hide resolved
…api-consensus-validated # Conflicts: # ethereum/spec/src/main/java/tech/pegasys/teku/spec/executionengine/ExecutionEngineChannel.java # services/powchain/src/main/java/tech/pegasys/teku/services/powchain/execution/ExecutionEngineChannelImpl.java # services/powchain/src/main/java/tech/pegasys/teku/services/powchain/execution/client/ExecutionEngineClient.java # services/powchain/src/main/java/tech/pegasys/teku/services/powchain/execution/client/Web3JExecutionEngineClient.java
Nashatyrev
force-pushed
the
merge/ee-api-consensus-validated
branch
from
September 22, 2021 15:16
2446500
to
58e5da9
Compare
tbenr
approved these changes
Sep 22, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM a double-check from @mkalinin could be nice
…api-consensus-validated # Conflicts: # ethereum/spec/src/main/java/tech/pegasys/teku/spec/executionengine/ExecutionEngineChannel.java
mkalinin
approved these changes
Sep 23, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 👍
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.
PR Description
Based atop of PR #4396
Just override the topmost
BlockProcessor.processAndValidateBlock()
method (which is called directly fromForkChoice.onBlock()
) in theBlockProcessorMerge
and invokeengine_consensusValidated()
VALID
result if theprocessAndValidateBlock()
completes normally and returns transitionedBeaconState
INVALID
result if aStateTransitionException
occursFixed Issue(s)
A part of #4346
Documentation
documentation
label to this PR if updates are required.Changelog