Merge branch 'develop' into indexer.metrics.server

indexer/api/api.go

@@ -10,6 +10,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/httputil"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/go-chi/chi/v5"
+	"github.com/go-chi/chi/v5/middleware"
 )
 
 const ethereumAddressRegex = `^0x[a-fA-F0-9]{40}$`
@@ -23,7 +24,8 @@ func NewApi(logger log.Logger, bv database.BridgeTransfersView) *Api {
 	r := chi.NewRouter()
 	h := routes.NewRoutes(logger, bv, r)
 
-	r.Get("/healthz", h.HealthzHandler)
+	r.Use(middleware.Heartbeat("/healthz"))
+
 	r.Get(fmt.Sprintf("/api/v0/deposits/{address:%s}", ethereumAddressRegex), h.L1DepositsHandler)
 	r.Get(fmt.Sprintf("/api/v0/withdrawals/{address:%s}", ethereumAddressRegex), h.L2WithdrawalsHandler)
 	return &Api{log: logger, Router: r}

indexer/api/routes/healthz.go

-package routes
-
-import (
-	"net/http"
-)
-
-func (h Routes) HealthzHandler(w http.ResponseWriter, r *http.Request) {
-	jsonResponse(w, h.Logger, "ok", http.StatusOK)
-}

op-challenger/challenger.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/ethereum-optimism/optimism/op-challenger/config"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault"
+	"github.com/ethereum-optimism/optimism/op-challenger/game"
 	"github.com/ethereum/go-ethereum/log"
 )
 
