From acde184aa765da7e331dcd1f6556e1a299801db1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Kapka?= Date: Tue, 19 Oct 2021 18:45:38 +0200 Subject: [PATCH] Fill out `Version` for SSZ block (#9801) --- beacon-chain/rpc/eth/beacon/blocks.go | 4 ++-- beacon-chain/rpc/eth/beacon/blocks_test.go | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/beacon-chain/rpc/eth/beacon/blocks.go b/beacon-chain/rpc/eth/beacon/blocks.go index 1fdbfa37a9..bdbd7824eb 100644 --- a/beacon-chain/rpc/eth/beacon/blocks.go +++ b/beacon-chain/rpc/eth/beacon/blocks.go @@ -327,7 +327,7 @@ func (bs *Server) GetBlockSSZV2(ctx context.Context, req *ethpbv2.BlockRequestV2 if err != nil { return nil, status.Errorf(codes.Internal, "Could not marshal block into SSZ: %v", err) } - return ðpbv2.BlockSSZResponseV2{Data: sszBlock}, nil + return ðpbv2.BlockSSZResponseV2{Version: ethpbv2.Version_PHASE0, Data: sszBlock}, nil } altairBlk, err := blk.PbAltairBlock() if err != nil { @@ -345,7 +345,7 @@ func (bs *Server) GetBlockSSZV2(ctx context.Context, req *ethpbv2.BlockRequestV2 if err != nil { return nil, status.Errorf(codes.Internal, "Could not marshal block into SSZ: %v", err) } - return ðpbv2.BlockSSZResponseV2{Data: sszData}, nil + return ðpbv2.BlockSSZResponseV2{Version: ethpbv2.Version_ALTAIR, Data: sszData}, nil } // GetBlockRoot retrieves hashTreeRoot of BeaconBlock/BeaconBlockHeader. diff --git a/beacon-chain/rpc/eth/beacon/blocks_test.go b/beacon-chain/rpc/eth/beacon/blocks_test.go index fe807ab39d..e21969db8e 100644 --- a/beacon-chain/rpc/eth/beacon/blocks_test.go +++ b/beacon-chain/rpc/eth/beacon/blocks_test.go @@ -773,6 +773,7 @@ func TestServer_GetBlockSSZV2(t *testing.T) { require.NoError(t, err) assert.NotNil(t, resp) assert.DeepEqual(t, sszBlock, resp.Data) + assert.Equal(t, ethpbv2.Version_PHASE0, resp.Version) }) t.Run("Altair", func(t *testing.T) { @@ -811,6 +812,7 @@ func TestServer_GetBlockSSZV2(t *testing.T) { require.NoError(t, err) assert.NotNil(t, resp) assert.DeepEqual(t, sszBlock, resp.Data) + assert.Equal(t, ethpbv2.Version_ALTAIR, resp.Version) }) }