Contract fixes

CommonDAO-DeedProtocol.code-workspace

@@ -13,8 +13,26 @@
       "path": "."
     },
   ],
+
   "settings": {
     "editor.tabSize": 2,
-    "prettier.tabWidth": 4
+
+    "prettier.tabWidth": 4,
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "[solidity]": {
+      "editor.defaultFormatter": "NomicFoundation.hardhat-solidity"
+    },
+    "[json]": {
+      "editor.defaultFormatter": "vscode.json-language-features"
+    }
+  },
+  "extensions": {
+    "recommendations": [
+      "esbenp.prettier-vscode",
+      "dsznajder.es7-react-js-snippets",
+      "dbaeumer.vscode-eslint",
+      "xabikos.javascriptsnippets",
+      "styled-components.vscode-styled-components"
+    ]
   }
 }

package.json

@@ -37,4 +37,4 @@
   "resolutions": {
     "usehooks-ts@^2.7.2": "patch:usehooks-ts@npm:^2.7.2#./.yarn/patches/usehooks-ts-npm-2.7.2-fceffe0e43.patch"
   }
-}
+}

packages/hardhat/contracts/DeedNFT.sol

@@ -3,35 +3,38 @@ pragma solidity ^0.8.0;
 import "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 import "@openzeppelin/contracts/access/AccessControl.sol";
 
-
 contract DeedNFT is ERC721, AccessControl {
     uint256 private _nextTokenId;
 
     mapping(uint256 => string) private _tokenNames;
-    mapping(uint256 => string) private _tokenSymbols;
     mapping(uint256 => string) private _tokenURIs;
     mapping(uint256 => AssetType) private _tokenAssetTypes;
 
     bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");
 
-    enum AssetType { Land, Vehicle, Estate }
+    enum AssetType {
+        Land,
+        Vehicle,
+        Estate,
+        CommercialEquipment
+    }
 
     constructor() ERC721("DeedNFT", "DEED") {
         _nextTokenId = 1;
-        _setupRole(MINTER_ROLE, _msgSender());
+        _setupRole(MINTER_ROLE, msg.sender);
+        _setupRole(DEFAULT_ADMIN_ROLE, msg.sender);
     }
 
     function mintAsset(
         address _to,
         string memory _tokenURI,
         string memory _name,
-        string memory _symbol,
         AssetType _assetType
     ) public onlyRole(MINTER_ROLE) {
+        // require(_to != address(0), "invalid address");
         _mint(_to, _nextTokenId);
         _setTokenURI(_nextTokenId, _tokenURI);
         _setName(_nextTokenId, _name);
-        _setSymbol(_nextTokenId, _symbol);
         _setAssetType(_nextTokenId, _assetType);
         _nextTokenId = _nextTokenId + 1;
     }
@@ -50,21 +53,12 @@ contract DeedNFT is ERC721, AccessControl {
         require(_exists(tokenId), "ERC721Metadata: Name set of nonexistent token");
         _tokenNames[tokenId] = _name;
     }
+
     function getTokenName(uint256 tokenId) public view returns (string memory) {
         require(_exists(tokenId), "ERC721Metadata: Name query for nonexistent token");
         return _tokenNames[tokenId];
     }
 
-    function _setSymbol(uint256 tokenId, string memory _symbol) internal virtual {
-        require(_exists(tokenId), "ERC721Metadata: Symbol set of nonexistent token");
-        _tokenSymbols[tokenId] = _symbol;
-    }
-
-    function getTokenSymbol(uint256 tokenId) public view returns (string memory) {
-        require(_exists(tokenId), "ERC721Metadata: Symbol query for nonexistent token");
-        return _tokenSymbols[tokenId];
-    }
-
     function _setAssetType(uint256 tokenId, AssetType _assetType) internal virtual {
         require(_exists(tokenId), "ERC721Metadata: Asset type set of nonexistent token");
         _tokenAssetTypes[tokenId] = _assetType;
@@ -82,13 +76,15 @@ contract DeedNFT is ERC721, AccessControl {
     function removeMinter(address minter) public onlyRole(DEFAULT_ADMIN_ROLE) {
         revokeRole(MINTER_ROLE, minter);
     }
-
-    function canSubdivide(uint256 tokenId) public view returns (bool) {
+
+    //External instead of public?
+    function canSubdivide(uint256 tokenId) external view returns (bool) {
         AssetType assetType = getAssetType(tokenId);
         return assetType == AssetType.Land || assetType == AssetType.Estate;
     }
 
+    //Use?
     function supportsInterface(bytes4 interfaceId) public view virtual override(ERC721, AccessControl) returns (bool) {
         return super.supportsInterface(interfaceId);
     }
-}
+}