Skip to content

minor Merge and forkchoice updates release#2733

Merged
djrtwo merged 66 commits intomasterfrom
dev
Nov 24, 2021
Merged

minor Merge and forkchoice updates release#2733
djrtwo merged 66 commits intomasterfrom
dev

Conversation

@djrtwo
Copy link
Contributor

@djrtwo djrtwo commented Nov 22, 2021 •
edited
Loading

hwwhww and others added 30 commits November 2, 2021 14:47
@hwwhww
Make altair transition tests support merge forks
0b0fe15
@hwwhww @ralexstokes
Apply suggestions from code review
fa4dc0c 
Co-authored-by: Alex Stokes <r.alex.stokes@gmail.com>
@hwwhww
ALL_FORKS sounds like a list of fork names. Rename it to `ALL_FORK_…
0641d1c 
…UPGRADES`
@paulhauner
Patch for genesis blocks
6cfd38e
@djrtwo
Apply suggestions from code review
61207c5
@djrtwo
Merge pull request #2719 from paulhauner/patch-33
fb34e16 
Genesis execution block handling
@hwwhww
Merge branch 'dev' into transition-reuse
e70da78
@hwwhww
Add a sample altair-to-merge-only transition
49d96f9
@djrtwo
working through test issues
cd3d2ce
@hwwhww
Fix issue around on_attestation validation by skipping epoch scope
f643554 
validation if attestation is from a block message
@hwwhww
Refactoring
d9e8306
@hwwhww
Fix test_transition_with_one_fourth_exiting_validators_exit_at_fork…
f0bb032 
… assertions
@hwwhww
Minor refactoring and add comments
63c9e5e
@paulhauner
Remove difficulty from PowBlock
16aaf74
@hwwhww
Add The Merge spec to coverage report targets
257173f
@hwwhww
Add a test to cover the case of is_execution_enabled result is false
2b9692a
@hwwhww
Clean PowBlock.difficulty leftover
79f1f16
@hwwhww
Fix get_pow_block_at_terminal_total_difficulty and add unit tests
e56bbb8
@hwwhww
PR feedback from @mkalinin
2876209
@djrtwo
cleanup forkchoice tests
eb00f8f
@djrtwo
port phase0 forkchocie changes to merge
3d4ece4
@hwwhww
Resolve the commented out code in `test_new_finalized_slot_is_not_jus…
2c865e3 
…tified_checkpoint_ancestor`
@mkalinin
Rename coinbase to fee_recipient
58968f9
@djrtwo
Merge pull request #2728 from mkalinin/coinbase-to-fee_recipient
140f30d 
Rename coinbase to fee_recipient
@djrtwo
Merge pull request #2720 from paulhauner/patch-34
dc14b79 
Remove `difficulty` from `PowBlock`
@djrtwo
Update specs/merge/validator.md
8333514
@djrtwo
Merge pull request #2723 from ethereum/add-test_is_execution_enabled_…
e7df64b 
…false

