From 724505651f59764bdf49edcdf7e4b1fbfcb2ce04 Mon Sep 17 00:00:00 2001 From: Roberto Bayardo Date: Sun, 13 Nov 2022 18:18:13 -0800 Subject: [PATCH] have CL compute the aggregated proof for the block, per updated spec --- beacon-chain/core/blob/sidecar.go | 16 ++--- .../v1alpha1/validator/proposer_eip4844.go | 8 ++- go.mod | 2 +- go.sum | 4 +- proto/engine/v1/execution_engine.pb.go | 63 ++++++++----------- proto/engine/v1/execution_engine.proto | 1 - proto/engine/v1/generated.ssz.go | 2 +- proto/engine/v1/json_marshal_unmarshal.go | 8 +-- proto/eth/ext/options.pb.go | 14 ++--- proto/eth/v1/generated.ssz.go | 2 +- proto/eth/v2/generated.ssz.go | 2 +- proto/prysm/v1alpha1/generated.ssz.go | 2 +- 12 files changed, 58 insertions(+), 66 deletions(-) diff --git a/beacon-chain/core/blob/sidecar.go b/beacon-chain/core/blob/sidecar.go index 28ed36da9bdd..134e6ee28f32 100644 --- a/beacon-chain/core/blob/sidecar.go +++ b/beacon-chain/core/blob/sidecar.go @@ -21,25 +21,25 @@ func (s commitmentSequenceImpl) Len() int { return len(s) } -type blobImpl [][]byte +type BlobImpl [][]byte -func (b blobImpl) At(i int) [32]byte { +func (b BlobImpl) At(i int) [32]byte { var out [32]byte copy(out[:], b[i][:]) return out } -func (b blobImpl) Len() int { +func (b BlobImpl) Len() int { return len(b) } -type blobsSequenceImpl []*v1.Blob +type BlobsSequenceImpl []*v1.Blob -func (s blobsSequenceImpl) At(i int) kzg.Blob { - return blobImpl(s[i].Blob) +func (s BlobsSequenceImpl) At(i int) kzg.Blob { + return BlobImpl(s[i].Blob) } -func (s blobsSequenceImpl) Len() int { +func (s BlobsSequenceImpl) Len() int { return len(s) } @@ -47,7 +47,7 @@ func (s blobsSequenceImpl) Len() int { func ValidateBlobsSidecar(slot types.Slot, root [32]byte, commitments [][]byte, sidecar *eth.BlobsSidecar) error { kzgSidecar := kzg.BlobsSidecar{ BeaconBlockSlot: kzg.Slot(sidecar.BeaconBlockSlot), - Blobs: blobsSequenceImpl(sidecar.Blobs), + Blobs: BlobsSequenceImpl(sidecar.Blobs), } copy(kzgSidecar.BeaconBlockRoot[:], sidecar.BeaconBlockRoot) copy(kzgSidecar.KZGAggregatedProof[:], sidecar.AggregatedProof) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_eip4844.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_eip4844.go index a78ff1b298a3..615e530e0e64 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_eip4844.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_eip4844.go @@ -5,7 +5,9 @@ import ( "context" "fmt" + "github.com/ethereum/go-ethereum/crypto/kzg" "github.com/pkg/errors" + "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/blob" "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/transition/interop" "github.com/prysmaticlabs/prysm/v3/config/params" consensusblocks "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" @@ -108,11 +110,15 @@ func (vs *Server) assembleEip4844Block(ctx context.Context, altairBlk *ethpb.Bea var sideCar *ethpb.BlobsSidecar if len(blobsBundle.Blobs) != 0 { + aggregatedProof, err := kzg.ComputeAggregateKZGProof(blob.BlobsSequenceImpl(blobsBundle.Blobs)) + if err != nil { + return nil, fmt.Errorf("failed to compute aggregated kzg proof: %v", err) + } sideCar = ðpb.BlobsSidecar{ BeaconBlockRoot: r[:], BeaconBlockSlot: wsb.Block().Slot(), Blobs: blobsBundle.Blobs, - AggregatedProof: blobsBundle.AggregatedProof, + AggregatedProof: aggregatedProof[:], } } diff --git a/go.mod b/go.mod index 8f746c8c5930..423e13d435b1 100644 --- a/go.mod +++ b/go.mod @@ -269,4 +269,4 @@ replace github.com/json-iterator/go => github.com/prestonvanloon/go v1.1.7-0.201 replace github.com/grpc-ecosystem/grpc-gateway/v2 => github.com/prysmaticlabs/grpc-gateway/v2 v2.3.1-0.20220721162526-0d1c40b5f064 // For eip-4844 types -replace github.com/ethereum/go-ethereum => github.com/mdehoog/go-ethereum v1.10.19-0.20221113220910-b4e09c8948db +replace github.com/ethereum/go-ethereum => github.com/mdehoog/go-ethereum v1.10.19-0.20221114011613-42a69e6e01ae diff --git a/go.sum b/go.sum index 7238d878935a..8700d1dee197 100644 --- a/go.sum +++ b/go.sum @@ -865,8 +865,8 @@ github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsO github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mdehoog/go-ethereum v1.10.19-0.20221113220910-b4e09c8948db h1:+it0Xflw4jcbnRqu0XLEMQfbh/SdBc/8z0Q5+eNyqBc= -github.com/mdehoog/go-ethereum v1.10.19-0.20221113220910-b4e09c8948db/go.mod h1:g+vX1+faxlr/KM1C0wybtfdcH5aPghqJAfpLGAn+Kbk= +github.com/mdehoog/go-ethereum v1.10.19-0.20221114011613-42a69e6e01ae h1:2wXfDkt06PPDhG4Lxkse69fDegYljvz9fSZExd5V41c= +github.com/mdehoog/go-ethereum v1.10.19-0.20221114011613-42a69e6e01ae/go.mod h1:g+vX1+faxlr/KM1C0wybtfdcH5aPghqJAfpLGAn+Kbk= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= diff --git a/proto/engine/v1/execution_engine.pb.go b/proto/engine/v1/execution_engine.pb.go index 665bbda3df4e..2bbcad7b29ff 100755 --- a/proto/engine/v1/execution_engine.pb.go +++ b/proto/engine/v1/execution_engine.pb.go @@ -1274,10 +1274,9 @@ type BlobsBundle struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - BlockHash []byte `protobuf:"bytes,1,opt,name=block_hash,json=blockHash,proto3" json:"block_hash,omitempty" ssz-size:"32"` - Kzgs [][]byte `protobuf:"bytes,2,rep,name=kzgs,proto3" json:"kzgs,omitempty" ssz-max:"16" ssz-size:"?,48"` - Blobs []*Blob `protobuf:"bytes,3,rep,name=blobs,proto3" json:"blobs,omitempty" ssz-max:"16"` - AggregatedProof []byte `protobuf:"bytes,4,opt,name=aggregated_proof,json=aggregatedProof,proto3" json:"aggregated_proof,omitempty" ssz-size:"48"` + BlockHash []byte `protobuf:"bytes,1,opt,name=block_hash,json=blockHash,proto3" json:"block_hash,omitempty" ssz-size:"32"` + Kzgs [][]byte `protobuf:"bytes,2,rep,name=kzgs,proto3" json:"kzgs,omitempty" ssz-max:"16" ssz-size:"?,48"` + Blobs []*Blob `protobuf:"bytes,3,rep,name=blobs,proto3" json:"blobs,omitempty" ssz-max:"16"` } func (x *BlobsBundle) Reset() { @@ -1333,13 +1332,6 @@ func (x *BlobsBundle) GetBlobs() []*Blob { return nil } -func (x *BlobsBundle) GetAggregatedProof() []byte { - if x != nil { - return x.AggregatedProof - } - return nil -} - type Blob struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1742,7 +1734,7 @@ var file_proto_engine_v1_execution_engine_proto_rawDesc = []byte{ 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x33, 0x32, 0x52, 0x12, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, - 0x73, 0x68, 0x22, 0xc3, 0x01, 0x0a, 0x0b, 0x42, 0x6c, 0x6f, 0x62, 0x73, 0x42, 0x75, 0x6e, 0x64, + 0x73, 0x68, 0x22, 0x90, 0x01, 0x0a, 0x0b, 0x42, 0x6c, 0x6f, 0x62, 0x73, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x25, 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x33, 0x32, 0x52, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x12, 0x22, 0x0a, 0x04, 0x6b, 0x7a, 0x67, @@ -1751,31 +1743,28 @@ var file_proto_engine_v1_execution_engine_proto_rawDesc = []byte{ 0x05, 0x62, 0x6c, 0x6f, 0x62, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x6c, 0x6f, 0x62, 0x42, 0x06, 0x92, 0xb5, 0x18, 0x02, 0x31, 0x36, 0x52, 0x05, - 0x62, 0x6c, 0x6f, 0x62, 0x73, 0x12, 0x31, 0x0a, 0x10, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, - 0x74, 0x65, 0x64, 0x5f, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x42, - 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x34, 0x38, 0x52, 0x0f, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, - 0x74, 0x65, 0x64, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x22, 0x27, 0x0a, 0x04, 0x42, 0x6c, 0x6f, 0x62, - 0x12, 0x1f, 0x0a, 0x04, 0x62, 0x6c, 0x6f, 0x62, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x42, 0x0b, - 0x8a, 0xb5, 0x18, 0x07, 0x34, 0x30, 0x39, 0x36, 0x2c, 0x33, 0x32, 0x52, 0x04, 0x62, 0x6c, 0x6f, - 0x62, 0x22, 0x84, 0x01, 0x0a, 0x0a, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, - 0x12, 0x29, 0x0a, 0x10, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x5f, 0x69, - 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0f, 0x77, 0x69, 0x74, 0x68, - 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x33, 0x0a, 0x11, 0x65, - 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x32, 0x30, 0x52, 0x10, - 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, - 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, - 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x96, 0x01, 0x0a, 0x16, 0x6f, 0x72, 0x67, - 0x2e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, - 0x2e, 0x76, 0x31, 0x42, 0x14, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, - 0x67, 0x69, 0x6e, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, - 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, - 0x63, 0x6c, 0x61, 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x65, - 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x76, 0x31, 0xaa, 0x02, 0x12, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, - 0x75, 0x6d, 0x2e, 0x45, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x12, 0x45, - 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x5c, 0x76, - 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x62, 0x6c, 0x6f, 0x62, 0x73, 0x22, 0x27, 0x0a, 0x04, 0x42, 0x6c, 0x6f, 0x62, 0x12, 0x1f, 0x0a, + 0x04, 0x62, 0x6c, 0x6f, 0x62, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x42, 0x0b, 0x8a, 0xb5, 0x18, + 0x07, 0x34, 0x30, 0x39, 0x36, 0x2c, 0x33, 0x32, 0x52, 0x04, 0x62, 0x6c, 0x6f, 0x62, 0x22, 0x84, + 0x01, 0x0a, 0x0a, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x12, 0x29, 0x0a, + 0x10, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x61, 0x6c, 0x5f, 0x69, 0x6e, 0x64, 0x65, + 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0f, 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, + 0x77, 0x61, 0x6c, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x33, 0x0a, 0x11, 0x65, 0x78, 0x65, 0x63, + 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0c, 0x42, 0x06, 0x8a, 0xb5, 0x18, 0x02, 0x32, 0x30, 0x52, 0x10, 0x65, 0x78, 0x65, + 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x16, 0x0a, + 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x61, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x96, 0x01, 0x0a, 0x16, 0x6f, 0x72, 0x67, 0x2e, 0x65, 0x74, + 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x2e, 0x76, 0x31, + 0x42, 0x14, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x67, 0x69, 0x6e, + 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x6c, 0x61, + 0x62, 0x73, 0x2f, 0x70, 0x72, 0x79, 0x73, 0x6d, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x2f, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x6e, 0x67, 0x69, + 0x6e, 0x65, 0x76, 0x31, 0xaa, 0x02, 0x12, 0x45, 0x74, 0x68, 0x65, 0x72, 0x65, 0x75, 0x6d, 0x2e, + 0x45, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x12, 0x45, 0x74, 0x68, 0x65, + 0x72, 0x65, 0x75, 0x6d, 0x5c, 0x45, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x5c, 0x76, 0x31, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/engine/v1/execution_engine.proto b/proto/engine/v1/execution_engine.proto index ccb3a8043292..8cce6c8908da 100644 --- a/proto/engine/v1/execution_engine.proto +++ b/proto/engine/v1/execution_engine.proto @@ -167,7 +167,6 @@ message BlobsBundle { bytes block_hash = 1 [(ethereum.eth.ext.ssz_size) = "32"]; repeated bytes kzgs = 2 [(ethereum.eth.ext.ssz_size) = "?,48", (ethereum.eth.ext.ssz_max) = "16"]; repeated Blob blobs = 3 [(ethereum.eth.ext.ssz_max) = "16"]; - bytes aggregated_proof = 4 [(ethereum.eth.ext.ssz_size) = "48"]; } message Blob { diff --git a/proto/engine/v1/generated.ssz.go b/proto/engine/v1/generated.ssz.go index 7c1c030d7a50..b3cd3fa81f9b 100644 --- a/proto/engine/v1/generated.ssz.go +++ b/proto/engine/v1/generated.ssz.go @@ -1,5 +1,5 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 9d770a5b11b36db58e568585825cb8920fda4884594b4e1b2d86daf11919235c +// Hash: db83674b7d60215b93a4964a082b84c350ac331be875724071f501df2e9206cd package enginev1 import ( diff --git a/proto/engine/v1/json_marshal_unmarshal.go b/proto/engine/v1/json_marshal_unmarshal.go index f574e6e786f2..44bc7105e563 100644 --- a/proto/engine/v1/json_marshal_unmarshal.go +++ b/proto/engine/v1/json_marshal_unmarshal.go @@ -570,10 +570,9 @@ func (b *BlobsBundle) MarshalJSON() ([]byte, error) { } return json.Marshal(blobBundleJSON{ - BlockHash: bytesutil.ToBytes32(b.BlockHash), - Kzgs: kzgs, - Blobs: blobs, - AggregatedProof: bytesutil.ToBytes48(b.AggregatedProof), + BlockHash: bytesutil.ToBytes32(b.BlockHash), + Kzgs: kzgs, + Blobs: blobs, }) } @@ -600,6 +599,5 @@ func (e *BlobsBundle) UnmarshalJSON(enc []byte) error { } } e.Blobs = blobs - e.AggregatedProof = bytesutil.PadTo(dec.AggregatedProof[:], fieldparams.BLSPubkeyLength) return nil } diff --git a/proto/eth/ext/options.pb.go b/proto/eth/ext/options.pb.go index eadc5c7f75e2..d4446fb515de 100755 --- a/proto/eth/ext/options.pb.go +++ b/proto/eth/ext/options.pb.go @@ -7,9 +7,9 @@ package ext import ( - descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + descriptorpb "google.golang.org/protobuf/types/descriptorpb" reflect "reflect" ) @@ -22,7 +22,7 @@ const ( var file_proto_eth_ext_options_proto_extTypes = []protoimpl.ExtensionInfo{ { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*string)(nil), Field: 50000, Name: "ethereum.eth.ext.cast_type", @@ -30,7 +30,7 @@ var file_proto_eth_ext_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "proto/eth/ext/options.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*string)(nil), Field: 50001, Name: "ethereum.eth.ext.ssz_size", @@ -38,7 +38,7 @@ var file_proto_eth_ext_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "proto/eth/ext/options.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*string)(nil), Field: 50002, Name: "ethereum.eth.ext.ssz_max", @@ -46,7 +46,7 @@ var file_proto_eth_ext_options_proto_extTypes = []protoimpl.ExtensionInfo{ Filename: "proto/eth/ext/options.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*string)(nil), Field: 50003, Name: "ethereum.eth.ext.spec_name", @@ -55,7 +55,7 @@ var file_proto_eth_ext_options_proto_extTypes = []protoimpl.ExtensionInfo{ }, } -// Extension fields to descriptor.FieldOptions. +// Extension fields to descriptorpb.FieldOptions. var ( // optional string cast_type = 50000; E_CastType = &file_proto_eth_ext_options_proto_extTypes[0] @@ -102,7 +102,7 @@ var file_proto_eth_ext_options_proto_rawDesc = []byte{ } var file_proto_eth_ext_options_proto_goTypes = []interface{}{ - (*descriptor.FieldOptions)(nil), // 0: google.protobuf.FieldOptions + (*descriptorpb.FieldOptions)(nil), // 0: google.protobuf.FieldOptions } var file_proto_eth_ext_options_proto_depIdxs = []int32{ 0, // 0: ethereum.eth.ext.cast_type:extendee -> google.protobuf.FieldOptions diff --git a/proto/eth/v1/generated.ssz.go b/proto/eth/v1/generated.ssz.go index 0a8d28caa7a7..cc7cac3490cd 100644 --- a/proto/eth/v1/generated.ssz.go +++ b/proto/eth/v1/generated.ssz.go @@ -1,5 +1,5 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 59bde931814d95807c0932dc7b27cc235ffed4e7c7b80053b7a88632373c7042 +// Hash: df8a853f5b774fd36815786c1690f18f9036403fc0dd7d9c6e4568094316879b package v1 import ( diff --git a/proto/eth/v2/generated.ssz.go b/proto/eth/v2/generated.ssz.go index 92488fad97bb..53c8f03ccaeb 100644 --- a/proto/eth/v2/generated.ssz.go +++ b/proto/eth/v2/generated.ssz.go @@ -1,5 +1,5 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: c25a31d1f7ed41bb40abc5c9e7adfcefb332319040b6ecd30e3a0f2f2c9f6200 +// Hash: a7263bacf115fcb18d5975da47a990452408272cd8bf47cca1fbc0b72ba569c6 package eth import ( diff --git a/proto/prysm/v1alpha1/generated.ssz.go b/proto/prysm/v1alpha1/generated.ssz.go index c0458874aebc..03da1161c671 100644 --- a/proto/prysm/v1alpha1/generated.ssz.go +++ b/proto/prysm/v1alpha1/generated.ssz.go @@ -1,5 +1,5 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: b9ffe13e361455f66e5fd724185953b23d8503eea88a183efe827d4d5b47152c +// Hash: 37c5da3ffa1234c7bc3ac95e12c484f984c57df3f8668a07043aa6a962766e56 package eth import (