4c4219e405
## Description Omit null `witness` field from payload envelope. ## Motivation Currently, JSON encoded payload types always include `"witness": null`, which, I believe, is not intentional.
79 lines
2.4 KiB
Go
79 lines
2.4 KiB
Go
// Code generated by github.com/fjl/gencodec. DO NOT EDIT.
|
|
|
|
package engine
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"math/big"
|
|
|
|
"github.com/ethereum/go-ethereum/common/hexutil"
|
|
)
|
|
|
|
var _ = (*executionPayloadEnvelopeMarshaling)(nil)
|
|
|
|
// MarshalJSON marshals as JSON.
|
|
func (e ExecutionPayloadEnvelope) MarshalJSON() ([]byte, error) {
|
|
type ExecutionPayloadEnvelope struct {
|
|
ExecutionPayload *ExecutableData `json:"executionPayload" gencodec:"required"`
|
|
BlockValue *hexutil.Big `json:"blockValue" gencodec:"required"`
|
|
BlobsBundle *BlobsBundleV1 `json:"blobsBundle"`
|
|
Requests []hexutil.Bytes `json:"executionRequests"`
|
|
Override bool `json:"shouldOverrideBuilder"`
|
|
Witness *hexutil.Bytes `json:"witness,omitempty"`
|
|
}
|
|
var enc ExecutionPayloadEnvelope
|
|
enc.ExecutionPayload = e.ExecutionPayload
|
|
enc.BlockValue = (*hexutil.Big)(e.BlockValue)
|
|
enc.BlobsBundle = e.BlobsBundle
|
|
if e.Requests != nil {
|
|
enc.Requests = make([]hexutil.Bytes, len(e.Requests))
|
|
for k, v := range e.Requests {
|
|
enc.Requests[k] = v
|
|
}
|
|
}
|
|
enc.Override = e.Override
|
|
enc.Witness = e.Witness
|
|
return json.Marshal(&enc)
|
|
}
|
|
|
|
// UnmarshalJSON unmarshals from JSON.
|
|
func (e *ExecutionPayloadEnvelope) UnmarshalJSON(input []byte) error {
|
|
type ExecutionPayloadEnvelope struct {
|
|
ExecutionPayload *ExecutableData `json:"executionPayload" gencodec:"required"`
|
|
BlockValue *hexutil.Big `json:"blockValue" gencodec:"required"`
|
|
BlobsBundle *BlobsBundleV1 `json:"blobsBundle"`
|
|
Requests []hexutil.Bytes `json:"executionRequests"`
|
|
Override *bool `json:"shouldOverrideBuilder"`
|
|
Witness *hexutil.Bytes `json:"witness,omitempty"`
|
|
}
|
|
var dec ExecutionPayloadEnvelope
|
|
if err := json.Unmarshal(input, &dec); err != nil {
|
|
return err
|
|
}
|
|
if dec.ExecutionPayload == nil {
|
|
return errors.New("missing required field 'executionPayload' for ExecutionPayloadEnvelope")
|
|
}
|
|
e.ExecutionPayload = dec.ExecutionPayload
|
|
if dec.BlockValue == nil {
|
|
return errors.New("missing required field 'blockValue' for ExecutionPayloadEnvelope")
|
|
}
|
|
e.BlockValue = (*big.Int)(dec.BlockValue)
|
|
if dec.BlobsBundle != nil {
|
|
e.BlobsBundle = dec.BlobsBundle
|
|
}
|
|
if dec.Requests != nil {
|
|
e.Requests = make([][]byte, len(dec.Requests))
|
|
for k, v := range dec.Requests {
|
|
e.Requests[k] = v
|
|
}
|
|
}
|
|
if dec.Override != nil {
|
|
e.Override = *dec.Override
|
|
}
|
|
if dec.Witness != nil {
|
|
e.Witness = dec.Witness
|
|
}
|
|
return nil
|
|
}
|