forked from hyperledger/besu
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Base EIP-6110 on top of Cancun (hyperledger#5752)
This is to base the existed implementation of EIP-6110 from Shanghai to Cancun. As well, it updates the implementation according to the latest Engine API specification. Changes include: - Remove 6110 related changes from engine_newPayloadV2 and engine_getPayloadV2 - Rename deposits to depositReceipts in EnginePayloadParameter - Introduce engine_newPayloadV6110 and engine_getPayloadV6110 that are based on engine_newPayloadV3 and engine_getPayloadV3 - Revamp the existed 6110 acceptance test --- Signed-off-by: Navie Chan <[email protected]> Signed-off-by: naviechan <[email protected]> Signed-off-by: Simon Dudley <[email protected]>
- Loading branch information
Showing
31 changed files
with
975 additions
and
330 deletions.
There are no files selected for viewing
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
45 changes: 42 additions & 3 deletions
45
acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/genesis.json
Large diffs are not rendered by default.
Oops, something went wrong.
34 changes: 34 additions & 0 deletions
34
...tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/01_cancun_prepare_payload.json
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "request": { | ||
| "jsonrpc": "2.0", | ||
| "method": "engine_forkchoiceUpdatedV3", | ||
| "params": [ | ||
| { | ||
| "headBlockHash": "0x26118cf71453320edcebbc4ebb34af5b578087a32385b80108bf691fa23efc42", | ||
| "safeBlockHash": "0x26118cf71453320edcebbc4ebb34af5b578087a32385b80108bf691fa23efc42", | ||
| "finalizedBlockHash": "0x0000000000000000000000000000000000000000000000000000000000000000" | ||
| }, | ||
| { | ||
| "timestamp": "0x10", | ||
| "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000", | ||
| "suggestedFeeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", | ||
| "withdrawals": [], | ||
| "parentBeaconBlockRoot": "0x0000000000000000000000000000000000000000000000000000000000000000" | ||
| } | ||
| ], | ||
| "id": 67 | ||
| }, | ||
| "response": { | ||
| "jsonrpc": "2.0", | ||
| "id": 67, | ||
| "result": { | ||
| "payloadStatus": { | ||
| "status": "VALID", | ||
| "latestValidHash": "0x26118cf71453320edcebbc4ebb34af5b578087a32385b80108bf691fa23efc42", | ||
| "validationError": null | ||
| }, | ||
| "payloadId": "0x282643c14de2dfef" | ||
| } | ||
| }, | ||
| "statusCode" : 200 | ||
| } |
46 changes: 0 additions & 46 deletions
46
...sts/src/test/resources/jsonrpc/engine/eip6110/test-cases/01_shanghai_prepare_payload.json
This file was deleted.
Oops, something went wrong.
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
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
28 changes: 28 additions & 0 deletions
28
...s/src/test/resources/jsonrpc/engine/eip6110/test-cases/04_cancun_forkchoiceUpdatedV3.json
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| { | ||
| "request": { | ||
| "jsonrpc": "2.0", | ||
| "method": "engine_forkchoiceUpdatedV3", | ||
| "params": [ | ||
| { | ||
| "headBlockHash": "0x17da7aea0f4e4ba1d905dbb7d60f6ab4133f3009ae1a1ba99e6e9cb37c15412c", | ||
| "safeBlockHash": "0x17da7aea0f4e4ba1d905dbb7d60f6ab4133f3009ae1a1ba99e6e9cb37c15412c", | ||
| "finalizedBlockHash": "0x17da7aea0f4e4ba1d905dbb7d60f6ab4133f3009ae1a1ba99e6e9cb37c15412c" | ||
| }, | ||
| null | ||
| ], | ||
| "id": 67 | ||
| }, | ||
| "response": { | ||
| "jsonrpc": "2.0", | ||
| "id": 67, | ||
| "result": { | ||
| "payloadStatus": { | ||
| "status": "VALID", | ||
| "latestValidHash": "0x17da7aea0f4e4ba1d905dbb7d60f6ab4133f3009ae1a1ba99e6e9cb37c15412c", | ||
| "validationError": null | ||
| }, | ||
| "payloadId": null | ||
| } | ||
| }, | ||
| "statusCode": 200 | ||
| } |
28 changes: 0 additions & 28 deletions
28
...src/test/resources/jsonrpc/engine/eip6110/test-cases/04_shanghai_forkchoiceUpdatedV2.json
This file was deleted.
Oops, something went wrong.
34 changes: 34 additions & 0 deletions
34
.../src/test/resources/jsonrpc/engine/eip6110/test-cases/05_eip6110_forkchoiceUpdatedV3.json
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "request": { | ||
| "jsonrpc": "2.0", | ||
| "method": "engine_forkchoiceUpdatedV3", | ||
| "params": [ | ||
| { | ||
| "headBlockHash": "0x17da7aea0f4e4ba1d905dbb7d60f6ab4133f3009ae1a1ba99e6e9cb37c15412c", | ||
| "safeBlockHash": "0x17da7aea0f4e4ba1d905dbb7d60f6ab4133f3009ae1a1ba99e6e9cb37c15412c", | ||
| "finalizedBlockHash": "0x0000000000000000000000000000000000000000000000000000000000000000" | ||
| }, | ||
| { | ||
| "timestamp": "0x20", | ||
| "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000", | ||
| "suggestedFeeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", | ||
| "withdrawals": [], | ||
| "parentBeaconBlockRoot": "0x0000000000000000000000000000000000000000000000000000000000000000" | ||
| } | ||
| ], | ||
| "id": 67 | ||
| }, | ||
| "response": { | ||
| "jsonrpc": "2.0", | ||
| "id": 67, | ||
| "result": { | ||
| "payloadStatus": { | ||
| "status": "VALID", | ||
| "latestValidHash": "0x17da7aea0f4e4ba1d905dbb7d60f6ab4133f3009ae1a1ba99e6e9cb37c15412c", | ||
| "validationError": null | ||
| }, | ||
| "payloadId": "0x282643962616abdf" | ||
| } | ||
| }, | ||
| "statusCode" : 200 | ||
| } |
46 changes: 0 additions & 46 deletions
46
...ests/src/test/resources/jsonrpc/engine/eip6110/test-cases/05_eip6110_prepare_payload.json
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.