Optimize attestation processing (#841)

* Start updating types

* WIP

* Signature hacking

* Existing EF tests passing with fake_crypto

* Updates

* Delete outdated API spec

* The refactor continues

* It compiles

* WIP test fixes

* All release tests passing bar genesis state parsing

* Update and test YamlConfig

* Update to spec v0.10 compatible BLS

* Updates to BLS EF tests

* Add EF test for AggregateVerify

And delete unused hash2curve tests for uncompressed points

* Update EF tests to v0.10.1

* Use optional block root correctly in block proc

* Use genesis fork in deposit domain. All tests pass

* Cargo fmt

* Fast aggregate verify test

* Update REST API docs

* Cargo fmt

* Fix unused import

* Bump spec tags to v0.10.1

* Add `seconds_per_eth1_block` to chainspec

* Update to timestamp based eth1 voting scheme

* Return None from `get_votes_to_consider` if block cache is empty

* Handle overflows in `is_candidate_block`

* Revert to failing tests

* Fix eth1 data sets test

* Choose default vote according to spec

* Fix collect_valid_votes tests

* Fix `get_votes_to_consider` to choose all eligible blocks

* Uncomment winning_vote tests

* Add comments; remove unused code

* Reduce seconds_per_eth1_block for simulation

* Addressed review comments

* Add test for default vote case

* Fix logs

* Remove unused functions

* Meter default eth1 votes

* Fix comments

* Address review comments; remove unused dependency

* Add first attempt at attestation proc. re-write

* Add version 2 of attestation processing

* Minor fixes

* Add validator pubkey cache

* Make get_indexed_attestation take a committee

* Link signature processing into new attn verification

* First working version

* Ensure pubkey cache is updated

* Add more metrics, slight optimizations

* Clone committee cache during attestation processing

* Update shuffling cache during block processing

* Remove old commented-out code

* Fix shuffling cache insert bug

* Used indexed attestation in fork choice

* Restructure attn processing, add metrics

* Add more detailed metrics

* Tidy, fix failing tests

* Fix failing tests, tidy

* Disable/delete two outdated tests

* Tidy

* Add pubkey cache persistence file

* Add more comments

* Integrate persistence file into builder

* Add pubkey cache tests

* Add data_dir to beacon chain builder

* Remove Option in pubkey cache persistence file

* Ensure consistency between datadir/data_dir

* Fix failing network test

* Tidy

* Fix todos

* Add attestation processing tests

* Add another test

* Only run attestation tests in release

* Make attestation tests MainnetEthSpec

* Address Michael's comments

* Remove redundant check

* Fix warning

* Fix failing test

Co-authored-by: Michael Sproul <micsproul@gmail.com>
Co-authored-by: Pawan Dhananjay <pawandhananjay@gmail.com>

beacon_node/beacon_chain/src/fork_choice.rs

@@ -5,10 +5,10 @@ use checkpoint_manager::{get_effective_balances, CheckpointManager, CheckpointWi
 use parking_lot::{RwLock, RwLockReadGuard};
 use proto_array_fork_choice::{core::ProtoArray, ProtoArrayForkChoice};
 use ssz_derive::{Decode, Encode};
-use state_processing::common::get_attesting_indices;
+use state_processing::common::get_indexed_attestation;
 use std::marker::PhantomData;
 use store::Error as StoreError;
-use types::{Attestation, BeaconBlock, BeaconState, BeaconStateError, Epoch, Hash256};
+use types::{BeaconBlock, BeaconState, BeaconStateError, Epoch, Hash256, IndexedAttestation, Slot};
 
 type Result<T> = std::result::Result<T, Error>;
 
@@ -24,6 +24,7 @@ pub enum Error {
     UnknownJustifiedBlock(Hash256),
     UnknownJustifiedState(Hash256),
     UnableToJsonEncode(String),
+    InvalidAttestation,
 }
 
 pub struct ForkChoice<T: BeaconChainTypes> {
@@ -105,6 +106,11 @@ impl<T: BeaconChainTypes> ForkChoice<T> {
         self.backend.contains_block(block_root)
     }
 
+    /// Returns the state root for the given block root.
+    pub fn block_slot_and_state_root(&self, block_root: &Hash256) -> Option<(Slot, Hash256)> {
+        self.backend.block_slot_and_state_root(block_root)
+    }
+
     /// Process all attestations in the given `block`.
     ///
     /// Assumes the block (and therefore its attestations) are valid. It is a logic error to
@@ -133,7 +139,12 @@ impl<T: BeaconChainTypes> ForkChoice<T> {
                 .backend
                 .contains_block(&attestation.data.beacon_block_root)
             {
-                self.process_attestation(state, attestation)?;
+                let committee =
+                    state.get_beacon_committee(attestation.data.slot, attestation.data.index)?;
+                let indexed_attestation =
+                    get_indexed_attestation(committee.committee, &attestation)
+                        .map_err(|_| Error::InvalidAttestation)?;
+                self.process_indexed_attestation(&indexed_attestation)?;
             }
         }
 
@@ -143,6 +154,7 @@ impl<T: BeaconChainTypes> ForkChoice<T> {
             block.slot,
             block_root,
             block.parent_root,
+            block.state_root,
             state.current_justified_checkpoint.epoch,
             state.finalized_checkpoint.epoch,
         )?;
@@ -155,10 +167,9 @@ impl<T: BeaconChainTypes> ForkChoice<T> {
     /// Process an attestation which references `block` in `attestation.data.beacon_block_root`.
     ///
     /// Assumes the attestation is valid.
-    pub fn process_attestation(
+    pub fn process_indexed_attestation(
         &self,
-        state: &BeaconState<T::EthSpec>,
-        attestation: &Attestation<T::EthSpec>,
+        attestation: &IndexedAttestation<T::EthSpec>,
     ) -> Result<()> {
         let timer = metrics::start_timer(&metrics::FORK_CHOICE_PROCESS_ATTESTATION_TIMES);
 
@@ -180,12 +191,9 @@ impl<T: BeaconChainTypes> ForkChoice<T> {
         //
         // Additionally, don't add any block hash to fork choice unless we have imported the block.
         if block_hash != Hash256::zero() {
-            let validator_indices =
-                get_attesting_indices(state, &attestation.data, &attestation.aggregation_bits)?;
-
-            for validator_index in validator_indices {
+            for validator_index in attestation.attesting_indices.iter() {
                 self.backend.process_attestation(
-                    validator_index,
+                    *validator_index as usize,
                     block_hash,
                     attestation.data.target.epoch,
                 )?;