fix(staking): use block's epoch instead of current epoch when validating blocks

Author: guidiaz

data_structures/src/staking/stakes.rs

@@ -444,7 +444,10 @@ where
                 let stake_entry = self.by_key.get_mut(key);
                 if let Some(stake_entry) = stake_entry {
                     let penalty_epochs = Epoch::from((1 + winner_rank - index) as u32);
-                    log::debug!("Disabling mining power of {} during +{} epochs", key, penalty_epochs);
+                    log::info!(
+                        "Resetting and disabling mining power of {} (ranked as #{}) during +{} epochs", 
+                        key, index + 1, penalty_epochs
+                    );
                     stake_entry
                         .value
                         .write()

node/src/actors/chain_manager/mining.rs

@@ -110,6 +110,7 @@ impl ChainManager {
         let checkpoint_zero_timestamp = chain_info.consensus_constants.checkpoint_zero_timestamp;
         let halving_period = chain_info.consensus_constants.halving_period;
 
+        let previous_block_epoch = chain_info.highest_block_checkpoint.checkpoint;
         let mut beacon = chain_info.highest_block_checkpoint;
         let mut vrf_input = chain_info.highest_vrf_output;
         let protocol_version = get_protocol_version(self.current_epoch);
@@ -251,6 +252,7 @@ impl ChainManager {
             .and_then(move |block, act, _ctx| {
                 act.future_process_validations(
                     block.clone(),
+                    previous_block_epoch,
                     current_epoch,
                     vrf_input,
                     beacon,

node/src/actors/chain_manager/mod.rs

@@ -2325,6 +2325,7 @@ impl ChainManager {
     pub fn future_process_validations(
         &mut self,
         block: Block,
+        previous_block_epoch: Epoch,
         current_epoch: Epoch,
         vrf_input: CheckpointVRF,
         chain_beacon: CheckpointBeacon,
@@ -2340,7 +2341,7 @@ impl ChainManager {
         let protocol_version = ProtocolVersion::from_epoch(block.block_header.beacon.checkpoint);
         let replication_factor = self
             .consensus_constants_wit2
-            .get_replication_factor(current_epoch, chain_beacon.checkpoint);
+            .get_replication_factor(block.block_header.beacon.checkpoint, previous_block_epoch);
         let res = validate_block(
             &block,
             current_epoch,
@@ -3127,7 +3128,7 @@ pub fn process_validations(
     stakes: &StakesTracker,
     protocol_version: ProtocolVersion,
 ) -> Result<Diff, failure::Error> {
-    let replication_factor = consensus_constants_wit2.get_replication_factor(current_epoch, chain_beacon.checkpoint);
+    let replication_factor = consensus_constants_wit2.get_replication_factor(block.block_header.beacon.checkpoint, chain_beacon.checkpoint);
     if !resynchronizing {
         let mut signatures_to_verify = vec![];
         validate_block(