Execution api: add and use blobs_bundle_v2

terencechain · terencechain · commit 972a381fc223 · 2025-04-11T20:06:06.000-07:00
diff --git a/api/client/builder/client.go b/api/client/builder/client.go
@@ -88,7 +88,7 @@ type BuilderClient interface {
 	NodeURL() string
 	GetHeader(ctx context.Context, slot primitives.Slot, parentHash [32]byte, pubkey [48]byte) (SignedBid, error)
 	RegisterValidator(ctx context.Context, svr []*ethpb.SignedValidatorRegistrationV1) error
-	SubmitBlindedBlock(ctx context.Context, sb interfaces.ReadOnlySignedBeaconBlock) (interfaces.ExecutionData, *v1.BlobsBundle, error)
+	SubmitBlindedBlock(ctx context.Context, sb interfaces.ReadOnlySignedBeaconBlock) (interfaces.ExecutionData, v1.BlobsBundler, error)
 	Status(ctx context.Context) error
 }
 
@@ -310,7 +310,7 @@ var errResponseVersionMismatch = errors.New("builder API response uses a differe
 
 // SubmitBlindedBlock calls the builder API endpoint that binds the validator to the builder and submits the block.
 // The response is the full execution payload used to create the blinded block.
-func (c *Client) SubmitBlindedBlock(ctx context.Context, sb interfaces.ReadOnlySignedBeaconBlock) (interfaces.ExecutionData, *v1.BlobsBundle, error) {
+func (c *Client) SubmitBlindedBlock(ctx context.Context, sb interfaces.ReadOnlySignedBeaconBlock) (interfaces.ExecutionData, v1.BlobsBundler, error) {
 	if !sb.IsBlinded() {
 		return nil, nil, errNotBlinded
 	}
diff --git a/api/client/builder/testing/mock.go b/api/client/builder/testing/mock.go
@@ -41,7 +41,7 @@ func (m MockClient) RegisterValidator(_ context.Context, svr []*ethpb.SignedVali
 }
 
 // SubmitBlindedBlock --
-func (MockClient) SubmitBlindedBlock(_ context.Context, _ interfaces.ReadOnlySignedBeaconBlock) (interfaces.ExecutionData, *v1.BlobsBundle, error) {
+func (MockClient) SubmitBlindedBlock(_ context.Context, _ interfaces.ReadOnlySignedBeaconBlock) (interfaces.ExecutionData, v1.BlobsBundler, error) {
 	return nil, nil, nil
 }
 
diff --git a/api/client/builder/types.go b/api/client/builder/types.go
@@ -558,9 +558,9 @@ type ParsedPayload interface {
 	PayloadProto() (proto.Message, error)
 }
 
-// BlobBundler can retrieve the underlying blob bundle protobuf message for the given execution payload response.
+// BlobBundler can retrieve the underlying blob bundler interface  for the given execution payload response.
 type BlobBundler interface {
-	BundleProto() (*v1.BlobsBundle, error)
+	BundleProto() (v1.BlobsBundler, error)
 }
 
 // ParsedExecutionRequests can retrieve the underlying execution requests for the given execution payload response.
diff --git a/beacon-chain/builder/service.go b/beacon-chain/builder/service.go
@@ -25,7 +25,7 @@ var ErrNoBuilder = errors.New("builder endpoint not configured")
 
 // BlockBuilder defines the interface for interacting with the block builder
 type BlockBuilder interface {
-	SubmitBlindedBlock(ctx context.Context, block interfaces.ReadOnlySignedBeaconBlock) (interfaces.ExecutionData, *v1.BlobsBundle, error)
+	SubmitBlindedBlock(ctx context.Context, block interfaces.ReadOnlySignedBeaconBlock) (interfaces.ExecutionData, v1.BlobsBundler, error)
 	GetHeader(ctx context.Context, slot primitives.Slot, parentHash [32]byte, pubKey [48]byte) (builder.SignedBid, error)
 	RegisterValidator(ctx context.Context, reg []*ethpb.SignedValidatorRegistrationV1) error
 	RegistrationByValidatorID(ctx context.Context, id primitives.ValidatorIndex) (*ethpb.ValidatorRegistrationV1, error)
@@ -88,7 +88,7 @@ func (s *Service) Stop() error {
 }
 
 // SubmitBlindedBlock submits a blinded block to the builder relay network.
-func (s *Service) SubmitBlindedBlock(ctx context.Context, b interfaces.ReadOnlySignedBeaconBlock) (interfaces.ExecutionData, *v1.BlobsBundle, error) {
+func (s *Service) SubmitBlindedBlock(ctx context.Context, b interfaces.ReadOnlySignedBeaconBlock) (interfaces.ExecutionData, v1.BlobsBundler, error) {
 	ctx, span := trace.StartSpan(ctx, "builder.SubmitBlindedBlock")
 	defer span.End()
 	start := time.Now()
diff --git a/beacon-chain/builder/testing/mock.go b/beacon-chain/builder/testing/mock.go
@@ -28,7 +28,8 @@ type MockBuilderService struct {
 	Payload               *v1.ExecutionPayload
 	PayloadCapella        *v1.ExecutionPayloadCapella
 	PayloadDeneb          *v1.ExecutionPayloadDeneb
-	BlobBundle            *v1.BlobsBundle
+	BlobBundleV1          *v1.BlobsBundle
+	BlobBundleV2          *v1.BlobsBundleV2
 	ErrSubmitBlindedBlock error
 	Bid                   *ethpb.SignedBuilderBid
 	BidCapella            *ethpb.SignedBuilderBidCapella
@@ -46,7 +47,7 @@ func (s *MockBuilderService) Configured() bool {
 }
 
 // SubmitBlindedBlock for mocking.
-func (s *MockBuilderService) SubmitBlindedBlock(_ context.Context, b interfaces.ReadOnlySignedBeaconBlock) (interfaces.ExecutionData, *v1.BlobsBundle, error) {
+func (s *MockBuilderService) SubmitBlindedBlock(_ context.Context, b interfaces.ReadOnlySignedBeaconBlock) (interfaces.ExecutionData, v1.BlobsBundler, error) {
 	switch b.Version() {
 	case version.Bellatrix:
 		w, err := blocks.WrappedExecutionPayload(s.Payload)
@@ -65,7 +66,13 @@ func (s *MockBuilderService) SubmitBlindedBlock(_ context.Context, b interfaces.
 		if err != nil {
 			return nil, nil, errors.Wrap(err, "could not wrap deneb payload")
 		}
-		return w, s.BlobBundle, s.ErrSubmitBlindedBlock
+		return w, s.BlobBundleV1, s.ErrSubmitBlindedBlock
+	case version.Fulu:
+		w, err := blocks.WrappedExecutionPayloadDeneb(s.PayloadDeneb)
+		if err != nil {
+			return nil, nil, errors.Wrap(err, "could not wrap deneb payload")
+		}
+		return w, s.BlobBundleV2, s.ErrSubmitBlindedBlock
 	default:
 		return nil, nil, errors.New("unknown block version for mocking")
 	}
diff --git a/beacon-chain/execution/engine_client.go b/beacon-chain/execution/engine_client.go
@@ -275,7 +275,7 @@ func (s *Service) ForkchoiceUpdated(
 func getPayloadMethodAndMessage(slot primitives.Slot) (string, proto.Message) {
 	pe := slots.ToEpoch(slot)
 	if pe >= params.BeaconConfig().FuluForkEpoch {
-		return GetPayloadMethodV5, &pb.ExecutionBundleElectra{}
+		return GetPayloadMethodV5, &pb.ExecutionBundleFulu{}
 	}
 	if pe >= params.BeaconConfig().ElectraForkEpoch {
 		return GetPayloadMethodV4, &pb.ExecutionBundleElectra{}
diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/construct_generic_block.go b/beacon-chain/rpc/prysm/v1alpha1/validator/construct_generic_block.go
@@ -3,6 +3,7 @@ package validator
 import (
 	"fmt"
 
+	"github.com/pkg/errors"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
 	enginev1 "github.com/prysmaticlabs/prysm/v5/proto/engine/v1"
@@ -12,9 +13,13 @@ import (
 )
 
 // constructGenericBeaconBlock constructs a `GenericBeaconBlock` based on the block version and other parameters.
-func (vs *Server) constructGenericBeaconBlock(sBlk interfaces.SignedBeaconBlock, blobsBundle *enginev1.BlobsBundle, winningBid primitives.Wei) (*ethpb.GenericBeaconBlock, error) {
+func (vs *Server) constructGenericBeaconBlock(
+	sBlk interfaces.SignedBeaconBlock,
+	blobsBundle enginev1.BlobsBundler,
+	winningBid primitives.Wei,
+) (*ethpb.GenericBeaconBlock, error) {
 	if sBlk == nil || sBlk.Block() == nil {
-		return nil, fmt.Errorf("block cannot be nil")
+		return nil, errors.New("block cannot be nil")
 	}
 
 	blockProto, err := sBlk.Block().Proto()
@@ -34,12 +39,21 @@ func (vs *Server) constructGenericBeaconBlock(sBlk interfaces.SignedBeaconBlock,
 		return vs.constructBellatrixBlock(blockProto, isBlinded, bidStr), nil
 	case version.Capella:
 		return vs.constructCapellaBlock(blockProto, isBlinded, bidStr), nil
-	case version.Deneb:
-		return vs.constructDenebBlock(blockProto, isBlinded, bidStr, blobsBundle), nil
-	case version.Electra:
-		return vs.constructElectraBlock(blockProto, isBlinded, bidStr, blobsBundle), nil
+	case version.Deneb, version.Electra:
+		bundle, ok := blobsBundle.(*enginev1.BlobsBundle)
+		if blobsBundle != nil && !ok {
+			return nil, fmt.Errorf("expected *BlobsBundle, got %T", blobsBundle)
+		}
+		if sBlk.Version() == version.Deneb {
+			return vs.constructDenebBlock(blockProto, isBlinded, bidStr, bundle), nil
+		}
+		return vs.constructElectraBlock(blockProto, isBlinded, bidStr, bundle), nil
 	case version.Fulu:
-		return vs.constructFuluBlock(blockProto, isBlinded, bidStr, blobsBundle), nil
+		bundle, ok := blobsBundle.(*enginev1.BlobsBundleV2)
+		if blobsBundle != nil && !ok {
+			return nil, fmt.Errorf("expected *BlobsBundleV2, got %T", blobsBundle)
+		}
+		return vs.constructFuluBlock(blockProto, isBlinded, bidStr, bundle), nil
 	default:
 		return nil, fmt.Errorf("unknown block version: %d", sBlk.Version())
 	}
@@ -92,7 +106,7 @@ func (vs *Server) constructElectraBlock(blockProto proto.Message, isBlinded bool
 	return &ethpb.GenericBeaconBlock{Block: &ethpb.GenericBeaconBlock_Electra{Electra: electraContents}, IsBlinded: false, PayloadValue: payloadValue}
 }
 
-func (vs *Server) constructFuluBlock(blockProto proto.Message, isBlinded bool, payloadValue string, bundle *enginev1.BlobsBundle) *ethpb.GenericBeaconBlock {
+func (vs *Server) constructFuluBlock(blockProto proto.Message, isBlinded bool, payloadValue string, bundle *enginev1.BlobsBundleV2) *ethpb.GenericBeaconBlock {
 	if isBlinded {
 		return &ethpb.GenericBeaconBlock{Block: &ethpb.GenericBeaconBlock_BlindedFulu{BlindedFulu: blockProto.(*ethpb.BlindedBeaconBlockFulu)}, IsBlinded: true, PayloadValue: payloadValue}
 	}
diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go
@@ -238,7 +238,7 @@ func (vs *Server) BuildBlockParallel(ctx context.Context, sBlk interfaces.Signed
 	}()
 
 	winningBid := primitives.ZeroWei()
-	var bundle *enginev1.BlobsBundle
+	var bundle enginev1.BlobsBundler
 	if sBlk.Version() >= version.Bellatrix {
 		local, err := vs.getLocalPayload(ctx, sBlk.Block(), head)
 		if err != nil {
@@ -369,7 +369,7 @@ func (vs *Server) handleBlindedBlock(ctx context.Context, block interfaces.Signe
 	}
 
 	if isPeerDASEnabled {
-		dataColumnSideCars, err := peerdas.ConstructDataColumnSidecars(block, bundle.Blobs, bundle.Proofs)
+		dataColumnSideCars, err := peerdas.ConstructDataColumnSidecars(block, bundle.GetBlobs(), bundle.GetProofs())
 		if err != nil {
 			return nil, nil, nil, errors.Wrap(err, "construct data column sidecars")
 		}
diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix.go
@@ -54,7 +54,7 @@ const blockBuilderTimeout = 1 * time.Second
 const gasLimitAdjustmentFactor = 1024
 
 // Sets the execution data for the block. Execution data can come from local EL client or remote builder depends on validator registration and circuit breaker conditions.
-func setExecutionData(ctx context.Context, blk interfaces.SignedBeaconBlock, local *blocks.GetPayloadResponse, bid builder.Bid, builderBoostFactor primitives.Gwei) (primitives.Wei, *enginev1.BlobsBundle, error) {
+func setExecutionData(ctx context.Context, blk interfaces.SignedBeaconBlock, local *blocks.GetPayloadResponse, bid builder.Bid, builderBoostFactor primitives.Gwei) (primitives.Wei, enginev1.BlobsBundler, error) {
 	_, span := trace.StartSpan(ctx, "ProposerServer.setExecutionData")
 	defer span.End()
 
@@ -376,7 +376,7 @@ func matchingWithdrawalsRoot(local, builder interfaces.ExecutionData) (bool, err
 func setLocalExecution(blk interfaces.SignedBeaconBlock, local *blocks.GetPayloadResponse) error {
 	var kzgCommitments [][]byte
 	if local.BlobsBundle != nil {
-		kzgCommitments = local.BlobsBundle.KzgCommitments
+		kzgCommitments = local.BlobsBundle.GetKzgCommitments()
 	}
 	if local.ExecutionRequests != nil {
 		if err := blk.SetExecutionRequests(local.ExecutionRequests); err != nil {
diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go
@@ -1116,7 +1116,7 @@ func TestProposer_ProposeBlock_OK(t *testing.T) {
 				BlockNotifier: c.BlockNotifier(),
 				P2P:           mockp2p.NewTestP2P(t),
 				BlockBuilder: &builderTest.MockBuilderService{HasConfigured: tt.useBuilder, PayloadCapella: emptyPayloadCapella(), PayloadDeneb: emptyPayloadDeneb(),
-					BlobBundle: &enginev1.BlobsBundle{KzgCommitments: [][]byte{bytesutil.PadTo([]byte{0x01}, 48)}, Proofs: [][]byte{{0x02}}, Blobs: [][]byte{{0x03}}}},
+					BlobBundleV1: &enginev1.BlobsBundle{KzgCommitments: [][]byte{bytesutil.PadTo([]byte{0x01}, 48)}, Proofs: [][]byte{{0x02}}, Blobs: [][]byte{{0x03}}}},
 				BeaconDB:          db,
 				BlobReceiver:      c,
 				OperationNotifier: c.OperationNotifier(),
diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/unblinder.go b/beacon-chain/rpc/prysm/v1alpha1/validator/unblinder.go
@@ -12,7 +12,7 @@ import (
 	"github.com/prysmaticlabs/prysm/v5/runtime/version"
 )
 
-func unblindBlobsSidecars(block interfaces.SignedBeaconBlock, bundle *enginev1.BlobsBundle) ([]*ethpb.BlobSidecar, error) {
+func unblindBlobsSidecars(block interfaces.SignedBeaconBlock, bundle enginev1.BlobsBundler) ([]*ethpb.BlobSidecar, error) {
 	if block.Version() < version.Deneb {
 		return nil, nil
 	}
@@ -33,35 +33,39 @@ func unblindBlobsSidecars(block interfaces.SignedBeaconBlock, bundle *enginev1.B
 		return nil, err
 	}
 
+	kzgCommitments := bundle.GetKzgCommitments()
+	blobs := bundle.GetBlobs()
+	proofs := bundle.GetProofs()
+
 	// Ensure there are equal counts of blobs/commitments/proofs.
-	if len(bundle.KzgCommitments) != len(bundle.Blobs) {
+	if len(kzgCommitments) != len(blobs) {
 		return nil, errors.New("mismatch commitments count")
 	}
-	if len(bundle.Proofs) != len(bundle.Blobs) {
+	if len(proofs) != len(blobs) {
 		return nil, errors.New("mismatch proofs count")
 	}
 
 	// Verify that commitments in the bundle match the block.
-	if len(bundle.KzgCommitments) != len(blockCommitments) {
+	if len(kzgCommitments) != len(blockCommitments) {
 		return nil, errors.New("commitment count doesn't match block")
 	}
 	for i, commitment := range blockCommitments {
-		if !bytes.Equal(bundle.KzgCommitments[i], commitment) {
+		if !bytes.Equal(kzgCommitments[i], commitment) {
 			return nil, errors.New("commitment value doesn't match block")
 		}
 	}
 
-	sidecars := make([]*ethpb.BlobSidecar, len(bundle.Blobs))
-	for i, b := range bundle.Blobs {
+	sidecars := make([]*ethpb.BlobSidecar, len(blobs))
+	for i, b := range blobs {
 		proof, err := consensusblocks.MerkleProofKZGCommitment(body, i)
 		if err != nil {
 			return nil, err
 		}
 		sidecars[i] = &ethpb.BlobSidecar{
 			Index:                    uint64(i),
 			Blob:                     bytesutil.SafeCopyBytes(b),
-			KzgCommitment:            bytesutil.SafeCopyBytes(bundle.KzgCommitments[i]),
-			KzgProof:                 bytesutil.SafeCopyBytes(bundle.Proofs[i]),
+			KzgCommitment:            bytesutil.SafeCopyBytes(kzgCommitments[i]),
+			KzgProof:                 bytesutil.SafeCopyBytes(proofs[i]),
 			SignedBlockHeader:        header,
 			CommitmentInclusionProof: proof,
 		}
diff --git a/consensus-types/blocks/get_payload.go b/consensus-types/blocks/get_payload.go
@@ -12,7 +12,7 @@ import (
 // GetPayloadResponseV(1|2|3|4) value.
 type GetPayloadResponse struct {
 	ExecutionData   interfaces.ExecutionData
-	BlobsBundle     *pb.BlobsBundle
+	BlobsBundle     pb.BlobsBundler
 	OverrideBuilder bool
 	// todo: should we convert this to Gwei up front?
 	Bid               primitives.Wei
@@ -24,6 +24,10 @@ type bundleGetter interface {
 	GetBlobsBundle() *pb.BlobsBundle
 }
 
+type bundleV2Getter interface {
+	GetBlobsBundle() *pb.BlobsBundleV2
+}
+
 // bidValueGetter is an interface satisfied by get payload responses that have a bid value.
 type bidValueGetter interface {
 	GetValue() []byte
@@ -43,6 +47,10 @@ func NewGetPayloadResponse(msg proto.Message) (*GetPayloadResponse, error) {
 	if hasBundle {
 		r.BlobsBundle = bundleGetter.GetBlobsBundle()
 	}
+	bundleV2Getter, hasBundle := msg.(bundleV2Getter)
+	if hasBundle {
+		r.BlobsBundle = bundleV2Getter.GetBlobsBundle()
+	}
 	bidValueGetter, hasBid := msg.(bidValueGetter)
 	executionRequestsGetter, hasExecutionRequests := msg.(executionRequestsGetter)
 	wei := primitives.ZeroWei()
diff --git a/proto/engine/v1/BUILD.bazel b/proto/engine/v1/BUILD.bazel
@@ -74,6 +74,7 @@ go_proto_library(
 go_library(
     name = "go_default_library",
     srcs = [
+        "blobs_bundle.go",
         "electra.go",
         "execution_engine.go",
         "json_marshal_unmarshal.go",
diff --git a/proto/engine/v1/blobs_bundle.go b/proto/engine/v1/blobs_bundle.go
@@ -0,0 +1,7 @@
+package enginev1
+
+type BlobsBundler interface {
+	GetKzgCommitments() [][]byte
+	GetProofs() [][]byte
+	GetBlobs() [][]byte
+}
diff --git a/proto/engine/v1/electra.pb.go b/proto/engine/v1/electra.pb.go
diff --git a/proto/engine/v1/electra.proto b/proto/engine/v1/electra.proto
diff --git a/proto/engine/v1/execution_engine.pb.go b/proto/engine/v1/execution_engine.pb.go
diff --git a/proto/engine/v1/execution_engine.proto b/proto/engine/v1/execution_engine.proto

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func (m MockClient) RegisterValidator(_ context.Context, svr []*ethpb.SignedVali`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`// SubmitBlindedBlock --`
`44`		`-func (MockClient) SubmitBlindedBlock(_ context.Context, _ interfaces.ReadOnlySignedBeaconBlock) (interfaces.ExecutionData, *v1.BlobsBundle, error) {`
	`44`	`+func (MockClient) SubmitBlindedBlock(_ context.Context, _ interfaces.ReadOnlySignedBeaconBlock) (interfaces.ExecutionData, v1.BlobsBundler, error) {`
`45`	`45`	`return nil, nil, nil`
`46`	`46`	`}`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -558,9 +558,9 @@ type ParsedPayload interface {`
`558`	`558`	`PayloadProto() (proto.Message, error)`
`559`	`559`	`}`
`560`	`560`
`561`		`-// BlobBundler can retrieve the underlying blob bundle protobuf message for the given execution payload response.`
	`561`	`+// BlobBundler can retrieve the underlying blob bundler interface for the given execution payload response.`
`562`	`562`	`type BlobBundler interface {`
`563`		`- BundleProto() (*v1.BlobsBundle, error)`
	`563`	`+ BundleProto() (v1.BlobsBundler, error)`
`564`	`564`	`}`
`565`	`565`
`566`	`566`	`// ParsedExecutionRequests can retrieve the underlying execution requests for the given execution payload response.`
Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ func (s *Service) ForkchoiceUpdated(`
`275`	`275`	`func getPayloadMethodAndMessage(slot primitives.Slot) (string, proto.Message) {`
`276`	`276`	`pe := slots.ToEpoch(slot)`
`277`	`277`	`if pe >= params.BeaconConfig().FuluForkEpoch {`
`278`		`- return GetPayloadMethodV5, &pb.ExecutionBundleElectra{}`
	`278`	`+ return GetPayloadMethodV5, &pb.ExecutionBundleFulu{}`
`279`	`279`	`}`
`280`	`280`	`if pe >= params.BeaconConfig().ElectraForkEpoch {`
`281`	`281`	`return GetPayloadMethodV4, &pb.ExecutionBundleElectra{}`