@@ -14,7 +14,7 @@ func Main(ctx context.Context, logger log.Logger, cfg *config.Config) error {
 	if err := cfg.Check(); err != nil {
 		return err
 	}
-	service, err := fault.NewService(ctx, logger, cfg)
+	service, err := game.NewService(ctx, logger, cfg)
 	if err != nil {
 		return fmt.Errorf("failed to create the fault service: %w", err)
 	}

op-challenger/fault/service_test.go

-package fault
-
-import (
-	"context"
-	"fmt"
-	"testing"
-
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
-
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/stretchr/testify/require"
-)
-
-var (
-	mockTraceProviderError = fmt.Errorf("mock trace provider error")
-	mockLoaderError        = fmt.Errorf("mock loader error")
-)
-
-// TestValidateAbsolutePrestate tests that the absolute prestate is validated
-// correctly by the service component.
-func TestValidateAbsolutePrestate(t *testing.T) {
-	t.Run("ValidPrestates", func(t *testing.T) {
-		prestate := []byte{0x00, 0x01, 0x02, 0x03}
-		prestateHash := crypto.Keccak256(prestate)
-		mockTraceProvider := newMockTraceProvider(false, prestate)
-		mockLoader := newMockLoader(false, prestateHash)
-		err := ValidateAbsolutePrestate(context.Background(), mockTraceProvider, mockLoader)
-		require.NoError(t, err)
-	})
-
-	t.Run("TraceProviderErrors", func(t *testing.T) {
-		prestate := []byte{0x00, 0x01, 0x02, 0x03}
-		mockTraceProvider := newMockTraceProvider(true, prestate)
-		mockLoader := newMockLoader(false, prestate)
-		err := ValidateAbsolutePrestate(context.Background(), mockTraceProvider, mockLoader)
-		require.ErrorIs(t, err, mockTraceProviderError)
-	})
-
-	t.Run("LoaderErrors", func(t *testing.T) {
-		prestate := []byte{0x00, 0x01, 0x02, 0x03}
-		mockTraceProvider := newMockTraceProvider(false, prestate)
-		mockLoader := newMockLoader(true, prestate)
-		err := ValidateAbsolutePrestate(context.Background(), mockTraceProvider, mockLoader)
-		require.ErrorIs(t, err, mockLoaderError)
-	})
-
-	t.Run("PrestateMismatch", func(t *testing.T) {
-		mockTraceProvider := newMockTraceProvider(false, []byte{0x00, 0x01, 0x02, 0x03})
-		mockLoader := newMockLoader(false, []byte{0x00})
-		err := ValidateAbsolutePrestate(context.Background(), mockTraceProvider, mockLoader)
-		require.Error(t, err)
-	})
-}
-
-type mockTraceProvider struct {
-	prestateErrors bool
-	prestate       []byte
-}
-
-func newMockTraceProvider(prestateErrors bool, prestate []byte) *mockTraceProvider {
-	return &mockTraceProvider{
-		prestateErrors: prestateErrors,
-		prestate:       prestate,
-	}
-}
-func (m *mockTraceProvider) Get(ctx context.Context, i uint64) (common.Hash, error) {
-	panic("not implemented")
-}
-func (m *mockTraceProvider) GetStepData(ctx context.Context, i uint64) (prestate []byte, proofData []byte, preimageData *types.PreimageOracleData, err error) {
-	panic("not implemented")
-}
-func (m *mockTraceProvider) AbsolutePreState(ctx context.Context) ([]byte, error) {
-	if m.prestateErrors {
-		return nil, mockTraceProviderError
-	}
-	return m.prestate, nil
-}
-
-type mockLoader struct {
-	prestateError bool
-	prestate      []byte
-}
-
-func newMockLoader(prestateError bool, prestate []byte) *mockLoader {
-	return &mockLoader{
-		prestateError: prestateError,
-		prestate:      prestate,
-	}
-}
-func (m *mockLoader) FetchClaims(ctx context.Context) ([]types.Claim, error) {
-	panic("not implemented")
-}
-func (m *mockLoader) FetchGameDepth(ctx context.Context) (uint64, error) {
-	panic("not implemented")
-}
-func (m *mockLoader) FetchAbsolutePrestateHash(ctx context.Context) ([]byte, error) {
-	if m.prestateError {
-		return nil, mockLoaderError
-	}
-	return m.prestate, nil
-}

op-challenger/fault/disk.go → op-challenger/game/disk.go

-package fault
+package game
 
 import (
 	"errors"

op-challenger/fault/disk_test.go → op-challenger/game/disk_test.go

-package fault
+package game
 
 import (
 	"os"

op-challenger/fault/factory.go → op-challenger/game/factory.go

-package fault
+package game
 
 import (
 	"context"

op-challenger/fault/factory_test.go → op-challenger/game/factory_test.go

-package fault
+package game
 
 import (
 	"context"
@@ -6,8 +6,6 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
-
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/require"
@@ -144,9 +142,6 @@ func newMockMinimalDisputeGameFactoryCaller(count uint64, gameCountErr bool, ind
 		games:        generateMockGames(count),
 	}
 }
-func (m *mockMinimalDisputeGameFactoryCaller) Status(opts *bind.CallOpts) (uint8, error) {
-	return uint8(types.GameStatusInProgress), nil
-}
 
 func (m *mockMinimalDisputeGameFactoryCaller) GameCount(opts *bind.CallOpts) (*big.Int, error) {
 	if m.gameCountErr {

op-challenger/fault/agent.go → op-challenger/game/fault/agent.go

@@ -5,8 +5,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/solver"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/solver"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/ethereum/go-ethereum/log"
 )
 

op-challenger/fault/agent_test.go → op-challenger/game/fault/agent_test.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"testing"
 
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/stretchr/testify/require"
 
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
 	"github.com/ethereum-optimism/optimism/op-node/testlog"
 )
 

op-challenger/fault/loader.go → op-challenger/game/fault/loader.go

@@ -5,7 +5,7 @@ import (
 	"math/big"
 
 	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"

op-challenger/fault/loader_test.go → op-challenger/game/fault/loader_test.go

@@ -6,7 +6,7 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"

op-challenger/fault/player.go → op-challenger/game/fault/player.go

 package fault
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 
 	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
 	"github.com/ethereum-optimism/optimism/op-challenger/config"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/alphabet"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/cannon"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/responder"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/responder"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace/alphabet"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace/cannon"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/ethereum-optimism/optimism/op-service/txmgr"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/log"
 )
 
@@ -135,3 +137,24 @@ func (g *GamePlayer) logGameStatus(ctx context.Context, status types.GameStatus)
 		g.logger.Error("Game lost", "status", status)
 	}
 }
+
+type PrestateLoader interface {
+	FetchAbsolutePrestateHash(ctx context.Context) ([]byte, error)
+}
+
+// ValidateAbsolutePrestate validates the absolute prestate of the fault game.
+func ValidateAbsolutePrestate(ctx context.Context, trace types.TraceProvider, loader PrestateLoader) error {
+	providerPrestate, err := trace.AbsolutePreState(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get the trace provider's absolute prestate: %w", err)
+	}
+	providerPrestateHash := crypto.Keccak256(providerPrestate)
+	onchainPrestate, err := loader.FetchAbsolutePrestateHash(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get the onchain absolute prestate: %w", err)
+	}
+	if !bytes.Equal(providerPrestateHash, onchainPrestate) {
+		return fmt.Errorf("trace provider's absolute prestate does not match onchain absolute prestate")
+	}
+	return nil
+}

op-challenger/fault/player_test.go → op-challenger/game/fault/player_test.go

@@ -3,14 +3,22 @@ package fault
 import (
 	"context"
 	"errors"
+	"fmt"
 	"testing"
 
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/ethereum-optimism/optimism/op-node/testlog"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/stretchr/testify/require"
 )
 
+var (
+	mockTraceProviderError = fmt.Errorf("mock trace provider error")
+	mockLoaderError        = fmt.Errorf("mock loader error")
+)
+
 func TestProgressGame_LogErrorFromAct(t *testing.T) {
 	handler, game, actor := setupProgressGameTest(t, true)
 	actor.actErr = errors.New("boom")
@@ -105,6 +113,42 @@ func TestDoNotActOnCompleteGame(t *testing.T) {
 	}
 }
 
+// TestValidateAbsolutePrestate tests that the absolute prestate is validated
+// correctly by the service component.
+func TestValidateAbsolutePrestate(t *testing.T) {
+	t.Run("ValidPrestates", func(t *testing.T) {
+		prestate := []byte{0x00, 0x01, 0x02, 0x03}
+		prestateHash := crypto.Keccak256(prestate)
+		mockTraceProvider := newMockTraceProvider(false, prestate)
+		mockLoader := newMockPrestateLoader(false, prestateHash)
+		err := ValidateAbsolutePrestate(context.Background(), mockTraceProvider, mockLoader)
+		require.NoError(t, err)
+	})
+
+	t.Run("TraceProviderErrors", func(t *testing.T) {
+		prestate := []byte{0x00, 0x01, 0x02, 0x03}
+		mockTraceProvider := newMockTraceProvider(true, prestate)
+		mockLoader := newMockPrestateLoader(false, prestate)
+		err := ValidateAbsolutePrestate(context.Background(), mockTraceProvider, mockLoader)
+		require.ErrorIs(t, err, mockTraceProviderError)
+	})
+
+	t.Run("LoaderErrors", func(t *testing.T) {
+		prestate := []byte{0x00, 0x01, 0x02, 0x03}
+		mockTraceProvider := newMockTraceProvider(false, prestate)
+		mockLoader := newMockPrestateLoader(true, prestate)
+		err := ValidateAbsolutePrestate(context.Background(), mockTraceProvider, mockLoader)
+		require.ErrorIs(t, err, mockLoaderError)
+	})
+
+	t.Run("PrestateMismatch", func(t *testing.T) {
+		mockTraceProvider := newMockTraceProvider(false, []byte{0x00, 0x01, 0x02, 0x03})
+		mockLoader := newMockPrestateLoader(false, []byte{0x00})
+		err := ValidateAbsolutePrestate(context.Background(), mockTraceProvider, mockLoader)
+		require.Error(t, err)
+	})
+}
+
 func setupProgressGameTest(t *testing.T, agreeWithProposedRoot bool) (*testlog.CapturingHandler, *GamePlayer, *stubGameState) {
 	logger := testlog.Logger(t, log.LvlDebug)
 	handler := &testlog.CapturingHandler{
@@ -141,3 +185,45 @@ func (s *stubGameState) GetGameStatus(ctx context.Context) (types.GameStatus, er
 func (s *stubGameState) GetClaimCount(ctx context.Context) (uint64, error) {
 	return s.claimCount, nil
 }
+
+type mockTraceProvider struct {
+	prestateErrors bool
+	prestate       []byte
+}
+
+func newMockTraceProvider(prestateErrors bool, prestate []byte) *mockTraceProvider {
+	return &mockTraceProvider{
+		prestateErrors: prestateErrors,
+		prestate:       prestate,
+	}
+}
+func (m *mockTraceProvider) Get(ctx context.Context, i uint64) (common.Hash, error) {
+	panic("not implemented")
+}
+func (m *mockTraceProvider) GetStepData(ctx context.Context, i uint64) (prestate []byte, proofData []byte, preimageData *types.PreimageOracleData, err error) {
+	panic("not implemented")
+}
+func (m *mockTraceProvider) AbsolutePreState(ctx context.Context) ([]byte, error) {
+	if m.prestateErrors {
+		return nil, mockTraceProviderError
+	}
+	return m.prestate, nil
+}
+
+type mockLoader struct {
+	prestateError bool
+	prestate      []byte
+}
+
+func newMockPrestateLoader(prestateError bool, prestate []byte) *mockLoader {
+	return &mockLoader{
+		prestateError: prestateError,
+		prestate:      prestate,
+	}
+}
+func (m *mockLoader) FetchAbsolutePrestateHash(ctx context.Context) ([]byte, error) {
+	if m.prestateError {
+		return nil, mockLoaderError
+	}
+	return m.prestate, nil
+}

op-challenger/fault/responder/abi_test.go → op-challenger/game/fault/responder/abi_test.go

@@ -4,6 +4,8 @@ import (
 	"math/big"
 	"testing"
 
+	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
 	"github.com/ethereum/go-ethereum/common"
@@ -11,9 +13,6 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/stretchr/testify/require"
-
-	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
 )
 
 // setupFaultDisputeGame deploys the FaultDisputeGame contract to a simulated backend

op-challenger/fault/responder/responder.go → op-challenger/game/fault/responder/responder.go

@@ -5,7 +5,7 @@ import (
 	"math/big"
 
 	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/ethereum-optimism/optimism/op-service/txmgr"
 
 	"github.com/ethereum/go-ethereum"

op-challenger/fault/responder/responder_test.go → op-challenger/game/fault/responder/responder_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/ethereum-optimism/optimism/op-node/testlog"
 	"github.com/ethereum-optimism/optimism/op-service/txmgr"
 

op-challenger/fault/solver/solver.go → op-challenger/game/fault/solver/solver.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/ethereum/go-ethereum/common"
 )
 

op-challenger/fault/solver/solver_test.go → op-challenger/game/fault/solver/solver_test.go

@@ -5,9 +5,9 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/solver"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/test"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/solver"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/test"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/stretchr/testify/require"
 )
 

op-challenger/fault/test/alphabet.go → op-challenger/game/fault/test/alphabet.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/alphabet"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace/alphabet"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 )
 
 func NewAlphabetWithProofProvider(t *testing.T, maxDepth int, oracleError error) *alphabetWithProofProvider {

op-challenger/fault/test/claim_builder.go → op-challenger/game/fault/test/claim_builder.go

@@ -5,7 +5,7 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/require"
 )

op-challenger/fault/test/seq_builder.go → op-challenger/game/fault/test/seq_builder.go

 package test
 
 import (
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 )
 
 type SequenceBuilder struct {

op-challenger/fault/alphabet/provider.go → op-challenger/game/fault/trace/alphabet/provider.go

@@ -6,7 +6,7 @@ import (
 	"math/big"
 	"strings"
 
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 )

op-challenger/fault/alphabet/updater.go → op-challenger/game/fault/trace/alphabet/updater.go

@@ -3,7 +3,7 @@ package alphabet
 import (
 	"context"
 
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/ethereum/go-ethereum/log"
 )
 

op-challenger/fault/alphabet/updater_test.go → op-challenger/game/fault/trace/alphabet/updater_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/ethereum-optimism/optimism/op-node/testlog"
 
 	"github.com/ethereum/go-ethereum/log"

op-challenger/fault/cannon/provider.go → op-challenger/game/fault/trace/cannon/provider.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
 	"github.com/ethereum-optimism/optimism/op-challenger/config"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"

op-challenger/fault/cannon/provider_test.go → op-challenger/game/fault/trace/cannon/provider_test.go

@@ -11,7 +11,7 @@ import (
 	"testing"
 
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/ethereum-optimism/optimism/op-node/testlog"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"

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

@@ -6,7 +6,7 @@ import (
 	"math/big"
 
 	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/ethereum-optimism/optimism/op-service/txmgr"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 

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

@@ -6,7 +6,7 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/ethereum-optimism/optimism/op-node/testlog"
 
 	"github.com/ethereum-optimism/optimism/op-service/txmgr"

op-challenger/fault/monitor.go → op-challenger/game/monitor.go

-package fault
+package game
 
 import (
 	"context"
@@ -7,7 +7,7 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/scheduler"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/scheduler"
 	"github.com/ethereum-optimism/optimism/op-service/clock"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"

op-challenger/fault/monitor_test.go → op-challenger/game/monitor_test.go

-package fault
+package game
 
 import (
 	"context"

op-challenger/fault/service.go → op-challenger/game/service.go

-package fault
+package game
 
 import (
-	"bytes"
 	"context"
 	"fmt"
 
 	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
 	"github.com/ethereum-optimism/optimism/op-challenger/config"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/scheduler"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/scheduler"
 	"github.com/ethereum-optimism/optimism/op-challenger/metrics"
 	"github.com/ethereum-optimism/optimism/op-challenger/version"
 	"github.com/ethereum-optimism/optimism/op-service/client"
@@ -16,14 +15,9 @@ import (
 	oppprof "github.com/ethereum-optimism/optimism/op-service/pprof"
 	"github.com/ethereum-optimism/optimism/op-service/txmgr"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/log"
 )
 
-type Loader interface {
-	FetchAbsolutePrestateHash(ctx context.Context) ([]byte, error)
-}
-
 type Service struct {
 	logger  log.Logger
 	metrics metrics.Metricer
@@ -78,7 +72,7 @@ func NewService(ctx context.Context, logger log.Logger, cfg *config.Config) (*Se
 		disk,
 		cfg.MaxConcurrency,
 		func(addr common.Address, dir string) (scheduler.GamePlayer, error) {
-			return NewGamePlayer(ctx, logger, cfg, dir, addr, txMgr, client)
+			return fault.NewGamePlayer(ctx, logger, cfg, dir, addr, txMgr, client)
 		})
 
 	monitor := newGameMonitor(logger, cl, loader, sched, cfg.GameWindow, client.BlockNumber, cfg.GameAllowlist)
@@ -94,23 +88,6 @@ func NewService(ctx context.Context, logger log.Logger, cfg *config.Config) (*Se
 	}, nil
 }
 
-// ValidateAbsolutePrestate validates the absolute prestate of the fault game.
-func ValidateAbsolutePrestate(ctx context.Context, trace types.TraceProvider, loader Loader) error {
-	providerPrestate, err := trace.AbsolutePreState(ctx)
-	if err != nil {
-		return fmt.Errorf("failed to get the trace provider's absolute prestate: %w", err)
-	}
-	providerPrestateHash := crypto.Keccak256(providerPrestate)
-	onchainPrestate, err := loader.FetchAbsolutePrestateHash(ctx)
-	if err != nil {
-		return fmt.Errorf("failed to get the onchain absolute prestate: %w", err)
-	}
-	if !bytes.Equal(providerPrestateHash, onchainPrestate) {
-		return fmt.Errorf("trace provider's absolute prestate does not match onchain absolute prestate")
-	}
-	return nil
-}
-
 // MonitorGame monitors the fault dispute game and attempts to progress it.
 func (s *Service) MonitorGame(ctx context.Context) error {
 	s.sched.Start(ctx)

op-e2e/e2eutils/disputegame/cannon_helper.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"path/filepath"
 
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/cannon"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace/cannon"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/challenger"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-node/testlog"

op-e2e/e2eutils/disputegame/game_helper.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"

op-e2e/e2eutils/disputegame/helper.go

@@ -12,8 +12,8 @@ import (
 	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/alphabet"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/cannon"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace/alphabet"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace/cannon"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/challenger"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/transactions"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait"

op-e2e/e2eutils/disputegame/honest_helper.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/stretchr/testify/require"
 )