State Cleanup

Before a new game starts, we need to clean up old state while keeping ended games inspectable.

Another Helper Function:

Create function _resetGame() private to handle cleanup.

This keeps the code organized and reusable.

What to Reset Before a New Game:

Clear the board with a loop: for (uint i = 0; i < 9; i++) { board[i] = Cell.Empty; }

Reset pending-game fields:
gameAccepted = false;
acceptDeadline = 0;
lastMoveAt = 0;

Calling Helpers:

Keep _endGame focused on the payout and lifecycle flags: gameAccepted = false; , acceptDeadline = 0; , and lastMoveAt = 0; .

Then update startGame to call _resetGame before setting the accept deadline.

This ensures every new game starts with a clean slate, while the last completed board remains readable after GameEnded.

Create _resetGame and integrate it into startGame without clearing the final board in _endGame.

Create _resetGame helper and preserve the final board

Requirements:

Declares _resetGame function

_resetGame is private

Clears board with loop

Resets gameAccepted to false

Resets acceptDeadline to 0

Resets lastMoveAt to 0

_endGame resets gameAccepted to false

_endGame resets acceptDeadline to 0

_endGame resets lastMoveAt to 0

_endGame leaves board inspectable

startGame calls _resetGame

startGame sets deadline after reset

startGame removes old board loop

// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;

contract TicTacToe {
    uint64 constant ACCEPT_TIMEOUT = 1 days;
    uint64 constant MOVE_TIMEOUT = 1 days;

    event GameStarted(address indexed playerX, address indexed playerO, uint stake);
    event GameEnded(address indexed winner, bool isDraw);

    address public playerX;
    address public playerO;

    enum Cell { Empty, X, O }

    Cell[9] public board;

    bool public xTurn;
    bool public gameOver;
    address public winner;
    uint public stake;
    bool public gameActive;
    bool public gameAccepted;
    uint64 public acceptDeadline;
    uint64 public lastMoveAt;
    mapping(address => uint256) public credits;

    function startGame(address _opponent) public payable {
        require(!gameActive, "Game already active");
        require(_opponent != address(0), "Invalid opponent");
        require(_opponent != msg.sender, "Cannot play yourself");

        playerX = msg.sender;
        playerO = _opponent;
        xTurn = true;
        gameOver = false;
        winner = address(0);
        stake = msg.value;
        gameActive = true;
        gameAccepted = false;
        acceptDeadline = uint64(block.timestamp) + ACCEPT_TIMEOUT;

        for (uint i = 0; i < 9; i++) {
            board[i] = Cell.Empty;
        }

        emit GameStarted(playerX, playerO, stake);
    }

    function acceptGame() public payable {
        require(gameActive, "No active game");
        require(!gameAccepted, "Already accepted");
        require(!gameOver, "Game already over");
        require(msg.value == stake, "Must match stake");
        require(msg.sender == playerO, "Only opponent can accept");
        require(block.timestamp <= acceptDeadline, "Accept period expired");

        gameAccepted = true;
        lastMoveAt = uint64(block.timestamp);
        stake = msg.value * 2;
    }

    function cancelUnaccepted() public {
        require(msg.sender == playerX, "Only starter can cancel");
        require(block.timestamp > acceptDeadline, "Accept period not expired");
        require(!gameAccepted, "Game already accepted");

        credits[playerX] += stake;
        stake = 0;
        gameActive = false;
    }

    function withdraw() public {
        require(credits[msg.sender] > 0, "No credits");
        uint256 amount = credits[msg.sender];
        credits[msg.sender] = 0;
        (bool success, ) = payable(msg.sender).call{value: amount}("");
        require(success, "Transfer failed");
    }

    function claimForfeit() public {
        require(gameAccepted, "Game not started");
        require(!gameOver, "Game already over");
        require(block.timestamp > lastMoveAt + MOVE_TIMEOUT, "Timeout not reached");

        if (xTurn) {
            require(msg.sender == playerO, "Not your turn to claim");
        } else {
            require(msg.sender == playerX, "Not your turn to claim");
        }

        _endGame(msg.sender, false);
    }

    function makeMove(uint _position) public {
        require(!gameOver, "Game over");
        require(_position < 9, "Invalid position");
        require(board[_position] == Cell.Empty, "Cell already taken");
        require(xTurn ? msg.sender == playerX : msg.sender == playerO, "Not your turn");

        Cell piece = xTurn ? Cell.X : Cell.O;
        board[_position] = piece;
        lastMoveAt = uint64(block.timestamp);

        if (checkWin()) {
            _endGame(msg.sender, false);
        } else if (checkDraw()) {
            _endGame(address(0), true);
        } else {
            xTurn = !xTurn;
        }
    }

    function _endGame(address _winner, bool isDraw) private {
        gameOver = true;
        winner = _winner;
        uint256 pot = stake;

        if (isDraw) {
            credits[playerX] += pot / 2;
            credits[playerO] += pot / 2;
        } else {
            credits[_winner] += pot;
        }

        stake = 0;
        gameActive = false;
        emit GameEnded(winner, isDraw);
    }

    function checkWin() private view returns (bool) {
        // Check rows
        for (uint i = 0; i < 3; i++) {
            if (board[i*3] != Cell.Empty &&
                board[i*3] == board[i*3+1] &&
                board[i*3] == board[i*3+2]) {
                return true;
            }
        }

        // Check columns
        for (uint i = 0; i < 3; i++) {
            if (board[i] != Cell.Empty &&
                board[i] == board[i+3] &&
                board[i] == board[i+6]) {
                return true;
            }
        }

        // Check diagonals
        if (board[0] != Cell.Empty &&
            board[0] == board[4] &&
            board[0] == board[8]) {
            return true;
        }

        if (board[2] != Cell.Empty &&
            board[2] == board[4] &&
            board[2] == board[6]) {
            return true;
        }

        return false;
    }

    function checkDraw() private view returns (bool) {
        for (uint i = 0; i < 9; i++) {
            if (board[i] == Cell.Empty) {
                return false;
            }
        }
        return true;
    }
}