Fix setup forkchoice (#15684)

* Insert the head block to forkchoice

* Add test

* Rename file

* add changelog

* Remove test

beacon-chain/blockchain/BUILD.bazel

@@ -27,7 +27,7 @@ go_library(
         "receive_block.go",
         "receive_data_column.go",
         "service.go",
-        "setup_forchoice.go",
+        "setup_forkchoice.go",
         "tracked_proposer.go",
         "weak_subjectivity_checks.go",
     ],

beacon-chain/blockchain/setup_forkchoice.go

@@ -78,7 +78,10 @@ func (s *Service) setupForkchoiceTree(st state.BeaconState) error {
 	}
 	s.cfg.ForkChoiceStore.Lock()
 	defer s.cfg.ForkChoiceStore.Unlock()
-	return s.cfg.ForkChoiceStore.InsertChain(s.ctx, chain)
+	if err := s.cfg.ForkChoiceStore.InsertChain(s.ctx, chain); err != nil {
+		return errors.Wrap(err, "could not insert forkchoice chain")
+	}
+	return s.cfg.ForkChoiceStore.InsertNode(s.ctx, st, chain[0].Block)
 }
 
 func (s *Service) buildForkchoiceChain(ctx context.Context, head interfaces.ReadOnlySignedBeaconBlock) ([]*forkchoicetypes.BlockAndCheckpoints, error) {

beacon-chain/blockchain/setup_forkchoice_test.go

@@ -124,5 +124,5 @@ func Test_setupForkchoiceTree_Head(t *testing.T) {
 	require.NotEqual(t, fRoot, root)
 	require.Equal(t, root, service.startupHeadRoot())
 	require.NoError(t, service.setupForkchoiceTree(st))
-	require.Equal(t, 2, service.cfg.ForkChoiceStore.NodeCount())
+	require.Equal(t, 3, service.cfg.ForkChoiceStore.NodeCount())
 }

changelog/potuz_fix_forkchoice_startup.md

@@ -0,0 +1,3 @@
+### Fixed
+
+- Fixed an off-by-one in forkchoice startup.