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

EIP-7251 add consolidation request type #7266

Merged
merged 42 commits into from
Jul 16, 2024
Merged

EIP-7251 add consolidation request type #7266

merged 42 commits into from
Jul 16, 2024

Commits on Jun 26, 2024

  1. add request type for consolidations, encoder, decoder and tests 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    3ab66c6 View commit details
    Browse the repository at this point in the history

  2. added conslidation request lists processing 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    1804cd9 View commit details
    Browse the repository at this point in the history

  3. plugin api hash update 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    d471124 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' of github.com:hyperledger/besu into 7251-consolid… 

    …ation-request
    @macfarla
    macfarla committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    21255ee View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. Merge branch 'main' of github.com:hyperledger/besu into 7251-consolid… 

    …ation-request
    @macfarla
    macfarla committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    a6cdd29 View commit details
    Browse the repository at this point in the history

  2. added validator and todo for processor 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    b276971 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of github.com:hyperledger/besu into 7251-consolid… 

    …ation-request
    @macfarla
    macfarla committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    49185ff View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. merge 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    86ddbd6 View commit details
    Browse the repository at this point in the history

  2. update hash for plugin api 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    191e0c6 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Merge branch 'main' of github.com:hyperledger/besu into 7251-consolid… 

    …ation-request
    @macfarla
    macfarla committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    abe4fa5 View commit details
    Browse the repository at this point in the history

  2. add bytecode for consolidation contract 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    261c48b View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. updated hashes for blocks starting with genesis 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    6d754cc View commit details
    Browse the repository at this point in the history

  2. merge 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    a2fd61b View commit details
    Browse the repository at this point in the history

  3. minor fixes 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    f19e53f View commit details
    Browse the repository at this point in the history

  4. updated plugin hash 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    3c6510a View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. fixed block hash and state root for remaining tests 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    d5f7740 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of github.com:hyperledger/besu into 7251-consolid… 

    …ation-request
    @macfarla
    macfarla committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    1ed399b View commit details
    Browse the repository at this point in the history

  3. formatting 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    43d868c View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. added raw tx for consolidation 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    3faa927 View commit details
    Browse the repository at this point in the history

  2. allow empty consolidation requests 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    2620468 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of github.com:hyperledger/besu into 7251-consolid… 

    …ation-request
    @macfarla
    macfarla committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    2f96b3b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into 7251-consolidation-request

    @macfarla
    macfarla committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    7c902d7 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. Merge branch 'main' of github.com:hyperledger/besu into 7251-consolid… 

    …ation-request
    @macfarla
    macfarla committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    2208035 View commit details
    Browse the repository at this point in the history

  2. add consolidation reqs to EngineGetPayloadResultV4 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    59ad51e View commit details
    Browse the repository at this point in the history

  3. add consolidation requests to tests 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    b639c35 View commit details
    Browse the repository at this point in the history

  4. nonce 1 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    3ae41f9 View commit details
    Browse the repository at this point in the history

  5. consolidation request in output payload 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    9f8598e View commit details
    Browse the repository at this point in the history

  6. consolidation request transaction had nonce 2 too far ahead 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    9884cb7 View commit details
    Browse the repository at this point in the history

  7. don't need the next block 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    5694b15 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' of github.com:hyperledger/besu into 7251-consolid… 

    …ation-request
    @macfarla
    macfarla committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    4a4b168 View commit details
    Browse the repository at this point in the history

  9. source address 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    ad60631 View commit details
    Browse the repository at this point in the history

  10. set storage slot value to 0 initially and value for tx 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    2bb468f View commit details
    Browse the repository at this point in the history

  11. Pubkey not PubKey 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    d622664 View commit details
    Browse the repository at this point in the history

  12. don't need another payload 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    27c7c8c View commit details
    Browse the repository at this point in the history

  13. Merge branch 'main' of github.com:hyperledger/besu into 7251-consolid… 

    …ation-request
    @macfarla
    macfarla committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    f70a955 View commit details
    Browse the repository at this point in the history

  14. consistency of variable names 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    505ee00 View commit details
    Browse the repository at this point in the history

  15. Merge branch '7251-consolidation-request' of github.com:macfarla/besu… 

    … into 7251-consolidation-request
    @macfarla
    macfarla committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    96dda36 View commit details
    Browse the repository at this point in the history

  16. updates plugin api 

    Signed-off-by: Justin Florentine <[email protected]>
    @jflo
    jflo committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    a0a4fe0 View commit details
    Browse the repository at this point in the history

  17. updated API hash 

    Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    0611f7e View commit details
    Browse the repository at this point in the history

  18. Merge branch '7251-consolidation-request' of github.com:macfarla/besu… 

    … into 7251-consolidation-request
    @macfarla
    macfarla committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    134e0c1 View commit details
    Browse the repository at this point in the history

  19. reverted addition of consolidation contract into t8n test files, just… 

    … add consolidation requests [] to expected output

Signed-off-by: Sally MacFarlane <[email protected]>
    @macfarla
    macfarla committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    c3300dc View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. Merge branch 'main' into 7251-consolidation-request

    @macfarla
    macfarla committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    56bec94 View commit details
    Browse the repository at this point in the history