Change consolidated balance calculation + small refactor #8908
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
StefanBratanov
changed the title
.../java/tech/pegasys/teku/spec/logic/versions/electra/helpers/BeaconStateAccessorsElectra.java
Outdated
Show resolved
Hide resolved
rolfyone
reviewed
Dec 10, 2024
Comment on lines
-363
to
-365
| /* | ||
| Implements process_deposit_request from consensus-specs (EIP-6110) | ||
| */ |
There was a problem hiding this comment.
moving all of these fns does make it a lot harder to determine if there were changes in githubs ui...
StefanBratanov
force-pushed
the
8891_fix
branch
2 times, most recently
from
a9b079f to
e99e85b
Compare
jtraglia
reviewed
Dec 11, 2024
Comment on lines
-325
to
+336
| final UInt64 activeBalance = | ||
| stateAccessorsElectra.getActiveBalance(state, pendingConsolidation.getSourceIndex()); | ||
| // Calculate the consolidated balance | ||
| final UInt64 sourceEffectiveBalance = | ||
| state | ||
| .getBalances() | ||
| .get(pendingConsolidation.getSourceIndex()) | ||
| .get() | ||
| .min(sourceValidator.getEffectiveBalance()); | ||
| // Move active balance to target. Excess balance is withdrawable. | ||
| beaconStateMutators.decreaseBalance( | ||
| state, pendingConsolidation.getSourceIndex(), activeBalance); | ||
| state, pendingConsolidation.getSourceIndex(), sourceEffectiveBalance); | ||
| beaconStateMutators.increaseBalance( | ||
| state, pendingConsolidation.getTargetIndex(), activeBalance); | ||
| state, pendingConsolidation.getTargetIndex(), sourceEffectiveBalance); |
There was a problem hiding this comment.
Just to make it easier for others to review. These are the spec changes:
And these changes track those properly 👍
There was a problem hiding this comment.
yep next time i think this can be a PR and refactor can be separate for sanity.
There was a problem hiding this comment.
Yes, noted for next time.
StefanBratanov
force-pushed
the
8891_fix
branch
from
e99e85b to
baef17e
Compare
StefanBratanov
force-pushed
the
8891_fix
branch
from
baef17e to
8441b42
Compare
lucassaldanha
approved these changes
Dec 17, 2024
rolfyone
added a commit
to rolfyone/teku
that referenced
this pull request
Dec 17, 2024
change from Consensys#8908 Signed-off-by: Paul Harris <[email protected]>
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.
PR Description
ELECTRAref tests while waiting forv1.5.0-alpha.10releaseEpochProcessorElectraFixed Issue(s)
fixes #8891
Documentation
doc-change-requiredlabel to this PR if updates are required.Changelog