Merge branch 'develop' into willc/entrypoint

op-challenger/challenger/challenger.go

@@ -43,9 +43,9 @@ type Challenger struct {
 	l2ooABI          *abi.ABI
 
 	// dispute game factory contract
-	// dgfContract     *bindings.DisputeGameFactoryCaller
+	dgfContract     *bindings.DisputeGameFactoryCaller
 	dgfContractAddr common.Address
-	// dgfABI          *abi.ABI
+	dgfABI          *abi.ABI
 
 	networkTimeout time.Duration
 }
@@ -79,6 +79,12 @@ func NewChallenger(cfg config.Config, l log.Logger, m metrics.Metricer) (*Challe
 		return nil, err
 	}
 
+	dgfContract, err := bindings.NewDisputeGameFactoryCaller(cfg.DGFAddress, l1Client)
+	if err != nil {
+		cancel()
+		return nil, err
+	}
+
 	cCtx, cCancel := context.WithTimeout(ctx, cfg.NetworkTimeout)
 	defer cCancel()
 	version, err := l2ooContract.Version(&bind.CallOpts{Context: cCtx})
@@ -88,7 +94,13 @@ func NewChallenger(cfg config.Config, l log.Logger, m metrics.Metricer) (*Challe
 	}
 	l.Info("Connected to L2OutputOracle", "address", cfg.L2OOAddress, "version", version)
 
-	parsed, err := bindings.L2OutputOracleMetaData.GetAbi()
+	parsedL2oo, err := bindings.L2OutputOracleMetaData.GetAbi()
+	if err != nil {
+		cancel()
+		return nil, err
+	}
+
+	parsedDgf, err := bindings.DisputeGameFactoryMetaData.GetAbi()
 	if err != nil {
 		cancel()
 		return nil, err
@@ -110,9 +122,11 @@ func NewChallenger(cfg config.Config, l log.Logger, m metrics.Metricer) (*Challe
 
 		l2ooContract:     l2ooContract,
 		l2ooContractAddr: cfg.L2OOAddress,
-		l2ooABI:          parsed,
+		l2ooABI:          parsedL2oo,
 
+		dgfContract:     dgfContract,
 		dgfContractAddr: cfg.DGFAddress,
+		dgfABI:          parsedDgf,
 
 		networkTimeout: cfg.NetworkTimeout,
 	}, nil