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

EIP 6110 fixes #3397

Merged
merged 8 commits into from
May 4, 2024
Merged

EIP 6110 fixes #3397

merged 8 commits into from
May 4, 2024

Conversation

jochem-brouwer
Copy link
Member

This PR runs these 6110 tests: https://github.com/ethereum/execution-spec-tests/files/15101579/fixtures_develop.tar.gz

(only activate 6110 and 7685 in common)

@jochem-brouwer
Copy link
Member Author

Current status

Errors thrown in file: blockchain_tests/prague/eip6110_deposits/deposits/deposit.json test: tests/prague/eip6110_deposits/test_deposits.py::test_deposit[fork_Prague-blockchain_test-multiple_deposit_from_same_eoa]:
	Error: invalid requestsRoot (vm hf=prague -> block number=1 hash=0xb164f1922a21bcba751e0e045289fb784fc8df9f650324e9df157c76c0434116 hf=prague baseFeePerGas=7 txs=2 uncles=0)
	correct last header block
Errors thrown in file: blockchain_tests/prague/eip6110_deposits/deposits/deposit.json test: tests/prague/eip6110_deposits/test_deposits.py::test_deposit[fork_Prague-blockchain_test-multiple_deposit_from_same_eoa_high_count]:
	Error: invalid requestsRoot (vm hf=prague -> block number=1 hash=0x988b9317a6aafeb5b8a25953d92b2fe13ab5ecb6d92dafbde00b6748302e8420 hf=prague baseFeePerGas=7 txs=2000 uncles=0)
	correct last header block
Errors thrown in file: blockchain_tests/prague/eip6110_deposits/deposits/deposit.json test: tests/prague/eip6110_deposits/test_deposits.py::test_deposit[fork_Prague-blockchain_test-multiple_deposit_from_different_eoa]:
	Error: invalid requestsRoot (vm hf=prague -> block number=1 hash=0xe0ee0395258646d91291a46d8e9dceeed0e853ac08ed405732d00c461c3f8915 hf=prague baseFeePerGas=7 txs=2 uncles=0)
	correct last header block
Errors thrown in file: blockchain_tests/prague/eip6110_deposits/deposits/deposit.json test: tests/prague/eip6110_deposits/test_deposits.py::test_deposit[fork_Prague-blockchain_test-multiple_deposits_from_contract]:
	Error: invalid requestsRoot (vm hf=prague -> block number=1 hash=0xeea5d13534f4d682df4d68301d294fd3b933cd5ab5659a9e09b548e980acaab7 hf=prague baseFeePerGas=7 txs=1 uncles=0)
	correct last header block
Errors thrown in file: blockchain_tests/prague/eip6110_deposits/deposits/deposit.json test: tests/prague/eip6110_deposits/test_deposits.py::test_deposit[fork_Prague-blockchain_test-single_deposit_from_contract_single_deposit_from_eoa]:
	Error: invalid requestsRoot (vm hf=prague -> block number=1 hash=0x07f457eb1e9945427d805f2bf0a84a588a54ee62eaf3b3a2de3c774b12fb74b8 hf=prague baseFeePerGas=7 txs=2 uncles=0)
	correct last header block
Errors thrown in file: blockchain_tests/prague/eip6110_deposits/deposits/deposit.json test: tests/prague/eip6110_deposits/test_deposits.py::test_deposit[fork_Prague-blockchain_test-single_deposit_from_eoa_single_deposit_from_contract]:
	Error: invalid requestsRoot (vm hf=prague -> block number=1 hash=0xba8e98a070716ca39d126e461b8fccd33e85ed832031c10fc7e0ced4a572fa8c hf=prague baseFeePerGas=7 txs=2 uncles=0)
	correct last header block
Errors thrown in file: blockchain_tests/prague/eip6110_deposits/deposits/deposit.json test: tests/prague/eip6110_deposits/test_deposits.py::test_deposit[fork_Prague-blockchain_test-single_deposit_from_contract_between_eoa_deposits]:
	Error: invalid requestsRoot (vm hf=prague -> block number=1 hash=0xce8509e9a42a7eb48b60d102432cfadf799c0301a6dfa1d8b8bd978395a418a5 hf=prague baseFeePerGas=7 txs=3 uncles=0)
	correct last header block
Errors thrown in file: blockchain_tests/prague/eip6110_deposits/deposits/deposit.json test: tests/prague/eip6110_deposits/test_deposits.py::test_deposit[fork_Prague-blockchain_test-single_deposit_from_eoa_between_contract_deposits]:
	Error: invalid requestsRoot (vm hf=prague -> block number=1 hash=0x724b96fc1df1a0699be602f35048bdf8977bd34c1d770312a2f0495e9dc3c856 hf=prague baseFeePerGas=7 txs=3 uncles=0)
	correct last header block

@acolytec3
Copy link
Contributor

That's a promising start!

@acolytec3
Copy link
Contributor

I wonder if we're not encoding the other 3 fields correctly (e.g. they're BE in the event but should be LE in the request)?

Copy link

codecov bot commented May 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 87.25%. Comparing base (61acbd3) to head (b50183d).
Report is 18 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

Flag Coverage Δ
tx ?
wallet 87.25% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

@jochem-brouwer
Copy link
Member Author

I just fixed it, all tests now pass! For some reason extracting LE Uint64 using DataView did not work, so I settled on this by manually converting the LEs to BEs.

@acolytec3
Copy link
Contributor

Just need to adjust the error message the test checks for and this will be ready to merge

Copy link
Contributor

@acolytec3 acolytec3 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@scorbajio scorbajio left a comment

Choose a reason for hiding this comment

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

LGTM

@scorbajio scorbajio merged commit 674ed0b into master May 4, 2024
35 of 36 checks passed
@scorbajio scorbajio deleted the eip6110-fixes branch May 4, 2024 01:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants