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

Added terminalTotalDifficulty field in ChainConfig #2900

Merged
merged 5 commits into from
Nov 3, 2021
Merged

Added terminalTotalDifficulty field in ChainConfig #2900

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8dbfc47
added TerminalTotalDifficulty to chain config (EIP-3675)
Giulio2002 Oct 31, 2021
58c2f58
better comments
Giulio2002 Oct 31, 2021
485c5c6
better omitempty
Giulio2002 Oct 31, 2021
e971c12
lint
Giulio2002 Nov 1, 2021
54fd757
Update config.go
Giulio2002 Nov 2, 2021
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
2 changes: 2 additions & 0 deletions params/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,8 @@ type ChainConfig struct {
LondonBlock *big.Int `json:"londonBlock,omitempty"` // London switch block (nil = no fork, 0 = already on london)
ArrowGlacierBlock *big.Int `json:"arrowGlacierBlock,omitempty"` // EIP-4345 (bomb delay) switch block (nil = no fork, 0 = already activated)

// EIP-3675: Upgrade consensus to Proof-of-Stake
TerminalTotalDifficulty *big.Int `json:"terminalTotalDifficulty,omitempty"` // The merge happens when terminal total difficulty is reached
// Various consensus engines
Ethash *EthashConfig `json:"ethash,omitempty"`
Clique *CliqueConfig `json:"clique,omitempty"`
Expand Down