feat(tests): EIP-6110 `DepositEvent` layout+topic tests #1371

jochem-brouwer · 2025-03-31T19:33:34Z

🗒️ Description

PR built on top of #1280 to add EIP-6110 DepositEvent log layout tests as described in ethereum/EIPs#9460

It tests:

LOG with correct layout and an ERC20 Transfer event (Sepolia-like case) (VALID)
LOG with log data > 576 (INVALID block)
LOG with log data < 576 (INVALID block)

For each param (pubkey, withdrawal_credentials, amount, signature, index)

LOG with offsets not at the right location (INVALID block)
LOG with sizes not at the right sizes (INVALID block)

🔗 Related Issues

Closes #1360

✅ Checklist

All: Set appropriate labels for the changes.
All: Considered squashing commits to improve commit history.
All: Added an entry to CHANGELOG.md.
All: Considered updating the online docs in the ./docs/ directory.
Tests: All converted JSON/YML tests from ethereum/tests have been added to converted-ethereum-tests.txt.
Tests: A PR with removal of converted JSON/YML tests from ethereum/tests have been opened.
Tests: Included the type and version of evm t8n tool used to locally execute test cases: e.g., ref with commit hash or geth 1.13.1-stable-3f40e65.
Tests: Ran mkdocs serve locally and verified the auto-generated docs for new tests in the Test Case Reference are correctly formatted.

tests/prague/eip6110_deposits/helpers.py

marioevz

Thanks for these!

I think it looks pretty good overall, and just some minor linting issues to get to calm down ruff and mypy :)

If you need help with anything please just ping me and I can help out, but basically once we fix the comments we should be able to go ahead and merge 👍

tests/prague/eip6110_deposits/helpers.py

tests/prague/eip6110_deposits/test_modified_contract.py

Co-authored-by: Mario Vega <[email protected]>

jochem-brouwer · 2025-04-16T23:20:15Z

CI passes, ready for review!

NOTE: the current tests will check for the "failed transaction error" for the invalid deposit logs. This will fail on client implementations which check the deposit contract logs after ALL transactions (EthJS) and not after EACH transaction (EELS). Any client which has this bug likely implements it the "EthJS" way and is therefore not suitable to fill the tests. Note that EIP-6110 specs parsing the deposit logs after all transactions, not after each transaction.

marioevz

Looks great, thanks so much for these!

tests/prague/eip6110_deposits/test_modified_contract.py

* new(tests): Add EIP-6110 Sepolia Variant Contract test * fix(tests): Log code * fix(tests): Log code * fix: ABI encoding optional * fix: parametrize for ABI (No-ABI test disabled) * fix(docs): add docs to helper * fix(tests): lint modified_contract (?) * feat(tests): add DEPOSIT_EVENT_SIGNATURE_HASH EIP-6110 * tmp: add sepolia deposit log data * change test and helper methods * convert back to little-endian encoding * feat(helpers): add helper method to construct modified deposit logs * feat(tests): use new helper in modified contract tests * update test modified contract * fix test filler to produce the correct requests hash * feat(tests): add EIP6110 invalid event layout tests * feat(tests): add exception to transaction * cleanup(tests): use DEFAULTs where appropriate * feat(tests): add invalid log length test * chore(tests) lint * Update tests/prague/eip6110_deposits/helpers.py Co-authored-by: Mario Vega <[email protected]> * Update tests/prague/eip6110_deposits/helpers.py Co-authored-by: Mario Vega <[email protected]> * Update tests/prague/eip6110_deposits/test_modified_contract.py Co-authored-by: Mario Vega <[email protected]> * Update tests/prague/eip6110_deposits/test_modified_contract.py Co-authored-by: Mario Vega <[email protected]> * Update tests/prague/eip6110_deposits/helpers.py Co-authored-by: Mario Vega <[email protected]> * Update tests/prague/eip6110_deposits/helpers.py Co-authored-by: Mario Vega <[email protected]> * chore(tests): lint * chore(tests): make typecheck say "congratulations" * chore(tests): add pytestmark * chore(tests): remove TODO * Update tests/prague/eip6110_deposits/test_modified_contract.py --------- Co-authored-by: Mario Vega <[email protected]>

jochem-brouwer changed the title ~~Eip6110 event layout tests~~ feat(tests): EIP-6110 DepositEvent layout+topic tests Mar 31, 2025

marioevz mentioned this pull request Apr 1, 2025

new(tests): Add EIP-6110 Sepolia Variant Contract test #1280

Closed

8 tasks

danceratopz mentioned this pull request Apr 2, 2025

chore(tests): review prague test cases #1299

Closed

33 tasks

spencer-tb mentioned this pull request Apr 2, 2025

feat(release): tasks for version v4.2.0 #1383

Closed

11 tasks

