op-node: remove Goerli references & config overrides

op-node/chaincfg/chains.go

@@ -42,8 +42,6 @@ func AvailableNetworks() []string {
 
 func handleLegacyName(name string) string {
 	switch name {
-	case "goerli":
-		return "op-goerli"
 	case "mainnet":
 		return "op-mainnet"
 	case "sepolia":

op-node/rollup/superchain.go

@@ -16,14 +16,10 @@ var OPStackSupport = params.ProtocolVersionV0{Build: [8]byte{}, Major: 6, Minor:
 
 const (
 	opMainnet = 10
-	opGoerli  = 420
 	opSepolia = 11155420
 
-	labsGoerliDevnet   = 997
-	labsGoerliChaosnet = 888
 	labsSepoliaDevnet0 = 11155421
 
-	baseGoerli  = 84531
 	baseMainnet = 8453
 
 	pgnMainnet = 424
@@ -61,19 +57,6 @@ func LoadOPStackRollupConfig(chainID uint64) (*Config, error) {
 	}
 
 	regolithTime := uint64(0)
-	// three goerli testnets test-ran Bedrock and later upgraded to Regolith.
-	// All other OP-Stack chains have Regolith enabled from the start.
-	switch chainID {
-	case baseGoerli:
-		regolithTime = 1683219600
-	case opGoerli:
-		regolithTime = 1679079600
-	case labsGoerliDevnet:
-		regolithTime = 1677984480
-	case labsGoerliChaosnet:
-		regolithTime = 1692156862
-	}
-
 	cfg := &Config{
 		Genesis: Genesis{
 			L1: eth.BlockID{
@@ -106,13 +89,10 @@ func LoadOPStackRollupConfig(chainID uint64) (*Config, error) {
 		DepositContractAddress: common.Address(addrs.OptimismPortalProxy),
 		L1SystemConfigAddress:  common.Address(addrs.SystemConfigProxy),
 	}
+
 	if superChain.Config.ProtocolVersionsAddr != nil { // Set optional protocol versions address
 		cfg.ProtocolVersionsAddress = common.Address(*superChain.Config.ProtocolVersionsAddr)
 	}
-	if chainID == labsGoerliDevnet || chainID == labsGoerliChaosnet {
-		cfg.ChannelTimeout = 120
-		cfg.MaxSequencerDrift = 1200
-	}
 	if chainID == pgnSepolia {
 		cfg.MaxSequencerDrift = 1000
 		cfg.SeqWindowSize = 7200

op-node/rollup/types_test.go

@@ -147,9 +147,9 @@ func TestRandomConfigDescription(t *testing.T) {
 	})
 	t.Run("named L1", func(t *testing.T) {
 		config := randConfig()
-		config.L1ChainID = big.NewInt(5)
+		config.L1ChainID = big.NewInt(11155111)
 		out := config.Description(map[string]string{config.L2ChainID.String(): "foobar chain"})
-		require.Contains(t, out, "goerli")
+		require.Contains(t, out, "sepolia")
 	})
 	t.Run("unnamed", func(t *testing.T) {
 		config := randConfig()
@@ -506,7 +506,6 @@ func TestTimestampForBlock(t *testing.T) {
 			assert.Equal(t, timestamp, test.expectedBlockTime)
 		})
 	}
-
 }
 
 func TestForkchoiceUpdatedVersion(t *testing.T) {