update contract addresses in config files and enhance player move commitment handling

2026-03-12 10:58:11 +01:00 · 2025-11-21 18:42:43 +01:00
parent 06176e74f2
commit 3bd61490f1
5 changed files with 193 additions and 141 deletions
--- a/crypto_clash_frontend/app/clash/Commit.tsx
+++ b/crypto_clash_frontend/app/clash/Commit.tsx
@@ -13,6 +13,7 @@ interface CommitProps {
  setSelectedMove: (move: string | null) => void;
  secret: string;
  setSecret: (secret: string) => void;
+  onBothPlayersCommitted?: () => void;
 }

 type Move = "1" | "2" | "3" | null;
@@ -34,10 +35,13 @@ export default function Commit({
  setSelectedMove,
  secret,
  setSecret,
+  onBothPlayersCommitted,
 }: Readonly<CommitProps>) {
  const [loading, setLoading] = useState(false);
  const [playMove, setPlayMove] = useState<string>("");
  const [bothPlayed, setBothPlayed] = useState<string>("");
+  const [autoCheckInterval, setAutoCheckInterval] = useState<NodeJS.Timeout | null>(null);
+  const [moveSubmitted, setMoveSubmitted] = useState(false);

  // Generate random secret on mount if not already set
  useEffect(() => {
@@ -57,20 +61,42 @@ export default function Commit({
    }
  }, [selectedMove, secret]);

-  // Commit phase read-only handlers
-  const handleBothPlayed = async () => {
-    if (!contract) return;
-    setLoading(true);
-    try {
-      const res = await contract.methods.bothPlayed().call({from : account});
-      setBothPlayed(res ? "true" : "false");
-    } catch (err: any) {
-      setStatus("Failed to fetch bothPlayed: " + err.message);
-    } finally {
-      setLoading(false);
+  // Auto-check if both players have committed and trigger callback
+  useEffect(() => {
+    if (!contract || !account || !playMove || bothPlayed === "true") {
+      // Clear interval if conditions not met or already both played
+      if (autoCheckInterval) clearInterval(autoCheckInterval);
+      setAutoCheckInterval(null);
+      return;
    }
-  };

+    // Check immediately on mount or when dependencies change
+    const checkBothPlayed = async () => {
+      try {
+        const res = await contract.methods.bothPlayed().call({ from: account });
+        if (res) {
+          setBothPlayed("true");
+          if (onBothPlayersCommitted) {
+            onBothPlayersCommitted();
+          }
+        }
+      } catch (err: any) {
+        console.error("Auto-check failed:", err.message);
+      }
+    };
+
+    checkBothPlayed();
+
+    // Set up interval to check every 2 seconds
+    const interval = setInterval(checkBothPlayed, 2000);
+    setAutoCheckInterval(interval);
+
+    return () => {
+      if (interval) clearInterval(interval);
+    };
+  }, [contract, account, playMove, bothPlayed, onBothPlayersCommitted]);
+
+  // Commit phase read-only handlers
  const handlePlay = async () => {
    if (!contract || !web3 || !account || !playMove) return;
    setLoading(true);
@@ -92,6 +118,7 @@ export default function Commit({
        ],
      });
      setStatus("Play tx sent: " + result);
+      setMoveSubmitted(true);
    } catch (err: any) {
      setStatus("Play failed: " + err.message);
    } finally {
@@ -110,100 +137,95 @@ export default function Commit({
        Select Your Move
      </h2>

-      {/* Move Selection */}
-      <div className="mb-8">
-        <p className="text-sm text-slate-600 dark:text-slate-300 mb-4 font-medium">
-          Choose your move:
-        </p>
-        <div className="flex gap-4 justify-center">
-          {(["1", "2", "3"] as const).map((move) => (
-            <button
-              key={move}
-              onClick={() => setSelectedMove(move)}
-              className={`flex flex-col items-center justify-center p-6 rounded-lg transition-all transform ${
-                selectedMove === move
-                  ? "bg-blue-500 text-white shadow-lg scale-110"
-                  : "bg-white dark:bg-slate-600 text-slate-700 dark:text-slate-200 shadow hover:shadow-md hover:scale-105"
-              }`}
+      {moveSubmitted ? (
+        // Waiting animation after move is submitted
+        <div className="flex flex-col items-center justify-center py-16">
+          <div className="mb-6">
+            <div className="w-16 h-16 border-4 border-slate-300 dark:border-slate-500 border-t-blue-500 rounded-full animate-spin"></div>
+          </div>
+          <p className="text-lg font-semibold text-slate-700 dark:text-slate-300 mb-2">
+            Waiting for opponent...
+          </p>
+          <p className="text-sm text-slate-500 dark:text-slate-400">
+            Your move has been submitted. Stand by while the other player commits.
+          </p>
+        </div>
+      ) : (
+        <>
+          {/* Move Selection */}
+          <div className="mb-8">
+            <p className="text-sm text-slate-600 dark:text-slate-300 mb-4 font-medium">
+              Choose your move:
+            </p>
+            <div className="flex gap-4 justify-center">
+              {(["1", "2", "3"] as const).map((move) => (
+                <button
+                  key={move}
+                  onClick={() => setSelectedMove(move)}
+                  className={`flex flex-col items-center justify-center p-6 rounded-lg transition-all transform ${
+                    selectedMove === move
+                      ? "bg-blue-500 text-white shadow-lg scale-110"
+                      : "bg-white dark:bg-slate-600 text-slate-700 dark:text-slate-200 shadow hover:shadow-md hover:scale-105"
+                  }`}
+                >
+                  <span className="text-5xl mb-2">{MOVES[move].icon}</span>
+                  <span className="font-semibold text-sm">{MOVES[move].name}</span>
+                </button>
+              ))}
+            </div>
+          </div>
+
+          {/* Secret Input */}
+          <div className="mb-8 bg-white dark:bg-slate-700 p-4 rounded-lg">
+            <label className="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-3">
+              Secret:
+            </label>
+            <div className="flex gap-2">
+              <Input
+                type="text"
+                value={secret}
+                onChange={(e) => setSecret(e.target.value)}
+                placeholder="Your secret passphrase"
+                className="flex-1"
+              />
+              <Button
+                onClick={regenerateSecret}
+                variant="secondary"
+                disabled={loading}
+              >
+                🔄 New
+              </Button>
+            </div>
+            <p className="text-xs text-slate-500 dark:text-slate-400 mt-2">
+              Keep this secret safe! It's needed to reveal your move later.
+            </p>
+          </div>
+
+          {/* Encrypted Move Display */}
+          <div className="mb-8 bg-blue-50 dark:bg-blue-900 p-4 rounded-lg">
+            <label className="block text-sm font-medium text-slate-700 dark:text-blue-200 mb-2">
+              Encrypted Move (to be sent):
+            </label>
+            <div className="bg-white dark:bg-slate-700 p-3 rounded border border-blue-200 dark:border-blue-700 overflow-x-auto">
+              <code className="text-xs text-slate-600 dark:text-slate-300 font-mono break-all">
+                {playMove || "Select a move and enter a secret"}
+              </code>
+            </div>
+          </div>
+
+          {/* Action Buttons */}
+          <div className="flex flex-col gap-3">
+            <Button
+              onClick={handlePlay}
+              disabled={loading || !account || !contract || !selectedMove || !secret}
+              variant="primary"
+              className="w-full py-3 text-lg"
            >
-              <span className="text-5xl mb-2">{MOVES[move].icon}</span>
-              <span className="font-semibold text-sm">{MOVES[move].name}</span>
-            </button>
-          ))}
-        </div>
-      </div>
-
-      {/* Secret Input */}
-      <div className="mb-8 bg-white dark:bg-slate-700 p-4 rounded-lg">
-        <label className="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-3">
-          Secret:
-        </label>
-        <div className="flex gap-2">
-          <Input
-            type="text"
-            value={secret}
-            onChange={(e) => setSecret(e.target.value)}
-            placeholder="Your secret passphrase"
-            className="flex-1"
-          />
-          <Button
-            onClick={regenerateSecret}
-            variant="secondary"
-            disabled={loading}
-          >
-            🔄 New
-          </Button>
-        </div>
-        <p className="text-xs text-slate-500 dark:text-slate-400 mt-2">
-          Keep this secret safe! It's needed to reveal your move later.
-        </p>
-      </div>
-
-      {/* Encrypted Move Display */}
-      <div className="mb-8 bg-blue-50 dark:bg-blue-900 p-4 rounded-lg">
-        <label className="block text-sm font-medium text-slate-700 dark:text-blue-200 mb-2">
-          Encrypted Move (to be sent):
-        </label>
-        <div className="bg-white dark:bg-slate-700 p-3 rounded border border-blue-200 dark:border-blue-700 overflow-x-auto">
-          <code className="text-xs text-slate-600 dark:text-slate-300 font-mono break-all">
-            {playMove || "Select a move and enter a secret"}
-          </code>
-        </div>
-      </div>
-
-      {/* Action Buttons */}
-      <div className="flex flex-col gap-3">
-        <Button
-          onClick={handlePlay}
-          disabled={loading || !account || !contract || !selectedMove || !secret}
-          variant="primary"
-          className="w-full py-3 text-lg"
-        >
-          {loading ? "Submitting..." : "Submit Move"}
-        </Button>
-
-        <Button
-          onClick={handleBothPlayed}
-          disabled={loading}
-          variant="secondary"
-          className="w-full"
-        >
-          Check Both Played
-        </Button>
-        {bothPlayed && (
-          <span
-            className={`text-center text-sm font-medium ${
-              bothPlayed === "true"
-                ? "text-green-600 dark:text-green-400"
-                : "text-slate-600 dark:text-slate-400"
-            }`}
-          >
-            {bothPlayed === "true"
-              ? "✓ Both players have committed!"
-              : "Waiting for opponent..."}
-          </span>
-        )}
-      </div>
+              {loading ? "Submitting..." : "Submit Move"}
+            </Button>
+          </div>
+        </>
+      )}
    </div>
  );
 }
--- a/crypto_clash_frontend/app/clash/page.tsx
+++ b/crypto_clash_frontend/app/clash/page.tsx
@@ -17,6 +17,8 @@ export default function Clash() {
  const [phase, setPhase] = useState<"games" | "commit" | "reveal">("games");
  const [selectedMove, setSelectedMove] = useState<string | null>(null);
  const [secret, setSecret] = useState<string>("");
+  const [availableAccounts, setAvailableAccounts] = useState<string[]>([]);
+  const [selectedAccount, setSelectedAccount] = useState<string>("");

  const handlePlayClick = (gameId: number) => {
    setPhase("commit");
@@ -41,13 +43,15 @@ export default function Clash() {
          data.GAME_CONTRACT_ADDRESS
        );
        setContract(contractInstance);
-        // Get account
+        // Get accounts from MetaMask
        if (globalThis.window !== undefined && (globalThis as any).ethereum) {
          try {
            const accounts = await (globalThis as any).ethereum.request({
              method: "eth_requestAccounts",
            });
+            setAvailableAccounts(accounts);
            setAccount(accounts[0]);
+            setSelectedAccount(accounts[0]);
          } catch (err: any) {
            setStatus(
              "MetaMask not available or user denied access: " + err.message
@@ -79,10 +83,33 @@ export default function Clash() {
            {phase === "reveal" && "Reveal your move."}
          </p>
          <div className="mb-8 p-4 bg-slate-100 dark:bg-slate-700 rounded-lg">
+            <div className="mb-4">
+              <label className="block text-sm font-semibold text-slate-600 dark:text-slate-300 mb-2">
+                Select Wallet Address:
+              </label>
+              {availableAccounts.length > 0 ? (
+                <select
+                  value={selectedAccount}
+                  onChange={(e) => {
+                    setSelectedAccount(e.target.value);
+                    setAccount(e.target.value);
+                  }}
+                  className="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg bg-white dark:bg-slate-800 text-slate-900 dark:text-white focus:outline-none focus:ring-2 focus:ring-blue-500"
+                >
+                  {availableAccounts.map((acc) => (
+                    <option key={acc} value={acc}>
+                      {`${acc.slice(0, 6)}...${acc.slice(-4)}`}
+                    </option>
+                  ))}
+                </select>
+              ) : (
+                <p className="text-sm text-red-600 dark:text-red-400">No accounts available</p>
+              )}
+            </div>
            <p className="text-sm text-slate-600 dark:text-slate-300">
-              <span className="font-semibold">Connected Account:</span>{" "}
-              {account
-                ? `${account.slice(0, 6)}...${account.slice(-4)}`
+              <span className="font-semibold">Active Account:</span>{" "}
+              {selectedAccount
+                ? `${selectedAccount.slice(0, 6)}...${selectedAccount.slice(-4)}`
                : "Not connected"}
            </p>
            <p className="text-sm text-slate-600 dark:text-slate-300 mt-2">
@@ -125,7 +152,7 @@ export default function Clash() {
          <div className="space-y-6">
            {phase === "games" && (
              <GameList
-                account={account}
+                account={selectedAccount}
                contract={contract}
                config={config}
                web3={web3}
@@ -135,7 +162,7 @@ export default function Clash() {
            )}
            {phase === "commit" && (
              <Commit
-                account={account}
+                account={selectedAccount}
                contract={contract}
                config={config}
                web3={web3}
@@ -144,11 +171,12 @@ export default function Clash() {
                setSelectedMove={setSelectedMove}
                secret={secret}
                setSecret={setSecret}
+                onBothPlayersCommitted={() => setPhase("reveal")}
              />
            )}
            {phase === "reveal" && (
              <Reveal
-                account={account}
+                account={selectedAccount}
                contract={contract}
                config={config}
                web3={web3}
--- a/crypto_clash_frontend/public/config.json
+++ b/crypto_clash_frontend/public/config.json
@@ -1,6 +1,6 @@
 {
    "API_URL": "http://185.48.228.49:8545",
-    "CONTRACT_ADDRESS": "0x8aF379ED8C452612676ACB856E26955237358944",
+    "CONTRACT_ADDRESS": "0x6da7dE8330EF1ff087C66e61Aa87FbC29E9b2869",
    "ABI": [
        {
            "inputs": [
@@ -59,7 +59,7 @@
            "type": "function"
        }
    ],
-    "GAME_CONTRACT_ADDRESS": "0x267d1b8bf8C13ea60D39F90cC68AEc4b8389bb64",
+    "GAME_CONTRACT_ADDRESS": "0x503d096a9a163180F79B1AC2F1d9F7C63f5DC75a",
    "GAME_ABI": [
        {
            "inputs": [],