Merge pull request #80 from MyriadFlow/UpdateSmartContracts

Update Phygital Version
MyriadFlow · Jun 25, 2024 · 5f71029 · 5f71029
2 parents 4c0a77a + 6a17a24
commit 5f71029
Show file tree

Hide file tree

Showing 105 changed files with 4,931 additions and 2,170 deletions.
diff --git a/contracts/accessmaster/AccessMaster.sol b/contracts/accessmaster/AccessMaster.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.17;
+pragma solidity ^0.8.20;
 
-import "@openzeppelin/contracts/access/AccessControlEnumerable.sol";
+import "@openzeppelin/contracts/access/extensions/AccessControlEnumerable.sol";
 
 /**
  * @dev This Contract Module helps to deploy the
@@ -21,22 +21,17 @@ contract AccessMaster is AccessControlEnumerable {
         keccak256("FLOW_OPERATOR_ROLE");
     bytes32 public constant FLOW_CREATOR_ROLE = keccak256("FLOW_CREATOR_ROLE");
 
-    constructor(address storefrontAdmin) {
-        _setupRole(FLOW_ADMIN_ROLE, _msgSender());
-
+    constructor(address _payoutAddress) {
         _setRoleAdmin(FLOW_ADMIN_ROLE, FLOW_ADMIN_ROLE);
         _setRoleAdmin(FLOW_OPERATOR_ROLE, FLOW_ADMIN_ROLE);
         _setRoleAdmin(FLOW_CREATOR_ROLE, FLOW_OPERATOR_ROLE);
-
+        _grantRole(FLOW_ADMIN_ROLE, _msgSender());
         // add Admin to operator and Creator
         grantRole(FLOW_OPERATOR_ROLE, _msgSender());
-
         // assigning storefront publisher Wallet the Admin role
-        grantRole(FLOW_ADMIN_ROLE, storefrontAdmin);
-        grantRole(FLOW_OPERATOR_ROLE, storefrontAdmin);
-        grantRole(FLOW_CREATOR_ROLE, storefrontAdmin);
+        grantRole(FLOW_CREATOR_ROLE, _msgSender());
 
-        payoutAddress = storefrontAdmin;
+        payoutAddress = _payoutAddress;
     }
 
     function updateName(

diff --git a/contracts/accessmaster/interfaces/IAccessMaster.sol b/contracts/accessmaster/interfaces/IAccessMaster.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 /**
  * @dev External interface of AccessMaster declared to support ERC165 detection.

diff --git a/contracts/eternalsoul/EternalSoul.sol b/contracts/eternalsoul/EternalSoul.sol
@@ -3,8 +3,9 @@ pragma solidity ^0.8.17;
 
 import "@openzeppelin/contracts/utils/Context.sol";
 import "../accessmaster/interfaces/IAccessMaster.sol";
-import "@openzeppelin/contracts/utils/cryptography/draft-EIP712.sol";
+import "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
 import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
+import "@openzeppelin/contracts/utils/Strings.sol";
 import "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";
 
 /**
@@ -175,7 +176,7 @@ contract EternalSoul is Context, ERC721Enumerable, EIP712 {
      */
     function destroyAsset(uint256 tokenId) public {
         require(
-            _isApprovedOrOwner(_msgSender(), tokenId),
+            _isAuthorized(_ownerOf(tokenId), _msgSender(), tokenId),
             "EternalSoul: Caller is not token owner or approved"
         );
         _burn(tokenId);
@@ -193,7 +194,10 @@ contract EternalSoul is Context, ERC721Enumerable, EIP712 {
         uint256 tokenId,
         string memory _tokenURI
     ) internal virtual {
-        require(_exists(tokenId), "EternalSoul: Non-Existent Asset");
+        require(
+            _requireOwned(tokenId) == _msgSender(),
+            "EternalSoul: Non-Existent Asset"
+        );
         _tokenURIs[tokenId] = _tokenURI;
     }
 
@@ -222,7 +226,10 @@ contract EternalSoul is Context, ERC721Enumerable, EIP712 {
     function tokenURI(
         uint256 tokenId
     ) public view virtual override returns (string memory) {
-        require(_exists(tokenId), "EternalSoul: Non-Existent Asset");
+        require(
+            _requireOwned(tokenId) == _msgSender(),
+            "EternalSoul: Non-Existent Asset"
+        );
         if (bytes(_tokenURIs[tokenId]).length == 0) {
             string memory _tokenUri = _baseURI(); //ERC721
             return _tokenUri;
@@ -235,19 +242,26 @@ contract EternalSoul is Context, ERC721Enumerable, EIP712 {
         return baseURI;
     }
 
-    /// @dev only minting and burning can happen
-    /// token transfer are restricted
-    function _beforeTokenTransfer(
-        address from,
+    // function _transfer(
+    //     address from,
+    //     address to,
+    //     uint256 tokenId
+    // ) internal override {
+    //     require(
+    //         from == address(0) || to == address(0),
+    //         "EternalSoul : Asset cannot be transferred"
+    //     );
+    //     super._transfer(from, to, tokenId);
+    // }
+
+    function _update(
         address to,
         uint256 tokenId,
-        uint256 batchSize
-    ) internal virtual override(ERC721Enumerable) {
-        require(
-            from == address(0) || to == address(0),
-            "EternalSoul : Asset cannot be transferred"
-        );
-        super._beforeTokenTransfer(from, to, tokenId, batchSize);
+        address auth
+    ) internal virtual override returns (address) {
+        require(to == address(0), "EternalSoul : Asset cannot be transferred");
+        address from = super._update(to, tokenId, auth);
+        return from;
     }
 
     /**

diff --git a/contracts/eturnumpass/EternumPass.sol b/contracts/eturnumpass/EternumPass.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity ^0.8.20;
 
 import "../common/interface/IERC4907.sol";
 import "../common/interface/IERC5643.sol";
@@ -73,7 +73,10 @@ contract EternumPass is Context, IERC4907, IERC5643, ERC2981, ERC721Enumerable {
     }
 
     modifier onlyWhenTokenExist(uint256 tokenId) {
-        require(_exists(tokenId), "EternumPass: Not a valid tokenId");
+        require(
+            _requireOwned(tokenId) == _msgSender(),
+            "EternumPass: Not a valid tokenId"
+        );
         _;
     }
 
@@ -224,7 +227,7 @@ contract EternumPass is Context, IERC4907, IERC5643, ERC2981, ERC721Enumerable {
      */
     function revokeSubscription(uint256 _tokenId) public {
         require(
-            _isApprovedOrOwner(_msgSender(), _tokenId),
+            _isAuthorized(_ownerOf(_tokenId), _msgSender(), _tokenId),
             "EternumPass: Not Owner Or Approved"
         );
         _burn(_tokenId);
@@ -247,7 +250,7 @@ contract EternumPass is Context, IERC4907, IERC5643, ERC2981, ERC721Enumerable {
         uint64 expires
     ) public override {
         require(
-            _isApprovedOrOwner(_msgSender(), tokenId),
+            _isAuthorized(_ownerOf(tokenId), _msgSender(), tokenId),
             "EternumPass: Not token owner Or approved"
         );
         require(
@@ -267,7 +270,7 @@ contract EternumPass is Context, IERC4907, IERC5643, ERC2981, ERC721Enumerable {
         uint256 pricePerHour
     ) public {
         require(
-            _isApprovedOrOwner(_msgSender(), tokenId),
+            _isAuthorized(_ownerOf(tokenId), _msgSender(), tokenId),
             "EternumPass: Caller is not token owner or approved"
         );
         rentables[tokenId].isRentable = isRentable;
@@ -283,7 +286,10 @@ contract EternumPass is Context, IERC4907, IERC5643, ERC2981, ERC721Enumerable {
     /// @param _timeInHours  is in hours , Ex- 1,2,3
 
     function rent(uint256 _tokenId, uint256 _timeInHours) external payable {
-        require(_exists(_tokenId), "SignatureSeries: Invalide Token Id");
+        require(
+            _requireOwned(_tokenId) == _msgSender(),
+            "Eternumpass: Invalide Token Id"
+        );
         require(
             rentables[_tokenId].isRentable,
             "EternumPass: Not available for rent"
@@ -339,7 +345,8 @@ contract EternumPass is Context, IERC4907, IERC5643, ERC2981, ERC721Enumerable {
     ) external payable onlyWhenTokenExist(tokenId) {
         bool isOperator = flowRoles.isOperator(_msgSender());
         require(
-            _isApprovedOrOwner(_msgSender(), tokenId) || isOperator,
+            _isAuthorized(_ownerOf(tokenId), _msgSender(), tokenId) ||
+                isOperator,
             "EternumPass: Caller is owner nor approved or the Operator"
         );
         require(
@@ -385,7 +392,7 @@ contract EternumPass is Context, IERC4907, IERC5643, ERC2981, ERC721Enumerable {
         bool isOperator = flowRoles.isOperator(_msgSender());
         if (!isOperator) {
             require(
-                _isApprovedOrOwner(_msgSender(), tokenId),
+                _isAuthorized(_ownerOf(tokenId), _msgSender(), tokenId),
                 "EternumPass: Caller is owner nor approved"
             );
             require(
@@ -498,21 +505,17 @@ contract EternumPass is Context, IERC4907, IERC5643, ERC2981, ERC721Enumerable {
         return baseURI;
     }
 
-    function _beforeTokenTransfer(
-        address from,
+    function _update(
         address to,
         uint256 tokenId,
-        uint256 batchSize
-    ) internal virtual override(ERC721Enumerable) {
-        super._beforeTokenTransfer(from, to, tokenId, batchSize);
+        address auth
+    ) internal virtual override returns (address) {
+        address from = super._update(to, tokenId, auth);
         if (from != to && rentables[tokenId].user != address(0)) {
             delete rentables[tokenId];
             emit UpdateUser(tokenId, address(0), 0);
         }
-    }
-
-    function timeStamp() external view returns (uint256) {
-        return block.timestamp;
+        return from;
     }
 
     function supportsInterface(

diff --git a/contracts/flow-contracts/cybermaven/CyberMaven.sol b/contracts/flow-contracts/cybermaven/CyberMaven.sol
@@ -123,6 +123,7 @@ contract CyberMaven is
         }
         _nounce++;
     }
+
     // Put Getter
 
     function getValueFromMyContract(
@@ -260,7 +261,7 @@ contract CyberMaven is
 
     function supportsInterface(
         bytes4 interfaceId
-    ) public view virtual override(IERC165, ERC1155Receiver) returns (bool) {
+    ) public view virtual override(IERC165, ERC1155Holder) returns (bool) {
         if (
             interfaceId == type(IERC165).interfaceId ||
             interfaceId == type(IERC6551Account).interfaceId

diff --git a/contracts/flow-contracts/flowofferstation/FlowOfferStation.sol b/contracts/flow-contracts/flowofferstation/FlowOfferStation.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/utils/Context.sol";
-import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
+import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
 import "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol";
 import "@openzeppelin/contracts/token/common/ERC2981.sol";
 import "../../accessmaster/interfaces/IAccessMaster.sol";