Switch rollout to Jovian

Author: mdehoog

core/types/rollup_cost.go

@@ -55,9 +55,9 @@ var (
 	// EcotoneL1AttributesSelector is the selector indicating Ecotone style L1 gas attributes.
 	// keccak256("setL1BlockValuesEcotone()")[:4]
 	EcotoneL1AttributesSelector = [4]byte{0x44, 0x0a, 0x5e, 0x20}
-	// IsthmusL1AttributesSelector is the selector indicating Isthmus style L1 gas attributes.
-	// keccak256("setL1BlockValuesIsthmus()")[:4]
-	IsthmusL1AttributesSelector = [4]byte{0x09, 0x89, 0x99, 0xbe}
+	// JovianL1AttributesSelector is the selector indicating Jovian style L1 gas attributes.
+	// keccak256("setL1BlockValuesJovian()")[:4]
+	JovianL1AttributesSelector = [4]byte{0x3d, 0xb6, 0xbe, 0x2b}
 	// InteropL1AttributesSelector is the selector indicating Interop style L1 gas attributes.
 	// keccak256("setL1BlockValuesInterop()")[:4]
 	InteropL1AttributesSelector = [4]byte{0x76, 0x0e, 0xe0, 0x4d}
@@ -273,7 +273,7 @@ func extractL1GasParams(config *params.ChainConfig, time uint64, data []byte) (g
 	var err error
 	var signature [4]byte
 	copy(signature[:], data)
-	// Note: for Ecotone + Isthmus, the new L1Block method selector is used in the block after
+	// Note: for Ecotone + Jovian, the new L1Block method selector is used in the block after
 	// activation, so we use the selector for the switch block rather than the fork time.
 	switch signature {
 	case BedrockL1AttributesSelector:
@@ -283,17 +283,17 @@ func extractL1GasParams(config *params.ChainConfig, time uint64, data []byte) (g
 			return gasParams{}, fmt.Errorf("setL1BlockValuesEcotone called before Ecotone active")
 		}
 		p, err = extractL1GasParamsPostEcotone(data)
-	case IsthmusL1AttributesSelector:
-		if !config.IsIsthmus(time) {
-			return gasParams{}, fmt.Errorf("setL1BlockValuesIsthmus called before Isthmus active")
+	case JovianL1AttributesSelector:
+		if !config.IsJovian(time) {
+			return gasParams{}, fmt.Errorf("setL1BlockValuesJovian called before Jovian active")
 		}
-		p, err = extractL1GasParamsPostIsthmus(data)
+		p, err = extractL1GasParamsPostJovian(data)
 	case InteropL1AttributesSelector:
 		if !config.IsInterop(time) {
 			return gasParams{}, fmt.Errorf("setL1BlockValuesInterop called before Interop active")
 		}
-		// Interop uses the same tx calldata size/format as Isthmus
-		p, err = extractL1GasParamsPostIsthmus(data)
+		// Interop uses the same tx calldata size/format as Jovian
+		p, err = extractL1GasParamsPostJovian(data)
 	default:
 		return gasParams{}, fmt.Errorf("unknown L1Block function signature: 0x%s", common.Bytes2Hex(signature[:]))
 	}
@@ -345,19 +345,19 @@ func extractL1GasParamsPostEcotone(data []byte) (gasParams, error) {
 	if len(data) != 164 {
 		return gasParams{}, fmt.Errorf("expected 164 L1 info bytes, got %d", len(data))
 	}
-	return extractL1GasParamsPostEcotoneIsthmus(data)
+	return extractL1GasParamsPostEcotoneJovian(data)
 }
 
-// extractL1GasParamsPostIsthmus extracts the gas parameters necessary to compute gas from L1 attribute
-// info calldata after the Isthmus upgrade, but not for the very first Isthmus block.
-func extractL1GasParamsPostIsthmus(data []byte) (gasParams, error) {
+// extractL1GasParamsPostJovian extracts the gas parameters necessary to compute gas from L1 attribute
+// info calldata after the Jovian upgrade, but not for the very first Jovian block.
+func extractL1GasParamsPostJovian(data []byte) (gasParams, error) {
 	if len(data) != 180 {
 		return gasParams{}, fmt.Errorf("expected 180 L1 info bytes, got %d", len(data))
 	}
-	return extractL1GasParamsPostEcotoneIsthmus(data)
+	return extractL1GasParamsPostEcotoneJovian(data)
 }
 
-func extractL1GasParamsPostEcotoneIsthmus(data []byte) (gasParams, error) {
+func extractL1GasParamsPostEcotoneJovian(data []byte) (gasParams, error) {
 	// data layout assumed for Ecotone:
 	// offset type varname
 	// 0     <selector>
@@ -370,7 +370,7 @@ func extractL1GasParamsPostEcotoneIsthmus(data []byte) (gasParams, error) {
 	// 68    uint256 _blobBaseFee,
 	// 100   bytes32 _hash,
 	// 132   bytes32 _batcherHash,
-	// Isthmus adds two more uint64s, which are ignored by this function:
+	// Jovian adds two more uint64s, which are ignored by this function:
 	// 164   uint64 _depositNonce
 	// 172   uint64 _configUpdateNonce
 	l1BaseFee := new(big.Int).SetBytes(data[36:68])

core/types/rollup_cost_test.go

@@ -206,19 +206,19 @@ func TestExtractFjordGasParams(t *testing.T) {
 	require.Equal(t, fjordFee, c)
 }
 
-func TestExtractIsthmusGasParams(t *testing.T) {
+func TestExtractJovianGasParams(t *testing.T) {
 	zeroTime := uint64(0)
-	// create a config where isthmus is active
+	// create a config where jovian is active
 	config := &params.ChainConfig{
 		Optimism:     params.OptimismTestConfig.Optimism,
 		RegolithTime: &zeroTime,
 		EcotoneTime:  &zeroTime,
 		FjordTime:    &zeroTime,
-		IsthmusTime:  &zeroTime,
+		JovianTime:   &zeroTime,
 	}
-	require.True(t, config.IsOptimismIsthmus(zeroTime))
+	require.True(t, config.IsOptimismJovian(zeroTime))
 
-	data := getIsthmusL1Attributes(
+	data := getJovianL1Attributes(
 		baseFee,
 		blobBaseFee,
 		baseFeeScalar,
@@ -257,20 +257,20 @@ func TestFirstBlockEcotoneGasParams(t *testing.T) {
 	require.Equal(t, regolithFee, c)
 }
 
-// make sure the first block of the isthmus upgrade is properly detected, and invokes the ecotone
+// make sure the first block of the jovian upgrade is properly detected, and invokes the ecotone
 // cost function appropriately
-func TestFirstBlockIsthmusGasParams(t *testing.T) {
+func TestFirstBlockJovianGasParams(t *testing.T) {
 	zeroTime := uint64(0)
-	// create a config where isthmus upgrade is active
+	// create a config where jovian upgrade is active
 	config := &params.ChainConfig{
 		Optimism:     params.OptimismTestConfig.Optimism,
 		RegolithTime: &zeroTime,
 		EcotoneTime:  &zeroTime,
 		FjordTime:    &zeroTime,
-		IsthmusTime:  &zeroTime,
+		JovianTime:   &zeroTime,
 	}
 	require.True(t, config.IsOptimismEcotone(0))
-	require.True(t, config.IsOptimismIsthmus(0))
+	require.True(t, config.IsOptimismJovian(0))
 
 	data := getEcotoneL1Attributes(
 		baseFee,
@@ -322,13 +322,13 @@ func getEcotoneL1Attributes(baseFee, blobBaseFee, baseFeeScalar, blobBaseFeeScal
 	return data
 }
 
-func getIsthmusL1Attributes(baseFee, blobBaseFee, baseFeeScalar, blobBaseFeeScalar *big.Int) []byte {
+func getJovianL1Attributes(baseFee, blobBaseFee, baseFeeScalar, blobBaseFeeScalar *big.Int) []byte {
 	ignored := big.NewInt(1234)
 	data := []byte{}
 	uint256Slice := make([]byte, 32)
 	uint64Slice := make([]byte, 8)
 	uint32Slice := make([]byte, 4)
-	data = append(data, IsthmusL1AttributesSelector[:]...)
+	data = append(data, JovianL1AttributesSelector[:]...)
 	data = append(data, baseFeeScalar.FillBytes(uint32Slice)...)
 	data = append(data, blobBaseFeeScalar.FillBytes(uint32Slice)...)
 	data = append(data, ignored.FillBytes(uint64Slice)...)

params/config.go

@@ -353,6 +353,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)
 
@@ -515,11 +516,14 @@ func (c *ChainConfig) Description() string {
 		banner += fmt.Sprintf(" - Granite:                     @%-10v\n", *c.GraniteTime)
 	}
 	if c.HoloceneTime != nil {
-		banner += fmt.Sprintf(" - Holocene:                     @%-10v\n", *c.HoloceneTime)
+		banner += fmt.Sprintf(" - Holocene:                    @%-10v\n", *c.HoloceneTime)
 	}
 	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)
 	}
@@ -664,6 +668,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)
 }
@@ -706,6 +714,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)