ZHAW/crypto_clash
1
0
Fork 0
mirror of https://github.com/averel10/crypto_clash.git synced 2026-03-12 10:58:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
averel10
2025-11-21 18:42:43 +01:00
parent 06176e74f2
commit 3bd61490f1
5 changed files with 193 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
crypto_clash_contract/contracts/Game.sol
View File

@@ -228,6 +228,27 @@ contract Game {
game.firstReveal = block.timestamp;
}
if(
game.playerA.move != Moves.None &&
game.playerB.move != Moves.None
) {
// Both players have revealed, compute outcome
if (game.playerA.move == game.playerB.move) {
game.outcome = Outcomes.Draw;
} else if (
(game.playerA.move == Moves.Rock &&
game.playerB.move == Moves.Scissors) ||
(game.playerA.move == Moves.Paper &&
game.playerB.move == Moves.Rock) ||
(game.playerA.move == Moves.Scissors &&
game.playerB.move == Moves.Paper)
) {
game.outcome = Outcomes.PlayerA;
} else {
game.outcome = Outcomes.PlayerB;
}
}
return move;
}
@@ -272,29 +293,10 @@ contract Game {
uint gameId = playerToActiveGame[msg.sender];
GameState storage game = games[gameId];
// Only calculate outcome once
require(game.outcome == Outcomes.None, "Outcome already determined");
Outcomes outcome;
if (game.playerA.move == game.playerB.move) {
outcome = Outcomes.Draw;
} else if (
(game.playerA.move == Moves.Rock &&
game.playerB.move == Moves.Scissors) ||
(game.playerA.move == Moves.Paper &&
game.playerB.move == Moves.Rock) ||
(game.playerA.move == Moves.Scissors &&
game.playerB.move == Moves.Paper) ||
(game.playerA.move != Moves.None && game.playerB.move == Moves.None)
) {
outcome = Outcomes.PlayerA;
} else {
outcome = Outcomes.PlayerB;
}
// Store the outcome permanently before resetting
game.outcome = outcome;
require(
game.outcome != Outcomes.None,
"Outcome not yet determined"
);
address payable addrA = game.playerA.addr;
address payable addrB = game.playerB.addr;
@@ -305,9 +307,9 @@ contract Game {
// Reset and cleanup
resetGame(gameId); // Reset game before paying to avoid reentrancy attacks
pay(addrA, addrB, betPlayerA, outcome);
pay(addrA, addrB, betPlayerA, game.outcome);
return outcome;
return game.outcome;
}
// Pay the winner(s).