Skip to content

[Merged by Bors] - Enforce Optimistic Sync Conditions & CLI Tests (v2) - #3050

Closed
paulhauner wants to merge 18 commits into
sigp:unstablefrom
paulhauner:opt-cond-fix
Closed

[Merged by Bors] - Enforce Optimistic Sync Conditions & CLI Tests (v2)#3050
paulhauner wants to merge 18 commits into
sigp:unstablefrom
paulhauner:opt-cond-fix

Conversation

@paulhauner

@paulhauner paulhauner commented Mar 1, 2022

Copy link
Copy Markdown
Member

Description

This PR adds a single, trivial commit (f5d2b27) atop #2986 to resolve a tests compile error. The original author (@ethDreamer) is AFK so I'm getting this one merged ☺️

Please see #2986 for more information about the other, significant changes in this PR.

ethDreamer and others added 18 commits February 22, 2022 12:54
@ethDreamer
Added Spec Restrictions on Optimistic Block Import
3df6da8
@ethDreamer
Add Tests for Bellatrix CLI flags/Fix Peer Scoring
467eb44
@ethDreamer @realbigsean
Update beacon_node/beacon_chain/src/block_verification.rs
59a527c 
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
@ethDreamer @realbigsean
Update lighthouse/tests/exec.rs
b3cce88 
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
@ethDreamer @realbigsean
Update beacon_node/beacon_chain/src/execution_payload.rs
a6fce33 
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
@ethDreamer @realbigsean
Update lighthouse/tests/exec.rs
db3fa65 
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
@ethDreamer
Addressed Sean's Comments
e6863c1
@ethDreamer
Fixed Comment
3e652b4
@paulhauner
Add just/fin block getters to fork choice
58393c2
@paulhauner
Add first version of safe check
418f836
@paulhauner
Add is_optimistic_candidate_block to fork choice
8c30461
@ethDreamer @paulhauner
Update beacon_node/beacon_chain/src/execution_payload.rs
ba171ab 
Co-authored-by: Paul Hauner <paul@paulhauner.com>
@ethDreamer
Merge pull request sigp#5 from paulhauner/optimistic_conditions_paul
f01e56d 
Suggestions for `optimistic_conditions` branch
@ethDreamer
Created Function to Reduce Duplicated Code
dbedc93
@ethDreamer
Merge branch 'unstable' into optimistic_conditions
8a6c32b
@paulhauner
Fix compile issue from merge
2440614
@ethDreamer
Merge pull request sigp#6 from paulhauner/opt-cond-merge
760e69a 
Fix merge conflict
@paulhauner
Change hash to exec block hash
f5d2b27
@paulhauner paulhauner added the bellatrix Required to support the Bellatrix Upgrade label Mar 1, 2022
@paulhauner paulhauner changed the title Opt cond fix Enforce Optimistic Sync Conditions & CLI Tests (v2) Mar 1, 2022
@paulhauner paulhauner mentioned this pull request Mar 1, 2022
Closed
29 tasks
@paulhauner

paulhauner commented Mar 1, 2022

Copy link
Copy Markdown
Member Author

bors r+

These changes have been reviewed in #2986