Add a test to cover the case of `is_execution_enabled` result is false
@djrtwo
Merge pull request #2721 from ethereum/cov-merge
b898810 
Add The Merge spec to coverage report targets
@djrtwo
Merge pull request #2726 from ethereum/get_pow_block_at_ttd-tests
3c25da8 
Fix `get_pow_block_at_terminal_total_difficulty` and add unit tests
@hwwhww
Merge pull request #2706 from ethereum/transition-reuse
29beba6
djrtwo and others added 6 commits November 22, 2021 11:39
@djrtwo
toc
ea09df5
@adiasg
Apply Danny's code review & suggestions
1d835c5
@adiasg
Rename test
d85d439
@qbzzt @djrtwo
How to write tests for the consensus layer (#2700)
9999331 
* Create README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Signed my name

* Update tests/README.md

Co-authored-by: Danny Ryan <dannyjryan@gmail.com>

* Update tests/README.md

Co-authored-by: Danny Ryan <dannyjryan@gmail.com>

* Update tests/README.md

Co-authored-by: Danny Ryan <dannyjryan@gmail.com>

* Update tests/README.md

Co-authored-by: Danny Ryan <dannyjryan@gmail.com>

* Update tests/README.md

Co-authored-by: Danny Ryan <dannyjryan@gmail.com>

* Update tests/README.md

Co-authored-by: Danny Ryan <dannyjryan@gmail.com>

* Update README.md

* Update README.md

Co-authored-by: Danny Ryan <dannyjryan@gmail.com>
@djrtwo
add PROPOSER_SCORE_BOOST to configuration yaml files
64b4ca2
@hwwhww
Add configuration value checks
bdd7b07
@dapplion
Copy link
Member

dapplion commented Nov 23, 2021

@djrtwo CL clients are expected to implement #2730 at any time between now and the merge? Is there any time target or just whenever possible?

@djrtwo
Copy link
Contributor Author

djrtwo commented Nov 23, 2021

I'll put some notes in the release, but ideally, these changes are on merge testnets by roughly end of January and released on the normal release cycle at or before the Merge itself

adiasg and others added 15 commits November 23, 2021 07:02
@adiasg
Apply HWW code's review - fix is_before_attesting_interval
a0b5a80
@benjaminion @hwwhww
Eth1 block hashes have type Hash32 (#2693)
44fec31 
* Eth1 block hashes have type Hash32

* Modify other forks as well

Co-authored-by: Hsiao-Wei Wang <hsiaowei.eth@gmail.com>
@adiasg
Apply HWW code's review - properly update test steps
ecbe919
@adiasg
Set PROPOSER_SCORE_BOOST to 70%
2a5c9d8
@adiasg
Merging local branch to remote latest
6f95637
@hwwhww
Add proposer_boost_root field to test vector "checks" step
2ba0586
@djrtwo
Merge pull request #2736 from ethereum/proposer-score-boost-add-check
40f1c85 
Add `proposer_boost_root` field to test vector "checks" step
@djrtwo
pr feedback
975931b
@hwwhww
Fix spec typo and add test_prepare_execution_payload unit tests
8050de3
@djrtwo
Merge pull request #2730 from ethereum/proposer-score-boost
395fdd4 
Proposer LMD Score Boosting
@djrtwo
Merge pull request #2737 from ethereum/test_prepare_execution_payload
32e8ca2 
Fix spec typo and add `test_prepare_execution_payload` unit tests
@djrtwo
is_merge -> is_merge_transition
a0d008b
@djrtwo
Merge pull request #2738 from ethereum/fix-names
69e7f58 
is_merge -> is_merge_transition
@djrtwo
bump VERSION.txt to 1.1.6
4370b9c
@djrtwo
Merge pull request #2739 from ethereum/bump-version
3a5f7d3 
bump VERSION.txt to 1.1.6
djrtwo
djrtwo commented Nov 23, 2021
View reviewed changes
Copy link
Contributor Author

@djrtwo djrtwo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor typos in config yaml

djrtwo
djrtwo commented Nov 23, 2021
View reviewed changes
tests/core/pyspec/eth2spec/test/phase0/fork_choice/test_on_block.py


@with_all_phases
@spec_state_test
Copy link
Contributor Author

@djrtwo djrtwo Nov 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These new tests should probably have. My test vector build is insanely slow

@with_presets([MINIMAL], reason="too slow")

Copy link
Contributor Author

@djrtwo djrtwo Nov 23, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nevermind, it's the transition tests iiuc and I believe the addition of Altair->Merge makes these two 40 minute builds additive. Should consider parallelization of these generators

@djrtwo djrtwo changed the title [DO NOT MERGE] minor Merge release minor Merge and forkchoice updates release Nov 24, 2021
@djrtwo djrtwo merged commit c81c27e into master Nov 24, 2021
@dapplion dapplion mentioned this pull request Nov 30, 2021
Closed
2 tasks
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

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@djrtwo @dapplion @hwwhww @paulhauner @mkalinin @adiasg @qbzzt @benjaminion