Fix errors

Author: 0x00101010

Diff for: api/server/structs/conversions.go

@@ -1598,6 +1598,13 @@ func SignedExitsFromConsensus(src []*eth.SignedVoluntaryExit) []*SignedVoluntary
 	return exits
 }
 
+func sszBytesToUint8String(b []byte) (string, error) {
+	if len(b) != 1 {
+		return "", fmt.Errorf("expected 1 byte, got %d", len(b))
+	}
+	return fmt.Sprintf("%d", b[0]), nil
+}
+
 func sszBytesToUint256String(b []byte) (string, error) {
 	bi := bytesutil.LittleEndianBytesToBigInt(b)
 	if !math.IsValidUint256(bi) {

Diff for: api/server/structs/conversions_block.go

@@ -3584,10 +3584,11 @@ func (b *BeaconBlockFulu) ToConsensus() (*eth.BeaconBlockFulu, error) {
 	if err != nil {
 		return nil, server.NewDecodeError(err, "Body.ExecutionPayload.ExcessBlobGas")
 	}
-	payloadProofVersion, err := bytesutil.DecodeHexWithMaxLength(b.Body.ExecutionPayload.ProofVersion, 1)
+	proofVersion, err := strconv.ParseUint(b.Body.ExecutionPayload.ProofVersion, 10, 1)
 	if err != nil {
 		return nil, server.NewDecodeError(err, "Body.ExecutionPayload.ProofVersion")
 	}
+	payloadProofVersion := []byte{uint8(proofVersion)}
 
 	if b.Body.ExecutionRequests == nil {
 		return nil, server.NewDecodeError(errors.New("nil execution requests"), "Body.ExequtionRequests")
@@ -4118,6 +4119,10 @@ func ExecutionPayloadFuluFromConsensus(payload *enginev1.ExecutionPayloadFulu) (
 	for i, tx := range payload.Transactions {
 		transactions[i] = hexutil.Encode(tx)
 	}
+	proofVersion, err := sszBytesToUint8String(payload.ProofVersion)
+	if err != nil {
+		return nil, err
+	}
 
 	return &ExecutionPayloadFulu{
 		ParentHash:    hexutil.Encode(payload.ParentHash),
@@ -4137,7 +4142,7 @@ func ExecutionPayloadFuluFromConsensus(payload *enginev1.ExecutionPayloadFulu) (
 		Withdrawals:   WithdrawalsFromConsensus(payload.Withdrawals),
 		BlobGasUsed:   fmt.Sprintf("%d", payload.BlobGasUsed),
 		ExcessBlobGas: fmt.Sprintf("%d", payload.ExcessBlobGas),
-		ProofVersion:  fmt.Sprintf("%d", payload.ProofVersion),
+		ProofVersion:  proofVersion,
 	}, nil
 }
 

Diff for: beacon-chain/core/peerdas/das_core.go

@@ -106,8 +106,11 @@ func ComputeColumnsForCustodyGroup(custodyGroup uint64) ([]uint64, error) {
 // DataColumnSidecars computes the data column sidecars from the signed block and blobs.
 // https://github.com/ethereum/consensus-specs/blob/dev/specs/fulu/das-core.md#get_data_column_sidecars
 func DataColumnSidecars(signedBlock interfaces.ReadOnlySignedBeaconBlock, cellsAndProofs []kzg.CellsAndProofs) ([]*ethpb.DataColumnSidecar, error) {
-	start := time.Now()
+	if signedBlock == nil || len(cellsAndProofs) == 0 {
+		return nil, nil
+	}
 
+	start := time.Now()
 	block := signedBlock.Block()
 	blockBody := block.Body()
 	blobKzgCommitments, err := blockBody.BlobKzgCommitments()

Diff for: beacon-chain/execution/engine_client.go

@@ -528,19 +528,6 @@ func (s *Service) GetBlobs(ctx context.Context, versionedHashes []common.Hash) (
 	return result, handleRPCError(err)
 }
 
-func (s *Service) GetBlobsV2(ctx context.Context, versionedHashes []common.Hash) ([]*pb.BlobAndProofV2, error) {
-	ctx, span := trace.StartSpan(ctx, "powchain.engine-api-client.GetBlobsV2")
-	defer span.End()
-
-	if !s.capabilityCache.has(GetBlobsV2) {
-		return nil, errors.New(fmt.Sprintf("%s is not supported", GetBlobsV2))
-	}
-
-	result := make([]*pb.BlobAndProofV2, len(versionedHashes))
-	err := s.rpcClient.CallContext(ctx, &result, GetBlobsV2, versionedHashes)
-	return result, handleRPCError(err)
-}
-
 // ReconstructFullBlock takes in a blinded beacon block and reconstructs
 // a beacon block with a full execution payload via the engine API.
 func (s *Service) ReconstructFullBlock(
@@ -668,13 +655,13 @@ func (s *Service) ReconstructDataColumnSidecars(ctx context.Context, block inter
 	}
 
 	// Fetch all blobsAndCellsProofs from EL
-	blobsAndCellsProofs, err := s.GetBlobsV2(ctx, kzgHashes)
+	blobsAndCellProofs, err := s.GetBlobs(ctx, kzgHashes)
 	if err != nil {
 		return nil, wrapWithBlockRoot(err, blockRoot, "get blobs V2")
 	}
 
 	var cellsAndProofs []kzg.CellsAndProofs
-	for _, blobAndCellProofs := range blobsAndCellsProofs {
+	for _, blobAndCellProofs := range blobsAndCellProofs {
 		if blobAndCellProofs == nil {
 			return nil, wrapWithBlockRoot(errors.New("unable to reconstruct data column sidecars, did not get all blobs from EL"), blockRoot, "")
 		}

Diff for: beacon-chain/execution/engine_client_test.go

@@ -2502,17 +2502,13 @@ func TestReconstructDataColumnSidecars(t *testing.T) {
 	require.NoError(t, err)
 
 	ctx := context.Background()
-	t.Run("GetBlobsV2 is not supported", func(t *testing.T) {
-		_, err := client.ReconstructDataColumnSidecars(ctx, sb, r)
-		require.ErrorContains(t, "get blobs V2 for block", err)
-	})
 
 	t.Run("receiving all blobs", func(t *testing.T) {
 		blobMasks := []bool{true, true, true, true, true, true}
 		srv := createBlobServerV2(t, 6, blobMasks)
 		defer srv.Close()
 
-		rpcClient, client := setupRpcClientV2(t, srv.URL, client)
+		rpcClient, client := setupRpcClient(t, srv.URL, client)
 		defer rpcClient.Close()
 
 		dataColumns, err := client.ReconstructDataColumnSidecars(ctx, sb, r)
@@ -2525,7 +2521,7 @@ func TestReconstructDataColumnSidecars(t *testing.T) {
 		srv := createBlobServerV2(t, 6, blobMasks)
 		defer srv.Close()
 
-		rpcClient, client := setupRpcClientV2(t, srv.URL, client)
+		rpcClient, client := setupRpcClient(t, srv.URL, client)
 		defer rpcClient.Close()
 
 		dataColumns, err := client.ReconstructDataColumnSidecars(ctx, sb, r)
@@ -2578,18 +2574,20 @@ func createBlobServerV2(t *testing.T, numBlobs int, blobMasks []bool) *httptest.
 
 		require.Equal(t, len(blobMasks), numBlobs)
 
-		blobAndCellProofs := make([]*pb.BlobAndCellProofJson, numBlobs)
+		blobAndCellProofs := make([]*pb.BlobAndProofJson, numBlobs)
 		for i := range blobAndCellProofs {
 			if !blobMasks[i] {
 				continue
 			}
 
-			blobAndCellProofs[i] = &pb.BlobAndCellProofJson{
+			blobAndCellProofs[i] = &pb.BlobAndProofJson{
 				Blob:       []byte("0xblob"),
 				CellProofs: []hexutil.Bytes{},
 			}
 			for j := 0; j < int(params.BeaconConfig().NumberOfColumns); j++ {
-				blobAndCellProofs[i].CellProofs = append(blobAndCellProofs[i].CellProofs, []byte(fmt.Sprintf("0xproof%d", j)))
+				cellProof := make([]byte, 48)
+
+				blobAndCellProofs[i].CellProofs = append(blobAndCellProofs[i].CellProofs, cellProof)
 			}
 		}
 

Diff for: beacon-chain/rpc/eth/beacon/handlers_test.go

@@ -325,6 +325,7 @@ func TestGetBlockV2(t *testing.T) {
 		s.GetBlockV2(writer, request)
 		require.Equal(t, http.StatusOK, writer.Code)
 		resp := &structs.GetBlockV2Response{}
+
 		require.NoError(t, json.Unmarshal(writer.Body.Bytes(), resp))
 		assert.Equal(t, version.String(version.Fulu), resp.Version)
 		sbb := &structs.SignedBeaconBlockFulu{Message: &structs.BeaconBlockFulu{}}
@@ -1469,7 +1470,7 @@ func TestPublishBlock(t *testing.T) {
 			converted, err := structs.SignedBeaconBlockContentsElectraFromConsensus(block.Electra)
 			require.NoError(t, err)
 			var signedblock *structs.SignedBeaconBlockContentsElectra
-			err = json.Unmarshal([]byte(rpctesting.FuluBlockContents), &signedblock)
+			err = json.Unmarshal([]byte(rpctesting.ElectraBlockContents), &signedblock)
 			require.NoError(t, err)
 			require.DeepEqual(t, converted, signedblock)
 			return ok
@@ -4745,7 +4746,7 @@ func Test_validateBlobSidecars(t *testing.T) {
 	s := &Server{}
 	require.NoError(t, s.validateBlobSidecars(b, [][]byte{blob[:]}, [][]byte{proof[:]}))
 
-	require.ErrorContains(t, "number of blobs, proofs, and commitments do not match", s.validateBlobSidecars(b, [][]byte{blob[:]}, [][]byte{}))
+	require.ErrorContains(t, "number of blobs and proofs do not match", s.validateBlobSidecars(b, [][]byte{blob[:]}, [][]byte{}))
 
 	sk, err := bls.RandKey()
 	require.NoError(t, err)

Diff for: beacon-chain/rpc/eth/shared/testing/json.go

@@ -747,7 +747,7 @@ func (b *BeaconBlock) HashTreeRoot() ([field_params.RootLength]byte, error) {
 		if b.IsBlinded() {
 			return pb.(*eth.BlindedBeaconBlockFulu).HashTreeRoot()
 		}
-		return pb.(*eth.BeaconBlockElectra).HashTreeRoot()
+		return pb.(*eth.BeaconBlockFulu).HashTreeRoot()
 	default:
 		return [field_params.RootLength]byte{}, errIncorrectBlockVersion
 	}
@@ -788,7 +788,7 @@ func (b *BeaconBlock) HashTreeRootWith(h *ssz.Hasher) error {
 		if b.IsBlinded() {
 			return pb.(*eth.BlindedBeaconBlockFulu).HashTreeRootWith(h)
 		}
-		return pb.(*eth.BeaconBlockElectra).HashTreeRootWith(h)
+		return pb.(*eth.BeaconBlockFulu).HashTreeRootWith(h)
 	default:
 		return errIncorrectBlockVersion
 	}
@@ -830,7 +830,7 @@ func (b *BeaconBlock) MarshalSSZ() ([]byte, error) {
 		if b.IsBlinded() {
 			return pb.(*eth.BlindedBeaconBlockFulu).MarshalSSZ()
 		}
-		return pb.(*eth.BeaconBlockElectra).MarshalSSZ()
+		return pb.(*eth.BeaconBlockFulu).MarshalSSZ()
 	default:
 		return []byte{}, errIncorrectBlockVersion
 	}
@@ -1277,7 +1277,7 @@ func (b *BeaconBlockBody) HashTreeRoot() ([field_params.RootLength]byte, error)
 		if b.IsBlinded() {
 			return pb.(*eth.BlindedBeaconBlockBodyElectra).HashTreeRoot()
 		}
-		return pb.(*eth.BeaconBlockBodyElectra).HashTreeRoot()
+		return pb.(*eth.BeaconBlockBodyFulu).HashTreeRoot()
 	default:
 		return [field_params.RootLength]byte{}, errIncorrectBodyVersion
 	}

Diff for: consensus-types/blocks/getters.go

@@ -382,15 +382,15 @@ func (b *BeaconBlock) Proto() (proto.Message, error) { // nolint:gocognit
 				Body:          body,
 			}, nil
 		}
-		var body *eth.BeaconBlockBodyElectra
+		var body *eth.BeaconBlockBodyFulu
 		if bodyMessage != nil {
 			var ok bool
-			body, ok = bodyMessage.(*eth.BeaconBlockBodyElectra)
+			body, ok = bodyMessage.(*eth.BeaconBlockBodyFulu)
 			if !ok {
 				return nil, errIncorrectBodyVersion
 			}
 		}
-		return &eth.BeaconBlockElectra{
+		return &eth.BeaconBlockFulu{
 			Slot:          b.slot,
 			ProposerIndex: b.proposerIndex,
 			ParentRoot:    b.parentRoot[:],
@@ -643,15 +643,15 @@ func (b *BeaconBlockBody) Proto() (proto.Message, error) {
 				ExecutionRequests:      b.executionRequests,
 			}, nil
 		}
-		var p *enginev1.ExecutionPayloadDeneb
+		var p *enginev1.ExecutionPayloadFulu
 		var ok bool
 		if b.executionPayload != nil {
-			p, ok = b.executionPayload.Proto().(*enginev1.ExecutionPayloadDeneb)
+			p, ok = b.executionPayload.Proto().(*enginev1.ExecutionPayloadFulu)
 			if !ok {
 				return nil, errPayloadWrongType
 			}
 		}
-		return &eth.BeaconBlockBodyElectra{
+		return &eth.BeaconBlockBodyFulu{
 			RandaoReveal:          b.randaoReveal[:],
 			Eth1Data:              b.eth1Data,
 			Graffiti:              b.graffiti[:],

Diff for: consensus-types/blocks/proto.go

@@ -155,6 +155,11 @@ func BigIntToLittleEndianBytes(bigInt *big.Int) []byte {
 	return ReverseByteOrder(bigInt.Bytes())
 }
 
+// Uint8ToSSZBytes takes a uint8 and returns its bytes stored as little-endian
+func Uint8ToSSZBytes(num uint8) []byte {
+	return []byte{num}
+}
+
 // Uint256ToSSZBytes takes a string representation of uint256 and returns its bytes stored as little-endian
 func Uint256ToSSZBytes(num string) ([]byte, error) {
 	uint256, ok := new(big.Int).SetString(num, 10)