feat: account cl pending deposits validators #571
+100
−11
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vgorkavenko
force-pushed
the
feat/account-cl-pending-deposits-validators
branch
2 times, most recently
from
a79c847 to
6d2f2ff
Compare
madlabman
reviewed
Dec 16, 2024
F4ever
reviewed
Dec 24, 2024
src/modules/accounting/accounting.py
Outdated
| @@ -217,7 +217,8 @@ def _get_consensus_lido_state(self, blockstamp: ReferenceBlockStamp) -> tuple[Va | |||
| lido_validators = self.w3.lido_validators.get_lido_validators(blockstamp) | |||
|
|
|||
| count = len(lido_validators) | |||
| total_balance = Gwei(sum(int(validator.balance) for validator in lido_validators)) | |||
| pending_deposits_sum = self.w3.lido_validators.calculate_pending_deposits_sum(lido_validators) | |||
| total_balance = Gwei(sum(int(validator.balance) for validator in lido_validators) + pending_deposits_sum) | |||
There was a problem hiding this comment.
Pls, split this into 2 lines
active_balance = ...
total_balance = active_balance + pending_deposits_sum
add logs for pending and active balance totals
F4ever
reviewed
Dec 24, 2024
| # NOTE: Using 32 ETH as a default validator pending balance is OK for the current protocol implementation. | ||
| # It must be changed in case of validators consolidation feature implementation. | ||
| return sum( | ||
| MIN_ACTIVATION_BALANCE |
There was a problem hiding this comment.
Maybe replace MIN_ACTIVATION_BALANCE with smth lido specific?
eg LIDO_DEPOSIT_AMOUNT
vgorkavenko
force-pushed
the
feat/account-cl-pending-deposits-validators
branch
from
947ebec to
32ee2a1
Compare
madlabman
reviewed
Jan 7, 2025
| @@ -1,3 +1,5 @@ | |||
| from src.types import Gwei | |||
Comment on lines
+44
to
+54
| validators = [ValidatorFactory.build_pending_deposit_vals() for _ in range(5)] | ||
| validators.extend(ValidatorFactory.batch(30)) | ||
| lido_keys = LidoKeyFactory.generate_for_validators(validators[:15]) | ||
| lido_keys.extend(LidoKeyFactory.batch(10)) | ||
|
|
||
| web3.lido_validators._kapi_sanity_check = Mock() | ||
|
|
||
| web3.cc.get_validators = Mock(return_value=validators) | ||
| web3.kac.get_used_lido_keys = Mock(return_value=lido_keys) | ||
|
|
||
| lido_validators = web3.lido_validators.get_lido_validators(blockstamp) |
There was a problem hiding this comment.
Why not to build lido_validators directly?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.