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.

Sign up for GitHub

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

Exclude empty requests from requests hash #8036

Merged
merged 18 commits into from
Jan 14, 2025
Merged

Exclude empty requests from requests hash #8036

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
770ee68
exclude empty requests from requests hash
daniellehrner Dec 16, 2024
6e9f120
Merge branch 'main' into feat/issue-7947/exclude_empty_requests_hash
daniellehrner Dec 17, 2024
d7c3a7f
Exclude empty requests and prepend request type byte in engine_getPay…
siladu Dec 18, 2024
a381b19
Merge branch 'main' into feat/issue-7947/exclude_empty_requests_hash
daniellehrner Dec 18, 2024
ffafb17
Merge branch 'feat/issue-7947/exclude_empty_requests_hash' of github.…
daniellehrner Dec 18, 2024
486812f
Merge branch 'main' into feat/issue-7947/exclude_empty_requests_hash
daniellehrner Dec 18, 2024
9d5b638
Merge branch 'main' into feat/issue-7947/exclude_empty_requests_hash
daniellehrner Jan 8, 2025
d8b62ff
fix test
daniellehrner Jan 8, 2025
857c369
fix prague tests: change request hash, reorder json elements
daniellehrner Jan 9, 2025
9c16f51
fix extracting of request for new payload
daniellehrner Jan 9, 2025
f19574b
Merge branch 'main' into feat/issue-7947/exclude_empty_requests_hash
daniellehrner Jan 9, 2025
1ec2403
Merge branch 'main' into feat/issue-7947/exclude_empty_requests_hash
daniellehrner Jan 13, 2025
61ea63a
fix test by fixing request object creation
daniellehrner Jan 13, 2025
ed3abc7
spotless
daniellehrner Jan 13, 2025
9f6c514
Merge branch 'main' into feat/issue-7947/exclude_empty_requests_hash
daniellehrner Jan 13, 2025
1b8a524
set request type to only one byte, fixed creation of request list in …
daniellehrner Jan 14, 2025
ed5d645
Merge branch 'main' into feat/issue-7947/exclude_empty_requests_hash
daniellehrner Jan 14, 2025
e25ebd2
fix expected json output to exclude empty requests
daniellehrner Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix expected json output to exclude empty requests 
Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net>
  • Loading branch information
@daniellehrner
daniellehrner committed Jan 14, 2025
commit e25ebd2a5d1e9acb56e5ac7835ebb6e5fba57e93
4 changes: 1 addition & 3 deletions ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/prague-deposit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,7 @@
"result": {
"requestsHash": "0xbf0f8feb8b18851a8ebdd8e3111f3bfe0cdccf51b07473cd26e6ee4703d23a31",
"requests": [
"0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200405973070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200405973070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030100000000000000",
"0x",
"0x"
"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200405973070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200405973070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030100000000000000"
],
"stateRoot": "0x6471f6d90b87f759176a0ad62a7096f69d0d24fd873bdb6b6ced57d04a71e274",
"txRoot": "0x2b790bf82ef7259a0e4513d1b89a77d81e99672ba68758ef2ba3fde32851d023",
Expand Down
16 changes: 7 additions & 9 deletions ...vmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/prague-withdrawal-request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,13 @@
"balance": "0x1",
"nonce": "0x1"
},
"0x0f792be4b0c0cb4dae440ef133e90c0ecd48cccc":{
"code":"0x3373fffffffffffffffffffffffffffffffffffffffe14604657602036036042575f35600143038111604257611fff81430311604257611fff9006545f5260205ff35b5f5ffd5b5f35611fff60014303065500",
"storage":{
"0x0000000000000000000000000000000000000000000000000000000000000000":"0x10715cfbefdb8a0cb2f7d7ca5ee6d1ea65515ecb41cff0a22d1e11716a9d27fb"
"0x0f792be4b0c0cb4dae440ef133e90c0ecd48cccc": {
"code": "0x3373fffffffffffffffffffffffffffffffffffffffe14604657602036036042575f35600143038111604257611fff81430311604257611fff9006545f5260205ff35b5f5ffd5b5f35611fff60014303065500",
"storage": {
"0x0000000000000000000000000000000000000000000000000000000000000000": "0x10715cfbefdb8a0cb2f7d7ca5ee6d1ea65515ecb41cff0a22d1e11716a9d27fb"
},
"balance":"0x0",
"nonce":"0x1"
"balance": "0x0",
"nonce": "0x1"
},
"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
"balance": "0xad78ebc5ac61f2b034",
Expand All @@ -215,9 +215,7 @@
"result": {
"requestsHash": "0x16a372318fd60f169dd3e1e2e528d1fb17edc62e741feebcb0896f950018769a",
"requests": [
"0x",
"0x00000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000",
"0x"
"0x0100000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000"
],
"stateRoot": "0xc7b49e4aef4229962b94ec0a7c83a6fc0b4015f2573b9a85446ed434c823164e",
"txRoot": "0x0d36638e52999b7beafa00eb94f7ca23139774cd14229c011d0edc1fc66125c9",
Expand Down
Loading