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

[Merged by Bors] - Log ttd #3339

Closed
wants to merge 12 commits into from
Closed

[Merged by Bors] - Log ttd #3339

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a6d5283
Initial commit
pawanjay176 Jul 15, 2022
bb5f47a
Tidy
pawanjay176 Jul 19, 2022
efd9e7e
lint
pawanjay176 Jul 19, 2022
ab1acdf
Add merge readiness draft
paulhauner Jul 19, 2022
41f662b
Refactor with merge_readiness module
pawanjay176 Jul 19, 2022
2b414d3
Add an endpoint for exchange_transition in mock execution
pawanjay176 Jul 19, 2022
8eea255
Tidy
pawanjay176 Jul 19, 2022
96a8df8
More cleanup
pawanjay176 Jul 19, 2022
ea27d8e
Add delay before warning about bellatrix
paulhauner Jul 20, 2022
6c8f5c6
Tidy
paulhauner Jul 20, 2022
86d6d62
Appease clippy
paulhauner Jul 20, 2022
04dcdae
Reduce prep time to 1 week
paulhauner Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Appease clippy
  • Loading branch information
@paulhauner
paulhauner committed Jul 20, 2022
commit 86d6d62412771d5a6b2ac217d8faad6a6e41efe1
10 changes: 2 additions & 8 deletions beacon_node/beacon_chain/src/merge_readiness.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,8 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
let merge_readiness_preparation_slots =
MERGE_READINESS_PREPARATION_SECONDS / self.spec.seconds_per_slot;

if current_slot + merge_readiness_preparation_slots > bellatrix_slot {
// Bellatrix is either nearby or has already happened, time to prepare!
true
} else {
// The Bellatrix fork epoch is far enough in the future that we don't need to
// prepare yet.
false
}
// Return `true` if Bellatrix has happened or is within the preparation time.
current_slot + merge_readiness_preparation_slots > bellatrix_slot
} else {
// The Bellatrix fork epoch has not been defined yet, no need to prepare.
false
Expand Down