Merge pull request #141 from ethscriptions-protocol/fix_collections

Enhance Ethscriptions Metadata Handling and URI Resolution

Author: RogerPodacter

contracts/script/L2Genesis.s.sol

@@ -212,7 +212,8 @@ contract L2Genesis is Script {
             bool isProxiedContract = addr == Predeploys.ETHSCRIPTIONS ||
                 addr == Predeploys.ERC20_FIXED_DENOMINATION_MANAGER ||
                 addr == Predeploys.ETHSCRIPTIONS_PROVER ||
-                addr == Predeploys.ERC721_ETHSCRIPTIONS_COLLECTION_MANAGER;
+                addr == Predeploys.ERC721_ETHSCRIPTIONS_COLLECTION_MANAGER ||
+                addr == Predeploys.NAME_REGISTRY;
             if (isProxiedContract) {
                 address impl = Predeploys.predeployToCodeNamespace(addr);
                 setImplementation(addr, impl);
@@ -223,10 +224,10 @@ contract L2Genesis is Script {
         _setImplementationCodeNamed(Predeploys.ERC20_FIXED_DENOMINATION_MANAGER, "ERC20FixedDenominationManager");
         _setImplementationCodeNamed(Predeploys.ERC721_ETHSCRIPTIONS_COLLECTION_MANAGER, "ERC721EthscriptionsCollectionManager");
         _setImplementationCodeNamed(Predeploys.ETHSCRIPTIONS_PROVER, "EthscriptionsProver");
-        // Templates live directly at their implementation addresses (no proxy wrapping)
+        _setImplementationCodeNamed(Predeploys.NAME_REGISTRY, "NameRegistry");
+        // Templates live directly at their addresses (no proxy wrapping)
         _setCodeAt(Predeploys.ERC20_FIXED_DENOMINATION_IMPLEMENTATION, "ERC20FixedDenomination");
         _setCodeAt(Predeploys.ERC721_ETHSCRIPTIONS_COLLECTION_IMPLEMENTATION, "ERC721EthscriptionsCollection");
-        _setCodeAt(Predeploys.NAME_REGISTRY, "NameRegistry");
 
         // Create genesis Ethscriptions (writes via proxy to proxy storage)
         createGenesisEthscriptions();

contracts/src/ERC721EthscriptionsCollection.sol

@@ -101,13 +101,25 @@ contract ERC721EthscriptionsCollection is ERC721EthscriptionsEnumerableUpgradeab
             manager.getCollectionItem(collectionId, tokenId);
         if (item.ethscriptionId == bytes32(0)) revert("Token not in collection");
 
+        // Get the ethscription data to extract the ethscription number
+        Ethscriptions.Ethscription memory ethscription = ethscriptions.getEthscription(item.ethscriptionId, false);
+
         (string memory mediaType, string memory mediaUri) = ethscriptions.getMediaUri(item.ethscriptionId);
 
+        // Convert ethscriptionId to hex string (0x prefixed)
+        string memory ethscriptionIdHex = uint256(item.ethscriptionId).toHexString(32);
+
         string memory jsonStart = string.concat('{"name":"', item.name.escapeJSON(), '"');
         if (bytes(item.description).length > 0) {
             jsonStart = string.concat(jsonStart, ',"description":"', item.description.escapeJSON(), '"');
         }
 
+        // Add ethscription ID and number
+        string memory ethscriptionFields = string.concat(
+            ',"ethscription_id":"', ethscriptionIdHex, '"',
+            ',"ethscription_number":', ethscription.ethscriptionNumber.toString()
+        );
+
         string memory mediaField = string.concat(
             ',"',
             mediaType,
@@ -135,7 +147,7 @@ contract ERC721EthscriptionsCollection is ERC721EthscriptionsEnumerableUpgradeab
         }
         attributesJson = string.concat(attributesJson, ']');
 
-        string memory json = string.concat(jsonStart, mediaField, bgColor, attributesJson, '}');
+        string memory json = string.concat(jsonStart, ethscriptionFields, mediaField, bgColor, attributesJson, '}');
 
         return string.concat("data:application/json;base64,", Base64.encode(bytes(json)));
     }

contracts/src/NameRegistry.sol

@@ -189,15 +189,23 @@ contract NameRegistry is ERC721EthscriptionsEnumerableUpgradeable, IProtocolHand
         if (record.ethscriptionId == bytes32(0)) revert TokenDoesNotExist();
         string memory name = LibString.unpackOne(record.packedName);
 
+        // Get the ethscription data to extract the ethscription number
+        Ethscriptions.Ethscription memory ethscription = ethscriptions.getEthscription(record.ethscriptionId, false);
+
+        // Convert ethscriptionId to hex string (0x prefixed)
+        string memory ethscriptionIdHex = uint256(record.ethscriptionId).toHexString(32);
+
         bytes memory json = abi.encodePacked(
             '{"name":"',
             name,
-            '","description":"Dotless word domain","attributes":[',
+            '","description":"Dotless word domain"',
+            ',"ethscription_id":"',
+            ethscriptionIdHex,
+            '","ethscription_number":',
+            ethscription.ethscriptionNumber.toString(),
+            ',"attributes":[',
             '{"trait_type":"Name","value":"',
             name,
-            '"},',
-            '{"trait_type":"Ethscription","value":"',
-            _bytes32ToHex(record.ethscriptionId),
             '"}',
             ']}'
         );
@@ -212,10 +220,6 @@ contract NameRegistry is ERC721EthscriptionsEnumerableUpgradeable, IProtocolHand
         return super._update(to, tokenId, auth);
     }
 
-    function _bytes32ToHex(bytes32 data) internal pure returns (string memory) {
-        return Strings.toHexString(uint256(data), 32);
-    }
-
     function _domainInfo(bytes32 nameKey) internal view returns (DomainInfo memory info) {
         DomainRecord storage record = domains[nameKey];
         if (record.ethscriptionId == bytes32(0)) revert DomainNotFound();

contracts/src/libraries/EthscriptionsRendererLib.sol

@@ -32,7 +32,7 @@ library EthscriptionsRendererLib {
         // Build in chunks to avoid stack too deep
         string memory part1 = string.concat(
             '[{"trait_type":"Ethscription ID","value":"',
-            uint256(ethscriptionId).toHexString(),
+            uint256(ethscriptionId).toHexString(32),
             '"},{"trait_type":"Ethscription Number","display_type":"number","value":',
             etsc.ethscriptionNumber.toString(),
             '},{"trait_type":"Creator","value":"',
@@ -43,7 +43,7 @@ library EthscriptionsRendererLib {
 
         string memory part2 = string.concat(
             '"},{"trait_type":"Content Hash","value":"',
-            uint256(etsc.contentHash).toHexString(),
+            uint256(etsc.contentHash).toHexString(32),
             '"},{"trait_type":"MIME Type","value":"',
             mimetype.escapeJSON(),
             '"},{"trait_type":"ESIP-6","value":"',

contracts/test/CollectionURIResolution.t.sol

@@ -72,7 +72,7 @@ contract CollectionURIResolutionTest is TestSetup {
         // Create collection with esc:// reference to the image
         string memory escUri = string.concat(
             "esc://ethscriptions/",
-            uint256(IMAGE_ETSC_TX_HASH).toHexString(),
+            uint256(IMAGE_ETSC_TX_HASH).toHexString(32),
             "/data"
         );
 
@@ -99,7 +99,7 @@ contract CollectionURIResolutionTest is TestSetup {
         bytes32 fakeId = keccak256("nonexistent");
         string memory escUri = string.concat(
             "esc://ethscriptions/",
-            uint256(fakeId).toHexString(),
+            uint256(fakeId).toHexString(32),
             "/data"
         );