Merge branch 'sigp:unstable' into unstable

Makefile

@@ -215,7 +215,8 @@ lint:
 		-A clippy::upper-case-acronyms \
 		-A clippy::vec-init-then-push \
 		-A clippy::question-mark \
-		-A clippy::uninlined-format-args
+		-A clippy::uninlined-format-args \
+		-A clippy::enum_variant_names
 
 # Lints the code using Clippy and automatically fix some simple compiler warnings.
 lint-fix:

beacon_node/beacon_chain/src/attestation_rewards.rs

@@ -5,7 +5,9 @@ use participation_cache::ParticipationCache;
 use safe_arith::SafeArith;
 use serde_utils::quoted_u64::Quoted;
 use slog::debug;
-use state_processing::per_epoch_processing::altair::process_inactivity_updates;
+use state_processing::per_epoch_processing::altair::{
+    process_inactivity_updates, process_justification_and_finalization,
+};
 use state_processing::{
     common::altair::BaseRewardPerIncrement,
     per_epoch_processing::altair::{participation_cache, rewards_and_penalties::get_flag_weight},
@@ -27,6 +29,7 @@ use state_processing::per_epoch_processing::base::rewards_and_penalties::{
 };
 use state_processing::per_epoch_processing::base::validator_statuses::InclusionInfo;
 use state_processing::per_epoch_processing::base::{
+    process_justification_and_finalization as process_justification_and_finalization_base,
     TotalBalances, ValidatorStatus, ValidatorStatuses,
 };
 
@@ -67,6 +70,13 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
         let mut validator_statuses = ValidatorStatuses::new(&state, spec)?;
         validator_statuses.process_attestations(&state)?;
 
+        process_justification_and_finalization_base(
+            &state,
+            &validator_statuses.total_balances,
+            spec,
+        )?
+        .apply_changes_to_state(&mut state);
+
         let ideal_rewards =
             self.compute_ideal_rewards_base(&state, &validator_statuses.total_balances)?;
 
@@ -125,6 +135,8 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
 
         // Calculate ideal_rewards
         let participation_cache = ParticipationCache::new(&state, spec)?;
+        process_justification_and_finalization(&state, &participation_cache)?
+            .apply_changes_to_state(&mut state);
         process_inactivity_updates(&mut state, &participation_cache, spec)?;
 
         let previous_epoch = state.previous_epoch();

beacon_node/beacon_chain/src/beacon_chain.rs

@@ -18,7 +18,7 @@ use crate::block_verification::{
 use crate::block_verification_types::{
     AsBlock, AvailableExecutedBlock, BlockImportData, ExecutedBlock, RpcBlock,
 };
-pub use crate::canonical_head::{CanonicalHead, CanonicalHeadRwLock};
+pub use crate::canonical_head::CanonicalHead;
 use crate::chain_config::ChainConfig;
 use crate::data_availability_checker::{
     Availability, AvailabilityCheckError, AvailableBlock, DataAvailabilityChecker,

beacon_node/beacon_chain/src/schema_change.rs

@@ -1,20 +1,14 @@
 //! Utilities for managing database schema changes.
-mod migration_schema_v12;
-mod migration_schema_v13;
-mod migration_schema_v14;
-mod migration_schema_v15;
-mod migration_schema_v16;
 mod migration_schema_v17;
 mod migration_schema_v18;
 
-use crate::beacon_chain::{BeaconChainTypes, ETH1_CACHE_DB_KEY};
-use crate::eth1_chain::SszEth1;
+use crate::beacon_chain::BeaconChainTypes;
 use crate::types::ChainSpec;
-use slog::{warn, Logger};
+use slog::Logger;
 use std::sync::Arc;
 use store::hot_cold_store::{HotColdDB, HotColdDBError};
 use store::metadata::{SchemaVersion, CURRENT_SCHEMA_VERSION};
-use store::{Error as StoreError, StoreItem};
+use store::Error as StoreError;
 
 /// Migrate the database from one schema version to another, applying all requisite mutations.
 #[allow(clippy::only_used_in_recursion)] // spec is not used but likely to be used in future
@@ -57,92 +51,8 @@ pub fn migrate_schema<T: BeaconChainTypes>(
         }
 
         //
-        // Migrations from before SchemaVersion(11) are deprecated.
+        // Migrations from before SchemaVersion(16) are deprecated.
         //
-
-        // Upgrade from v11 to v12 to store richer metadata in the attestation op pool.
-        (SchemaVersion(11), SchemaVersion(12)) => {
-            let ops = migration_schema_v12::upgrade_to_v12::<T>(db.clone(), log)?;
-            db.store_schema_version_atomically(to, ops)
-        }
-        // Downgrade from v12 to v11 to drop richer metadata from the attestation op pool.
-        (SchemaVersion(12), SchemaVersion(11)) => {
-            let ops = migration_schema_v12::downgrade_from_v12::<T>(db.clone(), log)?;
-            db.store_schema_version_atomically(to, ops)
-        }
-        (SchemaVersion(12), SchemaVersion(13)) => {
-            let mut ops = vec![];
-            if let Some(persisted_eth1_v1) = db.get_item::<SszEth1>(&ETH1_CACHE_DB_KEY)? {
-                let upgraded_eth1_cache =
-                    match migration_schema_v13::update_eth1_cache(persisted_eth1_v1) {
-                        Ok(upgraded_eth1) => upgraded_eth1,
-                        Err(e) => {
-                            warn!(log, "Failed to deserialize SszEth1CacheV1"; "error" => ?e);
-                            warn!(log, "Reinitializing eth1 cache");
-                            migration_schema_v13::reinitialized_eth1_cache_v13(
-                                deposit_contract_deploy_block,
-                            )
-                        }
-                    };
-                ops.push(upgraded_eth1_cache.as_kv_store_op(ETH1_CACHE_DB_KEY));
-            }
-
-            db.store_schema_version_atomically(to, ops)?;
-
-            Ok(())
-        }
-        (SchemaVersion(13), SchemaVersion(12)) => {
-            let mut ops = vec![];
-            if let Some(persisted_eth1_v13) = db.get_item::<SszEth1>(&ETH1_CACHE_DB_KEY)? {
-                let downgraded_eth1_cache = match migration_schema_v13::downgrade_eth1_cache(
-                    persisted_eth1_v13,
-                ) {
-                    Ok(Some(downgraded_eth1)) => downgraded_eth1,
-                    Ok(None) => {
-                        warn!(log, "Unable to downgrade eth1 cache from newer version: reinitializing eth1 cache");
-                        migration_schema_v13::reinitialized_eth1_cache_v1(
-                            deposit_contract_deploy_block,
-                        )
-                    }
-                    Err(e) => {
-                        warn!(log, "Unable to downgrade eth1 cache from newer version: failed to deserialize SszEth1CacheV13"; "error" => ?e);
-                        warn!(log, "Reinitializing eth1 cache");
-                        migration_schema_v13::reinitialized_eth1_cache_v1(
-                            deposit_contract_deploy_block,
-                        )
-                    }
-                };
-                ops.push(downgraded_eth1_cache.as_kv_store_op(ETH1_CACHE_DB_KEY));
-            }
-
-            db.store_schema_version_atomically(to, ops)?;
-
-            Ok(())
-        }
-        (SchemaVersion(13), SchemaVersion(14)) => {
-            let ops = migration_schema_v14::upgrade_to_v14::<T>(db.clone(), log)?;
-            db.store_schema_version_atomically(to, ops)
-        }
-        (SchemaVersion(14), SchemaVersion(13)) => {
-            let ops = migration_schema_v14::downgrade_from_v14::<T>(db.clone(), log)?;
-            db.store_schema_version_atomically(to, ops)
-        }
-        (SchemaVersion(14), SchemaVersion(15)) => {
-            let ops = migration_schema_v15::upgrade_to_v15::<T>(db.clone(), log)?;
-            db.store_schema_version_atomically(to, ops)
-        }
-        (SchemaVersion(15), SchemaVersion(14)) => {
-            let ops = migration_schema_v15::downgrade_from_v15::<T>(db.clone(), log)?;
-            db.store_schema_version_atomically(to, ops)
-        }
-        (SchemaVersion(15), SchemaVersion(16)) => {
-            let ops = migration_schema_v16::upgrade_to_v16::<T>(db.clone(), log)?;
-            db.store_schema_version_atomically(to, ops)
-        }
-        (SchemaVersion(16), SchemaVersion(15)) => {
-            let ops = migration_schema_v16::downgrade_from_v16::<T>(db.clone(), log)?;
-            db.store_schema_version_atomically(to, ops)
-        }
         (SchemaVersion(16), SchemaVersion(17)) => {
             let ops = migration_schema_v17::upgrade_to_v17::<T>(db.clone(), log)?;
             db.store_schema_version_atomically(to, ops)