Electra other containers #5652

realbigsean · 2024-04-25T20:20:48Z

Issue Addressed

Resolves #5608
Part of #5605

Proposed Changes

Add new fields for ExecutionPayload, ExecutionPayloadHeader, BeaconState, PartialBeaconState
implement upgrade_to_electra
- This required adding the following helper methods
  - get_balance_churn_limit
  - get_activation_exit_churn_limit
  - get_consolidation_churn_limit
  - queue_entire_balance_and_reset_validator
  - queue_excess_active_balance
  - has_compounding_withdrawal_credential
  - is_compounding_withdrawal_credential

This reverts commit c60b522.

…ectra-other-containers

pawanjay176 · 2024-04-26T18:13:58Z

consensus/types/src/beacon_state.rs

+            .balances_mut()
+            .get_mut(validator_index)
+            .ok_or(Error::UnknownValidator(validator_index))?;
+        let balance_copy = *balance;


old_balance maybe?

beacon_node/execution_layer/src/lib.rs

beacon_node/store/src/partial_beacon_state.rs

consensus/state_processing/src/upgrade/electra.rs

pawanjay176

Happy to merge this if CI passes.

realbigsean · 2024-04-26T20:15:34Z

@mergify queue

mergify · 2024-04-26T20:15:41Z

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 000a4fd

