Commit Graph

6435 Commits

Author SHA1 Message Date
realbigsean
a8d84d69c5 Merge branch 'electra_attestation_changes' of https://github.com/realbigsean/lighthouse into block-processing-electra 2024-06-25 13:05:27 -07:00
realbigsean
87fde510b8 Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes 2024-06-25 13:04:57 -07:00
ethDreamer
c52c598f69 Electra: Remaining Consensus Data Structures (#5712)
* 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

* 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)

* cargo fmt (#5740)

* Sketch op pool changes

* 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)

* 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 commit ab9e58aa3d.

* Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into electra_op_pool

* Compute on chain aggregate impl (#5752)

* add compute_on_chain_agg impl to op pool changes

* fmt

* get op pool tests to pass

* update the naive agg pool interface (#5760)

* Fix bugs in cross-committee aggregation

* Add comment to max cover optimisation

* Fix assert

* Merge pull request #5749 from sigp/electra_op_pool

Optimise Electra op pool aggregation

* update committee offset

* Fix Electra Fork Choice Tests (#5764)

* 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

* fix slashing handling

* 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

* 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

* 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

* fix compile

* 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

* 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

* 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
2024-06-24 21:08:07 +00:00
chonghe
758b58c9e9 Update slasher DB size and Lighthouse book (#5934)
* Update book

* Fix

* mdlint

* Revise

* Update slasher doc

* Revise max db size

* change blob to file

* Add checkpoint-blobs

* Thanks Jimmy for the command

* Update schema docs
2024-06-23 23:52:15 +00:00
realbigsean
d137881614 Update beacon_node/beacon_chain/src/attestation_verification.rs 2024-06-21 13:13:07 -04:00
realbigsean
68fd7a7881 Update beacon_node/beacon_chain/src/attestation_verification.rs 2024-06-21 13:09:56 -04:00
realbigsean
cf030d0a8a Merge pull request #5975 from michaelsproul/electra-slasher-no-migration
Avoid changing slasher schema for Electra
2024-06-21 11:25:01 -04:00
realbigsean
5517c78102 Merge pull request #5980 from dapplion/electra-lightclient
Add electra lightclient types
2024-06-21 11:24:33 -04:00
realbigsean
8fc533368c fix imports 2024-06-21 10:57:35 -04:00
realbigsean
09141ec51a Update slasher/src/database.rs 2024-06-21 10:48:43 -04:00
dapplion
8715589e40 Add electra lightclient types 2024-06-21 14:50:03 +02:00
Lion - dapplion
7509cf6d3b Update per_block_processing.rs 2024-06-21 09:55:23 +02:00
Lion - dapplion
70a80d5da0 Update database.rs 2024-06-21 09:48:35 +02:00
Michael Sproul
339d1b8229 Fix compilation of beacon_chain tests 2024-06-21 17:36:45 +10:00
Michael Sproul
13b1b05960 Fix clippy 2024-06-21 17:03:06 +10:00
Michael Sproul
ebbb17b6bc Delete slasher schema v4 2024-06-21 14:21:36 +10:00
Michael Sproul
b6913ae542 Avoid changing slasher schema for Electra 2024-06-21 14:21:36 +10:00
realbigsean
27ed90e4dc 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
2024-06-21 14:20:10 +10:00
realbigsean
dd0aa8e2ec Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra 2024-06-20 10:41:17 -04:00
realbigsean
efb8a01e91 Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes 2024-06-20 09:36:56 -04:00
Eitan Seri-Levi
f85a124362 Electra attestation changes from Lions review (#5971)
* dedup/cleanup and remove unneeded hashset use

* remove irrelevant TODOs
2024-06-20 09:36:43 -04:00
dapplion
0e2add2daa Fork aware ssz static attestation tests 2024-06-20 09:58:53 +02:00
realbigsean
381bbaba94 ensure aggregate and proof uses serde untagged on ref 2024-06-19 17:04:47 -04:00
realbigsean
afb9122cc1 update default persisted op pool deserialization 2024-06-19 15:00:33 -04:00
realbigsean
6e4483288a Merge pull request #5940 from dapplion/electra_attestation_changes_lionreview
Electra attestations #5712 review
2024-06-19 13:52:19 -04:00
realbigsean
3977b92c49 remove dup method get_indexed_attestation_from_committees 2024-06-19 13:45:47 -04:00
dapplion
d67270f899 committees are sorted 2024-06-19 12:59:27 +02:00
dapplion
a8d8989c05 Use ok_or instead of if let else 2024-06-19 12:50:41 +02:00
dapplion
9e6e76fb89 Remove get_indexed_attestation_from_signed_aggregate 2024-06-19 12:47:38 +02:00
dapplion
70a2d4de10 Use electra_enabled in pubsub 2024-06-19 11:43:41 +02:00
dapplion
cbb7c5d8f4 Test spec invariant 2024-06-19 11:39:45 +02:00
dapplion
370d511223 Fix beacon_chain tests 2024-06-19 11:31:51 +02:00
dapplion
4d4c268e1e Remove stale TODO 2024-06-19 11:31:51 +02:00
dapplion
7fce143300 Resolve into_attestation_and_indices todo 2024-06-19 11:31:50 +02:00
dapplion
4d3edfeaed Use Ord for ForkName in pubsub 2024-06-19 11:31:50 +02:00
dapplion
7521f97ca5 Diff reduction 2024-06-19 11:31:50 +02:00
dapplion
d26473621a Fix beacon_chain tests 2024-06-19 11:31:50 +02:00
dapplion
444cd625ef Diff reduction in tests 2024-06-19 11:31:50 +02:00
dapplion
6f0b78426a Dedup Attestation constructor code 2024-06-19 11:31:50 +02:00
dapplion
6a4d842376 Use if let Ok for committee_bits 2024-06-19 11:31:50 +02:00
dapplion
dec7cff9c7 Dedup attestation constructor logic in attester cache 2024-06-19 11:31:50 +02:00
Lion - dapplion
2634a1f1a6 Update common/eth2/src/types.rs
Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com>
2024-06-19 11:31:50 +02:00
Eitan Seri-Levi
7af3f2eb35 add electra fork enabled fn to ForkName impl (#36)
* add electra fork enabled fn to ForkName impl

* remove inadvertent file
2024-06-19 11:31:50 +02:00
realbigsean
9e84779522 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>
2024-06-19 11:31:50 +02:00
dapplion
45d007a71f Add PendingAttestationInElectra 2024-06-19 11:31:50 +02:00
dapplion
5070ab254d Drop TestRandom impl 2024-06-19 11:31:50 +02:00
dapplion
f0492852f3 Remove IndexedAttestation faulty Decode impl 2024-06-19 11:31:50 +02:00
dapplion
4f08f6e0da Remove TestRandom impl for IndexedAttestation 2024-06-19 11:31:50 +02:00
dapplion
5acc0523df Make to_electra not fallible 2024-06-19 11:31:50 +02:00
dapplion
1d0e3f4d30 Use ForkName Ord in BeaconBlockBody 2024-06-19 11:31:50 +02:00