Authorized deployer contract PRO-80

src/deployer/Deployer.sol

@@ -126,9 +126,13 @@ contract Deployer is TwoStepOwnable, IERC721ViewMetadata {
         if (descriptionHash[feature] != 0) {
             revert FeatureInitialized(feature);
         }
+        // TODO: put something better in the `"name"` field
         string memory content = string(abi.encodePacked("{\"description\": \"", description, "\", \"name\": \"0xV5\"}"));
-        string memory ipfsURI = string(abi.encodePacked("ipfs://", verifyIPFS.generateHash(content)));
+        bytes32 contentHash = verifyIPFS.ipfsHash(content);
+        descriptionHash[feature] = contentHash;
+        string memory ipfsURI = string(abi.encodePacked("ipfs://", verifyIPFS.formatHash(contentHash)));
         emit PermanentURI(ipfsURI, feature);
+        return ipfsURI;
     }
 
     event Deployed(uint128 indexed, address indexed);
@@ -256,10 +260,15 @@ contract Deployer is TwoStepOwnable, IERC721ViewMetadata {
         return false;
     }
 
+    error NoToken(uint256);
+
     function tokenURI(uint256 tokenId) external view returns (string memory) {
         if (tokenId > type(uint128).max) {
             Panic.panic(Panic.ARITHMETIC_OVERFLOW);
         }
-        // TODO:
+        if (_featureNonce[uint128(tokenId)] == 0) {
+            revert NoToken(tokenId);
+        }
+        return string(abi.encodePacked("ipfs://", verifyIPFS.formatHash(descriptionHash[uint128(tokenId)])));
     }
 }

src/vendor/verifyIPFS.sol

@@ -10,22 +10,22 @@ library verifyIPFS {
     bytes constant ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
 
     /// @dev generates the corresponding IPFS hash (in base 58) to the given string
-    /// @param contentString The content of the IPFS object
+    /// @param contentHash The hash of the content of the IPFS object
     /// @return The IPFS hash in base 58
-    function generateHash(string memory contentString) internal pure returns (bytes memory) {
+    function formatHash(bytes32 contentHash) internal pure returns (bytes memory) {
+        return toBase58(concat(sha256MultiHash, toBytes(contentHash)));
+    }
+
+    function ipfsHash(string memory contentString) internal pure returns (bytes32) {
         bytes memory content = bytes(contentString);
         bytes memory len = lengthEncode(content.length);
         bytes memory len2 = lengthEncode(content.length + 4 + 2 * len.length);
-        return toBase58(
-            concat(
-                sha256MultiHash, toBytes(sha256(abi.encodePacked(prefix1, len2, prefix2, len, content, postfix, len)))
-            )
-        );
+        return sha256(abi.encodePacked(prefix1, len2, prefix2, len, content, postfix, len));
     }
 
     /// @dev Compares an IPFS hash with content
     function verifyHash(string memory contentString, string memory hash) internal pure returns (bool) {
-        return equal(generateHash(contentString), bytes(hash));
+        return equal(formatHash(ipfsHash(contentString)), bytes(hash));
     }
 
     /// @dev Converts hex string to base 58