6aa88ccdd2
This PR makes EIP-4788 work in the engine API and miner. It also fixes some bugs related to EIP-4844 block processing and mining. Changes in detail: - Header.BeaconRoot has been renamed to ParentBeaconRoot. - The engine API now implements forkchoiceUpdatedV3 - newPayloadV3 method has been updated with the parentBeaconBlockRoot parameter - beacon root is now applied to new blocks in miner - For EIP-4844, block creation now updates the blobGasUsed field of the header
67 lines
2.3 KiB
Go
67 lines
2.3 KiB
Go
// Code generated by github.com/fjl/gencodec. DO NOT EDIT.
|
|
|
|
package engine
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/common/hexutil"
|
|
"github.com/ethereum/go-ethereum/core/types"
|
|
)
|
|
|
|
var _ = (*payloadAttributesMarshaling)(nil)
|
|
|
|
// MarshalJSON marshals as JSON.
|
|
func (p PayloadAttributes) MarshalJSON() ([]byte, error) {
|
|
type PayloadAttributes struct {
|
|
Timestamp hexutil.Uint64 `json:"timestamp" gencodec:"required"`
|
|
Random common.Hash `json:"prevRandao" gencodec:"required"`
|
|
SuggestedFeeRecipient common.Address `json:"suggestedFeeRecipient" gencodec:"required"`
|
|
Withdrawals []*types.Withdrawal `json:"withdrawals"`
|
|
BeaconRoot *common.Hash `json:"parentBeaconBlockRoot"`
|
|
}
|
|
var enc PayloadAttributes
|
|
enc.Timestamp = hexutil.Uint64(p.Timestamp)
|
|
enc.Random = p.Random
|
|
enc.SuggestedFeeRecipient = p.SuggestedFeeRecipient
|
|
enc.Withdrawals = p.Withdrawals
|
|
enc.BeaconRoot = p.BeaconRoot
|
|
return json.Marshal(&enc)
|
|
}
|
|
|
|
// UnmarshalJSON unmarshals from JSON.
|
|
func (p *PayloadAttributes) UnmarshalJSON(input []byte) error {
|
|
type PayloadAttributes struct {
|
|
Timestamp *hexutil.Uint64 `json:"timestamp" gencodec:"required"`
|
|
Random *common.Hash `json:"prevRandao" gencodec:"required"`
|
|
SuggestedFeeRecipient *common.Address `json:"suggestedFeeRecipient" gencodec:"required"`
|
|
Withdrawals []*types.Withdrawal `json:"withdrawals"`
|
|
BeaconRoot *common.Hash `json:"parentBeaconBlockRoot"`
|
|
}
|
|
var dec PayloadAttributes
|
|
if err := json.Unmarshal(input, &dec); err != nil {
|
|
return err
|
|
}
|
|
if dec.Timestamp == nil {
|
|
return errors.New("missing required field 'timestamp' for PayloadAttributes")
|
|
}
|
|
p.Timestamp = uint64(*dec.Timestamp)
|
|
if dec.Random == nil {
|
|
return errors.New("missing required field 'prevRandao' for PayloadAttributes")
|
|
}
|
|
p.Random = *dec.Random
|
|
if dec.SuggestedFeeRecipient == nil {
|
|
return errors.New("missing required field 'suggestedFeeRecipient' for PayloadAttributes")
|
|
}
|
|
p.SuggestedFeeRecipient = *dec.SuggestedFeeRecipient
|
|
if dec.Withdrawals != nil {
|
|
p.Withdrawals = dec.Withdrawals
|
|
}
|
|
if dec.BeaconRoot != nil {
|
|
p.BeaconRoot = dec.BeaconRoot
|
|
}
|
|
return nil
|
|
}
|