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

Pure consensus upgrade version of the merge #2257

Merged
merged 24 commits into from
Mar 26, 2021
Merged

Pure consensus upgrade version of the merge #2257

merged 24 commits into from
Mar 26, 2021

Commits on Mar 17, 2021

  1. Add initial merge spec

    @mkalinin
    mkalinin committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    0dec828 View commit details
    Browse the repository at this point in the history

  2. Polish beacon chain spec and validator guide

    @mkalinin
    mkalinin committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    ee16163 View commit details
    Browse the repository at this point in the history

  3. Index from GENESIS_SLOT in compute_time_at_slot 

    Co-authored-by: Paul Hauner <paul@paulhauner.com>
    @mkalinin @paulhauner
    mkalinin and paulhauner committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    f6f3687 View commit details
    Browse the repository at this point in the history

  4. Use Vector struct for recent_block_roots field 

    Co-authored-by: Paul Hauner <paul@paulhauner.com>
    @mkalinin @paulhauner
    mkalinin and paulhauner committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    3fb5f2e View commit details
    Browse the repository at this point in the history

  5. Add a line break in get_recent_beacon_block_roots 

    Co-authored-by: Danny Ryan <dannyjryan@gmail.com>
    @mkalinin @djrtwo
    mkalinin and djrtwo committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    5435324 View commit details
    Browse the repository at this point in the history

  6. Fix spelling 

    Co-authored-by: Danny Ryan <dannyjryan@gmail.com>
    @mkalinin @djrtwo
    mkalinin and djrtwo committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    3c9cd85 View commit details
    Browse the repository at this point in the history

  7. Lable Added/Remove notes with Merge explicitly

    @mkalinin
    mkalinin committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    a368f5d View commit details
    Browse the repository at this point in the history

  8. Remove min(..., ...) in get_evm_beacon_block_roots

    @mkalinin
    mkalinin committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    b8e16c1 View commit details
    Browse the repository at this point in the history

  9. Add rebase-to-Altair warning

    @mkalinin
    mkalinin committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    bf15164 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2021

  1. Strip down the merge to the pure consensus upgrade

    @mkalinin
    mkalinin committed Mar 20, 2021
    Configuration menu
    Copy the full SHA
    46fc8a1 View commit details
    Browse the repository at this point in the history

  2. Verify transition block to be assembled correctly

    @mkalinin
    mkalinin committed Mar 20, 2021
    Configuration menu
    Copy the full SHA
    3420e51 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2021

  1. Fix block_body variable in is_transition_block 

    Co-authored-by: terence tsao <terence@prysmaticlabs.com>
    @mkalinin @terencechain
    mkalinin and terencechain authored Mar 22, 2021
    Configuration menu
    Copy the full SHA
    24dc8a2 View commit details
    Browse the repository at this point in the history

  2. Verify that ApplicationPayload is zeroed before the transition

    @mkalinin
    mkalinin committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    38a455c View commit details
    Browse the repository at this point in the history

  3. Simplify merge.BeaconState definition

    @mkalinin
    mkalinin committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    83453d2 View commit details
    Browse the repository at this point in the history

  4. Boolean -> boolean

    @mkalinin
    mkalinin committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    7e6ac4e View commit details
    Browse the repository at this point in the history

  5. Distinguish invalid and not processed transition block

    @mkalinin
    mkalinin committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    96de910 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2021

  1. Address various cleanups and formatting suggestions

    @mkalinin
    mkalinin committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    ea5f606 View commit details
    Browse the repository at this point in the history

  2. Standardise PowBlock between fork-choice and validator

    @mkalinin
    mkalinin committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    63ae9f2 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2021

  1. Address a new portion of comments and fixes

    @mkalinin
    mkalinin committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    ee5ecf8 View commit details
    Browse the repository at this point in the history

  2. Bytes1 to byte in ApplicationPayload.logs_bloom

    @mkalinin
    mkalinin committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    a23bde3 View commit details
    Browse the repository at this point in the history

  3. Polish merge/fork-choice.md

    @mkalinin
    mkalinin committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    260a0a5 View commit details
    Browse the repository at this point in the history

  4. Use ByteList[N] and ByteVector[N] types

    @mkalinin
    mkalinin committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    81a2c2c View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2021

  1. minor edits from code review 

    Co-authored-by: terence tsao <terence@prysmaticlabs.com>
    @djrtwo @terencechain
    djrtwo and terencechain authored Mar 26, 2021
    Configuration menu
    Copy the full SHA
    41a087a View commit details
    Browse the repository at this point in the history

  2. byte-list for opaque transaction payload

    @djrtwo
    djrtwo committed Mar 26, 2021
    Configuration menu
    Copy the full SHA
    223aba3 View commit details
    Browse the repository at this point in the history