roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

eth/catalyst: fix engine API (#28135)

Browse Source
This commit is contained in:
rjl493456442 2023-09-17 21:50:18 +08:00 committed by GitHub
parent 16cd1a7561
commit 9a9db3d265
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eth/catalyst/api.go
View File

@ -207,21 +207,21 @@ func (api *ConsensusAPI) verifyPayloadAttributes(attr *engine.PayloadAttributes)
c := api.eth.BlockChain().Config() c := api.eth.BlockChain().Config()
// Verify withdrawals attribute for Shanghai. // Verify withdrawals attribute for Shanghai.
if err := checkAttribute(c.IsShanghai, attr.Withdrawals != nil, attr.Timestamp); err != nil { if err := checkAttribute(c.IsShanghai, attr.Withdrawals != nil, c.LondonBlock, attr.Timestamp); err != nil {
return fmt.Errorf("invalid withdrawals: %w", err) return fmt.Errorf("invalid withdrawals: %w", err)
} }
// Verify beacon root attribute for Cancun. // Verify beacon root attribute for Cancun.
if err := checkAttribute(c.IsCancun, attr.BeaconRoot != nil, attr.Timestamp); err != nil { if err := checkAttribute(c.IsCancun, attr.BeaconRoot != nil, c.LondonBlock, attr.Timestamp); err != nil {
return fmt.Errorf("invalid parent beacon block root: %w", err) return fmt.Errorf("invalid parent beacon block root: %w", err)
} }
return nil return nil
} }
func checkAttribute(active func(*big.Int, uint64) bool, exists bool, time uint64) error { func checkAttribute(active func(*big.Int, uint64) bool, exists bool, block *big.Int, time uint64) error {
if active(common.Big0, time) && !exists { if active(block, time) && !exists {
return errors.New("fork active, missing expected attribute") return errors.New("fork active, missing expected attribute")
} }
if !active(common.Big0, time) && exists { if !active(block, time) && exists {
return errors.New("fork inactive, unexpected attribute set") return errors.New("fork inactive, unexpected attribute set")
} }
return nil return nil