|
|
@ -642,7 +642,7 @@ func (c *ChainConfig) CheckConfigForkOrder() error { |
|
|
|
lastFork.name, cur.name, cur.block) |
|
|
|
lastFork.name, cur.name, cur.block) |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
return fmt.Errorf("unsupported fork ordering: %v not enabled, but %v enabled at timestamp %v", |
|
|
|
return fmt.Errorf("unsupported fork ordering: %v not enabled, but %v enabled at timestamp %v", |
|
|
|
lastFork.name, cur.name, cur.timestamp) |
|
|
|
lastFork.name, cur.name, *cur.timestamp) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Fork (whether defined by block or timestamp) must follow the fork definition sequence
|
|
|
|
// Fork (whether defined by block or timestamp) must follow the fork definition sequence
|
|
|
@ -652,7 +652,7 @@ func (c *ChainConfig) CheckConfigForkOrder() error { |
|
|
|
lastFork.name, lastFork.block, cur.name, cur.block) |
|
|
|
lastFork.name, lastFork.block, cur.name, cur.block) |
|
|
|
} else if lastFork.timestamp != nil && *lastFork.timestamp > *cur.timestamp { |
|
|
|
} else if lastFork.timestamp != nil && *lastFork.timestamp > *cur.timestamp { |
|
|
|
return fmt.Errorf("unsupported fork ordering: %v enabled at timestamp %v, but %v enabled at timestamp %v", |
|
|
|
return fmt.Errorf("unsupported fork ordering: %v enabled at timestamp %v, but %v enabled at timestamp %v", |
|
|
|
lastFork.name, lastFork.timestamp, cur.name, cur.timestamp) |
|
|
|
lastFork.name, *lastFork.timestamp, cur.name, *cur.timestamp) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Timestamp based forks can follow block based ones, but not the other way around
|
|
|
|
// Timestamp based forks can follow block based ones, but not the other way around
|
|
|
|