Skip to content

Commit

Permalink
emit player in gamedraw
Browse files Browse the repository at this point in the history
  • Loading branch information
hamdiallam committed Oct 4, 2024
1 parent ea8442d commit 9d2de09
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion contracts/lib/optimism
Submodule optimism updated 58 files
+3 −6 .circleci/config.yml
+3 −3 Makefile
+3 −0 cannon/.gitignore
+1 −1 cannon/Makefile
+1 −1 cannon/cmd/load_elf.go
+0 −1 cannon/cmd/run.go
+1 −9 cannon/mipsevm/exec/mips_syscalls.go
+1 −0 cannon/mipsevm/multithreaded/state.go
+1 −0 cannon/mipsevm/singlethreaded/state.go
+1 −11 cannon/mipsevm/tests/fuzz_evm_common_test.go
+1 −1 cannon/mipsevm/versions/detect.go
+7 −32 cannon/mipsevm/versions/detect_test.go
+3 −9 cannon/mipsevm/versions/state.go
+19 −22 cannon/mipsevm/versions/state_test.go
+ cannon/mipsevm/versions/testdata/states/0.bin.gz
+0 −48 cannon/mipsevm/versions/testdata/states/0.json
+ cannon/mipsevm/versions/testdata/states/1.bin.gz
+ cannon/mipsevm/versions/testdata/states/2.bin.gz
+1 −1 cannon/multicannon/exec.go
+1 −1 op-challenger/README.md
+1 −1 op-e2e/e2eutils/challenger/helper.go
+50 −7 op-e2e/system/gastoken/gastoken_test.go
+3 −2 op-node/node/conductor.go
+3 −3 op-node/node/node.go
+3 −3 op-program/Dockerfile.repro
+1 −1 op-program/README.md
+1 −7 op-program/scripts/build-prestates.sh
+22 −58 op-program/verify/verify.go
+5 −18 op-service/retry/operation.go
+1 −1 ops-bedrock/docker-compose.yml
+5 −2 ops/docker/op-stack-go/Dockerfile
+1 −1 packages/contracts-bedrock/foundry.toml
+1 −1 packages/contracts-bedrock/justfile
+12 −11 packages/contracts-bedrock/scripts/DeployImplementations.s.sol
+74 −0 packages/contracts-bedrock/scripts/checks/check-semver-natspec-match.sh
+0 −215 packages/contracts-bedrock/scripts/checks/semver-natspec/main.go
+0 −124 packages/contracts-bedrock/scripts/checks/semver-natspec/main_test.go
+197 −74 packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
+2 −111 packages/contracts-bedrock/scripts/deploy/DeployOwnership.s.sol
+17 −17 packages/contracts-bedrock/scripts/fpac/FPACOPS.s.sol
+18 −24 packages/contracts-bedrock/scripts/fpac/FPACOPS2.s.sol
+2 −2 packages/contracts-bedrock/scripts/fpac/Makefile
+1 −1 packages/contracts-bedrock/scripts/fpac/README.md
+6 −6 packages/contracts-bedrock/semver-lock.json
+18 −18 packages/contracts-bedrock/snapshots/abi/OPContractsManager.json
+18 −18 packages/contracts-bedrock/snapshots/abi/OPContractsManagerInterop.json
+1 −1 packages/contracts-bedrock/snapshots/storageLayout/OPContractsManager.json
+1 −1 packages/contracts-bedrock/snapshots/storageLayout/OPContractsManagerInterop.json
+57 −55 packages/contracts-bedrock/src/L1/OPContractsManager.sol
+8 −8 packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
+2 −2 packages/contracts-bedrock/src/cannon/MIPS.sol
+2 −2 packages/contracts-bedrock/src/cannon/MIPS2.sol
+3 −14 packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
+4 −6 packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
+1 −20 packages/contracts-bedrock/test/cannon/MIPS.t.sol
+1 −1 packages/contracts-bedrock/test/dispute/DelayedWETH.t.sol
+1 −1 packages/contracts-bedrock/test/dispute/DisputeGameFactory.t.sol
+1 −4 packages/contracts-bedrock/test/kontrol/scripts/make-summary-deployment.sh
4 changes: 2 additions & 2 deletions contracts/src/tictactoe/TicTacToe.sol
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ contract TicTacToe {
event GameWon(uint256 chainId, uint256 gameId, address winner, uint8 _x, uint8 _y);

/// @notice Emitted when all spots on the board were played with no winner with their lastest move
event GameDraw(uint256 chainId, uint256 gameId, uint8 _x, uint8 _y);
event GameDraw(uint256 chainId, uint256 gameId, address player, uint8 _x, uint8 _y);

/// @notice Creates a new game that any player can accept
function newGame() external {
Expand Down Expand Up @@ -188,7 +188,7 @@ contract TicTacToe {
emit GameWon(chainId, gameId, game.player, _x, _y);
}
else if (game.movesLeft == 0) {
emit GameDraw(chainId, gameId, _x, _y);
emit GameDraw(chainId, gameId, game.player, _x, _y);
}
else {
emit MovePlayed(chainId, gameId, game.player, _x, _y);
Expand Down

0 comments on commit 9d2de09

Please sign in to comment.