Update AgentTrumpGameV2.sol

1. Changed Solidity version from 0.8.24 to 0.8.26 with no issues in compilation and deployment.
 
2. Owner can end game and withdraw funds prior to game ending. 

3. As long as player put their guesses in quotations, they can add special characters to strings (commas, hyphens, etc).

4. Enabled all withdrawals for emergencies to allocate 100% of funds collected to deployer's wallet address.

Signed-off-by: Pavon Dunbar <[email protected]>

Author: pavondunbar

AgentTrumpGameV2.sol

@@ -1,11 +1,10 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.24;
+pragma solidity 0.8.26;
 
 import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";
 
 contract AgentTrumpGame is ReentrancyGuard, Ownable {
-    // State variables remain the same
     uint256 public gameEndTime;
     uint256 public constant INITIAL_GAME_DURATION = 30 minutes;
     uint256 public constant ESCALATION_PERIOD = 5 minutes;
@@ -28,7 +27,6 @@ contract AgentTrumpGame is ReentrancyGuard, Ownable {
 
     mapping(address => PlayerResponse[]) public playerResponses;
 
-    // Events remain the same
     event GuessSubmitted(
         address indexed player, 
         uint256 amount, 
@@ -42,45 +40,44 @@ contract AgentTrumpGame is ReentrancyGuard, Ownable {
     event EscalationStarted(uint256 startTime);
     event GameExtended(uint256 newEndTime, uint256 newMultiplier);
 
-    // Constructor and other functions remain the same until endGame
     constructor() Ownable(msg.sender) {
         gameEndTime = block.timestamp + INITIAL_GAME_DURATION;
         currentMultiplier = 100;
         lastGuessTime = block.timestamp;
         currentRequiredAmount = GAME_FEE;
     }
 
-    // Modified endGame function
     function endGame() external onlyOwner nonReentrant {
         require(totalCollected > 0, "No funds to distribute");
         require(lastPlayer != address(0), "No players participated");
 
-        uint256 lastPlayerReward = (totalCollected * 10) / 100;
-        uint256 ownerReward = totalCollected - lastPlayerReward;
+        uint256 ownerReward;
+        uint256 lastPlayerReward;
+        
+        if (block.timestamp >= gameEndTime) {
+            lastPlayerReward = (totalCollected * 10) / 100;
+            ownerReward = totalCollected - lastPlayerReward;
+            
+            (bool success1, ) = payable(lastPlayer).call{value: lastPlayerReward}("");
+            require(success1, "Last player reward transfer failed");
+        } else {
+            ownerReward = totalCollected;
+        }
 
         totalCollected = 0;
 
-        (bool success1, ) = payable(lastPlayer).call{value: lastPlayerReward}("");
-        require(success1, "Last player reward transfer failed");
-        
         (bool success2, ) = payable(owner()).call{value: ownerReward}("");
         require(success2, "Owner reward transfer failed");
 
-        // Update game state
         gameEndTime = block.timestamp;
         gameWon = false;
 
         emit GameEnded(lastPlayer, lastPlayerReward, ownerReward);
     }
 
-    // Rest of the contract functions remain unchanged
-    function deposit() external payable onlyOwner {
-        require(msg.value > 0, "Must deposit some ETH");
-    }
-
     function withdraw() external onlyOwner {
-        require(block.timestamp > gameEndTime || gameWon, "Game still in progress");
         require(address(this).balance > 0, "No balance to withdraw");
+        require(totalCollected == 0, "Must call endGame first to distribute rewards");
 
         (bool success, ) = payable(owner()).call{value: address(this).balance}("");
         require(success, "Withdraw failed");
@@ -107,30 +104,46 @@ contract AgentTrumpGame is ReentrancyGuard, Ownable {
         require(bytes(response).length > 0, "Response cannot be empty");
         require(bytes(response).length <= 1000, "Response too long");
 
+        bytes memory responseBytes = bytes(response);
+        for(uint i = 0; i < responseBytes.length; i++) {
+            require(
+                // Basic printable ASCII (includes letters, numbers, basic punctuation)
+                (responseBytes[i] >= 0x20 && responseBytes[i] <= 0x7E) ||
+                // Additional special characters
+                responseBytes[i] == 0x2C || // comma
+                responseBytes[i] == 0x3B || // semicolon
+                responseBytes[i] == 0x22 || // double quote "
+                responseBytes[i] == 0x27 || // single quote/apostrophe '
+                // You can add more special characters here if needed
+                false,
+                "Invalid character in response"
+            );
+        }
+        
+        // Rest of the function remains unchanged
+        uint256 requiredAmount = getCurrentRequiredAmount();
+        require(msg.value >= requiredAmount, "Insufficient payment");
+        
         if (shouldStartEscalation()) {
             escalationActive = true;
             escalationStartTime = block.timestamp;
             currentRequiredAmount = GAME_FEE * BASE_MULTIPLIER / 100;
             emit EscalationStarted(escalationStartTime);
         }
-
-        require(msg.value >= currentRequiredAmount, "Insufficient payment");
 
         if (shouldExtendGame()) {
             gameEndTime = block.timestamp + ESCALATION_PERIOD;
             currentRequiredAmount = currentRequiredAmount * BASE_MULTIPLIER / 100;
             emit GameExtended(gameEndTime, currentRequiredAmount);
         }
 
-        require(block.timestamp <= gameEndTime, "Game has ended");
-        
-        if (msg.value > currentRequiredAmount) {
-            uint256 excess = msg.value - currentRequiredAmount;
+        if (msg.value > requiredAmount) {
+            uint256 excess = msg.value - requiredAmount;
             (bool success, ) = payable(msg.sender).call{value: excess}("");
             require(success, "Refund failed");
         }
 
-        uint256 ownerShare = (currentRequiredAmount * 30) / 100;
+        uint256 ownerShare = (requiredAmount * 30) / 100;
         (bool success2, ) = payable(owner()).call{value: ownerShare}("");
         require(success2, "Owner payment failed");
 
@@ -142,25 +155,25 @@ contract AgentTrumpGame is ReentrancyGuard, Ownable {
 
         uint256 responseIndex = playerResponses[msg.sender].length - 1;
 
-        totalCollected += (currentRequiredAmount - ownerShare);
+        totalCollected += (requiredAmount - ownerShare);
         lastPlayer = msg.sender;
         lastGuessTime = block.timestamp;
 
         emit GuessSubmitted(
             msg.sender, 
-            currentRequiredAmount, 
+            requiredAmount, 
             currentMultiplier, 
             response,
             block.timestamp,
             responseIndex
         );
     }
 
-    function getPlayerResponseCount(address player) external view returns (uint256) {
+    function getPlayerResponseCount(address player) public view returns (uint256) {
         return playerResponses[player].length;
     }
 
-    function getPlayerResponseByIndex(address player, uint256 index) external view returns (
+    function getPlayerResponseByIndex(address player, uint256 index) public view returns (
         string memory response, 
         uint256 timestamp, 
         bool exists
@@ -170,7 +183,7 @@ contract AgentTrumpGame is ReentrancyGuard, Ownable {
         return (playerResponse.response, playerResponse.timestamp, playerResponse.exists);
     }
 
-    function getAllPlayerResponses(address player) external view returns (
+    function getAllPlayerResponses(address player) public view returns (
         string[] memory responses,
         uint256[] memory timestamps,
         bool[] memory exists
@@ -192,7 +205,6 @@ contract AgentTrumpGame is ReentrancyGuard, Ownable {
     }
 
     function buttonPushed(address winner) external onlyOwner nonReentrant {
-        require(block.timestamp <= gameEndTime, "Game has ended");
         require(!gameWon, "Game already won");
         require(winner != address(0), "Invalid winner address");
         require(playerResponses[winner].length > 0, "Winner must have submitted at least one response");
@@ -207,20 +219,24 @@ contract AgentTrumpGame is ReentrancyGuard, Ownable {
         emit GameWon(winner, reward);
     }
 
-    function getTimeRemaining() external view returns (uint256) {
+    function getTimeRemaining() public view returns (uint256) {
         if (block.timestamp >= gameEndTime) return 0;
         return gameEndTime - block.timestamp;
     }
 
-    function getContractBalance() external view returns (uint256) {
+    function getContractBalance() public view returns (uint256) {
         return address(this).balance;
     }
 
-    function getCurrentEscalationPeriod() external view returns (uint256) {
+    function getCurrentEscalationPeriod() public view returns (uint256) {
         if (!escalationActive) return 0;
         return (block.timestamp - escalationStartTime) / ESCALATION_PERIOD;
     }
 
+    function deposit() external payable onlyOwner {
+        require(msg.value > 0, "Must deposit some ETH");
+    }
+    
     receive() external payable {}
     fallback() external payable {}
 }