Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge queue: embarking unstable (758b58c) and #5712 together #5988

Closed
wants to merge 102 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 24, 2024

🎉 This pull request has been checked successfully and will be merged soon. 🎉

Branch unstable (758b58c) and #5712 are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of #5712.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue default for merge:

  • check-success=local-testnet-success
  • check-success=test-suite-success

Required conditions to stay in the queue:

---
previous_failed_batches: []
pull_requests:
  - number: 5712
...

eserilev and others added 30 commits April 30, 2024 11:49
* update

* experiment

* superstruct changes

* revert

* superstruct changes

* fix tests

* indexed attestation

* indexed attestation superstruct

* updated TODOs
* `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>
* Upgrade `superstruct` to `0.8.0`

* superstruct `AggregateAndProof`
Merge unstable into Electra attestation changes
* 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
* fix get attesting indices

* better errors

* fix compile

* only get committee index once
* attestation related ef test fixes

* delete commented out stuff
* Fix Aggregation Pool for Electra

* Remove Outdated Interface
* 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>
* add compute_on_chain_agg impl to op pool changes

* fmt

* get op pool tests to pass
Optimise Electra op pool aggregation
* subscribe to the correct att subnets for electra

* subscribe to the correct att subnets for electra
dapplion and others added 27 commits June 19, 2024 11:31
* dedup/cleanup and remove unneeded hashset use

* remove irrelevant TODOs
* 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
@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ realbigsean
❌ mergify[bot]
You have signed the CLA already but the status is still pending? Let us recheck it.

@mergify mergify bot closed this Jun 24, 2024
@mergify mergify bot deleted the mergify/merge-queue/b0d0718461 branch June 24, 2024 21:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants