Add Jovian time config (#463)

* Add Jovian time config

* Add Jovian in all the places

Author: mdehoog

cmd/geth/config.go

@@ -218,6 +218,11 @@ func makeFullNode(ctx *cli.Context) *node.Node {
 		cfg.Eth.OverrideOptimismIsthmus = &v
 	}
 
+	if ctx.IsSet(utils.OverrideOptimismJovian.Name) {
+		v := ctx.Uint64(utils.OverrideOptimismJovian.Name)
+		cfg.Eth.OverrideOptimismJovian = &v
+	}
+
 	if ctx.IsSet(utils.OverrideOptimismInterop.Name) {
 		v := ctx.Uint64(utils.OverrideOptimismInterop.Name)
 		cfg.Eth.OverrideOptimismInterop = &v

cmd/geth/main.go

@@ -70,8 +70,9 @@ var (
 		utils.OverrideOptimismFjord,
 		utils.OverrideOptimismGranite,
 		utils.OverrideOptimismHolocene,
-		utils.OverrideOptimismInterop,
 		utils.OverrideOptimismIsthmus,
+		utils.OverrideOptimismJovian,
+		utils.OverrideOptimismInterop,
 		utils.EnablePersonal, // deprecated
 		utils.TxPoolLocalsFlag,
 		utils.TxPoolNoLocalsFlag,

cmd/utils/flags.go

@@ -273,14 +273,19 @@ var (
 		Usage:    "Manually specify the Optimism Granite fork timestamp, overriding the bundled setting",
 		Category: flags.EthCategory,
 	}
+	OverrideOptimismHolocene = &cli.Uint64Flag{
+		Name:     "override.holocene",
+		Usage:    "Manually specify the Optimism Holocene fork timestamp, overriding the bundled setting",
+		Category: flags.EthCategory,
+	}
 	OverrideOptimismIsthmus = &cli.Uint64Flag{
 		Name:     "override.isthmus",
 		Usage:    "Manually specify the Optimism Isthmus fork timestamp, overriding the bundled setting",
 		Category: flags.EthCategory,
 	}
-	OverrideOptimismHolocene = &cli.Uint64Flag{
-		Name:     "override.holocene",
-		Usage:    "Manually specify the Optimism Holocene fork timestamp, overriding the bundled setting",
+	OverrideOptimismJovian = &cli.Uint64Flag{
+		Name:     "override.jovian",
+		Usage:    "Manually specify the Optimism Jovian fork timestamp, overriding the bundled setting",
 		Category: flags.EthCategory,
 	}
 	OverrideOptimismInterop = &cli.Uint64Flag{

core/genesis.go

@@ -285,6 +285,7 @@ type ChainOverrides struct {
 	OverrideOptimismGranite  *uint64
 	OverrideOptimismHolocene *uint64
 	OverrideOptimismIsthmus  *uint64
+	OverrideOptimismJovian   *uint64
 	OverrideOptimismInterop  *uint64
 	ApplySuperchainUpgrades  bool
 }
@@ -355,6 +356,9 @@ func (o *ChainOverrides) apply(cfg *params.ChainConfig) (*params.ChainConfig, er
 		cpy.IsthmusTime = o.OverrideOptimismIsthmus
 		cpy.PragueTime = o.OverrideOptimismIsthmus
 	}
+	if o.OverrideOptimismJovian != nil {
+		cpy.JovianTime = o.OverrideOptimismJovian
+	}
 	if o.OverrideOptimismInterop != nil {
 		cpy.InteropTime = o.OverrideOptimismInterop
 	}

eth/backend.go

@@ -247,6 +247,9 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 	if config.OverrideOptimismIsthmus != nil {
 		overrides.OverrideOptimismIsthmus = config.OverrideOptimismIsthmus
 	}
+	if config.OverrideOptimismJovian != nil {
+		overrides.OverrideOptimismJovian = config.OverrideOptimismJovian
+	}
 	if config.OverrideOptimismInterop != nil {
 		overrides.OverrideOptimismInterop = config.OverrideOptimismInterop
 	}

eth/ethconfig/config.go

@@ -165,10 +165,12 @@ type Config struct {
 
 	OverrideOptimismHolocene *uint64 `toml:",omitempty"`
 
-	OverrideOptimismInterop *uint64 `toml:",omitempty"`
-
 	OverrideOptimismIsthmus *uint64 `toml:",omitempty"`
 
+	OverrideOptimismJovian *uint64 `toml:",omitempty"`
+
+	OverrideOptimismInterop *uint64 `toml:",omitempty"`
+
 	// ApplySuperchainUpgrades requests the node to load chain-configuration from the superchain-registry.
 	ApplySuperchainUpgrades bool `toml:",omitempty"`
 

eth/ethconfig/gen_config.go

@@ -345,6 +345,7 @@ type ChainConfig struct {
 	GraniteTime  *uint64 `json:"graniteTime,omitempty"`  // Granite switch time (nil = no fork, 0 = already on Optimism Granite)
 	HoloceneTime *uint64 `json:"holoceneTime,omitempty"` // Holocene switch time (nil = no fork, 0 = already on Optimism Holocene)
 	IsthmusTime  *uint64 `json:"isthmusTime,omitempty"`  // Isthmus switch time (nil = no fork, 0 = already on Optimism Isthmus)
+	JovianTime   *uint64 `json:"jovianTime,omitempty"`   // Jovian switch time (nil = no fork, 0 = already on Optimism Jovian)
 
 	InteropTime *uint64 `json:"interopTime,omitempty"` // Interop switch time (nil = no fork, 0 = already on optimism interop)
 
@@ -501,6 +502,9 @@ func (c *ChainConfig) Description() string {
 	if c.IsthmusTime != nil {
 		banner += fmt.Sprintf(" - Isthmus:                     @%-10v\n", *c.IsthmusTime)
 	}
+	if c.JovianTime != nil {
+		banner += fmt.Sprintf(" - Jovian:                      @%-10v\n", *c.JovianTime)
+	}
 	if c.InteropTime != nil {
 		banner += fmt.Sprintf(" - Interop:                     @%-10v\n", *c.InteropTime)
 	}
@@ -659,6 +663,10 @@ func (c *ChainConfig) IsIsthmus(time uint64) bool {
 	return isTimestampForked(c.IsthmusTime, time)
 }
 
+func (c *ChainConfig) IsJovian(time uint64) bool {
+	return isTimestampForked(c.JovianTime, time)
+}
+
 func (c *ChainConfig) IsInterop(time uint64) bool {
 	return isTimestampForked(c.InteropTime, time)
 }
@@ -701,6 +709,10 @@ func (c *ChainConfig) IsOptimismIsthmus(time uint64) bool {
 	return c.IsOptimism() && c.IsIsthmus(time)
 }
 
+func (c *ChainConfig) IsOptimismJovian(time uint64) bool {
+	return c.IsOptimism() && c.IsJovian(time)
+}
+
 // IsOptimismPreBedrock returns true iff this is an optimism node & bedrock is not yet active
 func (c *ChainConfig) IsOptimismPreBedrock(num *big.Int) bool {
 	return c.IsOptimism() && !c.IsBedrock(num)
@@ -892,6 +904,9 @@ func (c *ChainConfig) checkCompatible(newcfg *ChainConfig, headNumber *big.Int,
 	if isForkTimestampIncompatible(c.IsthmusTime, newcfg.IsthmusTime, headTimestamp, genesisTimestamp) {
 		return newTimestampCompatError("Isthmus fork timestamp", c.IsthmusTime, newcfg.IsthmusTime)
 	}
+	if isForkTimestampIncompatible(c.JovianTime, newcfg.JovianTime, headTimestamp, genesisTimestamp) {
+		return newTimestampCompatError("Jovian fork timestamp", c.JovianTime, newcfg.JovianTime)
+	}
 	if isForkTimestampIncompatible(c.InteropTime, newcfg.InteropTime, headTimestamp, genesisTimestamp) {
 		return newTimestampCompatError("Interop fork timestamp", c.InteropTime, newcfg.InteropTime)
 	}

params/config.go

@@ -55,6 +55,7 @@ func LoadOPStackChainConfig(chConfig *superchain.ChainConfig) (*ChainConfig, err
 		GraniteTime:             hardforks.GraniteTime,
 		HoloceneTime:            hardforks.HoloceneTime,
 		IsthmusTime:             hardforks.IsthmusTime,
+		JovianTime:              hardforks.JovianTime,
 		TerminalTotalDifficulty: common.Big0,
 		Ethash:                  nil,
 		Clique:                  nil,

params/superchain.go

@@ -41,6 +41,7 @@ type HardforkConfig struct {
 	GraniteTime  *uint64 `toml:"granite_time"`
 	HoloceneTime *uint64 `toml:"holocene_time"`
 	IsthmusTime  *uint64 `toml:"isthmus_time"`
+	JovianTime   *uint64 `toml:"jovian_time"`
 }
 
 type OptimismConfig struct {