op-challenger: Load VM address via new style bindings.

op-challenger/game/fault/contracts/faultdisputegame.go

@@ -28,6 +28,7 @@ const (
 	methodDefend           = "defend"
 	methodStep             = "step"
 	methodAddLocalData     = "addLocalData"
+	methodVM               = "VM"
 )
 
 type FaultDisputeGameContract struct {
@@ -145,6 +146,14 @@ func (f *FaultDisputeGameContract) GetAllClaims(ctx context.Context) ([]types.Cl
 	return claims, nil
 }
 
+func (f *FaultDisputeGameContract) VMAddr(ctx context.Context) (common.Address, error) {
+	result, err := f.multiCaller.SingleCall(ctx, batching.BlockLatest, f.contract.Call(methodVM))
+	if err != nil {
+		return common.Address{}, fmt.Errorf("failed to fetch VM addr: %w", err)
+	}
+	return result.GetAddress(0), nil
+}
+
 func (f *FaultDisputeGameContract) AttackTx(parentContractIndex uint64, pivot common.Hash) (txmgr.TxCandidate, error) {
 	call := f.contract.Call(methodAttack, new(big.Int).SetUint64(parentContractIndex), pivot)
 	return call.ToTxCandidate()

op-challenger/game/fault/contracts/faultdisputegame_test.go

@@ -74,6 +74,13 @@ func TestSimpleGetters(t *testing.T) {
 				return game.CallResolve(context.Background())
 			},
 		},
+		{
+			method: methodVM,
+			result: common.Address{0xab, 0xbc},
+			call: func(game *FaultDisputeGameContract) (any, error) {
+				return game.VMAddr(context.Background())
+			},
+		},
 	}
 	for _, test := range tests {
 		test := test

op-challenger/game/fault/register.go

@@ -42,11 +42,12 @@ func RegisterGameTypes(
 
 	if cfg.TraceTypeEnabled(config.TraceTypeCannon) {
 		resourceCreator := func(addr common.Address, contract *contracts.FaultDisputeGameContract, gameDepth uint64, dir string) (faultTypes.TraceAccessor, faultTypes.OracleUpdater, gameValidator, error) {
+			logger := logger.New("game", addr)
 			provider, err := cannon.NewTraceProvider(ctx, logger, m, cfg, contract, dir, gameDepth)
 			if err != nil {
 				return nil, nil, nil, fmt.Errorf("create cannon trace provider: %w", err)
 			}
-			updater, err := cannon.NewOracleUpdater(ctx, logger, txMgr, addr, client, contract)
+			updater, err := cannon.NewOracleUpdater(ctx, logger, txMgr, client, contract)
 			if err != nil {
 				return nil, nil, nil, fmt.Errorf("failed to create the cannon updater: %w", err)
 			}
@@ -66,6 +67,7 @@ func RegisterGameTypes(
 	}
 	if cfg.TraceTypeEnabled(config.TraceTypeAlphabet) {
 		resourceCreator := func(addr common.Address, contract *contracts.FaultDisputeGameContract, gameDepth uint64, dir string) (faultTypes.TraceAccessor, faultTypes.OracleUpdater, gameValidator, error) {
+			logger := logger.New("game", addr)
 			provider := alphabet.NewTraceProvider(cfg.AlphabetTrace, gameDepth)
 			updater := alphabet.NewOracleUpdater(logger)
 			validator := func(ctx context.Context, contract *contracts.FaultDisputeGameContract) error {

op-challenger/game/fault/trace/cannon/updater.go

@@ -17,6 +17,7 @@ import (
 )
 
 type GameContract interface {
+	VMAddr(ctx context.Context) (common.Address, error)
 	AddLocalDataTx(data *types.PreimageOracleData) (txmgr.TxCandidate, error)
 }
 
@@ -37,18 +38,13 @@ func NewOracleUpdater(
 	ctx context.Context,
 	logger log.Logger,
 	txMgr txmgr.TxManager,
-	fdgAddr common.Address,
 	client bind.ContractCaller,
 	gameContract GameContract,
 ) (*cannonUpdater, error) {
-	gameCaller, err := bindings.NewFaultDisputeGameCaller(fdgAddr, client)
-	if err != nil {
-		return nil, fmt.Errorf("create caller for game %v: %w", fdgAddr, err)
-	}
 	opts := &bind.CallOpts{Context: ctx}
-	vm, err := gameCaller.VM(opts)
+	vm, err := gameContract.VMAddr(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("failed to load VM address from game %v: %w", fdgAddr, err)
+		return nil, fmt.Errorf("failed to load VM address: %w", err)
 	}
 	mipsCaller, err := bindings.NewMIPSCaller(vm, client)
 	if err != nil {
@@ -56,7 +52,7 @@ func NewOracleUpdater(
 	}
 	oracleAddr, err := mipsCaller.Oracle(opts)
 	if err != nil {
-		return nil, fmt.Errorf("failed to load pre-image oracle address from game %v: %w", fdgAddr, err)
+		return nil, fmt.Errorf("failed to load pre-image oracle address: %w", err)
 	}
 	return NewOracleUpdaterWithOracle(logger, txMgr, gameContract, oracleAddr)
 }

op-challenger/game/fault/trace/cannon/updater_test.go

@@ -153,6 +153,10 @@ type mockGameContract struct {
 	err error
 }
 
-func (m *mockGameContract) AddLocalDataTx(data *types.PreimageOracleData) (txmgr.TxCandidate, error) {
+func (m *mockGameContract) VMAddr(_ context.Context) (common.Address, error) {
+	return common.Address{0xcc}, nil
+}
+
+func (m *mockGameContract) AddLocalDataTx(_ *types.PreimageOracleData) (txmgr.TxCandidate, error) {
 	return m.tx, m.err
 }