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.

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

Add terminal block hash override #2617

Merged
merged 10 commits into from
Sep 27, 2021

Conversation

lsankar4033
Copy link
Contributor

This is a rewrite of #2599 in consideration of #2605

Basically, hardcode a TERMINAL_BLOCK_HASH parameter that can be used to override the transition point implied by TERMINAL_TOTAL_DIFFICULTY

Copy link
Collaborator

@mkalinin mkalinin left a comment

Choose a reason for hiding this comment

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

Looks good to me! Left a couple of suggestions

specs/merge/beacon-chain.md Outdated Show resolved Hide resolved
specs/merge/validator.md Outdated Show resolved Hide resolved
Copy link
Contributor

@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.

A couple of minor suggestions. plus lint

specs/merge/client-settings.md Outdated Show resolved Hide resolved
specs/merge/validator.md Outdated Show resolved Hide resolved
@djrtwo
Copy link
Contributor

djrtwo commented Sep 24, 2021

okay, I patched up the lint too! will merge after CI

@lsankar4033
Copy link
Contributor Author

ah, thanks!

@djrtwo djrtwo mentioned this pull request Sep 27, 2021
3 tasks
@djrtwo djrtwo merged commit cc92c2a into ethereum:dev Sep 27, 2021
g11tech added a commit to g11tech/lodestar that referenced this pull request Nov 5, 2021
@tbenr tbenr mentioned this pull request Nov 8, 2021
25 tasks
dapplion pushed a commit to ChainSafe/lodestar that referenced this pull request Nov 15, 2021
* completing ethereum/consensus-specs#2617

* add TBH_ACTIVATION_EPOCH ethereum/consensus-specs#2682

* remove prepare payload specs 2682, add payload id as return to notify_forkchoice... 2711

* remove uniion from transaction (2683), fix gossip and tx size (2686), remove gas validation(2699)

* remove extraneous p2p condition (2687)

* params e2e test fix

* update penalty params for Merge (2698)

* updating spec version

* spec runner merge sanity and operations fixes

* removing the beacon block gossip validations as per 1.1.4

* feedback cleanup

* spec v1.1.5, fixed blockhash (2710), payloadid (2711) already changed, tbh activation check(2712) already correct

* kintsugi geth interop

* ee test fixes

* assetterminalpowblock refac and root comparision fix

* runGethPreMerge test case

* runGethPreMerge scenario with ignoring geth side ttd not reached error

* assertvalidterminalpow block fix

* tracker in comments for geth preMerge to postMerge issue

* merge transition scenario with ttd > 0 check fix deployed on geth:kintsugi-spec

* cleanup as merge-interop test file scenaros updated and working

* handling prepare payload failure scenarios

* seperating optimistic sync, fixing and testing the transaction submission/execution
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants