use correct max eb in epoch cache initialization

sigp · May 11, 2024 · a75257f · a75257f
1 parent 261551e
commit a75257f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/consensus/state_processing/src/epoch_cache.rs b/consensus/state_processing/src/epoch_cache.rs
@@ -86,9 +86,10 @@ impl PreEpochCache {
         let base_reward_per_increment = BaseRewardPerIncrement::new(total_active_balance, spec)?;
 
         let effective_balance_increment = spec.effective_balance_increment;
-        let max_effective_balance_eth = spec
-            .max_effective_balance
-            .safe_div(effective_balance_increment)?;
+        let max_effective_balance =
+            spec.max_effective_balance_for_fork(spec.fork_name_at_epoch(epoch));
+        let max_effective_balance_eth =
+            max_effective_balance.safe_div(effective_balance_increment)?;
 
         let mut base_rewards = Vec::with_capacity(max_effective_balance_eth.safe_add(1)? as usize);
 

diff --git a/consensus/types/src/chain_spec.rs b/consensus/types/src/chain_spec.rs
@@ -400,6 +400,14 @@ impl ChainSpec {
         }
     }
 
+    pub fn max_effective_balance_for_fork(&self, fork_name: ForkName) -> u64 {
+        if fork_name >= ForkName::Electra {
+            self.max_effective_balance_electra
+        } else {
+            self.max_effective_balance
+        }
+    }
+
     /// Returns a full `Fork` struct for a given epoch.
     pub fn fork_at_epoch(&self, epoch: Epoch) -> Fork {
         let current_fork_name = self.fork_name_at_epoch(epoch);