v0.12 fork choice update (#1229)

* Incomplete scraps

* Add progress on new fork choice impl

* Further progress

* First complete compiling version

* Remove chain reference

* Add new lmd_ghost crate

* Start integrating into beacon chain

* Update `milagro_bls` to new release (#1183)

* Update milagro_bls to new release

Signed-off-by: Kirk Baird <baird.k@outlook.com>

* Tidy up fake cryptos

Signed-off-by: Kirk Baird <baird.k@outlook.com>

* move SecretHash to bls and put plaintext back

Signed-off-by: Kirk Baird <baird.k@outlook.com>

* Update state processing for v0.12

* Fix EF test runners for v0.12

* Fix some tests

* Fix broken attestation verification test

* More test fixes

* Rough beacon chain impl working

* Remove fork_choice_2

* Remove checkpoint manager

* Half finished ssz impl

* Add missed file

* Add persistence

* Tidy, fix some compile errors

* Remove RwLock from ProtoArrayForkChoice

* Fix store-based compile errors

* Add comments, tidy

* Move function out of ForkChoice struct

* Start testing

* More testing

* Fix compile error

* Tidy beacon_chain::fork_choice

* Queue attestations from the current slot

* Allow fork choice to handle prior-to-genesis start

* Improve error granularity

* Test attestation dequeuing

* Process attestations during block

* Store target root in fork choice

* Move fork choice verification into new crate

* Update tests

* Consensus updates for v0.12 (#1228)

* Update state processing for v0.12

* Fix EF test runners for v0.12

* Fix some tests

* Fix broken attestation verification test

* More test fixes

* Fix typo found in review

* Add `Block` struct to ProtoArray

* Start fixing get_ancestor

* Add rough progress on testing

* Get fork choice tests working

* Progress with testing

* Fix partialeq impl

* Move slot clock from fc_store

* Improve testing

* Add testing for best justified

* Add clone back to SystemTimeSlotClock

* Add balances test

* Start adding balances cache again

* Wire-in balances cache

* Improve tests

* Remove commented-out tests

* Remove beacon_chain::ForkChoice

* Rename crates

* Update wider codebase to new fork_choice layout

* Move advance_slot in test harness

* Tidy ForkChoice::update_time

* Fix verification tests

* Fix compile error with iter::once

* Fix fork choice tests

* Ensure block attestations are processed

* Fix failing beacon_chain tests

* Add first invalid block check

* Add finalized block check

* Progress with testing, new store builder

* Add fixes to get_ancestor

* Fix old genesis justification test

* Fix remaining fork choice tests

* Change root iteration method

* Move on_verified_block

* Remove unused method

* Start adding attestation verification tests

* Add invalid ffg target test

* Add target epoch test

* Add queued attestation test

* Remove old fork choice verification tests

* Tidy, add test

* Move fork choice lock drop

* Rename BeaconForkChoiceStore

* Add comments, tidy BeaconForkChoiceStore

* Update metrics, rename fork_choice_store.rs

* Remove genesis_block_root from ForkChoice

* Tidy

* Update fork_choice comments

* Tidy, add comments

* Tidy, simplify ForkChoice, fix compile issue

* Tidy, removed dead file

* Increase http request timeout

* Fix failing rest_api test

* Set HTTP timeout back to 5s

* Apply fix to get_ancestor

* Address Michael's comments

* Fix typo

* Revert "Fix broken attestation verification test"

This reverts commit 722cdc903b.

Co-authored-by: Kirk Baird <baird.k@outlook.com>
Co-authored-by: Michael Sproul <michael@sigmaprime.io>

beacon_node/rest_api/src/validator.rs

@@ -2,8 +2,8 @@ use crate::helpers::{check_content_type_for_json, publish_beacon_block_to_networ
 use crate::response_builder::ResponseBuilder;
 use crate::{ApiError, ApiResult, NetworkChannel, UrlQuery};
 use beacon_chain::{
-    attestation_verification::Error as AttnError, BeaconChain, BeaconChainTypes, BlockError,
-    StateSkipConfig,
+    attestation_verification::Error as AttnError, BeaconChain, BeaconChainError, BeaconChainTypes,
+    BlockError, ForkChoiceError, StateSkipConfig,
 };
 use bls::PublicKeyBytes;
 use eth2_libp2p::PubsubMessage;
@@ -506,7 +506,7 @@ fn process_unaggregated_attestation<T: BeaconChainTypes>(
     beacon_chain
         .apply_attestation_to_fork_choice(&verified_attestation)
         .map_err(|e| {
-            handle_attestation_error(
+            handle_fork_choice_error(
                 e,
                 &format!(
                     "unaggregated attestation {} was unable to be added to fork choice",
@@ -645,7 +645,7 @@ fn process_aggregated_attestation<T: BeaconChainTypes>(
     beacon_chain
         .apply_attestation_to_fork_choice(&verified_attestation)
         .map_err(|e| {
-            handle_attestation_error(
+            handle_fork_choice_error(
                 e,
                 &format!(
                     "aggregated attestation {} was unable to be added to fork choice",
@@ -717,3 +717,48 @@ fn handle_attestation_error(
         }
     }
 }
+
+/// Common handler for `ForkChoiceError` during attestation verification.
+fn handle_fork_choice_error(
+    e: BeaconChainError,
+    detail: &str,
+    data: &AttestationData,
+    log: &Logger,
+) -> ApiError {
+    match e {
+        BeaconChainError::ForkChoiceError(ForkChoiceError::InvalidAttestation(e)) => {
+            error!(
+                log,
+                "Local attestation invalid for fork choice";
+                "detail" => detail,
+                "reason" => format!("{:?}", e),
+                "target" => data.target.epoch,
+                "source" => data.source.epoch,
+                "index" => data.index,
+                "slot" => data.slot,
+            );
+
+            ApiError::ProcessingError(format!(
+                "Invalid local attestation. Error: {:?} Detail: {}",
+                e, detail
+            ))
+        }
+        e => {
+            error!(
+                log,
+                "Internal error applying attn to fork choice";
+                "detail" => detail,
+                "error" => format!("{:?}", e),
+                "target" => data.target.epoch,
+                "source" => data.source.epoch,
+                "index" => data.index,
+                "slot" => data.slot,
+            );
+
+            ApiError::ServerError(format!(
+                "Internal error verifying local attestation. Error: {:?}. Detail: {}",
+                e, detail
+            ))
+        }
+    }
+}