Merge 8d60623 into 58dea75

ChainSafe · Sep 26, 2024 · 1e23466 · 1e23466
2 parents 58dea75 + 8d60623
commit 1e23466
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/packages/beacon-node/test/spec/utils/specTestIterator.ts b/packages/beacon-node/test/spec/utils/specTestIterator.ts
@@ -66,8 +66,6 @@ export const defaultSkipOpts: SkipOpts = {
     /^capella\/light_client\/single_merkle_proof\/BeaconBlockBody.*/,
     /^deneb\/light_client\/single_merkle_proof\/BeaconBlockBody.*/,
     /^electra\/light_client\/single_merkle_proof\/BeaconBlockBody.*/,
-    // TODO Electra: slashings tests to be enabled in PR#7071
-    /^electra\/epoch_processing\/slashings.*/,
   ],
   skippedTests: [],
   skippedRunners: ["merkle_proof", "networking"],

diff --git a/packages/state-transition/src/epoch/processSlashings.ts b/packages/state-transition/src/epoch/processSlashings.ts
@@ -50,15 +50,23 @@ export function processSlashings(
     totalBalanceByIncrement
   );
   const increment = EFFECTIVE_BALANCE_INCREMENT;
+
+  const penaltyPerEffectiveBalanceIncrement = Math.floor(
+    (adjustedTotalSlashingBalanceByIncrement * increment) / totalBalanceByIncrement
+  );
   const penalties: number[] = [];
 
   const penaltiesByEffectiveBalanceIncrement = new Map<number, number>();
   for (const index of cache.indicesToSlash) {
     const effectiveBalanceIncrement = effectiveBalanceIncrements[index];
     let penalty = penaltiesByEffectiveBalanceIncrement.get(effectiveBalanceIncrement);
     if (penalty === undefined) {
-      const penaltyNumeratorByIncrement = effectiveBalanceIncrement * adjustedTotalSlashingBalanceByIncrement;
-      penalty = Math.floor(penaltyNumeratorByIncrement / totalBalanceByIncrement) * increment;
+      if (fork < ForkSeq.electra) {
+        const penaltyNumeratorByIncrement = effectiveBalanceIncrement * adjustedTotalSlashingBalanceByIncrement;
+        penalty = Math.floor(penaltyNumeratorByIncrement / totalBalanceByIncrement) * increment;
+      } else {
+        penalty = penaltyPerEffectiveBalanceIncrement * effectiveBalanceIncrement;
+      }
       penaltiesByEffectiveBalanceIncrement.set(effectiveBalanceIncrement, penalty);
     }