forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-23 05:06:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

eth/catalyst: check getPayloadV4/5 based on Osaka

Browse source
This commit is contained in:
jsvisa 2025-09-26 11:44:26 +08:00 committed by lightclient
parent 16b735fddd
commit 9411be428f
No known key found for this signature in database
GPG key ID: 657913021EF45A6A
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
eth/catalyst/api.go
View file

@ -446,7 +446,16 @@ func (api *ConsensusAPI) GetPayloadV4(payloadID engine.PayloadID) (*engine.Execu
if !payloadID.Is(engine.PayloadV3) { if !payloadID.Is(engine.PayloadV3) {
return nil, engine.UnsupportedFork 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 is greater or equal to Osaka activation timestamp
if data.ExecutionPayload != nil && api.config().LatestFork(data.ExecutionPayload.Timestamp) >= forks.Osaka {
return nil, engine.UnsupportedFork.With(errors.New("engine_getPayloadV4 is not available after Osaka fork"))
}
return data, nil
} }
// GetPayloadV5 returns a cached payload by id. This endpoint should only // GetPayloadV5 returns a cached payload by id. This endpoint should only
@ -458,7 +467,16 @@ func (api *ConsensusAPI) GetPayloadV5(payloadID engine.PayloadID) (*engine.Execu
if !payloadID.Is(engine.PayloadV3) { if !payloadID.Is(engine.PayloadV3) {
return nil, engine.UnsupportedFork 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
if data.ExecutionPayload != nil && api.config().LatestFork(data.ExecutionPayload.Timestamp) < forks.Osaka {
return nil, engine.UnsupportedFork.With(errors.New("engine_getPayloadV5 is not available after Osaka fork"))
}
return data, nil
} }
func (api *ConsensusAPI) getPayload(payloadID engine.PayloadID, full bool) (*engine.ExecutionPayloadEnvelope, error) { func (api *ConsensusAPI) getPayload(payloadID engine.PayloadID, full bool) (*engine.ExecutionPayloadEnvelope, error) {