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

Jump to bottom

feat: update correlation penalty computation #7071

Merged
merged 7 commits into from
Sep 30, 2024
Merged

feat: update correlation penalty computation #7071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
20f96da
Update slashing calculation to be more aligned with spec style
ensi321 Sep 6, 2024
1b798e6
Update calculation
ensi321 Sep 6, 2024
8c498c9
Lint
ensi321 Sep 7, 2024
d3bec5a
Fix rounding issue
ensi321 Sep 9, 2024
e07ed10
Update calculation
ensi321 Sep 9, 2024
ba0e0b4
Enable slashing spec test
ensi321 Sep 25, 2024
8d60623
lint
ensi321 Sep 26, 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
2 changes: 0 additions & 2 deletions packages/beacon-node/test/spec/utils/specTestIterator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ export const defaultSkipOpts: SkipOpts = {
/^capella\/light_client\/single_merkle_proof\/BeaconBlockBody.*/,
/^deneb\/light_client\/single_merkle_proof\/BeaconBlockBody.*/,
/^electra\/light_client\/single_merkle_proof\/BeaconBlockBody.*/,
// TODO Electra: slashings tests to be enabled in PR#7071
/^electra\/epoch_processing\/slashings.*/,
],
skippedTests: [],
skippedRunners: ["merkle_proof", "networking"],
Expand Down
12 changes: 10 additions & 2 deletions packages/state-transition/src/epoch/processSlashings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,23 @@ export function processSlashings(
totalBalanceByIncrement
);
const increment = EFFECTIVE_BALANCE_INCREMENT;

const penaltyPerEffectiveBalanceIncrement = Math.floor(
(adjustedTotalSlashingBalanceByIncrement * increment) / totalBalanceByIncrement
);
const penalties: number[] = [];

const penaltiesByEffectiveBalanceIncrement = new Map<number, number>();
for (const index of cache.indicesToSlash) {
const effectiveBalanceIncrement = effectiveBalanceIncrements[index];
let penalty = penaltiesByEffectiveBalanceIncrement.get(effectiveBalanceIncrement);
if (penalty === undefined) {
const penaltyNumeratorByIncrement = effectiveBalanceIncrement * adjustedTotalSlashingBalanceByIncrement;
penalty = Math.floor(penaltyNumeratorByIncrement / totalBalanceByIncrement) * increment;
if (fork < ForkSeq.electra) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any reason why the check is reversed here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any reason why the check is reversed here?

No particular reason. I don't think there is a convention for fork check to be >= ForkSeq.electra vs < ForkSeq.electra.

Several places use < see:

lodestar/packages/state-transition/src/block/initiateValidatorExit.ts

Line 39 in 94b6c5b

if (fork < ForkSeq.electra) {

lodestar/packages/state-transition/src/block/processDeposit.ts

Line 73 in 94b6c5b

if (fork < ForkSeq.electra) {

lodestar/packages/state-transition/src/epoch/processEffectiveBalanceUpdates.ts

Line 60 in 94b6c5b

if (fork < ForkSeq.electra) {

const penaltyNumeratorByIncrement = effectiveBalanceIncrement * adjustedTotalSlashingBalanceByIncrement;
penalty = Math.floor(penaltyNumeratorByIncrement / totalBalanceByIncrement) * increment;
} else {
penalty = penaltyPerEffectiveBalanceIncrement * effectiveBalanceIncrement;
}
penaltiesByEffectiveBalanceIncrement.set(effectiveBalanceIncrement, penalty);
}

Expand Down
Loading