mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-10 20:22:02 +00:00
* Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Merge branch 'beacon-api-electra' of https://github.com/sigp/lighthouse into p2p-electra * Merge branch 'p2p-electra' of https://github.com/sigp/lighthouse into ef-tests-electra * Merge pull request #5749 from sigp/electra_op_pool Optimise Electra op pool aggregation * don't fail on empty consolidations * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Merge branch 'beacon-api-electra' of https://github.com/sigp/lighthouse into p2p-electra * Merge branch 'p2p-electra' of https://github.com/sigp/lighthouse into ef-tests-electra * update committee offset * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * update committee offset * update committee offset * update committee offset * update committee offset * update committee offset * only increment deposit index on state for old deposit flow * Revert "only increment deposit index on state for old deposit flow" This reverts commit817d4235ae. * only increment the state deposit index on old deposit flow * Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Merge branch 'beacon-api-electra' of https://github.com/sigp/lighthouse into p2p-electra * Merge branch 'p2p-electra' of https://github.com/sigp/lighthouse into ef-tests-electra * read electra payloads from file * accept new payload v4 in mock el * use correct max eb in epoch cache initialization * drop initiate validator ordering optimization * fix initiate exit for single pass * use correct max eb in epoch cache initialization * drop initiate validator ordering optimization * fix initiate exit for single pass * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * accept new payload v4 in mock el * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Merge branch 'beacon-api-electra' of https://github.com/sigp/lighthouse into p2p-electra * Merge branch 'p2p-electra' of https://github.com/sigp/lighthouse into ef-tests-electra * fix genesis from eth1 for electra * Fix Electra Fork Choice Tests (#5764) * add new operation tests * Fix Electra Fork Choice Tests (#5764) * Fix Electra Fork Choice Tests (#5764) * Fix Electra Fork Choice Tests (#5764) * add epoch processing new tests * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Merge branch 'beacon-api-electra' of https://github.com/sigp/lighthouse into p2p-electra * Merge branch 'ef-tests-electra' of https://github.com/sigp/lighthouse into ef-tests-electra * Merge branch 'p2p-electra' of https://github.com/sigp/lighthouse into ef-tests-electra * fix ef test compilation * disable and enable ef test for epoch processing appropriately * add consolidations to merkle calc for inclusion proof * fix should_override_fc tests * Merge branch 'ef-tests-electra' of https://github.com/sigp/lighthouse into ef-tests-electra * get ssz tests compiling * ssz merkle validity for only deneb * im dumb af * Merge remote-tracking branch 'upstream/ef-tests-electra' into ef-tests-electra * enable tests * Fix Consolidation Sigs & Withdrawals * Merge pull request #5766 from ethDreamer/two_fixes Fix Consolidation Sigs & Withdrawals * Merge branches 'block-processing-electra' and 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-epoch-proc * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Merge branch 'beacon-api-electra' of https://github.com/sigp/lighthouse into p2p-electra * Merge branch 'p2p-electra' of https://github.com/sigp/lighthouse into ef-tests-electra * comment out consolidation operation ef tests until they are added * add signed consolidation ssz tests * add as_iter to all List and Vector fields in the beacon state * remove dbg * Send unagg attestation based on fork * Merge branch 'beacon-api-electra' into p2p-electra * Merge branch 'p2p-electra' into ef-tests-electra * Fix Epoch Processing Consolidations * Fix Final Spec Tests! * Fix ser/de * Merge branch 'electra-engine-api' into beacon-api-electra * Merge branch 'beacon-api-electra' into p2p-electra * Merge branch 'p2p-electra' into ef-tests-electra * Subscribe to the correct subnets for electra attestations (#5782) * subscribe to the correct att subnets for electra * subscribe to the correct att subnets for electra * cargo fmt * Subscribe to the correct subnets for electra attestations (#5782) * subscribe to the correct att subnets for electra * subscribe to the correct att subnets for electra * cargo fmt * Subscribe to the correct subnets for electra attestations (#5782) * subscribe to the correct att subnets for electra * subscribe to the correct att subnets for electra * cargo fmt * Subscribe to the correct subnets for electra attestations (#5782) * subscribe to the correct att subnets for electra * subscribe to the correct att subnets for electra * cargo fmt * Subscribe to the correct subnets for electra attestations (#5782) * subscribe to the correct att subnets for electra * subscribe to the correct att subnets for electra * cargo fmt * Subscribe to the correct subnets for electra attestations (#5782) * subscribe to the correct att subnets for electra * subscribe to the correct att subnets for electra * cargo fmt * Subscribe to the correct subnets for electra attestations (#5782) * subscribe to the correct att subnets for electra * subscribe to the correct att subnets for electra * cargo fmt * update electra readiness with new endpoints * don't block mev boost till genesis finalization * Publish all aggregates * just one more check bro plz.. * Fix Bug In Block Processing with 0x02 Credentials * fix slashing handling * Fix Bug In Block Processing with 0x02 Credentials * Merge remote-tracking branch 'upstream/unstable' * Send unagg attestation based on fork * Publish all aggregates * just one more check bro plz.. * Merge pull request #5832 from ethDreamer/electra_attestation_changes_merge_unstable Merge `unstable` into `electra_attestation_changes` * Merge pull request #5835 from realbigsean/fix-validator-logic Fix validator logic * Merge pull request #5816 from realbigsean/electra-attestation-slashing-handling Electra slashing handling * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Merge branch 'beacon-api-electra' of https://github.com/sigp/lighthouse into p2p-electra * Merge branch 'p2p-electra' of https://github.com/sigp/lighthouse into ef-tests-electra * Rename deploy block electra (#5853) * Rename deploy_block.txt to deposit_contract_block.txt * fmt * Change for prater too * fix: serde rename camle case for execution payload body (#5846) * Merge branch 'electra-engine-api' into beacon-api-electra * Merge branch 'beacon-api-electra' into p2p-electra * Merge branch 'p2p-electra' into ef-tests-electra * Electra attestation changes rm decode impl (#5856) * Remove Crappy Decode impl for Attestation * Remove Inefficient Attestation Decode impl * Implement Schema Upgrade / Downgrade * Update beacon_node/beacon_chain/src/schema_change/migration_schema_v20.rs Co-authored-by: Michael Sproul <micsproul@gmail.com> --------- Co-authored-by: Michael Sproul <micsproul@gmail.com> * Fix failing attestation tests and misc electra attestation cleanup (#5810) * - get attestation related beacon chain tests to pass - observed attestations are now keyed off of data + committee index - rename op pool attestationref to compactattestationref - remove unwraps in agg pool and use options instead - cherry pick some changes from ef-tests-electra * cargo fmt * fix failing test * Revert dockerfile changes * make committee_index return option * function args shouldnt be a ref to attestation ref * fmt * fix dup imports --------- Co-authored-by: realbigsean <seananderson33@GMAIL.com> * fix some todos (#5817) * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes * add consolidations to merkle calc for inclusion proof * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Merge branch 'beacon-api-electra' of https://github.com/sigp/lighthouse into p2p-electra * Merge branch 'p2p-electra' of https://github.com/sigp/lighthouse into ef-tests-electra * Remove Duplicate KZG Commitment Merkle Proof Code (#5874) * Remove Duplicate KZG Commitment Merkle Proof Code * s/tree_lists/fields/ * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Merge branch 'beacon-api-electra' of https://github.com/sigp/lighthouse into ef-tests-electra * fix compile * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Merge branch 'beacon-api-electra' of https://github.com/sigp/lighthouse into ef-tests-electra * Fix slasher tests (#5906) * Fix electra tests * Add electra attestations to double vote tests * Update superstruct to 0.8 * Merge remote-tracking branch 'origin/unstable' into electra_attestation_changes * Small cleanup in slasher tests * Clean up Electra observed aggregates (#5929) * Use consistent key in observed_attestations * Remove unwraps from observed aggregates * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes * De-dup attestation constructor logic * Remove unwraps in Attestation construction * Dedup match_attestation_data * Remove outdated TODO * Use ForkName Ord in fork-choice tests * Use ForkName Ord in BeaconBlockBody * Make to_electra not fallible * Remove TestRandom impl for IndexedAttestation * Remove IndexedAttestation faulty Decode impl * Drop TestRandom impl * Add PendingAttestationInElectra * Indexed att on disk (#35) * indexed att on disk * fix lints * Update slasher/src/migrate.rs Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com> --------- Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com> Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com> * add electra fork enabled fn to ForkName impl (#36) * add electra fork enabled fn to ForkName impl * remove inadvertent file * Update common/eth2/src/types.rs Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com> * Dedup attestation constructor logic in attester cache * Use if let Ok for committee_bits * Dedup Attestation constructor code * Diff reduction in tests * Fix beacon_chain tests * Diff reduction * Use Ord for ForkName in pubsub * Resolve into_attestation_and_indices todo * Remove stale TODO * Fix beacon_chain tests * Test spec invariant * Use electra_enabled in pubsub * Remove get_indexed_attestation_from_signed_aggregate * Use ok_or instead of if let else * committees are sorted * remove dup method `get_indexed_attestation_from_committees` * Merge pull request #5940 from dapplion/electra_attestation_changes_lionreview Electra attestations #5712 review * update default persisted op pool deserialization * ensure aggregate and proof uses serde untagged on ref * Fork aware ssz static attestation tests * Electra attestation changes from Lions review (#5971) * dedup/cleanup and remove unneeded hashset use * remove irrelevant TODOs * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Merge branch 'beacon-api-electra' of https://github.com/sigp/lighthouse into ef-tests-electra * Fix Compilation Break * Merge pull request #5973 from ethDreamer/beacon-api-electra Fix Compilation Break * Merge branch 'beacon-api-electra' of https://github.com/sigp/lighthouse into ef-tests-electra * Electra attestation changes sean review (#5972) * instantiate empty bitlist in unreachable code * clean up error conversion * fork enabled bool cleanup * remove a couple todos * return bools instead of options in `aggregate` and use the result * delete commented out code * use map macros in simple transformations * remove signers_disjoint_from * get ef tests compiling * get ef tests compiling * update intentionally excluded files * Avoid changing slasher schema for Electra * Delete slasher schema v4 * Fix clippy * Fix compilation of beacon_chain tests * Update database.rs * Update per_block_processing.rs * Add electra lightclient types * Update slasher/src/database.rs * fix imports * Merge pull request #5980 from dapplion/electra-lightclient Add electra lightclient types * Merge pull request #5975 from michaelsproul/electra-slasher-no-migration Avoid changing slasher schema for Electra * Update beacon_node/beacon_chain/src/attestation_verification.rs * Update beacon_node/beacon_chain/src/attestation_verification.rs * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes * Merge branch 'electra_attestation_changes' of https://github.com/realbigsean/lighthouse into block-processing-electra * Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Merge branch 'beacon-api-electra' of https://github.com/sigp/lighthouse into ef-tests-electra * clean up enabled and disabled fork logic in ef tests * add light client ssz tests * disable failing light client ssz tests * correctly exclude light client struct from accessed files * The great renaming receipt -> request * Address some more review comments * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra-engine-api * Update beacon_node/beacon_chain/src/electra_readiness.rs * Update consensus/types/src/chain_spec.rs * update GET requests * update POST requests * add client updates and test updates * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * compile after merge * unwrap -> unwrap_err * self review * fix tests * convert op pool messages to electra in electra * remove methods to post without content header * Add BeaconBlocksByRange v3 * Revert "Add BeaconBlocksByRange v3" This reverts commite3ce7fc5ea. * filter instead of convert * Add range sync metrics to track efficiency (#6095) * Add more range sync metrics to track efficiency * Add ignored blocks metrics * Enable the outbound rate limiter by default, and update blobs method quotas (#6093) * Enable the outbound rate limiter by default, and update blobs method quotas. * Lint and book updates. * Beacon api + validator electra (#5744) * Attestation superstruct changes for EIP 7549 (#5644) * update * experiment * superstruct changes * revert * superstruct changes * fix tests * indexed attestation * indexed attestation superstruct * updated TODOs * `superstruct` the `AttesterSlashing` (#5636) * `superstruct` Attester Fork Variants * Push a little further * Deal with Encode / Decode of AttesterSlashing * not so sure about this.. * Stop Encode/Decode Bounds from Propagating Out * Tons of Changes.. * More Conversions to AttestationRef * Add AsReference trait (#15) * Add AsReference trait * Fix some snafus * Got it Compiling! :D * Got Tests Building * Get beacon chain tests compiling --------- Co-authored-by: Michael Sproul <micsproul@gmail.com> * Merge remote-tracking branch 'upstream/unstable' into electra_attestation_changes * Make EF Tests Fork-Agnostic (#5713) * Finish EF Test Fork Agnostic (#5714) * Superstruct `AggregateAndProof` (#5715) * Upgrade `superstruct` to `0.8.0` * superstruct `AggregateAndProof` * Merge remote-tracking branch 'sigp/unstable' into electra_attestation_changes * cargo fmt * Merge pull request #5726 from realbigsean/electra_attestation_changes Merge unstable into Electra attestation changes * process withdrawals updates * cleanup withdrawals processing * update `process_operations` deposit length check * add apply_deposit changes * add execution layer withdrawal request processing * process deposit receipts * add consolidation processing * update process operations function * exit updates * clean up * update slash_validator * EIP7549 `get_attestation_indices` (#5657) * get attesting indices electra impl * fmt * get tests to pass * fmt * fix some beacon chain tests * fmt * fix slasher test * fmt got me again * fix more tests * fix tests * Some small changes (#5739) * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * cargo fmt (#5740) * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * fix attestation verification * Add new engine api methods * Fix the versioning of v4 requests * Handle new engine api methods in mock EL * Note todo * Fix todos * Add support for electra fields in getPayloadBodies * Add comments for potential versioning confusion * udpates for aggregate attestation endpoint * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Sketch op pool changes * fix get attesting indices (#5742) * fix get attesting indices * better errors * fix compile * only get committee index once * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Ef test fixes (#5753) * attestation related ef test fixes * delete commented out stuff * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Fix Aggregation Pool for Electra (#5754) * Fix Aggregation Pool for Electra * Remove Outdated Interface * fix ssz (#5755) * Get `electra_op_pool` up to date (#5756) * fix get attesting indices (#5742) * fix get attesting indices * better errors * fix compile * only get committee index once * Ef test fixes (#5753) * attestation related ef test fixes * delete commented out stuff * Fix Aggregation Pool for Electra (#5754) * Fix Aggregation Pool for Electra * Remove Outdated Interface * fix ssz (#5755) --------- Co-authored-by: realbigsean <sean@sigmaprime.io> * Revert "Get `electra_op_pool` up to date (#5756)" (#5757) This reverts commitab9e58aa3d. * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into electra_op_pool * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Compute on chain aggregate impl (#5752) * add compute_on_chain_agg impl to op pool changes * fmt * get op pool tests to pass * update beacon api aggregate attestationendpoint * update the naive agg pool interface (#5760) * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * updates after merge * Fix bugs in cross-committee aggregation * Add comment to max cover optimisation * Fix assert * Electra epoch processing * add deposit limit for old deposit queue * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Merge pull request #5749 from sigp/electra_op_pool Optimise Electra op pool aggregation * don't fail on empty consolidations * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * update committee offset * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * update committee offset * update committee offset * update committee offset * only increment the state deposit index on old deposit flow * Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * use correct max eb in epoch cache initialization * drop initiate validator ordering optimization * fix initiate exit for single pass * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * accept new payload v4 in mock el * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Fix Electra Fork Choice Tests (#5764) * Fix Electra Fork Choice Tests (#5764) * Fix Electra Fork Choice Tests (#5764) * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Fix Consolidation Sigs & Withdrawals * Merge pull request #5766 from ethDreamer/two_fixes Fix Consolidation Sigs & Withdrawals * Merge branches 'block-processing-electra' and 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-epoch-proc * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Send unagg attestation based on fork * Fix ser/de * Merge branch 'electra-engine-api' into beacon-api-electra * Subscribe to the correct subnets for electra attestations (#5782) * subscribe to the correct att subnets for electra * subscribe to the correct att subnets for electra * cargo fmt * Subscribe to the correct subnets for electra attestations (#5782) * subscribe to the correct att subnets for electra * subscribe to the correct att subnets for electra * cargo fmt * Subscribe to the correct subnets for electra attestations (#5782) * subscribe to the correct att subnets for electra * subscribe to the correct att subnets for electra * cargo fmt * Subscribe to the correct subnets for electra attestations (#5782) * subscribe to the correct att subnets for electra * subscribe to the correct att subnets for electra * cargo fmt * Subscribe to the correct subnets for electra attestations (#5782) * subscribe to the correct att subnets for electra * subscribe to the correct att subnets for electra * cargo fmt * update electra readiness with new endpoints * fix slashing handling * Fix Bug In Block Processing with 0x02 Credentials * Merge remote-tracking branch 'upstream/unstable' * Send unagg attestation based on fork * Publish all aggregates * just one more check bro plz.. * Merge pull request #5832 from ethDreamer/electra_attestation_changes_merge_unstable Merge `unstable` into `electra_attestation_changes` * Merge pull request #5835 from realbigsean/fix-validator-logic Fix validator logic * Merge pull request #5816 from realbigsean/electra-attestation-slashing-handling Electra slashing handling * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * fix: serde rename camle case for execution payload body (#5846) * Merge branch 'electra-engine-api' into beacon-api-electra * Electra attestation changes rm decode impl (#5856) * Remove Crappy Decode impl for Attestation * Remove Inefficient Attestation Decode impl * Implement Schema Upgrade / Downgrade * Update beacon_node/beacon_chain/src/schema_change/migration_schema_v20.rs Co-authored-by: Michael Sproul <micsproul@gmail.com> --------- Co-authored-by: Michael Sproul <micsproul@gmail.com> * Fix failing attestation tests and misc electra attestation cleanup (#5810) * - get attestation related beacon chain tests to pass - observed attestations are now keyed off of data + committee index - rename op pool attestationref to compactattestationref - remove unwraps in agg pool and use options instead - cherry pick some changes from ef-tests-electra * cargo fmt * fix failing test * Revert dockerfile changes * make committee_index return option * function args shouldnt be a ref to attestation ref * fmt * fix dup imports --------- Co-authored-by: realbigsean <seananderson33@GMAIL.com> * fix some todos (#5817) * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes * add consolidations to merkle calc for inclusion proof * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Remove Duplicate KZG Commitment Merkle Proof Code (#5874) * Remove Duplicate KZG Commitment Merkle Proof Code * s/tree_lists/fields/ * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * fix compile * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Fix slasher tests (#5906) * Fix electra tests * Add electra attestations to double vote tests * Update superstruct to 0.8 * Merge remote-tracking branch 'origin/unstable' into electra_attestation_changes * Small cleanup in slasher tests * Clean up Electra observed aggregates (#5929) * Use consistent key in observed_attestations * Remove unwraps from observed aggregates * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes * De-dup attestation constructor logic * Remove unwraps in Attestation construction * Dedup match_attestation_data * Remove outdated TODO * Use ForkName Ord in fork-choice tests * Use ForkName Ord in BeaconBlockBody * Make to_electra not fallible * Remove TestRandom impl for IndexedAttestation * Remove IndexedAttestation faulty Decode impl * Drop TestRandom impl * Add PendingAttestationInElectra * Indexed att on disk (#35) * indexed att on disk * fix lints * Update slasher/src/migrate.rs Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com> --------- Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com> Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com> * add electra fork enabled fn to ForkName impl (#36) * add electra fork enabled fn to ForkName impl * remove inadvertent file * Update common/eth2/src/types.rs Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com> * Dedup attestation constructor logic in attester cache * Use if let Ok for committee_bits * Dedup Attestation constructor code * Diff reduction in tests * Fix beacon_chain tests * Diff reduction * Use Ord for ForkName in pubsub * Resolve into_attestation_and_indices todo * Remove stale TODO * Fix beacon_chain tests * Test spec invariant * Use electra_enabled in pubsub * Remove get_indexed_attestation_from_signed_aggregate * Use ok_or instead of if let else * committees are sorted * remove dup method `get_indexed_attestation_from_committees` * Merge pull request #5940 from dapplion/electra_attestation_changes_lionreview Electra attestations #5712 review * update default persisted op pool deserialization * ensure aggregate and proof uses serde untagged on ref * Fork aware ssz static attestation tests * Electra attestation changes from Lions review (#5971) * dedup/cleanup and remove unneeded hashset use * remove irrelevant TODOs * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes * Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra * Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * Fix Compilation Break * Merge pull request #5973 from ethDreamer/beacon-api-electra Fix Compilation Break * Electra attestation changes sean review (#5972) * instantiate empty bitlist in unreachable code * clean up error conversion * fork enabled bool cleanup * remove a couple todos * return bools instead of options in `aggregate` and use the result * delete commented out code * use map macros in simple transformations * remove signers_disjoint_from * get ef tests compiling * get ef tests compiling * update intentionally excluded files * Avoid changing slasher schema for Electra * Delete slasher schema v4 * Fix clippy * Fix compilation of beacon_chain tests * Update database.rs * Update per_block_processing.rs * Add electra lightclient types * Update slasher/src/database.rs * fix imports * Merge pull request #5980 from dapplion/electra-lightclient Add electra lightclient types * Merge pull request #5975 from michaelsproul/electra-slasher-no-migration Avoid changing slasher schema for Electra * Update beacon_node/beacon_chain/src/attestation_verification.rs * Update beacon_node/beacon_chain/src/attestation_verification.rs * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes * Merge branch 'electra_attestation_changes' of https://github.com/realbigsean/lighthouse into block-processing-electra * Merge branch 'block-processing-electra' of https://github.com/sigp/lighthouse into electra-epoch-proc * Merge branch 'electra-epoch-proc' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * The great renaming receipt -> request * Address some more review comments * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra-engine-api * Update beacon_node/beacon_chain/src/electra_readiness.rs * Update consensus/types/src/chain_spec.rs * update GET requests * update POST requests * add client updates and test updates * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra-engine-api * Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra * compile after merge * unwrap -> unwrap_err * self review * fix tests * convert op pool messages to electra in electra * remove methods to post without content header * filter instead of convert * Merge branch 'unstable' of https://github.com/sigp/lighthouse into beacon-api-electra * Merge branch 'beacon-api-electra' of https://github.com/sigp/lighthouse into ef-tests-electra * fix ef test compile * use `enabled` fork methods * get tests passing * last updates * Merge branch 'unstable' of https://github.com/sigp/lighthouse into ef-tests-electra * add deposit request file
1023 lines
35 KiB
Rust
1023 lines
35 KiB
Rust
use crate::{
|
|
common::{
|
|
decrease_balance, increase_balance,
|
|
update_progressive_balances_cache::initialize_progressive_balances_cache,
|
|
},
|
|
epoch_cache::{initialize_epoch_cache, PreEpochCache},
|
|
per_epoch_processing::{Delta, Error, ParticipationEpochSummary},
|
|
};
|
|
use itertools::izip;
|
|
use safe_arith::{SafeArith, SafeArithIter};
|
|
use std::cmp::{max, min};
|
|
use std::collections::{BTreeSet, HashMap};
|
|
use types::{
|
|
consts::altair::{
|
|
NUM_FLAG_INDICES, PARTICIPATION_FLAG_WEIGHTS, TIMELY_HEAD_FLAG_INDEX,
|
|
TIMELY_TARGET_FLAG_INDEX, WEIGHT_DENOMINATOR,
|
|
},
|
|
milhouse::Cow,
|
|
ActivationQueue, BeaconState, BeaconStateError, ChainSpec, Checkpoint, Epoch, EthSpec,
|
|
ExitCache, ForkName, List, ParticipationFlags, ProgressiveBalancesCache, RelativeEpoch,
|
|
Unsigned, Validator,
|
|
};
|
|
|
|
pub struct SinglePassConfig {
|
|
pub inactivity_updates: bool,
|
|
pub rewards_and_penalties: bool,
|
|
pub registry_updates: bool,
|
|
pub slashings: bool,
|
|
pub pending_balance_deposits: bool,
|
|
pub pending_consolidations: bool,
|
|
pub effective_balance_updates: bool,
|
|
}
|
|
|
|
impl Default for SinglePassConfig {
|
|
fn default() -> SinglePassConfig {
|
|
Self::enable_all()
|
|
}
|
|
}
|
|
|
|
impl SinglePassConfig {
|
|
pub fn enable_all() -> SinglePassConfig {
|
|
Self {
|
|
inactivity_updates: true,
|
|
rewards_and_penalties: true,
|
|
registry_updates: true,
|
|
slashings: true,
|
|
pending_balance_deposits: true,
|
|
pending_consolidations: true,
|
|
effective_balance_updates: true,
|
|
}
|
|
}
|
|
|
|
pub fn disable_all() -> SinglePassConfig {
|
|
SinglePassConfig {
|
|
inactivity_updates: false,
|
|
rewards_and_penalties: false,
|
|
registry_updates: false,
|
|
slashings: false,
|
|
pending_balance_deposits: false,
|
|
pending_consolidations: false,
|
|
effective_balance_updates: false,
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Values from the state that are immutable throughout epoch processing.
|
|
struct StateContext {
|
|
current_epoch: Epoch,
|
|
next_epoch: Epoch,
|
|
finalized_checkpoint: Checkpoint,
|
|
is_in_inactivity_leak: bool,
|
|
total_active_balance: u64,
|
|
churn_limit: u64,
|
|
fork_name: ForkName,
|
|
}
|
|
|
|
struct RewardsAndPenaltiesContext {
|
|
unslashed_participating_increments_array: [u64; NUM_FLAG_INDICES],
|
|
active_increments: u64,
|
|
}
|
|
|
|
struct SlashingsContext {
|
|
adjusted_total_slashing_balance: u64,
|
|
target_withdrawable_epoch: Epoch,
|
|
}
|
|
|
|
struct PendingBalanceDepositsContext {
|
|
/// The value to set `next_deposit_index` to *after* processing completes.
|
|
next_deposit_index: usize,
|
|
/// The value to set `deposit_balance_to_consume` to *after* processing completes.
|
|
deposit_balance_to_consume: u64,
|
|
/// Total balance increases for each validator due to pending balance deposits.
|
|
validator_deposits_to_process: HashMap<usize, u64>,
|
|
}
|
|
|
|
struct EffectiveBalancesContext {
|
|
downward_threshold: u64,
|
|
upward_threshold: u64,
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Clone)]
|
|
pub struct ValidatorInfo {
|
|
pub index: usize,
|
|
pub effective_balance: u64,
|
|
pub base_reward: u64,
|
|
pub is_eligible: bool,
|
|
pub is_slashed: bool,
|
|
pub is_active_current_epoch: bool,
|
|
pub is_active_previous_epoch: bool,
|
|
// Used for determining rewards.
|
|
pub previous_epoch_participation: ParticipationFlags,
|
|
// Used for updating the progressive balances cache for next epoch.
|
|
pub current_epoch_participation: ParticipationFlags,
|
|
}
|
|
|
|
impl ValidatorInfo {
|
|
#[inline]
|
|
pub fn is_unslashed_participating_index(&self, flag_index: usize) -> Result<bool, Error> {
|
|
Ok(self.is_active_previous_epoch
|
|
&& !self.is_slashed
|
|
&& self
|
|
.previous_epoch_participation
|
|
.has_flag(flag_index)
|
|
.map_err(|_| Error::InvalidFlagIndex(flag_index))?)
|
|
}
|
|
}
|
|
|
|
pub fn process_epoch_single_pass<E: EthSpec>(
|
|
state: &mut BeaconState<E>,
|
|
spec: &ChainSpec,
|
|
conf: SinglePassConfig,
|
|
) -> Result<ParticipationEpochSummary<E>, Error> {
|
|
initialize_epoch_cache(state, spec)?;
|
|
initialize_progressive_balances_cache(state, spec)?;
|
|
state.build_exit_cache(spec)?;
|
|
state.build_committee_cache(RelativeEpoch::Previous, spec)?;
|
|
state.build_committee_cache(RelativeEpoch::Current, spec)?;
|
|
|
|
let previous_epoch = state.previous_epoch();
|
|
let current_epoch = state.current_epoch();
|
|
let next_epoch = state.next_epoch()?;
|
|
let is_in_inactivity_leak = state.is_in_inactivity_leak(previous_epoch, spec)?;
|
|
let total_active_balance = state.get_total_active_balance()?;
|
|
let churn_limit = state.get_validator_churn_limit(spec)?;
|
|
let activation_churn_limit = state.get_activation_churn_limit(spec)?;
|
|
let finalized_checkpoint = state.finalized_checkpoint();
|
|
let fork_name = state.fork_name_unchecked();
|
|
|
|
let state_ctxt = &StateContext {
|
|
current_epoch,
|
|
next_epoch,
|
|
finalized_checkpoint,
|
|
is_in_inactivity_leak,
|
|
total_active_balance,
|
|
churn_limit,
|
|
fork_name,
|
|
};
|
|
|
|
// Contexts that require immutable access to `state`.
|
|
let slashings_ctxt = &SlashingsContext::new(state, state_ctxt, spec)?;
|
|
let mut next_epoch_cache = PreEpochCache::new_for_next_epoch(state)?;
|
|
|
|
let pending_balance_deposits_ctxt =
|
|
if fork_name.electra_enabled() && conf.pending_balance_deposits {
|
|
Some(PendingBalanceDepositsContext::new(state, spec)?)
|
|
} else {
|
|
None
|
|
};
|
|
|
|
let mut earliest_exit_epoch = state.earliest_exit_epoch().ok();
|
|
let mut exit_balance_to_consume = state.exit_balance_to_consume().ok();
|
|
|
|
// Split the state into several disjoint mutable borrows.
|
|
let (
|
|
validators,
|
|
balances,
|
|
previous_epoch_participation,
|
|
current_epoch_participation,
|
|
inactivity_scores,
|
|
progressive_balances,
|
|
exit_cache,
|
|
epoch_cache,
|
|
) = state.mutable_validator_fields()?;
|
|
|
|
let num_validators = validators.len();
|
|
|
|
// Take a snapshot of the validators and participation before mutating. This is used for
|
|
// informational purposes (e.g. by the validator monitor).
|
|
let summary = ParticipationEpochSummary::new(
|
|
validators.clone(),
|
|
previous_epoch_participation.clone(),
|
|
current_epoch_participation.clone(),
|
|
previous_epoch,
|
|
current_epoch,
|
|
);
|
|
|
|
// Compute shared values required for different parts of epoch processing.
|
|
let rewards_ctxt = &RewardsAndPenaltiesContext::new(progressive_balances, state_ctxt, spec)?;
|
|
|
|
let mut activation_queues = if !fork_name.electra_enabled() {
|
|
let activation_queue = epoch_cache
|
|
.activation_queue()?
|
|
.get_validators_eligible_for_activation(
|
|
finalized_checkpoint.epoch,
|
|
activation_churn_limit as usize,
|
|
);
|
|
let next_epoch_activation_queue = ActivationQueue::default();
|
|
Some((activation_queue, next_epoch_activation_queue))
|
|
} else {
|
|
None
|
|
};
|
|
let effective_balances_ctxt = &EffectiveBalancesContext::new(spec)?;
|
|
|
|
// Iterate over the validators and related fields in one pass.
|
|
let mut validators_iter = validators.iter_cow();
|
|
let mut balances_iter = balances.iter_cow();
|
|
let mut inactivity_scores_iter = inactivity_scores.iter_cow();
|
|
|
|
for (index, &previous_epoch_participation, ¤t_epoch_participation) in izip!(
|
|
0..num_validators,
|
|
previous_epoch_participation.iter(),
|
|
current_epoch_participation.iter(),
|
|
) {
|
|
let (_, mut validator) = validators_iter
|
|
.next_cow()
|
|
.ok_or(BeaconStateError::UnknownValidator(index))?;
|
|
let (_, mut balance) = balances_iter
|
|
.next_cow()
|
|
.ok_or(BeaconStateError::UnknownValidator(index))?;
|
|
let (_, mut inactivity_score) = inactivity_scores_iter
|
|
.next_cow()
|
|
.ok_or(BeaconStateError::UnknownValidator(index))?;
|
|
|
|
let is_active_current_epoch = validator.is_active_at(current_epoch);
|
|
let is_active_previous_epoch = validator.is_active_at(previous_epoch);
|
|
let is_eligible = is_active_previous_epoch
|
|
|| (validator.slashed && previous_epoch.safe_add(1)? < validator.withdrawable_epoch);
|
|
|
|
let base_reward = if is_eligible {
|
|
epoch_cache.get_base_reward(index)?
|
|
} else {
|
|
0
|
|
};
|
|
|
|
let validator_info = &ValidatorInfo {
|
|
index,
|
|
effective_balance: validator.effective_balance,
|
|
base_reward,
|
|
is_eligible,
|
|
is_slashed: validator.slashed,
|
|
is_active_current_epoch,
|
|
is_active_previous_epoch,
|
|
previous_epoch_participation,
|
|
current_epoch_participation,
|
|
};
|
|
|
|
if current_epoch != E::genesis_epoch() {
|
|
// `process_inactivity_updates`
|
|
if conf.inactivity_updates {
|
|
process_single_inactivity_update(
|
|
&mut inactivity_score,
|
|
validator_info,
|
|
state_ctxt,
|
|
spec,
|
|
)?;
|
|
}
|
|
|
|
// `process_rewards_and_penalties`
|
|
if conf.rewards_and_penalties {
|
|
process_single_reward_and_penalty(
|
|
&mut balance,
|
|
&inactivity_score,
|
|
validator_info,
|
|
rewards_ctxt,
|
|
state_ctxt,
|
|
spec,
|
|
)?;
|
|
}
|
|
}
|
|
|
|
// `process_registry_updates`
|
|
if conf.registry_updates {
|
|
let activation_queue_refs = activation_queues
|
|
.as_mut()
|
|
.map(|(current_queue, next_queue)| (&*current_queue, next_queue));
|
|
process_single_registry_update(
|
|
&mut validator,
|
|
validator_info,
|
|
exit_cache,
|
|
activation_queue_refs,
|
|
state_ctxt,
|
|
earliest_exit_epoch.as_mut(),
|
|
exit_balance_to_consume.as_mut(),
|
|
spec,
|
|
)?;
|
|
}
|
|
|
|
// `process_slashings`
|
|
if conf.slashings {
|
|
process_single_slashing(&mut balance, &validator, slashings_ctxt, state_ctxt, spec)?;
|
|
}
|
|
|
|
// `process_pending_balance_deposits`
|
|
if let Some(pending_balance_deposits_ctxt) = &pending_balance_deposits_ctxt {
|
|
process_pending_balance_deposits_for_validator(
|
|
&mut balance,
|
|
validator_info,
|
|
pending_balance_deposits_ctxt,
|
|
)?;
|
|
}
|
|
|
|
// `process_effective_balance_updates`
|
|
if conf.effective_balance_updates {
|
|
process_single_effective_balance_update(
|
|
validator_info.index,
|
|
*balance,
|
|
&mut validator,
|
|
validator_info.current_epoch_participation,
|
|
&mut next_epoch_cache,
|
|
progressive_balances,
|
|
effective_balances_ctxt,
|
|
state_ctxt,
|
|
spec,
|
|
)?;
|
|
}
|
|
}
|
|
|
|
if conf.registry_updates && fork_name.electra_enabled() {
|
|
if let Ok(earliest_exit_epoch_state) = state.earliest_exit_epoch_mut() {
|
|
*earliest_exit_epoch_state =
|
|
earliest_exit_epoch.ok_or(Error::MissingEarliestExitEpoch)?;
|
|
}
|
|
if let Ok(exit_balance_to_consume_state) = state.exit_balance_to_consume_mut() {
|
|
*exit_balance_to_consume_state =
|
|
exit_balance_to_consume.ok_or(Error::MissingExitBalanceToConsume)?;
|
|
}
|
|
}
|
|
|
|
// Finish processing pending balance deposits if relevant.
|
|
//
|
|
// This *could* be reordered after `process_pending_consolidations` which pushes only to the end
|
|
// of the `pending_balance_deposits` list. But we may as well preserve the write ordering used
|
|
// by the spec and do this first.
|
|
if let Some(ctxt) = pending_balance_deposits_ctxt {
|
|
let new_pending_balance_deposits = List::try_from_iter(
|
|
state
|
|
.pending_balance_deposits()?
|
|
.iter_from(ctxt.next_deposit_index)?
|
|
.cloned(),
|
|
)?;
|
|
*state.pending_balance_deposits_mut()? = new_pending_balance_deposits;
|
|
*state.deposit_balance_to_consume_mut()? = ctxt.deposit_balance_to_consume;
|
|
}
|
|
|
|
// Process consolidations outside the single-pass loop, as they depend on balances for multiple
|
|
// validators and cannot be computed accurately inside the loop.
|
|
if fork_name.electra_enabled() && conf.pending_consolidations {
|
|
process_pending_consolidations(
|
|
state,
|
|
&mut next_epoch_cache,
|
|
effective_balances_ctxt,
|
|
conf.effective_balance_updates,
|
|
state_ctxt,
|
|
spec,
|
|
)?;
|
|
}
|
|
|
|
// Finally, finish updating effective balance caches. We need this to happen *after* processing
|
|
// of pending consolidations, which recomputes some effective balances.
|
|
if conf.effective_balance_updates {
|
|
let next_epoch_total_active_balance = next_epoch_cache.get_total_active_balance();
|
|
state.set_total_active_balance(next_epoch, next_epoch_total_active_balance, spec);
|
|
let next_epoch_activation_queue =
|
|
activation_queues.map_or_else(ActivationQueue::default, |(_, queue)| queue);
|
|
*state.epoch_cache_mut() =
|
|
next_epoch_cache.into_epoch_cache(next_epoch_activation_queue, spec)?;
|
|
}
|
|
|
|
Ok(summary)
|
|
}
|
|
|
|
fn process_single_inactivity_update(
|
|
inactivity_score: &mut Cow<u64>,
|
|
validator_info: &ValidatorInfo,
|
|
state_ctxt: &StateContext,
|
|
spec: &ChainSpec,
|
|
) -> Result<(), Error> {
|
|
if !validator_info.is_eligible {
|
|
return Ok(());
|
|
}
|
|
|
|
// Increase inactivity score of inactive validators
|
|
if validator_info.is_unslashed_participating_index(TIMELY_TARGET_FLAG_INDEX)? {
|
|
// Avoid mutating when the inactivity score is 0 and can't go any lower -- the common
|
|
// case.
|
|
if **inactivity_score == 0 {
|
|
return Ok(());
|
|
}
|
|
inactivity_score.make_mut()?.safe_sub_assign(1)?;
|
|
} else {
|
|
inactivity_score
|
|
.make_mut()?
|
|
.safe_add_assign(spec.inactivity_score_bias)?;
|
|
}
|
|
|
|
// Decrease the score of all validators for forgiveness when not during a leak
|
|
if !state_ctxt.is_in_inactivity_leak {
|
|
let deduction = min(spec.inactivity_score_recovery_rate, **inactivity_score);
|
|
inactivity_score.make_mut()?.safe_sub_assign(deduction)?;
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
fn process_single_reward_and_penalty(
|
|
balance: &mut Cow<u64>,
|
|
inactivity_score: &u64,
|
|
validator_info: &ValidatorInfo,
|
|
rewards_ctxt: &RewardsAndPenaltiesContext,
|
|
state_ctxt: &StateContext,
|
|
spec: &ChainSpec,
|
|
) -> Result<(), Error> {
|
|
if !validator_info.is_eligible {
|
|
return Ok(());
|
|
}
|
|
|
|
let mut delta = Delta::default();
|
|
for flag_index in 0..NUM_FLAG_INDICES {
|
|
get_flag_index_delta(
|
|
&mut delta,
|
|
validator_info,
|
|
flag_index,
|
|
rewards_ctxt,
|
|
state_ctxt,
|
|
)?;
|
|
}
|
|
get_inactivity_penalty_delta(
|
|
&mut delta,
|
|
validator_info,
|
|
inactivity_score,
|
|
state_ctxt,
|
|
spec,
|
|
)?;
|
|
|
|
if delta.rewards != 0 || delta.penalties != 0 {
|
|
let balance = balance.make_mut()?;
|
|
balance.safe_add_assign(delta.rewards)?;
|
|
*balance = balance.saturating_sub(delta.penalties);
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
fn get_flag_index_delta(
|
|
delta: &mut Delta,
|
|
validator_info: &ValidatorInfo,
|
|
flag_index: usize,
|
|
rewards_ctxt: &RewardsAndPenaltiesContext,
|
|
state_ctxt: &StateContext,
|
|
) -> Result<(), Error> {
|
|
let base_reward = validator_info.base_reward;
|
|
let weight = get_flag_weight(flag_index)?;
|
|
let unslashed_participating_increments =
|
|
rewards_ctxt.get_unslashed_participating_increments(flag_index)?;
|
|
|
|
if validator_info.is_unslashed_participating_index(flag_index)? {
|
|
if !state_ctxt.is_in_inactivity_leak {
|
|
let reward_numerator = base_reward
|
|
.safe_mul(weight)?
|
|
.safe_mul(unslashed_participating_increments)?;
|
|
delta.reward(
|
|
reward_numerator.safe_div(
|
|
rewards_ctxt
|
|
.active_increments
|
|
.safe_mul(WEIGHT_DENOMINATOR)?,
|
|
)?,
|
|
)?;
|
|
}
|
|
} else if flag_index != TIMELY_HEAD_FLAG_INDEX {
|
|
delta.penalize(base_reward.safe_mul(weight)?.safe_div(WEIGHT_DENOMINATOR)?)?;
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
/// Get the weight for a `flag_index` from the constant list of all weights.
|
|
fn get_flag_weight(flag_index: usize) -> Result<u64, Error> {
|
|
PARTICIPATION_FLAG_WEIGHTS
|
|
.get(flag_index)
|
|
.copied()
|
|
.ok_or(Error::InvalidFlagIndex(flag_index))
|
|
}
|
|
|
|
fn get_inactivity_penalty_delta(
|
|
delta: &mut Delta,
|
|
validator_info: &ValidatorInfo,
|
|
inactivity_score: &u64,
|
|
state_ctxt: &StateContext,
|
|
spec: &ChainSpec,
|
|
) -> Result<(), Error> {
|
|
if !validator_info.is_unslashed_participating_index(TIMELY_TARGET_FLAG_INDEX)? {
|
|
let penalty_numerator = validator_info
|
|
.effective_balance
|
|
.safe_mul(*inactivity_score)?;
|
|
let penalty_denominator = spec
|
|
.inactivity_score_bias
|
|
.safe_mul(spec.inactivity_penalty_quotient_for_fork(state_ctxt.fork_name))?;
|
|
delta.penalize(penalty_numerator.safe_div(penalty_denominator)?)?;
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
impl RewardsAndPenaltiesContext {
|
|
fn new(
|
|
progressive_balances: &ProgressiveBalancesCache,
|
|
state_ctxt: &StateContext,
|
|
spec: &ChainSpec,
|
|
) -> Result<Self, Error> {
|
|
let mut unslashed_participating_increments_array = [0; NUM_FLAG_INDICES];
|
|
for flag_index in 0..NUM_FLAG_INDICES {
|
|
let unslashed_participating_balance =
|
|
progressive_balances.previous_epoch_flag_attesting_balance(flag_index)?;
|
|
let unslashed_participating_increments =
|
|
unslashed_participating_balance.safe_div(spec.effective_balance_increment)?;
|
|
|
|
*unslashed_participating_increments_array
|
|
.get_mut(flag_index)
|
|
.ok_or(Error::InvalidFlagIndex(flag_index))? = unslashed_participating_increments;
|
|
}
|
|
let active_increments = state_ctxt
|
|
.total_active_balance
|
|
.safe_div(spec.effective_balance_increment)?;
|
|
|
|
Ok(Self {
|
|
unslashed_participating_increments_array,
|
|
active_increments,
|
|
})
|
|
}
|
|
|
|
fn get_unslashed_participating_increments(&self, flag_index: usize) -> Result<u64, Error> {
|
|
self.unslashed_participating_increments_array
|
|
.get(flag_index)
|
|
.copied()
|
|
.ok_or(Error::InvalidFlagIndex(flag_index))
|
|
}
|
|
}
|
|
|
|
#[allow(clippy::too_many_arguments)]
|
|
fn process_single_registry_update(
|
|
validator: &mut Cow<Validator>,
|
|
validator_info: &ValidatorInfo,
|
|
exit_cache: &mut ExitCache,
|
|
activation_queues: Option<(&BTreeSet<usize>, &mut ActivationQueue)>,
|
|
state_ctxt: &StateContext,
|
|
earliest_exit_epoch: Option<&mut Epoch>,
|
|
exit_balance_to_consume: Option<&mut u64>,
|
|
spec: &ChainSpec,
|
|
) -> Result<(), Error> {
|
|
if !state_ctxt.fork_name.electra_enabled() {
|
|
let (activation_queue, next_epoch_activation_queue) =
|
|
activation_queues.ok_or(Error::SinglePassMissingActivationQueue)?;
|
|
process_single_registry_update_pre_electra(
|
|
validator,
|
|
validator_info,
|
|
exit_cache,
|
|
activation_queue,
|
|
next_epoch_activation_queue,
|
|
state_ctxt,
|
|
spec,
|
|
)
|
|
} else {
|
|
process_single_registry_update_post_electra(
|
|
validator,
|
|
exit_cache,
|
|
state_ctxt,
|
|
earliest_exit_epoch.ok_or(Error::MissingEarliestExitEpoch)?,
|
|
exit_balance_to_consume.ok_or(Error::MissingExitBalanceToConsume)?,
|
|
spec,
|
|
)
|
|
}
|
|
}
|
|
|
|
fn process_single_registry_update_pre_electra(
|
|
validator: &mut Cow<Validator>,
|
|
validator_info: &ValidatorInfo,
|
|
exit_cache: &mut ExitCache,
|
|
activation_queue: &BTreeSet<usize>,
|
|
next_epoch_activation_queue: &mut ActivationQueue,
|
|
state_ctxt: &StateContext,
|
|
spec: &ChainSpec,
|
|
) -> Result<(), Error> {
|
|
let current_epoch = state_ctxt.current_epoch;
|
|
|
|
if validator.is_eligible_for_activation_queue(spec, state_ctxt.fork_name) {
|
|
validator.make_mut()?.activation_eligibility_epoch = current_epoch.safe_add(1)?;
|
|
}
|
|
|
|
if validator.is_active_at(current_epoch) && validator.effective_balance <= spec.ejection_balance
|
|
{
|
|
initiate_validator_exit(validator, exit_cache, state_ctxt, None, None, spec)?;
|
|
}
|
|
|
|
if activation_queue.contains(&validator_info.index) {
|
|
validator.make_mut()?.activation_epoch =
|
|
spec.compute_activation_exit_epoch(current_epoch)?;
|
|
}
|
|
|
|
// Caching: add to speculative activation queue for next epoch.
|
|
next_epoch_activation_queue.add_if_could_be_eligible_for_activation(
|
|
validator_info.index,
|
|
validator,
|
|
state_ctxt.next_epoch,
|
|
spec,
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
fn process_single_registry_update_post_electra(
|
|
validator: &mut Cow<Validator>,
|
|
exit_cache: &mut ExitCache,
|
|
state_ctxt: &StateContext,
|
|
earliest_exit_epoch: &mut Epoch,
|
|
exit_balance_to_consume: &mut u64,
|
|
spec: &ChainSpec,
|
|
) -> Result<(), Error> {
|
|
let current_epoch = state_ctxt.current_epoch;
|
|
|
|
if validator.is_eligible_for_activation_queue(spec, state_ctxt.fork_name) {
|
|
validator.make_mut()?.activation_eligibility_epoch = current_epoch.safe_add(1)?;
|
|
}
|
|
|
|
if validator.is_active_at(current_epoch) && validator.effective_balance <= spec.ejection_balance
|
|
{
|
|
initiate_validator_exit(
|
|
validator,
|
|
exit_cache,
|
|
state_ctxt,
|
|
Some(earliest_exit_epoch),
|
|
Some(exit_balance_to_consume),
|
|
spec,
|
|
)?;
|
|
}
|
|
|
|
if validator.is_eligible_for_activation_with_finalized_checkpoint(
|
|
&state_ctxt.finalized_checkpoint,
|
|
spec,
|
|
) {
|
|
validator.make_mut()?.activation_epoch =
|
|
spec.compute_activation_exit_epoch(current_epoch)?;
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
fn initiate_validator_exit(
|
|
validator: &mut Cow<Validator>,
|
|
exit_cache: &mut ExitCache,
|
|
state_ctxt: &StateContext,
|
|
earliest_exit_epoch: Option<&mut Epoch>,
|
|
exit_balance_to_consume: Option<&mut u64>,
|
|
spec: &ChainSpec,
|
|
) -> Result<(), Error> {
|
|
// Return if the validator already initiated exit
|
|
if validator.exit_epoch != spec.far_future_epoch {
|
|
return Ok(());
|
|
}
|
|
|
|
let exit_queue_epoch = if state_ctxt.fork_name.electra_enabled() {
|
|
compute_exit_epoch_and_update_churn(
|
|
validator,
|
|
state_ctxt,
|
|
earliest_exit_epoch.ok_or(Error::MissingEarliestExitEpoch)?,
|
|
exit_balance_to_consume.ok_or(Error::MissingExitBalanceToConsume)?,
|
|
spec,
|
|
)?
|
|
} else {
|
|
// Compute exit queue epoch
|
|
let delayed_epoch = spec.compute_activation_exit_epoch(state_ctxt.current_epoch)?;
|
|
let mut exit_queue_epoch = exit_cache
|
|
.max_epoch()?
|
|
.map_or(delayed_epoch, |epoch| max(epoch, delayed_epoch));
|
|
let exit_queue_churn = exit_cache.get_churn_at(exit_queue_epoch)?;
|
|
|
|
if exit_queue_churn >= state_ctxt.churn_limit {
|
|
exit_queue_epoch.safe_add_assign(1)?;
|
|
}
|
|
exit_queue_epoch
|
|
};
|
|
|
|
let validator = validator.make_mut()?;
|
|
validator.exit_epoch = exit_queue_epoch;
|
|
validator.withdrawable_epoch =
|
|
exit_queue_epoch.safe_add(spec.min_validator_withdrawability_delay)?;
|
|
|
|
exit_cache.record_validator_exit(exit_queue_epoch)?;
|
|
Ok(())
|
|
}
|
|
|
|
fn compute_exit_epoch_and_update_churn(
|
|
validator: &mut Cow<Validator>,
|
|
state_ctxt: &StateContext,
|
|
earliest_exit_epoch_state: &mut Epoch,
|
|
exit_balance_to_consume_state: &mut u64,
|
|
spec: &ChainSpec,
|
|
) -> Result<Epoch, Error> {
|
|
let exit_balance = validator.effective_balance;
|
|
let mut earliest_exit_epoch = std::cmp::max(
|
|
*earliest_exit_epoch_state,
|
|
spec.compute_activation_exit_epoch(state_ctxt.current_epoch)?,
|
|
);
|
|
|
|
let per_epoch_churn = get_activation_exit_churn_limit(state_ctxt, spec)?;
|
|
// New epoch for exits
|
|
let mut exit_balance_to_consume = if *earliest_exit_epoch_state < earliest_exit_epoch {
|
|
per_epoch_churn
|
|
} else {
|
|
*exit_balance_to_consume_state
|
|
};
|
|
|
|
// Exit doesn't fit in the current earliest epoch
|
|
if exit_balance > exit_balance_to_consume {
|
|
let balance_to_process = exit_balance.safe_sub(exit_balance_to_consume)?;
|
|
let additional_epochs = balance_to_process
|
|
.safe_sub(1)?
|
|
.safe_div(per_epoch_churn)?
|
|
.safe_add(1)?;
|
|
earliest_exit_epoch.safe_add_assign(additional_epochs)?;
|
|
exit_balance_to_consume.safe_add_assign(additional_epochs.safe_mul(per_epoch_churn)?)?;
|
|
}
|
|
// Consume the balance and update state variables
|
|
*exit_balance_to_consume_state = exit_balance_to_consume.safe_sub(exit_balance)?;
|
|
*earliest_exit_epoch_state = earliest_exit_epoch;
|
|
|
|
Ok(earliest_exit_epoch)
|
|
}
|
|
|
|
fn get_activation_exit_churn_limit(
|
|
state_ctxt: &StateContext,
|
|
spec: &ChainSpec,
|
|
) -> Result<u64, Error> {
|
|
Ok(std::cmp::min(
|
|
spec.max_per_epoch_activation_exit_churn_limit,
|
|
get_balance_churn_limit(state_ctxt, spec)?,
|
|
))
|
|
}
|
|
|
|
fn get_balance_churn_limit(state_ctxt: &StateContext, spec: &ChainSpec) -> Result<u64, Error> {
|
|
let total_active_balance = state_ctxt.total_active_balance;
|
|
let churn = std::cmp::max(
|
|
spec.min_per_epoch_churn_limit_electra,
|
|
total_active_balance.safe_div(spec.churn_limit_quotient)?,
|
|
);
|
|
|
|
Ok(churn.safe_sub(churn.safe_rem(spec.effective_balance_increment)?)?)
|
|
}
|
|
|
|
impl SlashingsContext {
|
|
fn new<E: EthSpec>(
|
|
state: &BeaconState<E>,
|
|
state_ctxt: &StateContext,
|
|
spec: &ChainSpec,
|
|
) -> Result<Self, Error> {
|
|
let sum_slashings = state.get_all_slashings().iter().copied().safe_sum()?;
|
|
let adjusted_total_slashing_balance = min(
|
|
sum_slashings.safe_mul(spec.proportional_slashing_multiplier_for_state(state))?,
|
|
state_ctxt.total_active_balance,
|
|
);
|
|
|
|
let target_withdrawable_epoch = state_ctxt
|
|
.current_epoch
|
|
.safe_add(E::EpochsPerSlashingsVector::to_u64().safe_div(2)?)?;
|
|
|
|
Ok(Self {
|
|
adjusted_total_slashing_balance,
|
|
target_withdrawable_epoch,
|
|
})
|
|
}
|
|
}
|
|
|
|
fn process_single_slashing(
|
|
balance: &mut Cow<u64>,
|
|
validator: &Validator,
|
|
slashings_ctxt: &SlashingsContext,
|
|
state_ctxt: &StateContext,
|
|
spec: &ChainSpec,
|
|
) -> Result<(), Error> {
|
|
if validator.slashed && slashings_ctxt.target_withdrawable_epoch == validator.withdrawable_epoch
|
|
{
|
|
let increment = spec.effective_balance_increment;
|
|
let penalty_numerator = validator
|
|
.effective_balance
|
|
.safe_div(increment)?
|
|
.safe_mul(slashings_ctxt.adjusted_total_slashing_balance)?;
|
|
let penalty = penalty_numerator
|
|
.safe_div(state_ctxt.total_active_balance)?
|
|
.safe_mul(increment)?;
|
|
|
|
*balance.make_mut()? = balance.saturating_sub(penalty);
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
impl PendingBalanceDepositsContext {
|
|
fn new<E: EthSpec>(state: &BeaconState<E>, spec: &ChainSpec) -> Result<Self, Error> {
|
|
let available_for_processing = state
|
|
.deposit_balance_to_consume()?
|
|
.safe_add(state.get_activation_exit_churn_limit(spec)?)?;
|
|
let mut processed_amount = 0;
|
|
let mut next_deposit_index = 0;
|
|
let mut validator_deposits_to_process = HashMap::new();
|
|
|
|
let pending_balance_deposits = state.pending_balance_deposits()?;
|
|
|
|
for deposit in pending_balance_deposits.iter() {
|
|
if processed_amount.safe_add(deposit.amount)? > available_for_processing {
|
|
break;
|
|
}
|
|
validator_deposits_to_process
|
|
.entry(deposit.index as usize)
|
|
.or_insert(0)
|
|
.safe_add_assign(deposit.amount)?;
|
|
|
|
processed_amount.safe_add_assign(deposit.amount)?;
|
|
next_deposit_index.safe_add_assign(1)?;
|
|
}
|
|
|
|
let deposit_balance_to_consume = if next_deposit_index == pending_balance_deposits.len() {
|
|
0
|
|
} else {
|
|
available_for_processing.safe_sub(processed_amount)?
|
|
};
|
|
|
|
Ok(Self {
|
|
next_deposit_index,
|
|
deposit_balance_to_consume,
|
|
validator_deposits_to_process,
|
|
})
|
|
}
|
|
}
|
|
|
|
fn process_pending_balance_deposits_for_validator(
|
|
balance: &mut Cow<u64>,
|
|
validator_info: &ValidatorInfo,
|
|
pending_balance_deposits_ctxt: &PendingBalanceDepositsContext,
|
|
) -> Result<(), Error> {
|
|
if let Some(deposit_amount) = pending_balance_deposits_ctxt
|
|
.validator_deposits_to_process
|
|
.get(&validator_info.index)
|
|
{
|
|
balance.make_mut()?.safe_add_assign(*deposit_amount)?;
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
/// We process pending consolidations after all of single-pass epoch processing, and then patch up
|
|
/// the effective balances for affected validators.
|
|
///
|
|
/// This is safe because processing consolidations does not depend on the `effective_balance`.
|
|
fn process_pending_consolidations<E: EthSpec>(
|
|
state: &mut BeaconState<E>,
|
|
next_epoch_cache: &mut PreEpochCache,
|
|
effective_balances_ctxt: &EffectiveBalancesContext,
|
|
perform_effective_balance_updates: bool,
|
|
state_ctxt: &StateContext,
|
|
spec: &ChainSpec,
|
|
) -> Result<(), Error> {
|
|
let mut next_pending_consolidation: usize = 0;
|
|
let current_epoch = state.current_epoch();
|
|
let pending_consolidations = state.pending_consolidations()?.clone();
|
|
|
|
let mut affected_validators = BTreeSet::new();
|
|
|
|
for pending_consolidation in &pending_consolidations {
|
|
let source_index = pending_consolidation.source_index as usize;
|
|
let target_index = pending_consolidation.target_index as usize;
|
|
let source_validator = state.get_validator(source_index)?;
|
|
if source_validator.slashed {
|
|
next_pending_consolidation.safe_add_assign(1)?;
|
|
continue;
|
|
}
|
|
if source_validator.withdrawable_epoch > current_epoch {
|
|
break;
|
|
}
|
|
|
|
// Calculate the active balance while we have the source validator loaded. This is a safe
|
|
// reordering.
|
|
let source_balance = *state
|
|
.balances()
|
|
.get(source_index)
|
|
.ok_or(BeaconStateError::UnknownValidator(source_index))?;
|
|
let active_balance =
|
|
source_validator.get_active_balance(source_balance, spec, state_ctxt.fork_name);
|
|
|
|
// Churn any target excess active balance of target and raise its max.
|
|
state.switch_to_compounding_validator(target_index, spec)?;
|
|
|
|
// Move active balance to target. Excess balance is withdrawable.
|
|
decrease_balance(state, source_index, active_balance)?;
|
|
increase_balance(state, target_index, active_balance)?;
|
|
|
|
affected_validators.insert(source_index);
|
|
affected_validators.insert(target_index);
|
|
|
|
next_pending_consolidation.safe_add_assign(1)?;
|
|
}
|
|
|
|
let new_pending_consolidations = List::try_from_iter(
|
|
state
|
|
.pending_consolidations()?
|
|
.iter_from(next_pending_consolidation)?
|
|
.cloned(),
|
|
)?;
|
|
*state.pending_consolidations_mut()? = new_pending_consolidations;
|
|
|
|
// the spec tests require we don't perform effective balance updates when testing pending_consolidations
|
|
if !perform_effective_balance_updates {
|
|
return Ok(());
|
|
}
|
|
|
|
// Re-process effective balance updates for validators affected by consolidations.
|
|
let (validators, balances, _, current_epoch_participation, _, progressive_balances, _, _) =
|
|
state.mutable_validator_fields()?;
|
|
for validator_index in affected_validators {
|
|
let balance = *balances
|
|
.get(validator_index)
|
|
.ok_or(BeaconStateError::UnknownValidator(validator_index))?;
|
|
let mut validator = validators
|
|
.get_cow(validator_index)
|
|
.ok_or(BeaconStateError::UnknownValidator(validator_index))?;
|
|
let validator_current_epoch_participation = *current_epoch_participation
|
|
.get(validator_index)
|
|
.ok_or(BeaconStateError::UnknownValidator(validator_index))?;
|
|
|
|
process_single_effective_balance_update(
|
|
validator_index,
|
|
balance,
|
|
&mut validator,
|
|
validator_current_epoch_participation,
|
|
next_epoch_cache,
|
|
progressive_balances,
|
|
effective_balances_ctxt,
|
|
state_ctxt,
|
|
spec,
|
|
)?;
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
impl EffectiveBalancesContext {
|
|
fn new(spec: &ChainSpec) -> Result<Self, Error> {
|
|
let hysteresis_increment = spec
|
|
.effective_balance_increment
|
|
.safe_div(spec.hysteresis_quotient)?;
|
|
let downward_threshold =
|
|
hysteresis_increment.safe_mul(spec.hysteresis_downward_multiplier)?;
|
|
let upward_threshold = hysteresis_increment.safe_mul(spec.hysteresis_upward_multiplier)?;
|
|
|
|
Ok(Self {
|
|
downward_threshold,
|
|
upward_threshold,
|
|
})
|
|
}
|
|
}
|
|
|
|
/// This function abstracts over phase0 and Electra effective balance processing.
|
|
#[allow(clippy::too_many_arguments)]
|
|
fn process_single_effective_balance_update(
|
|
validator_index: usize,
|
|
balance: u64,
|
|
validator: &mut Cow<Validator>,
|
|
validator_current_epoch_participation: ParticipationFlags,
|
|
next_epoch_cache: &mut PreEpochCache,
|
|
progressive_balances: &mut ProgressiveBalancesCache,
|
|
eb_ctxt: &EffectiveBalancesContext,
|
|
state_ctxt: &StateContext,
|
|
spec: &ChainSpec,
|
|
) -> Result<(), Error> {
|
|
// Use the higher effective balance limit if post-Electra and compounding withdrawal credentials
|
|
// are set.
|
|
let effective_balance_limit =
|
|
validator.get_validator_max_effective_balance(spec, state_ctxt.fork_name);
|
|
|
|
let old_effective_balance = validator.effective_balance;
|
|
let new_effective_balance = if balance.safe_add(eb_ctxt.downward_threshold)?
|
|
< validator.effective_balance
|
|
|| validator
|
|
.effective_balance
|
|
.safe_add(eb_ctxt.upward_threshold)?
|
|
< balance
|
|
{
|
|
min(
|
|
balance.safe_sub(balance.safe_rem(spec.effective_balance_increment)?)?,
|
|
effective_balance_limit,
|
|
)
|
|
} else {
|
|
validator.effective_balance
|
|
};
|
|
|
|
let is_active_next_epoch = validator.is_active_at(state_ctxt.next_epoch);
|
|
|
|
if new_effective_balance != old_effective_balance {
|
|
validator.make_mut()?.effective_balance = new_effective_balance;
|
|
|
|
// Update progressive balances cache for the *current* epoch, which will soon become the
|
|
// previous epoch once the epoch transition completes.
|
|
progressive_balances.on_effective_balance_change(
|
|
validator.slashed,
|
|
validator_current_epoch_participation,
|
|
old_effective_balance,
|
|
new_effective_balance,
|
|
)?;
|
|
}
|
|
|
|
// Caching: update next epoch effective balances and total active balance.
|
|
next_epoch_cache.update_effective_balance(
|
|
validator_index,
|
|
new_effective_balance,
|
|
is_active_next_epoch,
|
|
)?;
|
|
|
|
Ok(())
|
|
}
|