Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: fix balance spec tests #6777

Merged
merged 3 commits into from
May 14, 2024
Merged

test: fix balance spec tests #6777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de887d0
fix: remove epochCache.balances and invalid MAX_EFFECTIVE_BALANCE check
matthewkeil May 14, 2024
dd21cdb
fix: update rewardsAndPenalties balance updates
matthewkeil May 14, 2024
6c5424f
docs: add comment to check epochTransitionCache
matthewkeil May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions packages/state-transition/src/epoch/processEffectiveBalanceUpdates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ export function processEffectiveBalanceUpdates(

// epochTransitionCache.balances is set in processRewardsAndPenalties(), so it's recycled here for performance.
// It defaults to `state.balances.getAll()` to make Typescript happy and for spec tests
const balances = cache.balances ?? state.balances.getAll();
const balances = state.balances.getAll();

// TODO: (@matthewkeil) This was causing additional failures but should not. Check the EpochTransitionCache for why
// const balances = cache.balances ?? state.balances.getAll();

for (let i = 0, len = balances.length; i < len; i++) {
const balance = balances[i];
Expand All @@ -55,7 +58,7 @@ export function processEffectiveBalanceUpdates(
// Too big
effectiveBalance > balance + DOWNWARD_THRESHOLD ||
// Too small. Check effectiveBalance < MAX_EFFECTIVE_BALANCE to prevent unnecessary updates
(effectiveBalance < MAX_EFFECTIVE_BALANCE && effectiveBalance < balance - UPWARD_THRESHOLD)
effectiveBalance + UPWARD_THRESHOLD < balance
) {
// Update the state tree
// Should happen rarely, so it's fine to update the tree
Expand Down
3 changes: 2 additions & 1 deletion packages/state-transition/src/epoch/processRewardsAndPenalties.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ export function processRewardsAndPenalties(
const balances = state.balances.getAll();

for (let i = 0, len = rewards.length; i < len; i++) {
balances[i] += rewards[i] - penalties[i] - (slashingPenalties[i] ?? 0);
const result = balances[i] + rewards[i] - penalties[i] - (slashingPenalties[i] ?? 0)
balances[i] = Math.max(result, 0);
}

// important: do not change state one balance at a time. Set them all at once, constructing the tree in one go
Expand Down
Loading