Merge pull request #575 from lidofinance/feat/new-max-effective-balance

feat: new max effective balance

Author: vgorkavenko

src/constants.py

@@ -11,6 +11,7 @@
 # https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/beacon-chain.md#gwei-values
 EFFECTIVE_BALANCE_INCREMENT = 2 ** 0 * 10 ** 9
 MAX_EFFECTIVE_BALANCE = 32 * 10 ** 9
+MIN_ACTIVATION_BALANCE = 32 * 10 ** 9
 MAX_EFFECTIVE_BALANCE_ELECTRA = 2048 * 10 ** 9
 # https://github.com/ethereum/consensus-specs/blob/dev/specs/capella/beacon-chain.md#execution
 MAX_WITHDRAWALS_PER_PAYLOAD = 2 ** 4

src/modules/ejector/ejector.py

@@ -7,8 +7,8 @@
 
 from src.constants import (
     FAR_FUTURE_EPOCH,
-    MAX_EFFECTIVE_BALANCE,
     MAX_WITHDRAWALS_PER_PAYLOAD,
+    MIN_ACTIVATION_BALANCE,
     MIN_VALIDATOR_WITHDRAWABILITY_DELAY,
 )
 from src.metrics.prometheus.business import CONTRACT_ON_PAUSE
@@ -219,7 +219,7 @@ def get_total_withdrawable_balance(balance: Wei, validator: Validator) -> Wei:
         return result
 
     def _get_predicted_withdrawable_balance(self, validator: Validator) -> Wei:
-        return self.w3.to_wei(min(int(validator.balance), MAX_EFFECTIVE_BALANCE), 'gwei')
+        return self.w3.to_wei(min(int(validator.balance), MIN_ACTIVATION_BALANCE), 'gwei')
 
     @lru_cache(maxsize=1)
     def _get_total_el_balance(self, blockstamp: BlockStamp) -> Wei:

src/services/bunker_cases/abnormal_cl_rebase.py

@@ -6,7 +6,7 @@
 from web3.contract.contract import ContractEvent
 from web3.types import EventData
 
-from src.constants import MAX_EFFECTIVE_BALANCE, EFFECTIVE_BALANCE_INCREMENT
+from src.constants import EFFECTIVE_BALANCE_INCREMENT, MIN_ACTIVATION_BALANCE
 from src.modules.submodules.types import ChainConfig
 from src.providers.consensus.types import Validator
 from src.providers.keys.types import LidoKey
@@ -93,6 +93,7 @@ def _calculate_lido_normal_cl_rebase(self, blockstamp: ReferenceBlockStamp) -> G
             self.lido_keys, last_report_all_validators
         )
 
+        # Calculate mean sum of effective balance for all validators and Lido validators (ACTIVE only)
         mean_sum_of_all_effective_balance = AbnormalClRebase.get_mean_sum_of_effective_balance(
             last_report_blockstamp, blockstamp, last_report_all_validators, self.all_validators
         )
@@ -289,7 +290,7 @@ def calculate_validators_count_diff_in_gwei(
         validators_diff = len(ref_validators) - len(prev_validators)
         if validators_diff < 0:
             raise ValueError("Validators count diff should be positive or 0. Something went wrong with CL API")
-        return Gwei(validators_diff * MAX_EFFECTIVE_BALANCE)
+        return Gwei(validators_diff * MIN_ACTIVATION_BALANCE)
 
     @staticmethod
     def get_mean_sum_of_effective_balance(