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.

Sign up for GitHub

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

Jump to bottom

Ensure merge transition block contains 🐼 #2875

Closed
wants to merge 3 commits into from
Closed

Ensure merge transition block contains 🐼 #2875

wants to merge 3 commits into from

Commits on Apr 24, 2022

  1. Ensure merge transition block contains 🐼 

    Given the importance of graffitis for representing significant moments
in blockchain history, e.g., Bitcoin and beacon chain genesis blocks,
the merge transition block's graffiti MUST refer to the panda as the
universally agreed mascot. This patch ensures that all implementations
adhere to this convention.

Co-authored-by: dapplion <[email protected]>
    @etan-status @dapplion
    etan-status and dapplion committed Apr 24, 2022
    Configuration menu
    Copy the full SHA
    602aed3 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2022

  1. Delay merge if configured graffiti lacks 🐼 

    When building `BeaconBlockBody`, if the configured `graffiti` is not
compatible with the fork choice rules for the merge transition block,
build a regular block without `ExecutionPayload` instead.
    @etan-status
    etan-status committed Apr 25, 2022
    Configuration menu
    Copy the full SHA
    e479506 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2022

  1. Merge branch 'dev' into 🐼 

    Resolve merge conflicts from fixes being accepted into `dev` that have
been discovered as part of 🐼 work: #2876
    @etan-status
    etan-status committed May 3, 2022
    Configuration menu
    Copy the full SHA
    87a657d View commit details
    Browse the repository at this point in the history