Skip to content
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

Adding engine_getPayloadV4 and engine_newPayloadV4 #6783

Merged
merged 5 commits into from
Mar 23, 2024

Conversation

lucassaldanha
Copy link
Member

@lucassaldanha lucassaldanha commented Mar 21, 2024

PR description

The Engine API spec has been updated with Prague (https://github.com/ethereum/execution-apis/blob/main/src/engine/prague.md). To help test the integration between CL and EL for EIP-6110 and EIP-7002, I have started working to move these methods from experimental into V4 (conditional to Prague activation).

At the moment, only deposit receipts are supported. I am adding support for validator exits as well. I can do it as a separate PR if it makes it easier to review etc. Just let me know.

Fixed Issue(s)

N/A

Thanks for sending a pull request! Have you done the following?

  • Checked out our contribution guidelines?
  • Considered documentation and added the doc-change-required label to this PR if updates are required.
  • Considered the changelog and included an update if required.
  • For database changes (e.g. KeyValueSegmentIdentifier) considered compatibility and performed forwards and backwards compatibility tests

Most advanced CI tests are deferred until PR approval, but you could:

  • locally run all unit tests via: ./gradlew build
  • locally run all acceptance tests via: ./gradlew acceptanceTest
  • locally run all integration tests via: ./gradlew integrationTest
  • locally run all reference tests via: ./gradlew ethereum:referenceTests:referenceTests

Copy link
Contributor

@jflo jflo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

easy reaname, welcome to prague

@@ -14,7 +14,7 @@
"londonBlock":0,
"terminalTotalDifficulty":0,
"cancunTime":0,
"experimentalEipsTime":20,
"pragueTime":0,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"pragueTime":0,
"pragueTime":20,

I think this might still want to be 20 because the point of these tests is to test the transition from cancun -> prague.
Hopefully that'll fix your AT failures, but that might be wishful thinking :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There were a couple of other things I had to fix, but yeah, this was the one that made me spend an hour braking my brain!

@@ -63,7 +63,6 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
.filter(e -> e.getMethodName().startsWith("engine_"))
.filter(e -> !e.equals(ENGINE_EXCHANGE_CAPABILITIES))
.filter(e -> !e.equals(ENGINE_PREPARE_PAYLOAD_DEBUG))
.filter(e -> !e.getMethodName().endsWith("6110"))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should pre-prague Besu advertise that it has engine_*V4 available yet 🤔 ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They will be filtered out at ExecutionEngineJsonRpcMethods if we are not in Prague.

CHANGELOG.md Outdated
@@ -442,7 +442,8 @@ https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/23.4.4/besu-23.4.4.z
- Early access - layered transaction pool implementation [#5290](https://github.com/hyperledger/besu/pull/5290)
- New RPC method `debug_getRawReceipts` [#5476](https://github.com/hyperledger/besu/pull/5476)
- Add TrieLogFactory plugin support [#5440](https://github.com/hyperledger/besu/pull/5440)
- Ignore `min-block-occupancy-ratio` option when on PoS networks, since in some cases, it prevents to have full blocks even if enough transactions are present [#5491](https://github.com/hyperledger/besu/pull/5491)
- Ignore `min-block-occupancy-ratio` option when on PoS networks, since in some cases, it prevents to have full blocks even if enough transactions are present [#5491](https://github.com/hyperledger/besu/pull/5491)
- Added engine_newPayloadV4 and engine_getPayloadV4 methods
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be way up at the top of the changelog :)

@lucassaldanha lucassaldanha force-pushed the newPayloadV4 branch 3 times, most recently from 499ca2a to 9f01436 Compare March 22, 2024 04:01
Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>
Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>
Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>
Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>
Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>
@lucassaldanha
Copy link
Member Author

EngineNewPayloadV6110Test seems to be testing the wrong thing (it was using engine_newPayloadV3). I added a comment to it and will fix it in a separate PR.

@lucassaldanha lucassaldanha merged commit 2eca4d5 into hyperledger:main Mar 23, 2024
42 checks passed
@lucassaldanha lucassaldanha deleted the newPayloadV4 branch March 23, 2024 23:46
jflo pushed a commit to jflo/besu that referenced this pull request Mar 26, 2024
Moved engine_newPayload6110 and engine_getPayload6110 to V4

Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>
Signed-off-by: Justin Florentine <justin+github@florentine.us>
amsmota pushed a commit to Citi/besu that referenced this pull request Apr 16, 2024
Moved engine_newPayload6110 and engine_getPayload6110 to V4

Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>
Signed-off-by: amsmota <antonio.mota@citi.com>
amsmota pushed a commit to Citi/besu that referenced this pull request Apr 16, 2024
Moved engine_newPayload6110 and engine_getPayload6110 to V4

Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>
Signed-off-by: amsmota <antonio.mota@citi.com>
matthew1001 pushed a commit to kaleido-io/besu that referenced this pull request Jun 7, 2024
Moved engine_newPayload6110 and engine_getPayload6110 to V4

Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants