EIP-7685 #7068

Gabriel-Trintinalia · 2024-05-07T22:11:09Z

Description

General purpose execution layer requests eip-7685

This PR implements the generic execution layer requests.

Fixes #6985, #6986 and the last item of #6800

Main changes:

Removal of depositsRoot and withdrawalRequestRoot from the blockheader
Removal of deposit and withdrawal requests from the block body
Introduction of requestsRoot in the blockHeader
Introduction of requests in the block body
Introduction of Generic Request Type
Removed depoistValidator and withdrawalRequestValidator
Added a generic Request decoder/encoder
Introduction of RequestValidatorCoordinator and RequestProcessorCoordinator
Extract the processing logic of deposits and withdrawalRequests from block creation and block processing to new DepositProcessor and WithdrawalRequestProcessor
Replaced of depositValidatorProvider and withdrawalRequestValidatorProvider by RequestValidadorProvider
Change logic in the engine methods to use the correct validator to validate requests
Adapts deposit existing tests and withdrawal existing tests to use the new classess
Adds generic validation to the request list (Request root, request ordering, etc)

This PR does not ensure the logic of Deposits and withdrawalRequests but encapsulates them into a generic request list that is used to calculate the new requestRoot. The engine API has not changed and the requests are still split into deposits and withdrawalRequests.

To do:

Add more unit tests

Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Gabriel-Trintinalia · 2024-05-09T02:33:25Z

@ensi321 @lucassaldanha

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeader.java

...core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/WithdrawalRequestEncoder.java

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockBody.java

...s/src/reference-test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java

.../hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/RequestValidatorProvider.java

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Signed-off-by: Justin Florentine <justin+github@florentine.us>

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

…nalia/besu into eip-7685-deposits

jflo · 2024-05-13T07:28:29Z

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/DepositEncoder.java

 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;

 import org.apache.tuweni.bytes.Bytes;

 public class DepositEncoder {

-  public static void encode(final Deposit deposit, final RLPOutput rlpOutput) {
+  public static void encode(final Request request, final RLPOutput rlpOutput) {


I like that we are using composition over inheritance with these codecs.

datatypes/src/main/java/org/hyperledger/besu/datatypes/RequestType.java

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/RequestEncoder.java

jframe · 2024-05-13T07:11:59Z

datatypes/src/main/java/org/hyperledger/besu/datatypes/RequestType.java

+   * @throws IllegalArgumentException if the serialized type value does not correspond to any {@link
+   *     RequestType}.
+   */
+  public static RequestType of(final int serializedTypeValue) {


Would rather just treat the request type as bytes and just pass the requestType byte in from the RequestDecoder

jframe · 2024-05-13T07:21:36Z

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/requests/RequestUtil.java

+    if (requests == null) {
+      return Collections.emptyList();
+    }
+    return requests.stream().filter(requestType::isInstance).map(requestType::cast).toList();


Can we use the enum RequestType to filter on instead of filtering by the class?

jframe · 2024-05-13T07:33:04Z

...c/main/java/org/hyperledger/besu/ethereum/mainnet/requests/RequestsValidatorCoordinator.java

+    return validateRequests(block, maybeRequests.get(), receipts);
+  }
+
+  public boolean validateRoot(final Block block, final Optional<List<Request>> requests) {


This method isn't being used anywhere

...um/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/PragueRequestsValidatorTest.java

jframe · 2024-05-13T08:05:55Z

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/SealableBlockHeader.java

@@ -170,16 +166,12 @@ public Optional<Hash> getWithdrawalsRoot() {
  }

  /**
-   * Returns the block deposits root hash.
+   * Returns the block request root hash.


nit: should be requests root hash

jframe · 2024-05-13T08:10:34Z

...core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/WithdrawalRequestEncoder.java

+   * @throws IllegalArgumentException if the provided request is not a WithdrawalRequest.
+   */
+  public static void encode(final Request request, final RLPOutput rlpOutput) {
+    if (!(request instanceof WithdrawalRequest withdrawalRequest)) {


Rather use the Request.getType() and check it is a deposit rather than doing an instanceof

jframe · 2024-05-13T08:16:33Z

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BodyValidation.java

@@ -91,36 +89,15 @@ public static Hash withdrawalsRoot(final List<Withdrawal> withdrawals) {
  }

  /**
-   * Generates the deposits root for a list of deposits
+   * Generates the request root for a list of requests


nit: request root

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BodyValidation.java

pinges · 2024-05-13T07:02:06Z

datatypes/src/main/java/org/hyperledger/besu/datatypes/RequestType.java

+   *     RequestType}.
+   */
+  public static RequestType of(final int serializedTypeValue) {
+    return Arrays.stream(RequestType.values())


Would a switch statement be easier/more performant?

pinges · 2024-05-13T08:28:09Z

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Request.java

+    return RequestDecoder.decode(rlpInput);
+  }
+
+  public void writeTo(final RLPOutput out) {


I think we do not need an implementation here!

jframe · 2024-05-13T11:21:54Z

...re/src/main/java/org/hyperledger/besu/ethereum/mainnet/requests/DepositRequestProcessor.java

+      return Optional.empty();
+    }
+    List<Deposit> deposits = findDepositsFromReceipts(transactionReceipts);
+    return Optional.of(deposits.stream().map(r -> (Request) r).toList());


If RequestProcessor.process arg type was List<? extends Request> instead of List<Request> could avoid the additional iteration to cast to the right type.

...eum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/requests/DepositsValidator.java

...rc/main/java/org/hyperledger/besu/ethereum/mainnet/requests/RequestProcessorCoordinator.java

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/RequestEncoder.java

lucassaldanha and others added 25 commits April 18, 2024 11:37

Renamed 7002 contract helper

5b2a34e

Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>

Huge 7002 update (exits -> withdrawal requests)

ccf2704

Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>

puglin hash update

4435bc3

Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>

Updated contract reading to support amount field

7d623b6

Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>

Updated at

0cb7679

Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>

Remove comments

457f54c

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Merge main into branch

0e3d776

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Introducing temp request class

cad1081

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Introducing Request Decoder

f18528e

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Merge main into branch

4dbf0f8

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Fix spotless

3b044c6

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Fix WithdrawalRequest tests

06d4c29

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Fix not implemented methods

ce12962

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Implement Request encoder

0745b8c

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Renaming missing exists

93a8403

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Change protocol specs to use request validator

0efe067

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Fix build, javadoc and tests

60a1b3d

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Add requestRoot to Genesis State

573070a

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Fix spotless

5e148fd

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Change deposit implementation to use general request bus

ec417c4

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Fix compilation errors and implement builder

bfaa633

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Fix tests and refactor

7d4cf4c

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Fix tests

9e10da4

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Fix spotless

0ca1c5f

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Extract methods into a RequestUtil class

13739f2

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Gabriel-Trintinalia requested a review from lucassaldanha May 9, 2024 02:30

Gabriel-Trintinalia self-assigned this May 9, 2024

jframe reviewed May 9, 2024

View reviewed changes

Rename variables to match spec

1b7c8f2

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Gabriel-Trintinalia and others added 8 commits May 12, 2024 10:20

Merge main into branch

7a4ba1b

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Sort processors

6048a1e

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Merge main into branch

5aef960

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Add requests to build processing result so it can be validated

ca116db

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Add requests to build processing result so it can be validated

94d6010

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Merge branch 'main' into eip-7685-deposits

3ca1942

Signed-off-by: Justin Florentine <justin+github@florentine.us>

Fix tests and build

69b34a7

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Merge branch 'eip-7685-deposits' of https://github.com/Gabriel-Trinti…

623e57e

…nalia/besu into eip-7685-deposits

jflo approved these changes May 13, 2024

View reviewed changes

jframe reviewed May 13, 2024

View reviewed changes

pinges reviewed May 13, 2024

View reviewed changes

Gabriel-Trintinalia marked this pull request as ready for review May 13, 2024 08:31

jframe reviewed May 13, 2024

View reviewed changes

Gabriel-Trintinalia added 5 commits May 13, 2024 15:29

Fix decoder

63a3477

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Fix engine tests

09b8b90

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Fix engine tests

6956e3c

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Fix engine tests

06aa734

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Fix unit test

d592257

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Gabriel-Trintinalia changed the title ~~WIP EIP-7685~~ EIP-7685 May 13, 2024

replace naming to depositRequests

758ae15

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

Gabriel-Trintinalia marked this pull request as draft May 14, 2024 09:02

Gabriel-Trintinalia added 2 commits May 14, 2024 12:11

Merge branch 'main' into eip-7685-deposits

2562a39

Add initial value check to the helper

75f0313

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

jframe approved these changes May 15, 2024

View reviewed changes

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/RequestEncoder.java Show resolved Hide resolved

Gabriel-Trintinalia marked this pull request as ready for review May 15, 2024 07:15

Merge branch 'main' into eip-7685-deposits

7c90df9

Gabriel-Trintinalia merged commit f9a61a0 into hyperledger:main May 15, 2024
42 checks passed

Gabriel-Trintinalia mentioned this pull request May 27, 2024

Minor improvements to EIP-7685 #7142

Draft

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

EIP-7685 #7068

EIP-7685 #7068

Gabriel-Trintinalia commented May 7, 2024 •

edited

Gabriel-Trintinalia commented May 9, 2024

jflo May 13, 2024

jframe May 13, 2024

jframe May 13, 2024

jframe May 13, 2024

jframe May 13, 2024

jframe May 13, 2024

jframe May 13, 2024

pinges May 13, 2024

pinges May 13, 2024

jframe May 13, 2024

EIP-7685 #7068

EIP-7685 #7068

Conversation

Gabriel-Trintinalia commented May 7, 2024 • edited

Description

General purpose execution layer requests eip-7685

Main changes:

To do:

Gabriel-Trintinalia commented May 9, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Gabriel-Trintinalia commented May 7, 2024 •

edited