op-e2e: Pass network config when starting challenger

op-challenger/fault/cannon/executor.go

@@ -17,7 +17,7 @@ import (
 
 const (
 	snapsDir     = "snapshots"
-	preimagesDir = "snapshots"
+	preimagesDir = "preimages"
 )
 
 var snapshotNameRegexp = regexp.MustCompile(`^[0-9]+\.json$`)
@@ -138,17 +138,17 @@ func findStartingSnapshot(logger log.Logger, snapDir string, absolutePreState st
 	bestSnap := uint64(0)
 	for _, entry := range entries {
 		if entry.IsDir() {
-			logger.Warn("Unexpected directory in snapshots dir: %v/%v", snapDir, entry.Name())
+			logger.Warn("Unexpected directory in snapshots dir", "parent", snapDir, "child", entry.Name())
 			continue
 		}
 		name := entry.Name()
 		if !snapshotNameRegexp.MatchString(name) {
-			logger.Warn("Unexpected file in snapshots dir: %v/%v", snapDir, entry.Name())
+			logger.Warn("Unexpected file in snapshots dir", "parent", snapDir, "child", entry.Name())
 			continue
 		}
 		index, err := strconv.ParseUint(name[0:len(name)-len(".json")], 10, 64)
 		if err != nil {
-			logger.Error("Unable to parse trace index of snapshot file: %v/%v", snapDir, entry.Name())
+			logger.Error("Unable to parse trace index of snapshot file", "parent", snapDir, "child", entry.Name())
 			continue
 		}
 		if index > bestSnap && index < traceIndex {

op-e2e/e2eutils/disputegame/cannon_helper.go

@@ -2,16 +2,21 @@ package disputegame
 
 import (
 	"context"
+	"encoding/json"
+	"os"
+	"path/filepath"
 
 	"github.com/ethereum-optimism/optimism/op-challenger/config"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/challenger"
+	"github.com/ethereum-optimism/optimism/op-node/rollup"
+	"github.com/ethereum/go-ethereum/core"
 )
 
 type CannonGameHelper struct {
 	FaultGameHelper
 }
 
-func (g *CannonGameHelper) StartChallenger(ctx context.Context, l1Endpoint string, l2Endpoint string, name string, options ...challenger.Option) *challenger.Helper {
+func (g *CannonGameHelper) StartChallenger(ctx context.Context, rollupCfg *rollup.Config, l2Genesis *core.Genesis, l1Endpoint string, l2Endpoint string, name string, options ...challenger.Option) *challenger.Helper {
 	opts := []challenger.Option{
 		func(c *config.Config) {
 			c.GameAddress = g.addr
@@ -24,6 +29,18 @@ func (g *CannonGameHelper) StartChallenger(ctx context.Context, l1Endpoint strin
 			c.CannonServer = "../op-program/bin/op-program"
 			c.CannonAbsolutePreState = "../op-program/bin/prestate.json"
 			c.CannonSnapshotFreq = config.DefaultCannonSnapshotFreq
+
+			genesisBytes, err := json.Marshal(l2Genesis)
+			g.require.NoError(err, "marshall l2 genesis config")
+			genesisFile := filepath.Join(c.CannonDatadir, "l2-genesis.json")
+			g.require.NoError(os.WriteFile(genesisFile, genesisBytes, 0644))
+			c.CannonL2GenesisPath = genesisFile
+
+			rollupBytes, err := json.Marshal(rollupCfg)
+			g.require.NoError(err, "marshall rollup config")
+			rollupFile := filepath.Join(c.CannonDatadir, "rollup.json")
+			g.require.NoError(os.WriteFile(rollupFile, rollupBytes, 0644))
+			c.CannonRollupConfigPath = rollupFile
 		},
 	}
 	opts = append(opts, options...)

op-e2e/faultproof_test.go

@@ -156,7 +156,7 @@ func TestCannonDisputeGame(t *testing.T) {
 	game := disputeGameFactory.StartCannonGame(ctx, common.Hash{0xaa})
 	require.NotNil(t, game)
 
-	game.StartChallenger(ctx, sys.NodeEndpoint("l1"), sys.NodeEndpoint("sequencer"), "Challenger", func(c *config.Config) {
+	game.StartChallenger(ctx, sys.RollupConfig, sys.L2GenesisCfg, sys.NodeEndpoint("l1"), sys.NodeEndpoint("sequencer"), "Challenger", func(c *config.Config) {
 		c.AgreeWithProposedOutput = true // Agree with the proposed output, so disagree with the root claim
 		c.TxMgrConfig.PrivateKey = e2eutils.EncodePrivKeyToString(sys.cfg.Secrets.Alice)
 	})