chore(fault): pass l2oo directly instead of extracting from optimism portal - supporting zk validity (ethereum-optimism#153)

* chore(fault): pass l2oo directly instead of extracting from optimism portal - supporting zk validity

* integrate retro compatibility

* integrate changes

* Update README to specify metric value on mismatch

Clarified the description of the 'isCurrentlyMismatched' metric.

---------

Co-authored-by: Emiliano Bonassi <[email protected]>

Author: raffaele-oplabs

op-monitorism/fault/README.md

@@ -10,6 +10,7 @@ OPTIONS:
    --l2.node.url value             Node URL of L2 peer Op-Geth node [$FAULT_MON_L2_NODE_URL]
    --start.output.index value      Output index to start from. -1 to find first unfinalized index (default: -1) [$FAULT_MON_START_OUTPUT_INDEX]
    --optimismportal.address value  Address of the OptimismPortal contract [$FAULT_MON_OPTIMISM_PORTAL]
+   --l2oo.address value            Address of the L2OutputOracle contract (alternative to optimismportal.address) [$FAULT_MON_L2OO_ADDRESS]
 ```
 
 On mismatch the `isCurrentlyMismatched` metrics is set to `1`.

op-monitorism/fault/cli.go

@@ -15,6 +15,7 @@ const (
 	L2NodeURLFlagName = "l2.node.url"
 
 	OptimismPortalAddressFlagName = "optimismportal.address"
+	L2OOAddressFlagName           = "l2oo.address"
 	StartOutputIndexFlagName      = "start.output.index"
 )
 
@@ -23,6 +24,7 @@ type CLIConfig struct {
 	L2NodeURL string
 
 	OptimismPortalAddress common.Address
+	L2OOAddress           common.Address
 	StartOutputIndex      int64
 }
 
@@ -33,11 +35,31 @@ func ReadCLIFlags(ctx *cli.Context) (CLIConfig, error) {
 		StartOutputIndex: ctx.Int64(StartOutputIndexFlagName),
 	}
 
+	// Check if L2OO address is provided directly
+	l2OOAddress := ctx.String(L2OOAddressFlagName)
 	portalAddress := ctx.String(OptimismPortalAddressFlagName)
-	if !common.IsHexAddress(portalAddress) {
-		return cfg, fmt.Errorf("--%s is not a hex-encoded address", OptimismPortalAddressFlagName)
+
+	// Validate that at least one address is provided
+	if l2OOAddress == "" && portalAddress == "" {
+		return cfg, fmt.Errorf("either --%s or --%s must be provided", L2OOAddressFlagName, OptimismPortalAddressFlagName)
+	}
+
+	// Validate that both are not provided (to avoid confusion)
+	if l2OOAddress != "" && portalAddress != "" {
+		return cfg, fmt.Errorf("cannot provide both --%s and --%s, choose one", L2OOAddressFlagName, OptimismPortalAddressFlagName)
+	}
+
+	if l2OOAddress != "" {
+		if !common.IsHexAddress(l2OOAddress) {
+			return cfg, fmt.Errorf("--%s is not a hex-encoded address", L2OOAddressFlagName)
+		}
+		cfg.L2OOAddress = common.HexToAddress(l2OOAddress)
+	} else {
+		if !common.IsHexAddress(portalAddress) {
+			return cfg, fmt.Errorf("--%s is not a hex-encoded address", OptimismPortalAddressFlagName)
+		}
+		cfg.OptimismPortalAddress = common.HexToAddress(portalAddress)
 	}
-	cfg.OptimismPortalAddress = common.HexToAddress(portalAddress)
 
 	return cfg, nil
 }
@@ -61,10 +83,14 @@ func CLIFlags(envVar string) []cli.Flag {
 			EnvVars: opservice.PrefixEnvVar(envVar, "START_OUTPUT_INDEX"),
 		},
 		&cli.StringFlag{
-			Name:     OptimismPortalAddressFlagName,
-			Usage:    "Address of the OptimismPortal contract",
-			EnvVars:  opservice.PrefixEnvVar(envVar, "OPTIMISM_PORTAL"),
-			Required: true,
+			Name:    OptimismPortalAddressFlagName,
+			Usage:   "Address of the OptimismPortal contract (alternative to l2oo.address)",
+			EnvVars: opservice.PrefixEnvVar(envVar, "OPTIMISM_PORTAL"),
+		},
+		&cli.StringFlag{
+			Name:    L2OOAddressFlagName,
+			Usage:   "Address of the L2OutputOracle contract (alternative to optimismportal.address)",
+			EnvVars: opservice.PrefixEnvVar(envVar, "L2OO_ADDRESS"),
 		},
 	}
 }

op-monitorism/fault/monitor.go

@@ -52,18 +52,28 @@ func NewMonitor(ctx context.Context, log log.Logger, m metrics.Factory, cfg CLIC
 		return nil, fmt.Errorf("failed to dial l2: %w", err)
 	}
 
-	optimismPortal, err := bindings.NewOptimismPortalCaller(cfg.OptimismPortalAddress, l1Client)
-	if err != nil {
-		return nil, fmt.Errorf("failed to bind to the OptimismPortal: %w", err)
-	}
+	var l2OOAddress common.Address
+	var l2OO *bindings.L2OutputOracleCaller
+
+	// Check if L2OO address is provided directly
+	if cfg.L2OOAddress != (common.Address{}) {
+		l2OOAddress = cfg.L2OOAddress
+		log.Info("using provided L2OutputOracle address", "address", l2OOAddress.String())
+	} else {
+		// Fallback to extracting from OptimismPortal (backward compatibility)
+		optimismPortal, err := bindings.NewOptimismPortalCaller(cfg.OptimismPortalAddress, l1Client)
+		if err != nil {
+			return nil, fmt.Errorf("failed to bind to the OptimismPortal: %w", err)
+		}
 
-	l2OOAddress, err := optimismPortal.L2ORACLE(&bind.CallOpts{Context: ctx})
-	if err != nil {
-		return nil, fmt.Errorf("failed to query L2OO address: %w", err)
+		l2OOAddress, err = optimismPortal.L2ORACLE(&bind.CallOpts{Context: ctx})
+		if err != nil {
+			return nil, fmt.Errorf("failed to query L2OO address: %w", err)
+		}
+		log.Info("extracted L2OutputOracle address from OptimismPortal", "address", l2OOAddress.String())
 	}
-	log.Info("configured L2OutputOracle", "address", l2OOAddress.String())
 
-	l2OO, err := bindings.NewL2OutputOracleCaller(l2OOAddress, l1Client)
+	l2OO, err = bindings.NewL2OutputOracleCaller(l2OOAddress, l1Client)
 	if err != nil {
 		return nil, fmt.Errorf("failed to bind to the L2OutputOracle: %w", err)
 	}