fix(beacon-chain/rpc): correct block root for block events (#11666)

prysmaticlabs · Nov 22, 2022 · fe1281d · fe1281d
1 parent 9761bd0
commit fe1281d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/beacon-chain/rpc/eth/events/events.go b/beacon-chain/rpc/eth/events/events.go
@@ -119,7 +119,7 @@ func handleBlockEvents(
 		if err != nil {
 			return err
 		}
-		item, err := v1Data.HashTreeRoot()
+		item, err := v1Data.Message.HashTreeRoot()
 		if err != nil {
 			return errors.Wrap(err, "could not hash tree root block")
 		}

diff --git a/beacon-chain/rpc/eth/events/events_test.go b/beacon-chain/rpc/eth/events/events_test.go
@@ -49,12 +49,18 @@ func TestStreamEvents_BlockEvents(t *testing.T) {
 		srv, ctrl, mockStream := setupServer(ctx, t)
 		defer ctrl.Finish()
 
-		wantedBlock := util.HydrateSignedBeaconBlock(&eth.SignedBeaconBlock{
+		blk := util.HydrateSignedBeaconBlock(&eth.SignedBeaconBlock{
 			Block: &eth.BeaconBlock{
 				Slot: 8,
 			},
 		})
-		wantedBlockRoot, err := wantedBlock.HashTreeRoot()
+		bodyRoot, err := blk.Block.Body.HashTreeRoot()
+		require.NoError(t, err)
+		wantedHeader := util.HydrateBeaconHeader(&eth.BeaconBlockHeader{
+			Slot:     8,
+			BodyRoot: bodyRoot[:],
+		})
+		wantedBlockRoot, err := wantedHeader.HashTreeRoot()
 		require.NoError(t, err)
 		genericResponse, err := anypb.New(&ethpb.EventBlock{
 			Slot:                8,
@@ -66,7 +72,7 @@ func TestStreamEvents_BlockEvents(t *testing.T) {
 			Event: BlockTopic,
 			Data:  genericResponse,
 		}
-		wsb, err := blocks.NewSignedBeaconBlock(wantedBlock)
+		wsb, err := blocks.NewSignedBeaconBlock(blk)
 		require.NoError(t, err)
 		assertFeedSendAndReceive(ctx, &assertFeedArgs{
 			t:             t,