comments

indexer/config/config.go

@@ -140,10 +140,6 @@ type ServerConfig struct {
 	Port int    `toml:"port"`
 }
 
-var (
-	DEVNET_CHAIN_ID = 901
-)
-
 // LoadConfig loads the `indexer.toml` config file from a given path
 func LoadConfig(log log.Logger, path string) (Config, error) {
 	log.Debug("loading config", "path", path)
@@ -161,7 +157,7 @@ func LoadConfig(log log.Logger, path string) (Config, error) {
 		return conf, err
 	}
 
-	if conf.Chain.Preset == DEVNET_CHAIN_ID {
+	if conf.Chain.Preset == DEVNET_L2_CHAIN_ID {
 		preset, err := GetDevnetPreset()
 		if err != nil {
 			return conf, err

indexer/config/devnet.go

@@ -2,59 +2,31 @@ package config
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"errors"
+	"io/fs"
 	"os"
-
-	"github.com/ethereum/go-ethereum/common"
 )
 
-type ethereumContracts struct {
-	AddressManager                    string `json:"AddressManager"`
-	BlockOracle                       string `json:"BlockOracle"`
-	DisputeGameFactory                string `json:"DisputeGameFactory"`
-	DisputeGameFactoryProxy           string `json:"DisputeGameFactoryProxy"`
-	L1CrossDomainMessenger            string `json:"L1CrossDomainMessenger"`
-	L1CrossDomainMessengerProxy       string `json:"L1CrossDomainMessengerProxy"`
-	L1ERC721Bridge                    string `json:"L1ERC721Bridge"`
-	L1ERC721BridgeProxy               string `json:"L1ERC721BridgeProxy"`
-	L1StandardBridge                  string `json:"L1StandardBridge"`
-	L1StandardBridgeProxy             string `json:"L1StandardBridgeProxy"`
-	L2OutputOracle                    string `json:"L2OutputOracle"`
-	L2OutputOracleProxy               string `json:"L2OutputOracleProxy"`
-	Mips                              string `json:"Mips"`
-	OptimismMintableERC20Factory      string `json:"OptimismMintableERC20Factory"`
-	OptimismMintableERC20FactoryProxy string `json:"OptimismMintableERC20FactoryProxy"`
-	OptimismPortal                    string `json:"OptimismPortal"`
-	OptimismPortalProxy               string `json:"OptimismPortalProxy"`
-	PreimageOracle                    string `json:"PreimageOracle"`
-	ProxyAdmin                        string `json:"ProxyAdmin"`
-	SystemConfig                      string `json:"SystemConfig"`
-	SystemConfigProxy                 string `json:"SystemConfigProxy"`
-}
+var (
+	filePath           = "../.devnet/addresses.json"
+	DEVNET_L2_CHAIN_ID = 901
+)
 
-func readEthereumContracts(filename string) (*ethereumContracts, error) {
-	// Check if the file exists
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
+func GetDevnetPreset() (*Preset, error) {
+	if _, err := os.Stat(filePath); errors.Is(err, fs.ErrNotExist) {
 		return nil, err
 	}
 
-	// Read the file
-	content, err := ioutil.ReadFile(filename)
+	content, err := os.ReadFile(filePath)
 	if err != nil {
 		return nil, err
 	}
 
-	// Unmarshal the JSON
-	var contracts ethereumContracts
-	if err := json.Unmarshal(content, &contracts); err != nil {
+	var l1Contracts L1Contracts
+	if err := json.Unmarshal(content, &l1Contracts); err != nil {
 		return nil, err
 	}
 
-	return &contracts, nil
-}
-
-func GetDevnetPreset() (*Preset, error) {
-	ethereumContracts, err := readEthereumContracts("../.devnet/addresses.json")
 	if err != nil {
 		return nil, err
 	}
@@ -64,17 +36,7 @@ func GetDevnetPreset() (*Preset, error) {
 			L1StartingHeight:        0,
 			L1BedrockStartingHeight: 0,
 			L2BedrockStartingHeight: 0,
-			L1Contracts: L1Contracts{
-				AddressManager:                  common.HexToAddress(ethereumContracts.AddressManager),
-				SystemConfigProxy:               common.HexToAddress(ethereumContracts.SystemConfigProxy),
-				OptimismPortalProxy:             common.HexToAddress(ethereumContracts.OptimismPortalProxy),
-				L2OutputOracleProxy:             common.HexToAddress(ethereumContracts.L2OutputOracleProxy),
-				L1CrossDomainMessengerProxy:     common.HexToAddress(ethereumContracts.L1CrossDomainMessengerProxy),
-				L1StandardBridgeProxy:           common.HexToAddress(ethereumContracts.L1StandardBridgeProxy),
-				L1ERC721BridgeProxy:             common.HexToAddress(ethereumContracts.L1ERC721BridgeProxy),
-				LegacyCanonicalTransactionChain: common.HexToAddress("0x0"),
-				LegacyStateCommitmentChain:      common.HexToAddress("0x0"),
-			},
+			L1Contracts:             l1Contracts,
 		},
 	}, nil
 }