* Fix execution integration tests (#5647) * update waiting status * revert to old nethermind version * Add electra presets to beacon API (#5630) * add presets to API * add extra fields to config spec in beacon API * remove unused * add mainnet presets for gnosis and fix minimal preset default values * Rename `Merge` to `Bellatrix` (#5601) * Rename Merge to Bellatrix * Remove tree-hash-cache which got readded from the rebase * Deterministic block generation for tests (#5654) * Deterministic block generation for tests * Electra other containers (#5652) * add new fields to execution payload and header * beacon state changes * partial beacon state * safe arith in upgrade to electra * initialize balances cache in interop genesis state * Revert "initialize balances cache in interop genesis state" This reverts commit c60b522. * always initialize balances cache if necessary in electra upgrade * build cache earlier * fix block test * per fork NUM_FIELDS_POW2 * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra-other-containers * fix lints * get fields based on post state, as is spec'd * fix type and move cache build * Add more electra helpers (#5653) * Add new helpers * Fix some stuff * Fix compilation errors * lint * Address review * Ignore gossip blob already imported (#5656) * Ignore gossip blob already imported * Beta compiler fix (#5659) * fix beta compiler compilation * remove unused import * Revert "remove unused import" This reverts commit 0bef36b. * Revert "fix beta compiler compilation" This reverts commit 23152cf. * rename ununsed fields * allow dead code on some error variants * remove unused blob download queue * add back debug to backfill error * more allow dead code on errors * fix(validator_client): raise soft fd limit (#4796) * fix(validator_client): raise soft fd limit * Merge branch 'unstable' of https://github.com/sigp/lighthouse into rkrasiuk/raise-vc-fdlimit * cargo lock * Merge branch 'unstable' of https://github.com/sigp/lighthouse into rkrasiuk/raise-vc-fdlimit * Proposer and attester slashing sse events (#5327) * default vc to block v3 endpoint and deprecate block-v3 flag * Merge branch 'unstable' of https://github.com/sigp/lighthouse into unstable * add proposer and attester event variants * add TOOOs * add tests, event triggers * Merge branch 'unstable' of https://github.com/sigp/lighthouse into proposer-and-attester-slashing-sse-events * revert * revert * remove double event tracking * Merge branch 'unstable' into proposer-and-attester-slashing-sse-events * remove todo, fix test * resolve merge conflicts * Merge branch 'proposer-and-attester-slashing-sse-events' of https://github.com/eserilev/lighthouse into proposer-and-attester-slashing-sse-events * leftover debugging * Merge branch 'unstable' of https://github.com/sigp/lighthouse into proposer-and-attester-slashing-sse-events * Merge branch 'unstable' of https://github.com/sigp/lighthouse into proposer-and-attester-slashing-sse-events * pin macos release runner to `macos-13` (#5665) * pin macos release runner to `macos-13` * Update .github/workflows/release.yml * Remove snapshot cache related code (#5661) * Remove snapshot cache and other references. * Fix default state cache size in docs * Remove cache miss comment entirely * Add state cache CLI tests * Uncomment self_hosted_runner after PR Merge #5137 (#5291) * Uncomment self_hosted_runner after PR Merge #5137 * Merge branch 'unstable' into fix_todo * Merge branch 'unstable' of https://github.com/sigp/lighthouse into fix_todo * Only `portable` builds (binaries) (#5615) * release workflow: portable builds by default * Delete outdated comment * Merge branch 'unstable' into portable-builds-binaries # Conflicts: # .github/workflows/release.yml * Merge parent and current sync lookups (#5655) * Drop lookup type trait for a simple arg * Drop reconstructed for processing * Send parent blocks one by one * Merge current and parent lookups * Merge current and parent lookups clean up todos * Merge current and parent lookups tests * Merge remote-tracking branch 'origin/unstable' into sync-merged-lookup * Merge branch 'unstable' of https://github.com/sigp/lighthouse into sync-merged-lookup * fix compile after merge * #5655 pr review (#26) * fix compile after merge * remove todos, fix typos etc * fix compile * stable rng * delete TODO and unfilled out test * make download result a struct * enums instead of bools as params * fix comment * Various fixes * Track ignored child components * Track dropped lookup reason as metric * fix test * add comment describing behavior of avail check error * update ordering * delete spammy log (#5672) * delete spammy log * Ensure block only range requests don't fail on download (#5675) * ensure pruned blobs don't fail on download * Typo * Improve ENR updates (#5483) * Improve ENR updates * forever fmt * Appease my old friend clippy * Merge network unstable * Check da_checker before doing a block lookup request (#5681) * Check da_checker before doing a block lookup request * Ensure consistent handling of lookup result * use req resp pre import cache rather than da checker * Update Cargo.lock (#5670) * update rust-yamux * update Cargo.lock * Merge branch 'unstable' of github.com:jxs/lighthouse into update-cargo * Merge branch 'unstable' of github.com:sigp/lighthouse into update-cargo * update to new libp2p versions * Add metric for current epoch total balance (#5688) * Add metric for current epoch total balance --------- Co-authored-by: realbigsean <sean@sigmaprime.io> Co-authored-by: Mac L <mjladson@pm.me> Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com> Co-authored-by: Pawan Dhananjay <pawandhananjay@gmail.com> Co-authored-by: Roman Krasiuk <rokrassyuk@gmail.com> Co-authored-by: Eitan Seri-Levi <eserilev@ucsc.edu> Co-authored-by: antondlr <anton@delaruelle.net> Co-authored-by: Jimmy Chen <jchen.tc@gmail.com> Co-authored-by: Ærvin <arvin.morawej@gmail.com> Co-authored-by: Age Manning <Age@AgeManning.com> Co-authored-by: João Oliveira <hello@jxs.pt> Co-authored-by: Michael Sproul <michael@sigmaprime.io>

realbigsean added 4 commits April 25, 2024 13:17

add new fields to execution payload and header

a80b94c

beacon state changes

dd63bf4

partial beacon state

bd9b179

safe arith in upgrade to electra

9ee134d

realbigsean added ready-for-review The code is ready for review electra Required for the Electra/Prague fork labels Apr 25, 2024

realbigsean mentioned this pull request Apr 25, 2024

Implement Electra Fork #5605

Open

63 tasks

initialize balances cache in interop genesis state

c60b522

realbigsean added work-in-progress PR is a work-in-progress and removed ready-for-review The code is ready for review labels Apr 25, 2024

realbigsean added 3 commits April 25, 2024 17:14

Revert "initialize balances cache in interop genesis state"

605726c

This reverts commit c60b522.

always initialize balances cache if necessary in electra upgrade

5abe624

build cache earlier

d2de5f3

realbigsean added ready-for-review The code is ready for review and removed work-in-progress PR is a work-in-progress labels Apr 25, 2024

pawanjay176 mentioned this pull request Apr 25, 2024

Add more electra helpers #5653

Merged

realbigsean added 4 commits April 26, 2024 09:13

fix block test

cbbb844

per fork NUM_FIELDS_POW2

736fcfc

Merge branch 'unstable' of https://github.com/sigp/lighthouse into el…

1ab1eb2

…ectra-other-containers

fix lints

9e96cc5

pawanjay176 reviewed Apr 26, 2024

View reviewed changes

realbigsean added 2 commits April 26, 2024 15:33

get fields based on post state, as is spec'd

687c325

fix type and move cache build

026c58b

pawanjay176 approved these changes Apr 26, 2024

View reviewed changes

mergify bot merged commit 000a4fd into sigp:unstable Apr 26, 2024
27 checks passed

jimmygchen mentioned this pull request May 1, 2024

BeaconState, PartialBeaconState, & Fork Transition #5608

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Electra other containers #5652

Electra other containers #5652

realbigsean commented Apr 25, 2024 •

edited

Loading

pawanjay176 Apr 26, 2024

pawanjay176 left a comment

realbigsean commented Apr 26, 2024

mergify bot commented Apr 26, 2024 •

edited

Loading

Electra other containers #5652

Electra other containers #5652

Conversation

realbigsean commented Apr 25, 2024 • edited Loading

Issue Addressed

Proposed Changes

pawanjay176 Apr 26, 2024

Choose a reason for hiding this comment

pawanjay176 left a comment

Choose a reason for hiding this comment

realbigsean commented Apr 26, 2024

mergify bot commented Apr 26, 2024 • edited Loading

✅ The pull request has been merged automatically

realbigsean commented Apr 25, 2024 •

edited

Loading

mergify bot commented Apr 26, 2024 •

edited

Loading