Cleanup some TODOs

Author: ethDreamer

beacon_node/beacon_chain/src/builder.rs

@@ -692,6 +692,7 @@ where
             None
         };
 
+        let anchor_state = fork_choice.anchor_state();
         let initial_head_block_root = fork_choice
             .get_head(current_slot, &self.spec)
             .map_err(|e| format!("Unable to get fork choice head: {:?}", e))?;
@@ -741,6 +742,7 @@ where
                 Some(current_slot),
                 &self.spec,
                 self.chain_config.progressive_balances_mode,
+                anchor_state,
                 &log,
             )?;
         }

beacon_node/beacon_chain/src/canonical_head.rs

@@ -746,7 +746,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
                 head_hash: new_forkchoice_update_parameters.head_hash,
                 justified_hash: new_forkchoice_update_parameters.justified_hash,
                 finalized_hash: new_forkchoice_update_parameters.finalized_hash,
-                anchor_state: new_view.anchor_state, // TODO: check this
+                anchor_state: new_view.anchor_state,
             };
 
             let mut cached_head_write_lock = self.canonical_head.cached_head_write_lock();

beacon_node/beacon_chain/src/fork_revert.rs

@@ -104,6 +104,7 @@ pub fn reset_fork_choice_to_finalization<E: EthSpec, Hot: ItemStore<E>, Cold: It
     current_slot: Option<Slot>,
     spec: &ChainSpec,
     progressive_balances_mode: ProgressiveBalancesMode,
+    anchor_state: AnchorState,
     log: &Logger,
 ) -> Result<ForkChoice<BeaconForkChoiceStore<E, Hot, Cold>, E>, String> {
     // Fetch finalized block.
@@ -157,7 +158,7 @@ pub fn reset_fork_choice_to_finalization<E: EthSpec, Hot: ItemStore<E>, Cold: It
         finalized_block_root,
         &finalized_snapshot.beacon_block,
         &finalized_snapshot.beacon_state,
-        AnchorState::Finalized, // FIXME: this needs to be understood
+        anchor_state,
         current_slot,
         spec,
     )

consensus/fork_choice/src/fork_choice.rs

@@ -1471,6 +1471,10 @@ where
             .map_err(Into::into)
     }
 
+    pub fn anchor_state(&self) -> AnchorState {
+        self.anchor_state
+    }
+
     /// Instantiate `Self` from some `PersistedForkChoice` generated by a earlier call to
     /// `Self::to_persisted`.
     pub fn proto_array_from_persisted(