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

check fork

Browse source
This commit is contained in:
jsvisa 2025-09-26 13:00:17 +08:00
parent 6d9d1f5c0d
commit bafa700f35
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
eth/catalyst/api.go
View file

@ -413,10 +413,6 @@ func (api *ConsensusAPI) GetPayloadV1(payloadID engine.PayloadID) (*engine.Execu
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Check if the payload timestamp is greater or equal to Shanghai activation timestamp
if data.ExecutionPayload != nil && api.config().LatestFork(data.ExecutionPayload.Timestamp) >= forks.Shanghai {
return nil, engine.UnsupportedFork.With(errors.New("engine_getPayloadV1 is not available after Shanghai fork"))
}
return data.ExecutionPayload, nil return data.ExecutionPayload, nil
} }
@ -436,9 +432,9 @@ func (api *ConsensusAPI) GetPayloadV2(payloadID engine.PayloadID) (*engine.Execu
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Check if the payload timestamp is greater or equal to Cancun activation timestamp // Check if the payload timestamp falls within the Shanghai fork timeframe
if data.ExecutionPayload != nil && api.config().LatestFork(data.ExecutionPayload.Timestamp) >= forks.Cancun { if data.ExecutionPayload != nil && !api.checkFork(data.ExecutionPayload.Timestamp, forks.Shanghai) {
return nil, engine.UnsupportedFork.With(errors.New("engine_getPayloadV2 is not available after Cancun fork")) return nil, engine.UnsupportedFork
} }
return data, nil return data, nil
} }
@ -453,9 +449,9 @@ func (api *ConsensusAPI) GetPayloadV3(payloadID engine.PayloadID) (*engine.Execu
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Check if the payload timestamp is greater or equal to Prague activation timestamp // Check if the payload timestamp falls within the Cancun fork timeframe
if data.ExecutionPayload != nil && api.config().LatestFork(data.ExecutionPayload.Timestamp) >= forks.Prague { if data.ExecutionPayload != nil && !api.checkFork(data.ExecutionPayload.Timestamp, forks.Cancun) {
return nil, engine.UnsupportedFork.With(errors.New("engine_getPayloadV3 is not available after Prague fork")) return nil, engine.UnsupportedFork
} }
return data, nil return data, nil
} }
@ -470,9 +466,9 @@ func (api *ConsensusAPI) GetPayloadV4(payloadID engine.PayloadID) (*engine.Execu
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Check if the payload timestamp is greater or equal to Osaka activation timestamp // Check if the payload timestamp falls within the Prague fork timeframe
if data.ExecutionPayload != nil && api.config().LatestFork(data.ExecutionPayload.Timestamp) >= forks.Osaka { if data.ExecutionPayload != nil && !api.checkFork(data.ExecutionPayload.Timestamp, forks.Prague) {
return nil, engine.UnsupportedFork.With(errors.New("engine_getPayloadV4 is not available after Osaka fork")) return nil, engine.UnsupportedFork
} }
return data, nil return data, nil
} }
@ -490,9 +486,9 @@ func (api *ConsensusAPI) GetPayloadV5(payloadID engine.PayloadID) (*engine.Execu
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Check if the payload timestamp falls within the time frame of the Osaka fork // 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 { if data.ExecutionPayload != nil && api.config().LatestFork(data.ExecutionPayload.Timestamp) < forks.Osaka {
return nil, engine.UnsupportedFork.With(errors.New("engine_getPayloadV5 is not available before Osaka fork")) return nil, engine.UnsupportedFork
} }
return data, nil return data, nil
} }