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 (a64cee3) and #5761 together #6020

Closed
wants to merge 163 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 28, 2024

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

Branch unstable (a64cee3) and #5761 are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of #5761.
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: 5761
...

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 <[email protected]>
* 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
realbigsean and others added 27 commits June 20, 2024 09:36
* 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.
4 out of 5 committers have signed the CLA.

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

@mergify mergify bot closed this Jun 28, 2024
@mergify mergify bot deleted the mergify/merge-queue/c02a3fc49d branch June 28, 2024 23:43
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