fix: penalty calculation for active_slashed (#160)

* fix: penalty calculation for `active_slashed`

* fix: att_inc_delay

src/duty/attestation/attestation.rewards.ts

@@ -67,6 +67,15 @@ export class AttestationRewards {
       let att_earned_reward = 0;
       let att_missed_reward = 0;
       let att_penalty = 0;
+      if (v.val_slashed) {
+        // If validator is slashed, we calculate it as if it missed attestation
+        // And set their attestation data to undefined, because there is no sense to consider attestation from slashed validator
+        pv.att_happened = undefined;
+        pv.att_inc_delay = undefined;
+        pv.att_valid_source = undefined;
+        pv.att_valid_target = undefined;
+        pv.att_valid_head = undefined;
+      }
       const rewards = getRewards({ source: pv.att_valid_source, target: pv.att_valid_target, head: pv.att_valid_head });
       const penalties = getPenalties({ source: pv.att_valid_source, target: pv.att_valid_target, head: pv.att_valid_head });
       const rewardSource = Math.trunc(rewards.source * epochMeta.state.base_reward * increments * sourceParticipation);

src/storage/clickhouse/clickhouse.constants.ts

@@ -92,7 +92,7 @@ export const validatorsCountWithNegativeDeltaQuery = (epoch: Epoch): string => `
     current.val_nos_id as val_nos_id,
     count(current.val_id) AS amount
   FROM (
-      SELECT val_balance, val_id, val_nos_id
+      SELECT val_balance, val_id, val_nos_id, val_slashed
       FROM validators_summary
       WHERE
         val_status != '${ValStatus.PendingQueued}' AND
@@ -128,7 +128,7 @@ export const validatorsCountWithNegativeDeltaQuery = (epoch: Epoch): string => `
   ON
     withdrawals.val_id = current.val_id
   GROUP BY current.val_nos_id
-  HAVING (current.val_balance - previous.val_balance + ifNull(withdrawals.withdrawn, 0)) < 0
+  HAVING (current.val_balance - previous.val_balance + ifNull(withdrawals.withdrawn, 0)) < 0 AND current.val_slashed = 0
 `;
 
 export const validatorsCountWithSyncParticipationByConditionLastNEpochQuery = (