diff --git a/beacon/engine/types.go b/beacon/engine/types.go index 034aaef5ac..d474ffe1d9 100644 --- a/beacon/engine/types.go +++ b/beacon/engine/types.go @@ -116,7 +116,6 @@ type BlobsBundleV1 struct { Commitments []hexutil.Bytes `json:"commitments"` Proofs []hexutil.Bytes `json:"proofs"` Blobs []hexutil.Bytes `json:"blobs"` - CellProofs []hexutil.Bytes `json:"cellProofs"` } type BlobAndProofV1 struct { @@ -332,15 +331,17 @@ func BlockToExecutableData(block *types.Block, fees *big.Int, sidecars []*types. Commitments: make([]hexutil.Bytes, 0), Blobs: make([]hexutil.Bytes, 0), Proofs: make([]hexutil.Bytes, 0), - CellProofs: make([]hexutil.Bytes, 0), } for _, sidecar := range sidecars { for j := range sidecar.Blobs { bundle.Blobs = append(bundle.Blobs, hexutil.Bytes(sidecar.Blobs[j][:])) bundle.Commitments = append(bundle.Commitments, hexutil.Bytes(sidecar.Commitments[j][:])) - bundle.Proofs = append(bundle.Proofs, hexutil.Bytes(sidecar.Proofs[j][:])) - for _, proof := range sidecar.CellProofs[j] { - bundle.CellProofs = append(bundle.CellProofs, hexutil.Bytes(proof[:])) + if len(sidecar.Proofs[j]) != 0 { + bundle.Proofs = append(bundle.Proofs, hexutil.Bytes(sidecar.Proofs[j][:])) + } else { + for _, proof := range sidecar.CellProofs[j] { + bundle.Proofs = append(bundle.Proofs, hexutil.Bytes(proof[:])) + } } } } diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go index 40f4a456e8..210b4cb4e4 100644 --- a/eth/catalyst/api.go +++ b/eth/catalyst/api.go @@ -517,7 +517,6 @@ func (api *ConsensusAPI) GetPayloadV3(payloadID engine.PayloadID) (*engine.Execu if err != nil { return nil, err } - envelope.BlobsBundle.CellProofs = nil return envelope, nil } @@ -530,7 +529,6 @@ func (api *ConsensusAPI) GetPayloadV4(payloadID engine.PayloadID) (*engine.Execu if err != nil { return nil, err } - envelope.BlobsBundle.CellProofs = nil return envelope, nil } @@ -543,7 +541,6 @@ func (api *ConsensusAPI) GetPayloadV5(payloadID engine.PayloadID) (*engine.Execu if err != nil { return nil, err } - envelope.BlobsBundle.Proofs = nil return envelope, nil }