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

fix(cli/eofwrap): fix merge issue (EIP-7685 updates) #920

Merged
merged 1 commit into from
Oct 29, 2024
Merged

Conversation

marioevz
Copy link
Member

🗒️ Description

Fixes a merge issue from #832, when merged after #896.

requests_root header field is removed in favor of requests_hash, but this field should not be manually overridden by eofwrap anyway since it's calculated by t8n automatically, and trying to force the value (or remove it by placing None instead) could render the block invalid.

Fix is to remove all EIP-7685 modifications in eofwrap.

Skipping changelog since I think it's not necessary.

🔗 Related Issues

None

✅ 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.

@marioevz marioevz added the type:bug Something isn't working label Oct 28, 2024
@marioevz marioevz requested a review from pdobacz October 28, 2024 19:13
@pdobacz
Copy link
Collaborator

pdobacz commented Oct 28, 2024

Hey, thanks, I'm not entirely following yet, but if I checkout and try wrapping (having removed the try/except) it gives me a lot of:

pydantic_core._pydantic_core.ValidationError: 1 validation error for FixtureHeader
  Value error, Field requests_hash is required for fork Osaka [type=value_error, input_value={'state_root': b'\xde\xca... b'\x00', 'fork': Osaka}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.8/v/value_error

(self-note: looks like wrap_fixture could use a unit test, I'll look into it asap)

If this is blocking other work, feel free to merge as is and I'll fix forward tmr.

@marioevz
Copy link
Member Author

Hey, thanks, I'm not entirely following yet, but if I checkout and try wrapping (having removed the try/except) it gives me a lot of:

pydantic_core._pydantic_core.ValidationError: 1 validation error for FixtureHeader
  Value error, Field requests_hash is required for fork Osaka [type=value_error, input_value={'state_root': b'\xde\xca... b'\x00', 'fork': Osaka}, input_type=dict]
    For further information visit https://errors.pydantic.dev/2.8/v/value_error

(self-note: looks like wrap_fixture could use a unit test, I'll look into it asap)

If this is blocking other work, feel free to merge as is and I'll fix forward tmr.

I've debugged the issue and it seems like it's because evmone is not returning requests_hash just yet.

I've created a tracking issue here: ethereum/evmone#1062.

@danceratopz danceratopz changed the title fix(cli/eofwrap): Fix merge issue (EIP-7685 updates) fix(cli/eofwrap): fix merge issue (EIP-7685 updates) Oct 29, 2024
@spencer-tb spencer-tb merged commit 4e9e371 into main Oct 29, 2024
4 of 5 checks passed
@spencer-tb spencer-tb deleted the fix-eofwrap branch October 29, 2024 11:24
@spencer-tb spencer-tb mentioned this pull request Oct 29, 2024
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type:bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants