Merge remote-tracking branch 'origin/unstable' into tree-states

consensus/state_processing/src/common/altair.rs

@@ -2,25 +2,43 @@ use integer_sqrt::IntegerSquareRoot;
 use safe_arith::{ArithError, SafeArith};
 use types::*;
 
+/// This type exists to avoid confusing `total_active_balance` with `base_reward_per_increment`,
+/// since they are used in close proximity and the same type (`u64`).
+#[derive(Copy, Clone)]
+pub struct BaseRewardPerIncrement(u64);
+
+impl BaseRewardPerIncrement {
+    pub fn new(total_active_balance: u64, spec: &ChainSpec) -> Result<Self, ArithError> {
+        get_base_reward_per_increment(total_active_balance, spec).map(Self)
+    }
+
+    pub fn as_u64(&self) -> u64 {
+        self.0
+    }
+}
+
 /// Returns the base reward for some validator.
 ///
+/// The function has a different interface to the spec since it accepts the
+/// `base_reward_per_increment` without computing it each time. Avoiding the re computation has
+/// shown to be a significant optimisation.
+///
 /// Spec v1.1.0
 pub fn get_base_reward(
     validator_effective_balance: u64,
-    // Should be == get_total_active_balance(state, spec)
-    total_active_balance: u64,
+    base_reward_per_increment: BaseRewardPerIncrement,
     spec: &ChainSpec,
 ) -> Result<u64, Error> {
     validator_effective_balance
         .safe_div(spec.effective_balance_increment)?
-        .safe_mul(get_base_reward_per_increment(total_active_balance, spec)?)
+        .safe_mul(base_reward_per_increment.as_u64())
         .map_err(Into::into)
 }
 
 /// Returns the base reward for some validator.
 ///
 /// Spec v1.1.0
-pub fn get_base_reward_per_increment(
+fn get_base_reward_per_increment(
     total_active_balance: u64,
     spec: &ChainSpec,
 ) -> Result<u64, ArithError> {

consensus/state_processing/src/common/get_attesting_indices.rs

@@ -1,12 +1,10 @@
 use types::*;
 
 /// Returns validator indices which participated in the attestation, sorted by increasing index.
-///
-/// Spec v0.12.1
 pub fn get_attesting_indices<T: EthSpec>(
     committee: &[usize],
     bitlist: &BitList<T::MaxValidatorsPerCommittee>,
-) -> Result<Vec<usize>, BeaconStateError> {
+) -> Result<Vec<u64>, BeaconStateError> {
     if bitlist.len() != committee.len() {
         return Err(BeaconStateError::InvalidBitfield);
     }
@@ -15,7 +13,7 @@ pub fn get_attesting_indices<T: EthSpec>(
 
     for (i, validator_index) in committee.iter().enumerate() {
         if let Ok(true) = bitlist.get(i) {
-            indices.push(*validator_index)
+            indices.push(*validator_index as u64)
         }
     }
 
@@ -23,3 +21,12 @@ pub fn get_attesting_indices<T: EthSpec>(
 
     Ok(indices)
 }
+
+/// Shortcut for getting the attesting indices while fetching the committee from the state's cache.
+pub fn get_attesting_indices_from_state<T: EthSpec>(
+    state: &BeaconState<T>,
+    att: &Attestation<T>,
+) -> Result<Vec<u64>, BeaconStateError> {
+    let committee = state.get_beacon_committee(att.data.slot, att.data.index)?;
+    get_attesting_indices::<T>(committee.committee, &att.aggregation_bits)
+}

consensus/state_processing/src/common/get_indexed_attestation.rs

@@ -14,9 +14,7 @@ pub fn get_indexed_attestation<T: EthSpec>(
     let attesting_indices = get_attesting_indices::<T>(committee, &attestation.aggregation_bits)?;
 
     Ok(IndexedAttestation {
-        attesting_indices: VariableList::new(
-            attesting_indices.into_iter().map(|x| x as u64).collect(),
-        )?,
+        attesting_indices: VariableList::new(attesting_indices)?,
         data: attestation.data.clone(),
         signature: attestation.signature.clone(),
     })

consensus/state_processing/src/common/mod.rs

@@ -10,7 +10,7 @@ pub mod base;
 
 pub use deposit_data_tree::DepositDataTree;
 pub use get_attestation_participation::get_attestation_participation_flag_indices;
-pub use get_attesting_indices::get_attesting_indices;
+pub use get_attesting_indices::{get_attesting_indices, get_attesting_indices_from_state};
 pub use get_indexed_attestation::get_indexed_attestation;
 pub use initiate_validator_exit::initiate_validator_exit;
 pub use slash_validator::slash_validator;