Fix deneb builder bid HTR (#12906)

Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
This commit is contained in:
terencechain 2023-09-14 17:14:03 -07:00 committed by GitHub
parent 9bb81537c8
commit 4d6b3252ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 121 additions and 121 deletions

View File

@ -1773,9 +1773,9 @@ type BlindedBlobsBundle struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
KzgCommitments [][]byte `protobuf:"bytes,1,rep,name=kzg_commitments,json=kzgCommitments,proto3" json:"kzg_commitments,omitempty" ssz-max:"4" ssz-size:"?,48"` KzgCommitments [][]byte `protobuf:"bytes,1,rep,name=kzg_commitments,json=kzgCommitments,proto3" json:"kzg_commitments,omitempty" ssz-max:"4096" ssz-size:"?,48"`
Proofs [][]byte `protobuf:"bytes,2,rep,name=proofs,proto3" json:"proofs,omitempty" ssz-max:"4" ssz-size:"?,48"` Proofs [][]byte `protobuf:"bytes,2,rep,name=proofs,proto3" json:"proofs,omitempty" ssz-max:"4096" ssz-size:"?,48"`
BlobRoots [][]byte `protobuf:"bytes,3,rep,name=blob_roots,json=blobRoots,proto3" json:"blob_roots,omitempty" ssz-max:"4" ssz-size:"?,32"` BlobRoots [][]byte `protobuf:"bytes,3,rep,name=blob_roots,json=blobRoots,proto3" json:"blob_roots,omitempty" ssz-max:"4096" ssz-size:"?,32"`
} }
func (x *BlindedBlobsBundle) Reset() { func (x *BlindedBlobsBundle) Reset() {
@ -2318,34 +2318,34 @@ var file_proto_engine_v1_execution_engine_proto_rawDesc = []byte{
0x6f, 0x66, 0x73, 0x12, 0x2a, 0x0a, 0x05, 0x62, 0x6c, 0x6f, 0x62, 0x73, 0x18, 0x03, 0x20, 0x03, 0x6f, 0x66, 0x73, 0x12, 0x2a, 0x0a, 0x05, 0x62, 0x6c, 0x6f, 0x62, 0x73, 0x18, 0x03, 0x20, 0x03,
0x28, 0x0c, 0x42, 0x14, 0x8a, 0xb5, 0x18, 0x08, 0x3f, 0x2c, 0x31, 0x33, 0x31, 0x30, 0x37, 0x32, 0x28, 0x0c, 0x42, 0x14, 0x8a, 0xb5, 0x18, 0x08, 0x3f, 0x2c, 0x31, 0x33, 0x31, 0x30, 0x37, 0x32,
0x92, 0xb5, 0x18, 0x04, 0x34, 0x30, 0x39, 0x36, 0x52, 0x05, 0x62, 0x6c, 0x6f, 0x62, 0x73, 0x22, 0x92, 0xb5, 0x18, 0x04, 0x34, 0x30, 0x39, 0x36, 0x52, 0x05, 0x62, 0x6c, 0x6f, 0x62, 0x73, 0x22,
0xa1, 0x01, 0x0a, 0x12, 0x42, 0x6c, 0x69, 0x6e, 0x64, 0x65, 0x64, 0x42, 0x6c, 0x6f, 0x62, 0x73, 0xaa, 0x01, 0x0a, 0x12, 0x42, 0x6c, 0x69, 0x6e, 0x64, 0x65, 0x64, 0x42, 0x6c, 0x6f, 0x62, 0x73,
0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x36, 0x0a, 0x0f, 0x6b, 0x7a, 0x67, 0x5f, 0x63, 0x6f, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x39, 0x0a, 0x0f, 0x6b, 0x7a, 0x67, 0x5f, 0x63, 0x6f,
0x6d, 0x6d, 0x69, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x42, 0x6d, 0x6d, 0x69, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x42,
0x0d, 0x8a, 0xb5, 0x18, 0x04, 0x3f, 0x2c, 0x34, 0x38, 0x92, 0xb5, 0x18, 0x01, 0x34, 0x52, 0x0e, 0x10, 0x8a, 0xb5, 0x18, 0x04, 0x3f, 0x2c, 0x34, 0x38, 0x92, 0xb5, 0x18, 0x04, 0x34, 0x30, 0x39,
0x6b, 0x7a, 0x67, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x25, 0x36, 0x52, 0x0e, 0x6b, 0x7a, 0x67, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x6d, 0x65, 0x6e, 0x74,
0x0a, 0x06, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0c, 0x42, 0x0d, 0x73, 0x12, 0x28, 0x0a, 0x06, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
0x8a, 0xb5, 0x18, 0x04, 0x3f, 0x2c, 0x34, 0x38, 0x92, 0xb5, 0x18, 0x01, 0x34, 0x52, 0x06, 0x70, 0x0c, 0x42, 0x10, 0x8a, 0xb5, 0x18, 0x04, 0x3f, 0x2c, 0x34, 0x38, 0x92, 0xb5, 0x18, 0x04, 0x34,
0x72, 0x6f, 0x6f, 0x66, 0x73, 0x12, 0x2c, 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x62, 0x5f, 0x72, 0x6f, 0x30, 0x39, 0x36, 0x52, 0x06, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x73, 0x12, 0x2f, 0x0a, 0x0a, 0x62,
0x6f, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0c, 0x42, 0x0d, 0x8a, 0xb5, 0x18, 0x04, 0x3f, 0x6c, 0x6f, 0x62, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0c, 0x42,
0x2c, 0x33, 0x32, 0x92, 0xb5, 0x18, 0x01, 0x34, 0x52, 0x09, 0x62, 0x6c, 0x6f, 0x62, 0x52, 0x6f, 0x10, 0x8a, 0xb5, 0x18, 0x04, 0x3f, 0x2c, 0x33, 0x32, 0x92, 0xb5, 0x18, 0x04, 0x34, 0x30, 0x39,
0x6f, 0x74, 0x73, 0x22, 0x26, 0x0a, 0x04, 0x42, 0x6c, 0x6f, 0x62, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x36, 0x52, 0x09, 0x62, 0x6c, 0x6f, 0x62, 0x52, 0x6f, 0x6f, 0x74, 0x73, 0x22, 0x26, 0x0a, 0x04,
0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x0a, 0x8a, 0xb5, 0x18, 0x06, 0x31, 0x42, 0x6c, 0x6f, 0x62, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01,
0x33, 0x31, 0x30, 0x37, 0x32, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x43, 0x0a, 0x14, 0x45, 0x28, 0x0c, 0x42, 0x0a, 0x8a, 0xb5, 0x18, 0x06, 0x31, 0x33, 0x31, 0x30, 0x37, 0x32, 0x52, 0x04,
0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x22, 0x43, 0x0a, 0x14, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65,
0x69, 0x65, 0x73, 0x12, 0x2b, 0x0a, 0x11, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x2b, 0x0a, 0x11,
0x5f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x10, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x5f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64,
0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x10, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74,
0x42, 0x96, 0x01, 0x0a, 0x16, 0x6f, 0x72, 0x67, 0x2e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x65, 0x64, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x42, 0x96, 0x01, 0x0a, 0x16, 0x6f, 0x72,
0x6d, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x14, 0x45, 0x78, 0x65, 0x67, 0x2e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e,
0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x14, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x45,
0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69,
0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74,
0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x6e, 0x67, 0x69, 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x34, 0x2f,
0x69, 0x6e, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x76, 0x31, 0xaa, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x2f, 0x76, 0x31, 0x3b,
0x02, 0x12, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x76, 0x31, 0xaa, 0x02, 0x12, 0x45, 0x74, 0x68, 0x65, 0x72,
0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x12, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x65, 0x75, 0x6d, 0x2e, 0x45, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x12,
0x45, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x5c, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x5c,
0x33, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (

View File

@ -230,11 +230,11 @@ message BlobsBundle {
// BlindedBlobsBundle is retrieved through the builder-api from /eth/v1/builder/header/{slot}/{parent_hash}/{pubkey} after the Deneb hardfork. // BlindedBlobsBundle is retrieved through the builder-api from /eth/v1/builder/header/{slot}/{parent_hash}/{pubkey} after the Deneb hardfork.
message BlindedBlobsBundle { message BlindedBlobsBundle {
// The KZG commitments of the blobs. // The KZG commitments of the blobs.
repeated bytes kzg_commitments = 1 [(ethereum.eth.ext.ssz_size) = "?,48", (ethereum.eth.ext.ssz_max) = "4"]; repeated bytes kzg_commitments = 1 [(ethereum.eth.ext.ssz_size) = "?,48", (ethereum.eth.ext.ssz_max) = "max_blob_commitments.size"];
// The proofs of the blobs. // The proofs of the blobs.
repeated bytes proofs = 2 [(ethereum.eth.ext.ssz_size) = "?,48", (ethereum.eth.ext.ssz_max) = "4"]; repeated bytes proofs = 2 [(ethereum.eth.ext.ssz_size) = "?,48", (ethereum.eth.ext.ssz_max) = "max_blob_commitments.size"];
// The blob roots. // The blob roots.
repeated bytes blob_roots = 3 [(ethereum.eth.ext.ssz_size) = "?,32", (ethereum.eth.ext.ssz_max) = "4"]; repeated bytes blob_roots = 3 [(ethereum.eth.ext.ssz_size) = "?,32", (ethereum.eth.ext.ssz_max) = "max_blob_commitments.size"];
} }
// Blob contains the data that is to be committed on chain. // Blob contains the data that is to be committed on chain.

View File

@ -1,5 +1,5 @@
// Code generated by fastssz. DO NOT EDIT. // Code generated by fastssz. DO NOT EDIT.
// Hash: 68f45ae4080f56abb8c89f1da5f89f449df5d58f2ff06318122ec28ce6a84751 // Hash: d163294d035463f410495773be37e7997f5305be52b9d58b513197b7b37d5124
package enginev1 package enginev1
import ( import (
@ -2685,8 +2685,8 @@ func (b *BlindedBlobsBundle) MarshalSSZTo(buf []byte) (dst []byte, err error) {
offset += len(b.BlobRoots) * 32 offset += len(b.BlobRoots) * 32
// Field (0) 'KzgCommitments' // Field (0) 'KzgCommitments'
if size := len(b.KzgCommitments); size > 4 { if size := len(b.KzgCommitments); size > 4096 {
err = ssz.ErrListTooBigFn("--.KzgCommitments", size, 4) err = ssz.ErrListTooBigFn("--.KzgCommitments", size, 4096)
return return
} }
for ii := 0; ii < len(b.KzgCommitments); ii++ { for ii := 0; ii < len(b.KzgCommitments); ii++ {
@ -2698,8 +2698,8 @@ func (b *BlindedBlobsBundle) MarshalSSZTo(buf []byte) (dst []byte, err error) {
} }
// Field (1) 'Proofs' // Field (1) 'Proofs'
if size := len(b.Proofs); size > 4 { if size := len(b.Proofs); size > 4096 {
err = ssz.ErrListTooBigFn("--.Proofs", size, 4) err = ssz.ErrListTooBigFn("--.Proofs", size, 4096)
return return
} }
for ii := 0; ii < len(b.Proofs); ii++ { for ii := 0; ii < len(b.Proofs); ii++ {
@ -2711,8 +2711,8 @@ func (b *BlindedBlobsBundle) MarshalSSZTo(buf []byte) (dst []byte, err error) {
} }
// Field (2) 'BlobRoots' // Field (2) 'BlobRoots'
if size := len(b.BlobRoots); size > 4 { if size := len(b.BlobRoots); size > 4096 {
err = ssz.ErrListTooBigFn("--.BlobRoots", size, 4) err = ssz.ErrListTooBigFn("--.BlobRoots", size, 4096)
return return
} }
for ii := 0; ii < len(b.BlobRoots); ii++ { for ii := 0; ii < len(b.BlobRoots); ii++ {
@ -2759,7 +2759,7 @@ func (b *BlindedBlobsBundle) UnmarshalSSZ(buf []byte) error {
// Field (0) 'KzgCommitments' // Field (0) 'KzgCommitments'
{ {
buf = tail[o0:o1] buf = tail[o0:o1]
num, err := ssz.DivideInt2(len(buf), 48, 4) num, err := ssz.DivideInt2(len(buf), 48, 4096)
if err != nil { if err != nil {
return err return err
} }
@ -2775,7 +2775,7 @@ func (b *BlindedBlobsBundle) UnmarshalSSZ(buf []byte) error {
// Field (1) 'Proofs' // Field (1) 'Proofs'
{ {
buf = tail[o1:o2] buf = tail[o1:o2]
num, err := ssz.DivideInt2(len(buf), 48, 4) num, err := ssz.DivideInt2(len(buf), 48, 4096)
if err != nil { if err != nil {
return err return err
} }
@ -2791,7 +2791,7 @@ func (b *BlindedBlobsBundle) UnmarshalSSZ(buf []byte) error {
// Field (2) 'BlobRoots' // Field (2) 'BlobRoots'
{ {
buf = tail[o2:] buf = tail[o2:]
num, err := ssz.DivideInt2(len(buf), 32, 4) num, err := ssz.DivideInt2(len(buf), 32, 4096)
if err != nil { if err != nil {
return err return err
} }
@ -2833,8 +2833,8 @@ func (b *BlindedBlobsBundle) HashTreeRootWith(hh *ssz.Hasher) (err error) {
// Field (0) 'KzgCommitments' // Field (0) 'KzgCommitments'
{ {
if size := len(b.KzgCommitments); size > 4 { if size := len(b.KzgCommitments); size > 4096 {
err = ssz.ErrListTooBigFn("--.KzgCommitments", size, 4) err = ssz.ErrListTooBigFn("--.KzgCommitments", size, 4096)
return return
} }
subIndx := hh.Index() subIndx := hh.Index()
@ -2848,16 +2848,16 @@ func (b *BlindedBlobsBundle) HashTreeRootWith(hh *ssz.Hasher) (err error) {
numItems := uint64(len(b.KzgCommitments)) numItems := uint64(len(b.KzgCommitments))
if ssz.EnableVectorizedHTR { if ssz.EnableVectorizedHTR {
hh.MerkleizeWithMixinVectorizedHTR(subIndx, numItems, 4) hh.MerkleizeWithMixinVectorizedHTR(subIndx, numItems, 4096)
} else { } else {
hh.MerkleizeWithMixin(subIndx, numItems, 4) hh.MerkleizeWithMixin(subIndx, numItems, 4096)
} }
} }
// Field (1) 'Proofs' // Field (1) 'Proofs'
{ {
if size := len(b.Proofs); size > 4 { if size := len(b.Proofs); size > 4096 {
err = ssz.ErrListTooBigFn("--.Proofs", size, 4) err = ssz.ErrListTooBigFn("--.Proofs", size, 4096)
return return
} }
subIndx := hh.Index() subIndx := hh.Index()
@ -2871,16 +2871,16 @@ func (b *BlindedBlobsBundle) HashTreeRootWith(hh *ssz.Hasher) (err error) {
numItems := uint64(len(b.Proofs)) numItems := uint64(len(b.Proofs))
if ssz.EnableVectorizedHTR { if ssz.EnableVectorizedHTR {
hh.MerkleizeWithMixinVectorizedHTR(subIndx, numItems, 4) hh.MerkleizeWithMixinVectorizedHTR(subIndx, numItems, 4096)
} else { } else {
hh.MerkleizeWithMixin(subIndx, numItems, 4) hh.MerkleizeWithMixin(subIndx, numItems, 4096)
} }
} }
// Field (2) 'BlobRoots' // Field (2) 'BlobRoots'
{ {
if size := len(b.BlobRoots); size > 4 { if size := len(b.BlobRoots); size > 4096 {
err = ssz.ErrListTooBigFn("--.BlobRoots", size, 4) err = ssz.ErrListTooBigFn("--.BlobRoots", size, 4096)
return return
} }
subIndx := hh.Index() subIndx := hh.Index()
@ -2894,9 +2894,9 @@ func (b *BlindedBlobsBundle) HashTreeRootWith(hh *ssz.Hasher) (err error) {
numItems := uint64(len(b.BlobRoots)) numItems := uint64(len(b.BlobRoots))
if ssz.EnableVectorizedHTR { if ssz.EnableVectorizedHTR {
hh.MerkleizeWithMixinVectorizedHTR(subIndx, numItems, 4) hh.MerkleizeWithMixinVectorizedHTR(subIndx, numItems, 4096)
} else { } else {
hh.MerkleizeWithMixin(subIndx, numItems, 4) hh.MerkleizeWithMixin(subIndx, numItems, 4096)
} }
} }

View File

@ -3660,9 +3660,9 @@ type BuilderBidDeneb struct {
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Header *v1.ExecutionPayloadHeaderDeneb `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"` Header *v1.ExecutionPayloadHeaderDeneb `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"`
Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty" ssz-size:"32"` BlindedBlobsBundle *v1.BlindedBlobsBundle `protobuf:"bytes,2,opt,name=blinded_blobs_bundle,json=blindedBlobsBundle,proto3" json:"blinded_blobs_bundle,omitempty"`
Pubkey []byte `protobuf:"bytes,3,opt,name=pubkey,proto3" json:"pubkey,omitempty" ssz-size:"48"` Value []byte `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty" ssz-size:"32"`
BlindedBlobsBundle *v1.BlindedBlobsBundle `protobuf:"bytes,4,opt,name=blinded_blobs_bundle,json=blindedBlobsBundle,proto3" json:"blinded_blobs_bundle,omitempty"` Pubkey []byte `protobuf:"bytes,4,opt,name=pubkey,proto3" json:"pubkey,omitempty" ssz-size:"48"`
} }
func (x *BuilderBidDeneb) Reset() { func (x *BuilderBidDeneb) Reset() {
@ -3704,6 +3704,13 @@ func (x *BuilderBidDeneb) GetHeader() *v1.ExecutionPayloadHeaderDeneb {
return nil return nil
} }
func (x *BuilderBidDeneb) GetBlindedBlobsBundle() *v1.BlindedBlobsBundle {
if x != nil {
return x.BlindedBlobsBundle
}
return nil
}
func (x *BuilderBidDeneb) GetValue() []byte { func (x *BuilderBidDeneb) GetValue() []byte {
if x != nil { if x != nil {
return x.Value return x.Value
@ -3718,13 +3725,6 @@ func (x *BuilderBidDeneb) GetPubkey() []byte {
return nil return nil
} }
func (x *BuilderBidDeneb) GetBlindedBlobsBundle() *v1.BlindedBlobsBundle {
if x != nil {
return x.BlindedBlobsBundle
}
return nil
}
type SignedBuilderBidDeneb struct { type SignedBuilderBidDeneb struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
@ -4869,16 +4869,16 @@ var file_proto_prysm_v1alpha1_beacon_block_proto_rawDesc = []byte{
0x75, 0x6d, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x78, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x78, 0x65,
0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x48, 0x65, 0x61, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x48, 0x65, 0x61,
0x64, 0x65, 0x72, 0x44, 0x65, 0x6e, 0x65, 0x62, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x64, 0x65, 0x72, 0x44, 0x65, 0x6e, 0x65, 0x62, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72,
0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x12, 0x58, 0x0a, 0x14, 0x62, 0x6c, 0x69, 0x6e, 0x64, 0x65, 0x64, 0x5f, 0x62, 0x6c, 0x6f, 0x62,
0x06, 0x8a, 0xb5, 0x18, 0x02, 0x33, 0x32, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1e, 0x73, 0x5f, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26,
0x0a, 0x06, 0x70, 0x75, 0x62, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x06, 0x2e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65,
0x8a, 0xb5, 0x18, 0x02, 0x34, 0x38, 0x52, 0x06, 0x70, 0x75, 0x62, 0x6b, 0x65, 0x79, 0x12, 0x58, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x6c, 0x69, 0x6e, 0x64, 0x65, 0x64, 0x42, 0x6c, 0x6f, 0x62, 0x73,
0x0a, 0x14, 0x62, 0x6c, 0x69, 0x6e, 0x64, 0x65, 0x64, 0x5f, 0x62, 0x6c, 0x6f, 0x62, 0x73, 0x5f, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x12, 0x62, 0x6c, 0x69, 0x6e, 0x64, 0x65, 0x64, 0x42,
0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6c, 0x6f, 0x62, 0x73, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61,
0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x2e, 0x76, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x33,
0x31, 0x2e, 0x42, 0x6c, 0x69, 0x6e, 0x64, 0x65, 0x64, 0x42, 0x6c, 0x6f, 0x62, 0x73, 0x42, 0x75, 0x32, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1e, 0x0a, 0x06, 0x70, 0x75, 0x62, 0x6b,
0x6e, 0x64, 0x6c, 0x65, 0x52, 0x12, 0x62, 0x6c, 0x69, 0x6e, 0x64, 0x65, 0x64, 0x42, 0x6c, 0x6f, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x34, 0x38,
0x62, 0x73, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x7f, 0x0a, 0x15, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x06, 0x70, 0x75, 0x62, 0x6b, 0x65, 0x79, 0x22, 0x7f, 0x0a, 0x15, 0x53, 0x69, 0x67, 0x6e,
0x65, 0x64, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x42, 0x69, 0x64, 0x44, 0x65, 0x6e, 0x65, 0x65, 0x64, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x42, 0x69, 0x64, 0x44, 0x65, 0x6e, 0x65,
0x62, 0x12, 0x40, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x62, 0x12, 0x40, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x74, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x74,

View File

@ -767,9 +767,9 @@ message SignedBuilderBidCapella {
message BuilderBidDeneb { message BuilderBidDeneb {
ethereum.engine.v1.ExecutionPayloadHeaderDeneb header = 1; ethereum.engine.v1.ExecutionPayloadHeaderDeneb header = 1;
bytes value = 2 [(ethereum.eth.ext.ssz_size) = "32"]; ethereum.engine.v1.BlindedBlobsBundle blinded_blobs_bundle = 2; // new in deneb
bytes pubkey = 3 [(ethereum.eth.ext.ssz_size) = "48"]; bytes value = 3 [(ethereum.eth.ext.ssz_size) = "32"];
ethereum.engine.v1.BlindedBlobsBundle blinded_blobs_bundle = 4; // new in deneb bytes pubkey = 4 [(ethereum.eth.ext.ssz_size) = "48"];
} }
message SignedBuilderBidDeneb { message SignedBuilderBidDeneb {

View File

@ -1,5 +1,5 @@
// Code generated by fastssz. DO NOT EDIT. // Code generated by fastssz. DO NOT EDIT.
// Hash: 2a9c193ab6b4d9257fe266b49ce98b5cfecc990e6757a8aabb9dd0931a797f1c // Hash: cddef0a13ca91be4f7ffa550163d8709c6f2f41b91d0894886169707feb934e8
package eth package eth
import ( import (
@ -9187,33 +9187,33 @@ func (b *BuilderBidDeneb) MarshalSSZTo(buf []byte) (dst []byte, err error) {
} }
offset += b.Header.SizeSSZ() offset += b.Header.SizeSSZ()
// Field (1) 'Value' // Offset (1) 'BlindedBlobsBundle'
if size := len(b.Value); size != 32 {
err = ssz.ErrBytesLengthFn("--.Value", size, 32)
return
}
dst = append(dst, b.Value...)
// Field (2) 'Pubkey'
if size := len(b.Pubkey); size != 48 {
err = ssz.ErrBytesLengthFn("--.Pubkey", size, 48)
return
}
dst = append(dst, b.Pubkey...)
// Offset (3) 'BlindedBlobsBundle'
dst = ssz.WriteOffset(dst, offset) dst = ssz.WriteOffset(dst, offset)
if b.BlindedBlobsBundle == nil { if b.BlindedBlobsBundle == nil {
b.BlindedBlobsBundle = new(v1.BlindedBlobsBundle) b.BlindedBlobsBundle = new(v1.BlindedBlobsBundle)
} }
offset += b.BlindedBlobsBundle.SizeSSZ() offset += b.BlindedBlobsBundle.SizeSSZ()
// Field (2) 'Value'
if size := len(b.Value); size != 32 {
err = ssz.ErrBytesLengthFn("--.Value", size, 32)
return
}
dst = append(dst, b.Value...)
// Field (3) 'Pubkey'
if size := len(b.Pubkey); size != 48 {
err = ssz.ErrBytesLengthFn("--.Pubkey", size, 48)
return
}
dst = append(dst, b.Pubkey...)
// Field (0) 'Header' // Field (0) 'Header'
if dst, err = b.Header.MarshalSSZTo(dst); err != nil { if dst, err = b.Header.MarshalSSZTo(dst); err != nil {
return return
} }
// Field (3) 'BlindedBlobsBundle' // Field (1) 'BlindedBlobsBundle'
if dst, err = b.BlindedBlobsBundle.MarshalSSZTo(dst); err != nil { if dst, err = b.BlindedBlobsBundle.MarshalSSZTo(dst); err != nil {
return return
} }
@ -9230,7 +9230,7 @@ func (b *BuilderBidDeneb) UnmarshalSSZ(buf []byte) error {
} }
tail := buf tail := buf
var o0, o3 uint64 var o0, o1 uint64
// Offset (0) 'Header' // Offset (0) 'Header'
if o0 = ssz.ReadOffset(buf[0:4]); o0 > size { if o0 = ssz.ReadOffset(buf[0:4]); o0 > size {
@ -9241,26 +9241,26 @@ func (b *BuilderBidDeneb) UnmarshalSSZ(buf []byte) error {
return ssz.ErrInvalidVariableOffset return ssz.ErrInvalidVariableOffset
} }
// Field (1) 'Value' // Offset (1) 'BlindedBlobsBundle'
if cap(b.Value) == 0 { if o1 = ssz.ReadOffset(buf[4:8]); o1 > size || o0 > o1 {
b.Value = make([]byte, 0, len(buf[4:36]))
}
b.Value = append(b.Value, buf[4:36]...)
// Field (2) 'Pubkey'
if cap(b.Pubkey) == 0 {
b.Pubkey = make([]byte, 0, len(buf[36:84]))
}
b.Pubkey = append(b.Pubkey, buf[36:84]...)
// Offset (3) 'BlindedBlobsBundle'
if o3 = ssz.ReadOffset(buf[84:88]); o3 > size || o0 > o3 {
return ssz.ErrOffset return ssz.ErrOffset
} }
// Field (2) 'Value'
if cap(b.Value) == 0 {
b.Value = make([]byte, 0, len(buf[8:40]))
}
b.Value = append(b.Value, buf[8:40]...)
// Field (3) 'Pubkey'
if cap(b.Pubkey) == 0 {
b.Pubkey = make([]byte, 0, len(buf[40:88]))
}
b.Pubkey = append(b.Pubkey, buf[40:88]...)
// Field (0) 'Header' // Field (0) 'Header'
{ {
buf = tail[o0:o3] buf = tail[o0:o1]
if b.Header == nil { if b.Header == nil {
b.Header = new(v1.ExecutionPayloadHeaderDeneb) b.Header = new(v1.ExecutionPayloadHeaderDeneb)
} }
@ -9269,9 +9269,9 @@ func (b *BuilderBidDeneb) UnmarshalSSZ(buf []byte) error {
} }
} }
// Field (3) 'BlindedBlobsBundle' // Field (1) 'BlindedBlobsBundle'
{ {
buf = tail[o3:] buf = tail[o1:]
if b.BlindedBlobsBundle == nil { if b.BlindedBlobsBundle == nil {
b.BlindedBlobsBundle = new(v1.BlindedBlobsBundle) b.BlindedBlobsBundle = new(v1.BlindedBlobsBundle)
} }
@ -9292,7 +9292,7 @@ func (b *BuilderBidDeneb) SizeSSZ() (size int) {
} }
size += b.Header.SizeSSZ() size += b.Header.SizeSSZ()
// Field (3) 'BlindedBlobsBundle' // Field (1) 'BlindedBlobsBundle'
if b.BlindedBlobsBundle == nil { if b.BlindedBlobsBundle == nil {
b.BlindedBlobsBundle = new(v1.BlindedBlobsBundle) b.BlindedBlobsBundle = new(v1.BlindedBlobsBundle)
} }
@ -9315,25 +9315,25 @@ func (b *BuilderBidDeneb) HashTreeRootWith(hh *ssz.Hasher) (err error) {
return return
} }
// Field (1) 'Value' // Field (1) 'BlindedBlobsBundle'
if err = b.BlindedBlobsBundle.HashTreeRootWith(hh); err != nil {
return
}
// Field (2) 'Value'
if size := len(b.Value); size != 32 { if size := len(b.Value); size != 32 {
err = ssz.ErrBytesLengthFn("--.Value", size, 32) err = ssz.ErrBytesLengthFn("--.Value", size, 32)
return return
} }
hh.PutBytes(b.Value) hh.PutBytes(b.Value)
// Field (2) 'Pubkey' // Field (3) 'Pubkey'
if size := len(b.Pubkey); size != 48 { if size := len(b.Pubkey); size != 48 {
err = ssz.ErrBytesLengthFn("--.Pubkey", size, 48) err = ssz.ErrBytesLengthFn("--.Pubkey", size, 48)
return return
} }
hh.PutBytes(b.Pubkey) hh.PutBytes(b.Pubkey)
// Field (3) 'BlindedBlobsBundle'
if err = b.BlindedBlobsBundle.HashTreeRootWith(hh); err != nil {
return
}
if ssz.EnableVectorizedHTR { if ssz.EnableVectorizedHTR {
hh.MerkleizeVectorizedHTR(indx) hh.MerkleizeVectorizedHTR(indx)
} else { } else {