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

fix for dev_net setup #19

Merged
merged 1 commit into from
Nov 27, 2023
Merged

fix for dev_net setup #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions chain/chain_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,8 @@ func (c *Config) IsGrayGlacier(num uint64) bool {
}

// IsShanghai returns whether time is either equal to the Shanghai fork time or greater.
func (c *Config) IsShanghai(time uint64) bool {
return isForked(c.ShanghaiTime, time)
func (c *Config) IsShanghai(num uint64, time uint64) bool {
return c.IsLondon(num) && isForked(c.ShanghaiTime, time)
}

// IsCancun returns whether time is either equal to the Cancun fork time or greater.
Expand Down Expand Up @@ -739,7 +739,7 @@ func (c *Config) Rules(num uint64, time uint64) *Rules {
IsIstanbul: c.IsIstanbul(num),
IsBerlin: c.IsBerlin(num),
IsLondon: c.IsLondon(num),
IsShanghai: c.IsShanghai(time),
IsShanghai: c.IsShanghai(num, time),
IsCancun: c.IsCancun(time),
IsPrague: c.IsPrague(time),
IsNano: c.IsNano(num),
Expand Down
Loading