Skip to content

eth/catalyst: check timestamp for getPayload response #32747

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

eth/catalyst: check timestamp for getPayload response #32747

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0978625
eth/catalyst: check getPayloadV4/5 based on Osaka
jsvisa Sep 26, 2025
6d9d1f5
check for v1..3
jsvisa Sep 26, 2025
bafa700
check fork
jsvisa Sep 26, 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
40 changes: 36 additions & 4 deletions eth/catalyst/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,15 @@ func (api *ConsensusAPI) GetPayloadV2(payloadID engine.PayloadID) (*engine.Execu
if !payloadID.Is(engine.PayloadV1, engine.PayloadV2) {
return nil, engine.UnsupportedFork
}
return api.getPayload(payloadID, false)
data, err := api.getPayload(payloadID, false)
if err != nil {
return nil, err
}
// Check if the payload timestamp falls within the Shanghai fork timeframe
if data.ExecutionPayload != nil && !api.checkFork(data.ExecutionPayload.Timestamp, forks.Shanghai) {
return nil, engine.UnsupportedFork
}
return data, nil
}

// GetPayloadV3 returns a cached payload by id. This endpoint should only
Expand All @@ -437,7 +445,15 @@ func (api *ConsensusAPI) GetPayloadV3(payloadID engine.PayloadID) (*engine.Execu
if !payloadID.Is(engine.PayloadV3) {
return nil, engine.UnsupportedFork
}
return api.getPayload(payloadID, false)
data, err := api.getPayload(payloadID, false)
if err != nil {
return nil, err
}
// Check if the payload timestamp falls within the Cancun fork timeframe
if data.ExecutionPayload != nil && !api.checkFork(data.ExecutionPayload.Timestamp, forks.Cancun) {
return nil, engine.UnsupportedFork
}
return data, nil
}

// GetPayloadV4 returns a cached payload by id. This endpoint should only
Expand All @@ -446,7 +462,15 @@ func (api *ConsensusAPI) GetPayloadV4(payloadID engine.PayloadID) (*engine.Execu
if !payloadID.Is(engine.PayloadV3) {
return nil, engine.UnsupportedFork
}
return api.getPayload(payloadID, false)
data, err := api.getPayload(payloadID, false)
if err != nil {
return nil, err
}
// Check if the payload timestamp falls within the Prague fork timeframe
if data.ExecutionPayload != nil && !api.checkFork(data.ExecutionPayload.Timestamp, forks.Prague) {
return nil, engine.UnsupportedFork
}
return data, nil
}

// GetPayloadV5 returns a cached payload by id. This endpoint should only
Expand All @@ -458,7 +482,15 @@ func (api *ConsensusAPI) GetPayloadV5(payloadID engine.PayloadID) (*engine.Execu
if !payloadID.Is(engine.PayloadV3) {
return nil, engine.UnsupportedFork
}
return api.getPayload(payloadID, false)
data, err := api.getPayload(payloadID, false)
if err != nil {
return nil, err
}
// Check if the payload timestamp falls within the time frame of the Osaka fork or later
if data.ExecutionPayload != nil && api.config().LatestFork(data.ExecutionPayload.Timestamp) < forks.Osaka {
return nil, engine.UnsupportedFork
}
return data, nil
}

func (api *ConsensusAPI) getPayload(payloadID engine.PayloadID, full bool) (*engine.ExecutionPayloadEnvelope, error) {
Expand Down
Loading