@paulhauner paulhauner added the ready-for-merge This PR is ready to merge. label Mar 1, 2022
bors Bot pushed a commit that referenced this pull request Mar 1, 2022
@paulhauner @ethDreamer
Enforce Optimistic Sync Conditions & CLI Tests (v2) (#3050)
b6493d5 
## Description

This PR adds a single, trivial commit (f5d2b27) atop #2986 to resolve a tests compile error. The original author (@ethDreamer) is AFK so I'm getting this one merged ☺️ 

Please see #2986 for more information about the other, significant changes in this PR.


Co-authored-by: Mark Mackey <mark@sigmaprime.io>
Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com>
@bors

bors Bot commented Mar 2, 2022

Copy link
Copy Markdown

Pull request successfully merged into unstable.

Build succeeded:

@bors bors Bot changed the title Enforce Optimistic Sync Conditions & CLI Tests (v2) [Merged by Bors] - Enforce Optimistic Sync Conditions & CLI Tests (v2) Mar 2, 2022
@bors bors Bot closed this Mar 2, 2022
@paulhauner paulhauner mentioned this pull request Mar 2, 2022
Closed
1 task
pawanjay176 added a commit to pawanjay176/lighthouse that referenced this pull request Mar 2, 2022
@pawanjay176
Squashed commit of Rename random to prev_randao sigp#3040:
1630817 
commit 6370edd
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 16:31:18 2022 +1100

    Update testing/execution_engine_integration/src/build_geth.rs

    Co-authored-by: Michael Sproul <micsproul@gmail.com>

commit f5a1dee
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 16:24:03 2022 +1100

    Fix proto-array bug

commit 4f7610f
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 16:23:52 2022 +1100

    Fix payload tests

commit cd7a0f5
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 15:22:54 2022 +1100

    Implement consensus-specs/2844

commit 5313364
Merge: d5e84a5 668115a
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 14:23:19 2022 +1100

    Merge branch 'unstable' into prev-randao-rename

commit d5e84a5
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 13:31:45 2022 +1100

    Fix windows test errors

commit 668115a
Author: Akihito Nakano <sora.akatsuki@gmail.com>
Date:   Wed Mar 2 01:05:08 2022 +0000

    Rename Eth1/Eth2 in documents (sigp#3021)

    ## Issue Addressed

    Resolves sigp#3019

    ## Proposed Changes

    - Eth2 Eth2.0 Ethereum 2.0 -> Ethereum consensus
    - Eth2 network -> consensus layer
    - Ethereum 2.0 specification -> Ethereum proof-of-stake consensus specification
    - Eth2 deposit contract -> Staking deposit contract
    - Eth1 -> execution client

    ## Additional Info

    The description needs to be updated by someone who has permission to do. 📝

    <img width="487" alt="image" src="https://user-images.githubusercontent.com/1885716/153995211-816d9561-751e-4810-abb9-83d979379783.png">

commit e34524b
Author: Age Manning <Age@AgeManning.com>
Date:   Wed Mar 2 01:05:07 2022 +0000

    Increase default target-peer count to 80 (sigp#3005)

    Increase the default peer count from 50 to 80

commit db2e3ae
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 11:08:40 2022 +1100

    Fix yaml indenting

commit a2f99e5
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 11:05:57 2022 +1100

    Specify go version in github actions

commit 0c5e9c6
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 11:04:15 2022 +1100

    Switch EE tests to be a binary

commit 7f07fa5
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 10:22:32 2022 +1100

    Print output of failed make command

commit fa20696
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 10:01:00 2022 +1100

    Bump spec tests version

commit c2d7677
Author: Paul Hauner <paul@paulhauner.com>
Date:   Sat Feb 26 10:17:14 2022 +1100

    Add auth port

commit 540337a
Author: Paul Hauner <paul@paulhauner.com>
Date:   Sat Feb 26 10:10:06 2022 +1100

    Use `merge-kiln-v2` branch for geth

commit 1a3d32e
Author: Paul Hauner <paul@paulhauner.com>
Date:   Fri Feb 25 15:08:38 2022 +1100

    Revert "Add serde "random" alias"

    This reverts commit bb02c2f.

commit 63376bd
Author: Paul Hauner <paul@paulhauner.com>
Date:   Fri Feb 25 14:59:26 2022 +1100

    Add serde "random" alias

commit 375aa32
Author: Paul Hauner <paul@paulhauner.com>
Date:   Fri Feb 25 10:09:38 2022 +1100

    Rename random to prev_randao

commit b6493d5
Author: Paul Hauner <paul@paulhauner.com>
Date:   Tue Mar 1 22:56:47 2022 +0000

    Enforce Optimistic Sync Conditions & CLI Tests (v2) (sigp#3050)

    ## Description

    This PR adds a single, trivial commit (f5d2b27) atop sigp#2986 to resolve a tests compile error. The original author (@ethDreamer) is AFK so I'm getting this one merged ☺️

    Please see sigp#2986 for more information about the other, significant changes in this PR.

    Co-authored-by: Mark Mackey <mark@sigmaprime.io>
    Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

bellatrix Required to support the Bellatrix Upgrade ready-for-merge This PR is ready to merge.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@paulhauner @ethDreamer