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

Jump to bottom

eth/catalyst: fix validation of type 0 request #31103

Merged
merged 2 commits into from
Jan 31, 2025
Merged

eth/catalyst: fix validation of type 0 request #31103

merged 2 commits into from
Jan 31, 2025

Conversation

s1na
Copy link
Contributor

@s1na s1na commented Jan 31, 2025

I caught this error on Hive. It was introduced by #31071 because after adding the equality check the request type 0 will be rejected.

@s1na s1na marked this pull request as ready for review January 31, 2025 13:25
@s1na s1na added the prague label Jan 31, 2025
@MariusVanDerWijden
Copy link
Member

Looks like this introduces a new issue:

		{
			name: "valid ascending",
			requests: [][]byte{
				{0xff, 0xAA, 0xBB}, // type 0x00
				{0xff, 0xCC},       // type 0x01
				{0x02, 0xDD},       // type 0x02
			},
			wantErr: false,
		},
		```
		This test passes

@s1na
Copy link
Contributor Author

s1na commented Jan 31, 2025

@MariusVanDerWijden hmm it's true. I just assumed CL will send only from valid request types for some reason.

MariusVanDerWijden
MariusVanDerWijden approved these changes Jan 31, 2025
View reviewed changes
Copy link
Member

@MariusVanDerWijden MariusVanDerWijden left a comment

Choose a reason for hiding this comment

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

LGTM

@fjl fjl added this to the 1.15.0 milestone Jan 31, 2025
@fjl fjl merged commit fc12dbe into ethereum:master Jan 31, 2025
3 of 4 checks passed
@BrewTestBot BrewTestBot mentioned this pull request Feb 6, 2025
Merged
tokeyg pushed a commit to tokeyg/go-ethereum that referenced this pull request Feb 6, 2025
@s1na
eth/catalyst: fix validation of type 0 request (ethereum#31103)
b7706df 
I caught this error on Hive. It was introduced by
ethereum#31071 because after adding
the equality check the request type 0 will be rejected.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fjl fjl fjl approved these changes

@MariusVanDerWijden MariusVanDerWijden MariusVanDerWijden approved these changes

@lightclient lightclient Awaiting requested review from lightclient lightclient is a code owner

@jwasinger jwasinger Awaiting requested review from jwasinger jwasinger is a code owner

Assignees
No one assigned
Labels
prague
Projects
None yet
Milestone
1.15.0
Development

Successfully merging this pull request may close these issues.
3 participants
@s1na @MariusVanDerWijden @fjl