spencer-tb added scope:tests Scope: Changes EL client test cases in `./tests` type:feat type: Feature labels Apr 3, 2025

spencer-tb mentioned this pull request Apr 9, 2025

feat(release): tasks for version v4.3.0 (Vltava) #1418

Closed

17 tasks

spencer-tb added the fork:prague Prague hardfork label Apr 14, 2025

jochem-brouwer mentioned this pull request Apr 14, 2025

vm/eip6110: log layout check ethereumjs/ethereumjs-monorepo#3977

Merged

holgerd77 reviewed Apr 15, 2025

View reviewed changes

tests/prague/eip6110_deposits/helpers.py Show resolved Hide resolved

marioevz reviewed Apr 16, 2025

View reviewed changes

jochem-brouwer force-pushed the eip6110-event-layout-tests branch from 71b9c65 to 75391a6 Compare April 16, 2025 17:09

marioevz and others added 18 commits April 17, 2025 01:09

new(tests): Add EIP-6110 Sepolia Variant Contract test

a150f8e

fix(tests): Log code

52d4ffc

fix(tests): Log code

4b32375

fix: ABI encoding optional

ac1a0d1

fix: parametrize for ABI (No-ABI test disabled)

bdc6d17

fix(docs): add docs to helper

badf7cf

fix(tests): lint modified_contract (?)

2c6443c

feat(tests): add DEPOSIT_EVENT_SIGNATURE_HASH EIP-6110

98f2dd9

tmp: add sepolia deposit log data

aec74d1

change test and helper methods

46e315d

convert back to little-endian encoding

1ca916f

feat(helpers): add helper method to construct modified deposit logs

d4be5db

feat(tests): use new helper in modified contract tests

2a85c2f

update test modified contract

bafdb21

fix test filler to produce the correct requests hash

d205135

feat(tests): add EIP6110 invalid event layout tests

c23faf9

feat(tests): add exception to transaction

5a3e363

cleanup(tests): use DEFAULTs where appropriate

c50ecca

jochem-brouwer and others added 12 commits April 17, 2025 01:09

feat(tests): add invalid log length test

ea65f51

chore(tests) lint

9512f65

Update tests/prague/eip6110_deposits/helpers.py

9b0f133

Co-authored-by: Mario Vega <[email protected]>

Update tests/prague/eip6110_deposits/helpers.py

ad1e86f

Co-authored-by: Mario Vega <[email protected]>

Update tests/prague/eip6110_deposits/test_modified_contract.py

acf8529

Co-authored-by: Mario Vega <[email protected]>

Update tests/prague/eip6110_deposits/test_modified_contract.py

05a4ae8

Co-authored-by: Mario Vega <[email protected]>

Update tests/prague/eip6110_deposits/helpers.py

1f6ee64

Co-authored-by: Mario Vega <[email protected]>

Update tests/prague/eip6110_deposits/helpers.py

84dd1da

Co-authored-by: Mario Vega <[email protected]>

chore(tests): lint

a9273da

chore(tests): make typecheck say "congratulations"

ee91ad7

chore(tests): add pytestmark

c8fa0ec

chore(tests): remove TODO

4f5cc55

jochem-brouwer force-pushed the eip6110-event-layout-tests branch from ca41b73 to 4f5cc55 Compare April 16, 2025 23:09

jochem-brouwer marked this pull request as ready for review April 16, 2025 23:17

marioevz approved these changes Apr 16, 2025

View reviewed changes

tests/prague/eip6110_deposits/test_modified_contract.py Outdated Show resolved Hide resolved

Update tests/prague/eip6110_deposits/test_modified_contract.py

bbc589a

marioevz merged commit 2757408 into ethereum:main Apr 16, 2025
11 checks passed

gurukamath mentioned this pull request Apr 17, 2025

Process deposit requests after all the transactions ethereum/execution-specs#1196

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat(tests): EIP-6110 `DepositEvent` layout+topic tests #1371

feat(tests): EIP-6110 `DepositEvent` layout+topic tests #1371

Uh oh!

jochem-brouwer commented Mar 31, 2025 •

edited

Loading

Uh oh!

Uh oh!

marioevz left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jochem-brouwer commented Apr 16, 2025

Uh oh!

marioevz left a comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

feat(tests): EIP-6110 DepositEvent layout+topic tests #1371

feat(tests): EIP-6110 DepositEvent layout+topic tests #1371

Uh oh!

Conversation

jochem-brouwer commented Mar 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🗒️ Description

🔗 Related Issues

✅ Checklist

Uh oh!

Uh oh!

marioevz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jochem-brouwer commented Apr 16, 2025

Uh oh!

marioevz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

feat(tests): EIP-6110 `DepositEvent` layout+topic tests #1371

feat(tests): EIP-6110 `DepositEvent` layout+topic tests #1371

jochem-brouwer commented Mar 31, 2025 •

edited

Loading