Skip to content

Commit 14de8b9

Browse files
etan-statusetan-status
committed
Forward compatible consensus data structures (EIP-7688)
- EIP https://eips.ethereum.org/EIPS/eip-7688 - Spec ethereum/consensus-specs#4630 - Tests ethereum/consensus-specs#4630 (comment) - Kurtosis ethereum/consensus-specs#4630 (comment)
1 parent b8ffcd8 commit 14de8b9

73 files changed

Lines changed: 1374 additions & 640 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ConsensusSpecPreset-mainnet.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2728,6 +2728,9 @@ ConsensusSpecPreset-mainnet
27282728
```
27292729
## EF - Gloas - Operations - Parent Execution Payload [Preset: mainnet]
27302730
```diff
2731+
+ [Invalid] EF - Gloas - Operations - Parent Execution Payload - invalid_too_many_consolidat OK
2732+
+ [Invalid] EF - Gloas - Operations - Parent Execution Payload - invalid_too_many_deposit_re OK
2733+
+ [Invalid] EF - Gloas - Operations - Parent Execution Payload - invalid_too_many_withdrawal OK
27312734
+ [Invalid] EF - Gloas - Operations - Parent Execution Payload - process_parent_execution_pa OK
27322735
+ [Valid] EF - Gloas - Operations - Parent Execution Payload - process_parent_execution_pa OK
27332736
+ [Valid] EF - Gloas - Operations - Parent Execution Payload - process_parent_execution_pa OK
@@ -3320,6 +3323,9 @@ ConsensusSpecPreset-mainnet
33203323
```
33213324
## EF - Heze - Operations - Parent Execution Payload [Preset: mainnet]
33223325
```diff
3326+
+ [Invalid] EF - Heze - Operations - Parent Execution Payload - invalid_too_many_consolidati OK
3327+
+ [Invalid] EF - Heze - Operations - Parent Execution Payload - invalid_too_many_deposit_req OK
3328+
+ [Invalid] EF - Heze - Operations - Parent Execution Payload - invalid_too_many_withdrawal_ OK
33233329
+ [Invalid] EF - Heze - Operations - Parent Execution Payload - process_parent_execution_pay OK
33243330
+ [Valid] EF - Heze - Operations - Parent Execution Payload - process_parent_execution_pay OK
33253331
+ [Valid] EF - Heze - Operations - Parent Execution Payload - process_parent_execution_pay OK
@@ -5803,6 +5809,13 @@ ConsensusSpecPreset-mainnet
58035809
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_prev_slot_block_transition [Preset: mainn OK
58045810
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_same_slot_block_transition [Preset: mainn OK
58055811
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_similar_proposer_slashings_same_block [Pr OK
5812+
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_too_many_attestations [Preset: mainnet] OK
5813+
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_too_many_attester_slashings [Preset: main OK
5814+
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_too_many_bls_to_execution_changes [Preset OK
5815+
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_too_many_deposits [Preset: mainnet] OK
5816+
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_too_many_payload_attestations [Preset: ma OK
5817+
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_too_many_proposer_slashings [Preset: main OK
5818+
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_too_many_voluntary_exits [Preset: mainnet OK
58065819
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_two_bls_changes_of_different_addresses_sa OK
58075820
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_withdrawal_fail_second_block_payload_isnt OK
58085821
+ [Invalid] EF - gloas - Sanity - Blocks - process_parent_execution_payload__wrong_execution OK
@@ -5833,6 +5846,8 @@ ConsensusSpecPreset-mainnet
58335846
+ [Valid] EF - gloas - Sanity - Blocks - missed_payload_next_block_with_withdrawals_unsati OK
58345847
+ [Valid] EF - gloas - Sanity - Blocks - missed_payload_next_block_without_withdrawals_sat OK
58355848
+ [Valid] EF - gloas - Sanity - Blocks - missed_payload_next_block_without_withdrawals_uns OK
5849+
+ [Valid] EF - gloas - Sanity - Blocks - missed_payload_recovery_resumes_with_remaining_wi OK
5850+
+ [Valid] EF - gloas - Sanity - Blocks - missed_payload_recovery_resumes_without_remaining OK
58365851
+ [Valid] EF - gloas - Sanity - Blocks - multiple_different_proposer_slashings_same_block OK
58375852
+ [Valid] EF - gloas - Sanity - Blocks - multiple_different_validator_exits_same_block [Pr OK
58385853
+ [Valid] EF - gloas - Sanity - Blocks - partial_withdrawal_in_epoch_transition [Preset: m OK
@@ -6114,6 +6129,13 @@ ConsensusSpecPreset-mainnet
61146129
+ [Invalid] EF - heze - Sanity - Blocks - invalid_prev_slot_block_transition [Preset: mainne OK
61156130
+ [Invalid] EF - heze - Sanity - Blocks - invalid_same_slot_block_transition [Preset: mainne OK
61166131
+ [Invalid] EF - heze - Sanity - Blocks - invalid_similar_proposer_slashings_same_block [Pre OK
6132+
+ [Invalid] EF - heze - Sanity - Blocks - invalid_too_many_attestations [Preset: mainnet] OK
6133+
+ [Invalid] EF - heze - Sanity - Blocks - invalid_too_many_attester_slashings [Preset: mainn OK
6134+
+ [Invalid] EF - heze - Sanity - Blocks - invalid_too_many_bls_to_execution_changes [Preset: OK
6135+
+ [Invalid] EF - heze - Sanity - Blocks - invalid_too_many_deposits [Preset: mainnet] OK
6136+
+ [Invalid] EF - heze - Sanity - Blocks - invalid_too_many_payload_attestations [Preset: mai OK
6137+
+ [Invalid] EF - heze - Sanity - Blocks - invalid_too_many_proposer_slashings [Preset: mainn OK
6138+
+ [Invalid] EF - heze - Sanity - Blocks - invalid_too_many_voluntary_exits [Preset: mainnet] OK
61176139
+ [Invalid] EF - heze - Sanity - Blocks - invalid_two_bls_changes_of_different_addresses_sam OK
61186140
+ [Invalid] EF - heze - Sanity - Blocks - invalid_withdrawal_fail_second_block_payload_isnt_ OK
61196141
+ [Invalid] EF - heze - Sanity - Blocks - process_parent_execution_payload__wrong_execution_ OK
@@ -6144,6 +6166,8 @@ ConsensusSpecPreset-mainnet
61446166
+ [Valid] EF - heze - Sanity - Blocks - missed_payload_next_block_with_withdrawals_unsatis OK
61456167
+ [Valid] EF - heze - Sanity - Blocks - missed_payload_next_block_without_withdrawals_sati OK
61466168
+ [Valid] EF - heze - Sanity - Blocks - missed_payload_next_block_without_withdrawals_unsa OK
6169+
+ [Valid] EF - heze - Sanity - Blocks - missed_payload_recovery_resumes_with_remaining_wit OK
6170+
+ [Valid] EF - heze - Sanity - Blocks - missed_payload_recovery_resumes_without_remaining_ OK
61476171
+ [Valid] EF - heze - Sanity - Blocks - multiple_different_proposer_slashings_same_block [ OK
61486172
+ [Valid] EF - heze - Sanity - Blocks - multiple_different_validator_exits_same_block [Pre OK
61496173
+ [Valid] EF - heze - Sanity - Blocks - partial_withdrawal_in_epoch_transition [Preset: ma OK

‎ConsensusSpecPreset-minimal.md‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2700,6 +2700,7 @@ ConsensusSpecPreset-minimal
27002700
+ [Invalid] EF - Gloas - Operations - Attester Slashing - invalid_no_double_or_surround OK
27012701
+ [Invalid] EF - Gloas - Operations - Attester Slashing - invalid_participants_already_slash OK
27022702
+ [Invalid] EF - Gloas - Operations - Attester Slashing - invalid_same_data OK
2703+
+ [Invalid] EF - Gloas - Operations - Attester Slashing - invalid_too_many_attesting_indices OK
27032704
+ [Invalid] EF - Gloas - Operations - Attester Slashing - invalid_unsorted_att_1 OK
27042705
+ [Invalid] EF - Gloas - Operations - Attester Slashing - invalid_unsorted_att_2 OK
27052706
+ [Valid] EF - Gloas - Operations - Attester Slashing - already_exited_long_ago OK
@@ -2871,6 +2872,9 @@ ConsensusSpecPreset-minimal
28712872
```
28722873
## EF - Gloas - Operations - Parent Execution Payload [Preset: minimal]
28732874
```diff
2875+
+ [Invalid] EF - Gloas - Operations - Parent Execution Payload - invalid_too_many_consolidat OK
2876+
+ [Invalid] EF - Gloas - Operations - Parent Execution Payload - invalid_too_many_deposit_re OK
2877+
+ [Invalid] EF - Gloas - Operations - Parent Execution Payload - invalid_too_many_withdrawal OK
28742878
+ [Invalid] EF - Gloas - Operations - Parent Execution Payload - process_parent_execution_pa OK
28752879
+ [Valid] EF - Gloas - Operations - Parent Execution Payload - process_parent_execution_pa OK
28762880
+ [Valid] EF - Gloas - Operations - Parent Execution Payload - process_parent_execution_pa OK
@@ -3337,6 +3341,7 @@ ConsensusSpecPreset-minimal
33373341
+ [Invalid] EF - Heze - Operations - Attester Slashing - invalid_no_double_or_surround OK
33383342
+ [Invalid] EF - Heze - Operations - Attester Slashing - invalid_participants_already_slashe OK
33393343
+ [Invalid] EF - Heze - Operations - Attester Slashing - invalid_same_data OK
3344+
+ [Invalid] EF - Heze - Operations - Attester Slashing - invalid_too_many_attesting_indices OK
33403345
+ [Invalid] EF - Heze - Operations - Attester Slashing - invalid_unsorted_att_1 OK
33413346
+ [Invalid] EF - Heze - Operations - Attester Slashing - invalid_unsorted_att_2 OK
33423347
+ [Valid] EF - Heze - Operations - Attester Slashing - already_exited_long_ago OK
@@ -3508,6 +3513,9 @@ ConsensusSpecPreset-minimal
35083513
```
35093514
## EF - Heze - Operations - Parent Execution Payload [Preset: minimal]
35103515
```diff
3516+
+ [Invalid] EF - Heze - Operations - Parent Execution Payload - invalid_too_many_consolidati OK
3517+
+ [Invalid] EF - Heze - Operations - Parent Execution Payload - invalid_too_many_deposit_req OK
3518+
+ [Invalid] EF - Heze - Operations - Parent Execution Payload - invalid_too_many_withdrawal_ OK
35113519
+ [Invalid] EF - Heze - Operations - Parent Execution Payload - process_parent_execution_pay OK
35123520
+ [Valid] EF - Heze - Operations - Parent Execution Payload - process_parent_execution_pay OK
35133521
+ [Valid] EF - Heze - Operations - Parent Execution Payload - process_parent_execution_pay OK
@@ -6249,6 +6257,13 @@ ConsensusSpecPreset-minimal
62496257
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_prev_slot_block_transition [Preset: minim OK
62506258
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_same_slot_block_transition [Preset: minim OK
62516259
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_similar_proposer_slashings_same_block [Pr OK
6260+
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_too_many_attestations [Preset: minimal] OK
6261+
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_too_many_attester_slashings [Preset: mini OK
6262+
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_too_many_bls_to_execution_changes [Preset OK
6263+
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_too_many_deposits [Preset: minimal] OK
6264+
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_too_many_payload_attestations [Preset: mi OK
6265+
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_too_many_proposer_slashings [Preset: mini OK
6266+
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_too_many_voluntary_exits [Preset: minimal OK
62526267
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_two_bls_changes_of_different_addresses_sa OK
62536268
+ [Invalid] EF - gloas - Sanity - Blocks - invalid_withdrawal_fail_second_block_payload_isnt OK
62546269
+ [Invalid] EF - gloas - Sanity - Blocks - process_parent_execution_payload__wrong_execution OK
@@ -6293,6 +6308,8 @@ ConsensusSpecPreset-minimal
62936308
+ [Valid] EF - gloas - Sanity - Blocks - missed_payload_next_block_with_withdrawals_unsati OK
62946309
+ [Valid] EF - gloas - Sanity - Blocks - missed_payload_next_block_without_withdrawals_sat OK
62956310
+ [Valid] EF - gloas - Sanity - Blocks - missed_payload_next_block_without_withdrawals_uns OK
6311+
+ [Valid] EF - gloas - Sanity - Blocks - missed_payload_recovery_resumes_with_remaining_wi OK
6312+
+ [Valid] EF - gloas - Sanity - Blocks - missed_payload_recovery_resumes_without_remaining OK
62966313
+ [Valid] EF - gloas - Sanity - Blocks - multiple_different_proposer_slashings_same_block OK
62976314
+ [Valid] EF - gloas - Sanity - Blocks - multiple_different_validator_exits_same_block [Pr OK
62986315
+ [Valid] EF - gloas - Sanity - Blocks - partial_withdrawal_in_epoch_transition [Preset: m OK
@@ -6596,6 +6613,13 @@ ConsensusSpecPreset-minimal
65966613
+ [Invalid] EF - heze - Sanity - Blocks - invalid_prev_slot_block_transition [Preset: minima OK
65976614
+ [Invalid] EF - heze - Sanity - Blocks - invalid_same_slot_block_transition [Preset: minima OK
65986615
+ [Invalid] EF - heze - Sanity - Blocks - invalid_similar_proposer_slashings_same_block [Pre OK
6616+
+ [Invalid] EF - heze - Sanity - Blocks - invalid_too_many_attestations [Preset: minimal] OK
6617+
+ [Invalid] EF - heze - Sanity - Blocks - invalid_too_many_attester_slashings [Preset: minim OK
6618+
+ [Invalid] EF - heze - Sanity - Blocks - invalid_too_many_bls_to_execution_changes [Preset: OK
6619+
+ [Invalid] EF - heze - Sanity - Blocks - invalid_too_many_deposits [Preset: minimal] OK
6620+
+ [Invalid] EF - heze - Sanity - Blocks - invalid_too_many_payload_attestations [Preset: min OK
6621+
+ [Invalid] EF - heze - Sanity - Blocks - invalid_too_many_proposer_slashings [Preset: minim OK
6622+
+ [Invalid] EF - heze - Sanity - Blocks - invalid_too_many_voluntary_exits [Preset: minimal] OK
65996623
+ [Invalid] EF - heze - Sanity - Blocks - invalid_two_bls_changes_of_different_addresses_sam OK
66006624
+ [Invalid] EF - heze - Sanity - Blocks - invalid_withdrawal_fail_second_block_payload_isnt_ OK
66016625
+ [Invalid] EF - heze - Sanity - Blocks - process_parent_execution_payload__wrong_execution_ OK
@@ -6640,6 +6664,8 @@ ConsensusSpecPreset-minimal
66406664
+ [Valid] EF - heze - Sanity - Blocks - missed_payload_next_block_with_withdrawals_unsatis OK
66416665
+ [Valid] EF - heze - Sanity - Blocks - missed_payload_next_block_without_withdrawals_sati OK
66426666
+ [Valid] EF - heze - Sanity - Blocks - missed_payload_next_block_without_withdrawals_unsa OK
6667+
+ [Valid] EF - heze - Sanity - Blocks - missed_payload_recovery_resumes_with_remaining_wit OK
6668+
+ [Valid] EF - heze - Sanity - Blocks - missed_payload_recovery_resumes_without_remaining_ OK
66436669
+ [Valid] EF - heze - Sanity - Blocks - multiple_different_proposer_slashings_same_block [ OK
66446670
+ [Valid] EF - heze - Sanity - Blocks - multiple_different_validator_exits_same_block [Pre OK
66456671
+ [Valid] EF - heze - Sanity - Blocks - partial_withdrawal_in_epoch_transition [Preset: mi OK

‎beacon_chain/beacon_chain_db.nim‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,11 @@ proc new*(T: type BeaconChainDB,
602602
"lc_electra_current_branches"
603603
else:
604604
"",
605+
gloasCurrentBranches:
606+
if cfg.GLOAS_FORK_EPOCH != FAR_FUTURE_EPOCH:
607+
"lc_gloas_current_branches"
608+
else:
609+
"",
605610
altairSyncCommittees: "lc_altair_sync_committees",
606611
legacyAltairBestUpdates: "lc_altair_best_updates",
607612
bestUpdates: "lc_best_updates",

0 commit comments

Comments
 (0)