Add Karst

Author: joshklop

cmd/geth/config.go

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

cmd/geth/main.go

@@ -75,6 +75,7 @@ var (
 		utils.OverrideOptimismHolocene,
 		utils.OverrideOptimismIsthmus,
 		utils.OverrideOptimismJovian,
+		utils.OverrideOptimismKarst,
 		utils.OverrideOptimismInterop,
 		utils.EnablePersonal, // deprecated
 		utils.TxPoolLocalsFlag,

cmd/utils/flags.go

@@ -312,6 +312,11 @@ var (
 		Usage:    "Manually specify the Optimism Jovian fork timestamp, overriding the bundled setting",
 		Category: flags.EthCategory,
 	}
+	OverrideOptimismKarst = &cli.Uint64Flag{
+		Name:     "override.karst",
+		Usage:    "Manually specify the Optimism Karst fork timestamp, overriding the bundled setting",
+		Category: flags.EthCategory,
+	}
 	OverrideOptimismInterop = &cli.Uint64Flag{
 		Name:     "override.interop",
 		Usage:    "Manually specify the Optimsim Interop feature-set fork timestamp, overriding the bundled setting",

core/genesis.go

@@ -303,6 +303,7 @@ type ChainOverrides struct {
 	OverrideOptimismHolocene *uint64
 	OverrideOptimismIsthmus  *uint64
 	OverrideOptimismJovian   *uint64
+	OverrideOptimismKarst    *uint64
 	OverrideOptimismInterop  *uint64
 	ApplySuperchainUpgrades  bool
 }
@@ -381,6 +382,9 @@ func (o *ChainOverrides) apply(cfg *params.ChainConfig) error {
 	if o.OverrideOptimismJovian != nil {
 		cfg.JovianTime = o.OverrideOptimismJovian
 	}
+	if o.OverrideOptimismKarst != nil {
+		cfg.KarstTime = o.OverrideOptimismKarst
+	}
 	if o.OverrideOptimismInterop != nil {
 		cfg.InteropTime = o.OverrideOptimismInterop
 	}

eth/backend.go

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

eth/ethconfig/config.go

@@ -205,6 +205,8 @@ type Config struct {
 
 	OverrideOptimismJovian *uint64 `toml:",omitempty"`
 
+	OverrideOptimismKarst *uint64 `toml:",omitempty"`
+
 	OverrideOptimismInterop *uint64 `toml:",omitempty"`
 
 	// ApplySuperchainUpgrades requests the node to load chain-configuration from the superchain-registry.

eth/ethconfig/gen_config.go

@@ -229,6 +229,7 @@ func TestDAFilters(t *testing.T) {
 func holoceneConfig() *params.ChainConfig {
 	config := *params.OptimismTestConfig
 	config.IsthmusTime = nil
+	config.KarstTime = nil
 	config.JovianTime = nil
 	config.PragueTime = nil
 	config.OsakaTime = nil

miner/payload_building_test.go

@@ -395,7 +395,8 @@ var (
 		conf.GraniteTime = &zero
 		conf.HoloceneTime = &zero
 		conf.IsthmusTime = &zero
-		conf.JovianTime = nil
+		conf.JovianTime = &zero
+		conf.KarstTime = nil
 		conf.InteropTime = nil
 		conf.Optimism = &OptimismConfig{EIP1559Elasticity: 6, EIP1559Denominator: 50, EIP1559DenominatorCanyon: uint64ptr(250)}
 		return &conf
@@ -514,6 +515,7 @@ type ChainConfig struct {
 	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)
+	KarstTime    *uint64 `json:"karstTime,omitempty"`    // Karst switch time (nil = no fork, 0 = already on Optimism Karst)
 
 	InteropTime *uint64 `json:"interopTime,omitempty"` // Interop switch time (nil = no fork, 0 = already on optimism interop)
 
@@ -1018,6 +1020,10 @@ func (c *ChainConfig) IsJovian(time uint64) bool {
 	return isTimestampForked(c.JovianTime, time)
 }
 
+func (c *ChainConfig) IsKarst(time uint64) bool {
+	return isTimestampForked(c.KarstTime, time)
+}
+
 func (c *ChainConfig) IsInterop(time uint64) bool {
 	return isTimestampForked(c.InteropTime, time)
 }
@@ -1064,6 +1070,10 @@ func (c *ChainConfig) IsOptimismJovian(time uint64) bool {
 	return c.IsOptimism() && c.IsJovian(time)
 }
 
+func (c *ChainConfig) IsOptimismKarst(time uint64) bool {
+	return c.IsOptimism() && c.IsKarst(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)
@@ -1641,6 +1651,7 @@ func (c *ChainConfig) Rules(num *big.Int, isMerge bool, timestamp uint64) Rules
 		IsOptimismHolocene: isMerge && c.IsOptimismHolocene(timestamp),
 		IsOptimismIsthmus:  isMerge && c.IsOptimismIsthmus(timestamp),
 		IsOptimismJovian:   isMerge && c.IsOptimismJovian(timestamp),
+		IsOptimismKarst:    isMerge && c.IsOptimismKarst(timestamp),
 	}
 }
 

params/config.go

@@ -33,6 +33,9 @@ func (c *ChainConfig) opCheckCompatible(newcfg *ChainConfig, headNumber *big.Int
 	if isForkTimestampIncompatible(c.JovianTime, newcfg.JovianTime, headTimestamp, genesisTimestamp) {
 		return newTimestampCompatError("Jovian fork timestamp", c.JovianTime, newcfg.JovianTime)
 	}
+	if isForkTimestampIncompatible(c.KarstTime, newcfg.KarstTime, headTimestamp, genesisTimestamp) {
+		return newTimestampCompatError("Karst fork timestamp", c.KarstTime, newcfg.KarstTime)
+	}
 	if isForkTimestampIncompatible(c.InteropTime, newcfg.InteropTime, headTimestamp, genesisTimestamp) {
 		return newTimestampCompatError("Interop fork timestamp", c.InteropTime, newcfg.InteropTime)
 	}
@@ -65,6 +68,9 @@ func (c *ChainConfig) opDescription() string {
 	if c.JovianTime != nil {
 		banner += fmt.Sprintf(" - Jovian:                      @%-10v\n", *c.JovianTime)
 	}
+	if c.KarstTime != nil {
+		banner += fmt.Sprintf(" - Karst:                       @%-10v\n", *c.KarstTime)
+	}
 	if c.InteropTime != nil {
 		banner += fmt.Sprintf(" - Interop:                     @%-10v\n", *c.InteropTime)
 	}