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

params: fix log + errors for Cancun timestamp #368

Merged
merged 2 commits into from
Nov 3, 2023
Merged

params: fix log + errors for Cancun timestamp #368

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48850bc
params: fix log + errors for Cancun timestamp
darioush Oct 31, 2023
ce64d86
Update params/config.go
darioush Nov 2, 2023
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
4 changes: 2 additions & 2 deletions params/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ func (c *ChainConfig) Description() string {
banner += fmt.Sprintf(" - Banff Timestamp: #%-8v (https://github.com/ava-labs/avalanchego/releases/tag/v1.9.0)\n", c.BanffBlockTimestamp)
banner += fmt.Sprintf(" - Cortina Timestamp: #%-8v (https://github.com/ava-labs/avalanchego/releases/tag/v1.10.0)\n", c.CortinaBlockTimestamp)
banner += fmt.Sprintf(" - DUpgrade Timestamp: #%-8v (https://github.com/ava-labs/avalanchego/releases/tag/v1.11.0)\n", c.DUpgradeBlockTimestamp)
banner += fmt.Sprintf(" - Cancun Timestamp: #%-8v (https://github.com/ava-labs/avalanchego/releases/tag/v1.11.0)\n", c.DUpgradeBlockTimestamp)
banner += fmt.Sprintf(" - Cancun Timestamp: #%-8v (https://github.com/ava-labs/avalanchego/releases/tag/v1.12.0)\n", c.CancunTime)
banner += "\n"
return banner
}
Expand Down Expand Up @@ -901,7 +901,7 @@ func (c *ChainConfig) checkCompatible(newcfg *ChainConfig, height *big.Int, time
return newTimestampCompatError("DUpgrade fork block timestamp", c.DUpgradeBlockTimestamp, newcfg.DUpgradeBlockTimestamp)
}
if isForkTimestampIncompatible(c.CancunTime, newcfg.CancunTime, time) {
return newTimestampCompatError("Cancun fork block timestamp", c.DUpgradeBlockTimestamp, newcfg.DUpgradeBlockTimestamp)
return newTimestampCompatError("Cancun fork block timestamp", c.CancunTime, newcfg.CancunTime)
}

return nil
Expand Down