Shanghai Engine API Updates #4945
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
Signed-off-by: Zhenyang Shi <wcgcyx@gmail.com>
Signed-off-by: Zhenyang Shi <wcgcyx@gmail.com>
Signed-off-by: Zhenyang Shi <wcgcyx@gmail.com>
Signed-off-by: Zhenyang Shi <wcgcyx@gmail.com>
siladu
reviewed
Jan 18, 2023
...r/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdatedTest.java
Outdated
Show resolved
Hide resolved
...erledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayloadTest.java
Outdated
Show resolved
Hide resolved
| return false; | ||
| } | ||
|
|
||
| protected ExecutionEngineJsonRpcMethod.EngineStatus getCorrectInvalidBlockHashStatus() { |
There was a problem hiding this comment.
I prefer 'expected' over 'correct' like your other tests: expectedInvalidBlockHashStatus
There was a problem hiding this comment.
or just getInvalidBlockHashStatus
There was a problem hiding this comment.
Suggested change
| protected ExecutionEngineJsonRpcMethod.EngineStatus getCorrectInvalidBlockHashStatus() { | |
| protected ExecutionEngineJsonRpcMethod.EngineStatus getInvalidBlockHashStatus() { |
There was a problem hiding this comment.
I'd prefer expected too - since we expect different status for the same error for V1 and V2.
Signed-off-by: Zhenyang Shi <wcgcyx@gmail.com>
macfarla
reviewed
Jan 18, 2023
| return false; | ||
| } | ||
|
|
||
| protected ExecutionEngineJsonRpcMethod.EngineStatus getCorrectInvalidBlockHashStatus() { |
There was a problem hiding this comment.
or just getInvalidBlockHashStatus
| } | ||
|
|
||
| @Override | ||
| protected ExecutionEngineJsonRpcMethod.EngineStatus getCorrectInvalidBlockHashStatus() { |
There was a problem hiding this comment.
Suggested change
| protected ExecutionEngineJsonRpcMethod.EngineStatus getCorrectInvalidBlockHashStatus() { | |
| protected ExecutionEngineJsonRpcMethod.EngineStatus getInvalidBlockHashStatus() { |
| return false; | ||
| } | ||
|
|
||
| protected ExecutionEngineJsonRpcMethod.EngineStatus getCorrectInvalidBlockHashStatus() { |
There was a problem hiding this comment.
Suggested change
| protected ExecutionEngineJsonRpcMethod.EngineStatus getCorrectInvalidBlockHashStatus() { | |
| protected ExecutionEngineJsonRpcMethod.EngineStatus getInvalidBlockHashStatus() { |
| @@ -154,7 +155,7 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext) | |||
| "Invalid payload attributes: {}", | |||
| () -> | |||
| maybePayloadAttributes.map(EnginePayloadAttributesParameter::serialize).orElse(null)); | |||
| return new JsonRpcErrorResponse(requestId, JsonRpcError.INVALID_PAYLOAD_ATTRIBUTES); | |||
There was a problem hiding this comment.
I didn't see this change mentioned in ethereum/execution-apis#338 - is this something different?
There was a problem hiding this comment.
Yea, bring some changes from ethereum/execution-apis#337 too. Sorry should have updated the description.
There was a problem hiding this comment.
my bad, I got Zhenyang to crowbar that change in too :)
Signed-off-by: Zhenyang Shi <wcgcyx@gmail.com>
macfarla
approved these changes
Jan 18, 2023
| @@ -154,7 +155,7 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext) | |||
| "Invalid payload attributes: {}", | |||
| () -> | |||
| maybePayloadAttributes.map(EnginePayloadAttributesParameter::serialize).orElse(null)); | |||
| return new JsonRpcErrorResponse(requestId, JsonRpcError.INVALID_PAYLOAD_ATTRIBUTES); | |||
jframe
reviewed
Jan 18, 2023
.../hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java
Show resolved
Hide resolved
...va/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV1.java
Show resolved
Hide resolved
jframe
approved these changes
Jan 18, 2023
elenduuche
pushed a commit
to elenduuche/besu
that referenced
this pull request
Aug 16, 2023
Update engine API to include some new changes introduced in - ethereum/execution-apis#338 - ethereum/execution-apis#337 Signed-off-by: Simon Dudley <simon.dudley@consensys.net> Signed-off-by: Zhenyang Shi <wcgcyx@gmail.com> Co-authored-by: Simon Dudley <simon.dudley@consensys.net>
eum602
pushed a commit
to lacchain/besu
that referenced
this pull request
Nov 3, 2023
Update engine API to include some new changes introduced in - ethereum/execution-apis#338 - ethereum/execution-apis#337 Signed-off-by: Simon Dudley <simon.dudley@consensys.net> Signed-off-by: Zhenyang Shi <wcgcyx@gmail.com> Co-authored-by: Simon Dudley <simon.dudley@consensys.net>
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.
Signed-off-by: Zhenyang Shi wcgcyx@gmail.com
PR description
Update engine API to include some new changes introduced in
Fixed Issue(s)
fixes #4916
Documentation
doc-change-requiredlabel to this PR ifupdates are required.
Changelog