updat1k

peeramid-labs · Nov 2, 2023 · 65fd262 · 65fd262
1 parent 372be10
commit 65fd262
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 21 deletions.
diff --git a/abi/hardhat-diamond-abi/HardhatDiamondABI.sol/BestOfDiamond.json b/abi/hardhat-diamond-abi/HardhatDiamondABI.sol/BestOfDiamond.json
@@ -107,6 +107,25 @@
     "name": "gameCreated",
     "type": "event"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "gameId",
+        "type": "uint256"
+      }
+    ],
+    "name": "canEndTurn",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [
       {

diff --git a/abi/src/facets/BestOfFacet.sol/BestOfFacet.json b/abi/src/facets/BestOfFacet.sol/BestOfFacet.json
@@ -107,6 +107,25 @@
     "name": "gameCreated",
     "type": "event"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "gameId",
+        "type": "uint256"
+      }
+    ],
+    "name": "canEndTurn",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [
       {

diff --git a/abi/src/vendor/interfaces/IERC173.sol/IERC173.json b/abi/src/vendor/interfaces/IERC173.sol/IERC173.json
@@ -1,23 +1,4 @@
 [
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "previousOwner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnershipTransferred",
-    "type": "event"
-  },
   {
     "inputs": [],
     "name": "owner",

diff --git a/src/facets/BestOfFacet.sol b/src/facets/BestOfFacet.sol
@@ -229,4 +229,9 @@ contract BestOfFacet is IBestOf, IERC1155Receiver, DiamondReentrancyGuard, IERC7
     function canStartGame(uint256 gameId) public view returns (bool) {
         return gameId.canStart();
     }
+
+    function canEndTurn(uint256 gameId) public view returns (bool)
+    {
+        return gameId.canEndTurn();
+    }
 }
diff --git a/src/vendor/facets/OwnershipFacet.sol b/src/vendor/facets/OwnershipFacet.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.4;
+pragma solidity 0.8.20;
 
 import "../libraries/LibDiamond.sol";
 import "../interfaces/IERC173.sol";

diff --git a/src/vendor/interfaces/IERC173.sol b/src/vendor/interfaces/IERC173.sol
@@ -6,7 +6,8 @@ pragma solidity ^0.8.4;
 /* is ERC165 */
 interface IERC173 {
     /// @dev This emits when ownership of a contract changes.
-    event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+    // Removed deue to duplicate abi generation in 8.20 compiler
+    // event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
 
     /// @notice Get the address of the owner
     /// @return owner_ The address of the owner.