@bannynet/core-v6 0.0.4 → 0.0.5

package/foundry.toml

@@ -1,7 +1,7 @@
 [profile.default]
 solc = '0.8.26'
 evm_version = 'paris'
-optimizer_runs = 800
+optimizer_runs = 200
 via_ir = true
 libs = ["node_modules", "lib"]
 fs_permissions = [{ access = "read-write", path = "./"}]

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bannynet/core-v6",
-    "version": "0.0.4",
+    "version": "0.0.5",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -11,7 +11,7 @@
     },
     "scripts": {
         "test": "forge test",
-        "coverage:integration": "forge coverage --match-path \"./src/*.sol\" --report lcov --report summary",
+        "coverage": "forge coverage --match-path \"./src/*.sol\" --report lcov --report summary",
         "generate:migration": "node ./script/outfit_drop/generate-migration.js",
         "deploy:mainnets": "source ./.env && export START_TIME=$(date +%s) && npx sphinx propose ./script/Deploy.s.sol --networks mainnets",
         "deploy:testnets": "source ./.env && export START_TIME=$(date +%s) && npx sphinx propose ./script/Deploy.s.sol --networks testnets",
@@ -21,14 +21,14 @@
     },
     "dependencies": {
         "@bananapus/721-hook-v6": "^0.0.9",
-        "@bananapus/core-v6": "^0.0.9",
+        "@bananapus/core-v6": "^0.0.10",
         "@bananapus/router-terminal-v6": "^0.0.6",
-        "@bananapus/suckers-v6": "^0.0.6",
+        "@bananapus/suckers-v6": "^0.0.7",
         "@openzeppelin/contracts": "5.2.0",
         "@rev-net/core-v6": "^0.0.6",
         "keccak": "^3.0.4"
     },
     "devDependencies": {
-        "@sphinx-labs/plugins": "0.33.3"
+        "@sphinx-labs/plugins": "^0.33.2"
     }
 }

package/src/Banny721TokenUriResolver.sol

@@ -1,19 +1,19 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import {IERC721} from "@bananapus/721-hook-v6/src/abstract/ERC721.sol";
-import {IJB721TiersHook} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHook.sol";
-import {IJB721TiersHookStore} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHookStore.sol";
-import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";
-import {JB721Tier} from "@bananapus/721-hook-v6/src/structs/JB721Tier.sol";
-import {JBIpfsDecoder} from "@bananapus/721-hook-v6/src/libraries/JBIpfsDecoder.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
-import {ReentrancyGuard} from "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
 import {ERC2771Context} from "@openzeppelin/contracts/metatx/ERC2771Context.sol";
 import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 import {Context} from "@openzeppelin/contracts/utils/Context.sol";
 import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
+import {ReentrancyGuard} from "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
 import {Base64} from "lib/base64/base64.sol";
+import {IERC721} from "@bananapus/721-hook-v6/src/abstract/ERC721.sol";
+import {IJB721TiersHook} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHook.sol";
+import {IJB721TiersHookStore} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHookStore.sol";
+import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";
+import {JBIpfsDecoder} from "@bananapus/721-hook-v6/src/libraries/JBIpfsDecoder.sol";
+import {JB721Tier} from "@bananapus/721-hook-v6/src/structs/JB721Tier.sol";
 
 import {IBanny721TokenUriResolver} from "./interfaces/IBanny721TokenUriResolver.sol";
 
@@ -28,6 +28,10 @@ contract Banny721TokenUriResolver is
 {
     using Strings for uint256;
 
+    //*********************************************************************//
+    // --------------------------- custom errors ------------------------- //
+    //*********************************************************************//
+
     error Banny721TokenUriResolver_ArrayLengthMismatch();
     error Banny721TokenUriResolver_BannyBodyNotBodyCategory();
     error Banny721TokenUriResolver_CantAccelerateTheLock();
@@ -38,14 +42,14 @@ contract Banny721TokenUriResolver is
     error Banny721TokenUriResolver_HeadAlreadyAdded();
     error Banny721TokenUriResolver_OutfitChangesLocked();
     error Banny721TokenUriResolver_SuitAlreadyAdded();
+    error Banny721TokenUriResolver_UnauthorizedBackground();
     error Banny721TokenUriResolver_UnauthorizedBannyBody();
     error Banny721TokenUriResolver_UnauthorizedOutfit();
-    error Banny721TokenUriResolver_UnauthorizedBackground();
+    error Banny721TokenUriResolver_UnauthorizedTransfer();
     error Banny721TokenUriResolver_UnorderedCategories();
-    error Banny721TokenUriResolver_UnrecognizedCategory();
     error Banny721TokenUriResolver_UnrecognizedBackground();
+    error Banny721TokenUriResolver_UnrecognizedCategory();
     error Banny721TokenUriResolver_UnrecognizedProduct();
-    error Banny721TokenUriResolver_UnauthorizedTransfer();
 
     //*********************************************************************//
     // ------------------------ private constants ------------------------ //
@@ -517,6 +521,39 @@ contract Banny721TokenUriResolver is
     // -------------------------- internal views ------------------------- //
     //*********************************************************************//
 
+    /// @notice The SVG contents for a banny body.
+    /// @param upc The ID of the token whose product's SVG is being returned.
+    /// @return contents The SVG contents of the banny body.
+    function _bannyBodySvgOf(uint256 upc) internal view returns (string memory) {
+        (
+            string memory b1,
+            string memory b2,
+            string memory b3,
+            string memory b4,
+            string memory a1,
+            string memory a2,
+            string memory a3
+        ) = _fillsFor(upc);
+        return string.concat(
+            "<style>.b1{fill:#",
+            b1,
+            ";}.b2{fill:#",
+            b2,
+            ";}.b3{fill:#",
+            b3,
+            ";}.b4{fill:#",
+            b4,
+            ";}.a1{fill:#",
+            a1,
+            ";}.a2{fill:#",
+            a2,
+            ";}.a3{fill:#",
+            a3,
+            ";}</style>",
+            BANNY_BODY
+        );
+    }
+
     /// @notice The name of each token's category.
     /// @param category The category of the token being named.
     /// @return name The token's category name.
@@ -561,11 +598,6 @@ contract Banny721TokenUriResolver is
         return "";
     }
 
-    /// @dev ERC-2771 specifies the context as being a single address (20 bytes).
-    function _contextSuffixLength() internal view virtual override(ERC2771Context, Context) returns (uint256) {
-        return super._contextSuffixLength();
-    }
-
     /// @notice Make sure the message sender own's the token.
     /// @param hook The 721 contract of the token having ownership checked.
     /// @param upc The product's UPC to check ownership of.
@@ -573,33 +605,9 @@ contract Banny721TokenUriResolver is
         if (IERC721(hook).ownerOf(upc) != _msgSender()) revert Banny721TokenUriResolver_UnauthorizedBannyBody();
     }
 
-    /// @notice The fills for a product.
-    /// @param upc The ID of the token whose product's fills are being returned.
-    /// @return fills The fills for the product.
-    function _fillsFor(uint256 upc)
-        internal
-        pure
-        returns (
-            string memory,
-            string memory,
-            string memory,
-            string memory,
-            string memory,
-            string memory,
-            string memory
-        )
-    {
-        if (upc == ALIEN_UPC) {
-            return ("67d757", "30a220", "217a15", "09490f", "e483ef", "dc2fef", "dc2fef");
-        } else if (upc == PINK_UPC) {
-            return ("ffd8c5", "ff96a9", "fe588b", "c92f45", "ffd8c5", "ff96a9", "fe588b");
-        } else if (upc == ORANGE_UPC) {
-            return ("f3a603", "ff7c02", "fd3600", "c32e0d", "f3a603", "ff7c02", "fd3600");
-        } else if (upc == ORIGINAL_UPC) {
-            return ("ffe900", "ffc700", "f3a603", "965a1a", "ffe900", "ffc700", "f3a603");
-        }
-
-        revert Banny721TokenUriResolver_UnrecognizedProduct();
+    /// @dev ERC-2771 specifies the context as being a single address (20 bytes).
+    function _contextSuffixLength() internal view virtual override(ERC2771Context, Context) returns (uint256) {
+        return super._contextSuffixLength();
     }
 
     /// @notice Encode the token URI JSON with base64.
@@ -647,6 +655,35 @@ contract Banny721TokenUriResolver is
         );
     }
 
+    /// @notice The fills for a product.
+    /// @param upc The ID of the token whose product's fills are being returned.
+    /// @return fills The fills for the product.
+    function _fillsFor(uint256 upc)
+        internal
+        pure
+        returns (
+            string memory,
+            string memory,
+            string memory,
+            string memory,
+            string memory,
+            string memory,
+            string memory
+        )
+    {
+        if (upc == ALIEN_UPC) {
+            return ("67d757", "30a220", "217a15", "09490f", "e483ef", "dc2fef", "dc2fef");
+        } else if (upc == PINK_UPC) {
+            return ("ffd8c5", "ff96a9", "fe588b", "c92f45", "ffd8c5", "ff96a9", "fe588b");
+        } else if (upc == ORANGE_UPC) {
+            return ("f3a603", "ff7c02", "fd3600", "c32e0d", "f3a603", "ff7c02", "fd3600");
+        } else if (upc == ORIGINAL_UPC) {
+            return ("ffe900", "ffc700", "f3a603", "965a1a", "ffe900", "ffc700", "f3a603");
+        }
+
+        revert Banny721TokenUriResolver_UnrecognizedProduct();
+    }
+
     /// @notice The full name of each product, including category and inventory.
     /// @param tokenId The ID of the token being named.
     /// @param product The product of the token being named.
@@ -744,39 +781,6 @@ contract Banny721TokenUriResolver is
         return ERC2771Context._msgSender();
     }
 
-    /// @notice The SVG contents for a banny body.
-    /// @param upc The ID of the token whose product's SVG is being returned.
-    /// @return contents The SVG contents of the banny body.
-    function _bannyBodySvgOf(uint256 upc) internal view returns (string memory) {
-        (
-            string memory b1,
-            string memory b2,
-            string memory b3,
-            string memory b4,
-            string memory a1,
-            string memory a2,
-            string memory a3
-        ) = _fillsFor(upc);
-        return string.concat(
-            "<style>.b1{fill:#",
-            b1,
-            ";}.b2{fill:#",
-            b2,
-            ";}.b3{fill:#",
-            b3,
-            ";}.b4{fill:#",
-            b4,
-            ";}.a1{fill:#",
-            a1,
-            ";}.a2{fill:#",
-            a2,
-            ";}.a3{fill:#",
-            a3,
-            ";}</style>",
-            BANNY_BODY
-        );
-    }
-
     /// @notice The SVG contents for a list of outfit IDs.
     /// @param hook The 721 contract that the product belongs to.
     /// @param outfitIds The IDs of the outfits that'll be associated with the specified banny.
@@ -1041,22 +1045,6 @@ contract Banny721TokenUriResolver is
         return IERC721Receiver.onERC721Received.selector;
     }
 
-    /// @notice Allows the owner to set the product's name.
-    /// @param upcs The universal product codes of the products having their name stored.
-    /// @param names The names of the products.
-    function setProductNames(uint256[] memory upcs, string[] memory names) external override onlyOwner {
-        if (upcs.length != names.length) revert Banny721TokenUriResolver_ArrayLengthMismatch();
-
-        for (uint256 i; i < upcs.length; i++) {
-            uint256 upc = upcs[i];
-            string memory name = names[i];
-
-            _customProductNameOf[upc] = name;
-
-            emit SetProductName({upc: upc, name: name, caller: _msgSender()});
-        }
-    }
-
     /// @notice Allows the owner of this contract to set the token metadata description, external URL, and SVG base URI.
     /// @dev All fields are always written. Pass the current value for any field you do not want to change,
     /// or pass an empty string to clear a field.
@@ -1079,6 +1067,22 @@ contract Banny721TokenUriResolver is
         emit SetMetadata({description: description, externalUrl: url, baseUri: baseUri, caller: _msgSender()});
     }
 
+    /// @notice Allows the owner to set the product's name.
+    /// @param upcs The universal product codes of the products having their name stored.
+    /// @param names The names of the products.
+    function setProductNames(uint256[] memory upcs, string[] memory names) external override onlyOwner {
+        if (upcs.length != names.length) revert Banny721TokenUriResolver_ArrayLengthMismatch();
+
+        for (uint256 i; i < upcs.length; i++) {
+            uint256 upc = upcs[i];
+            string memory name = names[i];
+
+            _customProductNameOf[upc] = name;
+
+            emit SetProductName({upc: upc, name: name, caller: _msgSender()});
+        }
+    }
+
     /// @notice The owner of this contract can store SVG files for product IDs.
     /// @param upcs The universal product codes of the products having SVGs stored.
     /// @param svgContents The svg contents being stored, not including the parent <svg></svg> element.
@@ -1133,6 +1137,71 @@ contract Banny721TokenUriResolver is
     // ---------------------- internal transactions ---------------------- //
     //*********************************************************************//
 
+    /// @notice Add a background to a banny body.
+    /// @param hook The hook storing the assets.
+    /// @param bannyBodyId The ID of the banny body being dressed.
+    /// @param backgroundId The ID of the background that'll be associated with the specified banny.
+    function _decorateBannyWithBackground(address hook, uint256 bannyBodyId, uint256 backgroundId) internal {
+        // Keep a reference to the previous background attached.
+        uint256 previousBackgroundId = _attachedBackgroundIdOf[hook][bannyBodyId];
+
+        // Keep a reference to the user of the previous background.
+        uint256 userOfPreviousBackground = userOf({hook: hook, backgroundId: previousBackgroundId});
+
+        // If the background is changing, add the latest background and transfer the old one back to the owner.
+        if (backgroundId != previousBackgroundId || userOfPreviousBackground != bannyBodyId) {
+            // Add the background if needed.
+            if (backgroundId != 0) {
+                // Keep a reference to the background's owner.
+                address owner = IERC721(hook).ownerOf(backgroundId);
+
+                // Check if the call is being made by the background's owner, or the owner of a banny body using it.
+                if (_msgSender() != owner) {
+                    // Get the banny body currently using this background.
+                    uint256 userId = userOf({hook: hook, backgroundId: backgroundId});
+
+                    // If the background is not currently used, only the background's owner can use it for decoration.
+                    if (userId == 0) revert Banny721TokenUriResolver_UnauthorizedBackground();
+
+                    // If the background is used, the banny body's owner can also authorize its use.
+                    if (_msgSender() != IERC721(hook).ownerOf(userId)) {
+                        revert Banny721TokenUriResolver_UnauthorizedBackground();
+                    }
+                }
+
+                // Get the background's product info.
+                JB721Tier memory backgroundProduct = _productOfTokenId({hook: hook, tokenId: backgroundId});
+
+                // Background must exist and must be a background category.
+                if (backgroundProduct.id == 0 || backgroundProduct.category != _BACKGROUND_CATEGORY) {
+                    revert Banny721TokenUriResolver_UnrecognizedBackground();
+                }
+
+                // Effects: update all state before any external transfers (CEI pattern).
+                _attachedBackgroundIdOf[hook][bannyBodyId] = backgroundId;
+                _userOf[hook][backgroundId] = bannyBodyId;
+
+                // Interactions: try-transfer the previous background back (may have been burned).
+                if (userOfPreviousBackground == bannyBodyId) {
+                    _tryTransferFrom({hook: hook, from: address(this), to: _msgSender(), assetId: previousBackgroundId});
+                }
+
+                // Transfer the new background to this contract if it's not already owned by this contract.
+                if (owner != address(this)) {
+                    _transferFrom({hook: hook, from: _msgSender(), to: address(this), assetId: backgroundId});
+                }
+            } else {
+                // Effects: clear the background state before any external transfer.
+                _attachedBackgroundIdOf[hook][bannyBodyId] = 0;
+
+                // Interactions: try-transfer the previous background back (may have been burned).
+                if (userOfPreviousBackground == bannyBodyId) {
+                    _tryTransferFrom({hook: hook, from: address(this), to: _msgSender(), assetId: previousBackgroundId});
+                }
+            }
+        }
+    }
+
     /// @notice Add outfits to a banny body.
     /// @dev The caller must own the banny body being dressed and all outfits being worn.
     /// @param hook The hook storing the assets.
@@ -1282,71 +1351,6 @@ contract Banny721TokenUriResolver is
         _attachedOutfitIdsOf[hook][bannyBodyId] = outfitIds;
     }
 
-    /// @notice Add a background to a banny body.
-    /// @param hook The hook storing the assets.
-    /// @param bannyBodyId The ID of the banny body being dressed.
-    /// @param backgroundId The ID of the background that'll be associated with the specified banny.
-    function _decorateBannyWithBackground(address hook, uint256 bannyBodyId, uint256 backgroundId) internal {
-        // Keep a reference to the previous background attached.
-        uint256 previousBackgroundId = _attachedBackgroundIdOf[hook][bannyBodyId];
-
-        // Keep a reference to the user of the previous background.
-        uint256 userOfPreviousBackground = userOf({hook: hook, backgroundId: previousBackgroundId});
-
-        // If the background is changing, add the latest background and transfer the old one back to the owner.
-        if (backgroundId != previousBackgroundId || userOfPreviousBackground != bannyBodyId) {
-            // Add the background if needed.
-            if (backgroundId != 0) {
-                // Keep a reference to the background's owner.
-                address owner = IERC721(hook).ownerOf(backgroundId);
-
-                // Check if the call is being made by the background's owner, or the owner of a banny body using it.
-                if (_msgSender() != owner) {
-                    // Get the banny body currently using this background.
-                    uint256 userId = userOf({hook: hook, backgroundId: backgroundId});
-
-                    // If the background is not currently used, only the background's owner can use it for decoration.
-                    if (userId == 0) revert Banny721TokenUriResolver_UnauthorizedBackground();
-
-                    // If the background is used, the banny body's owner can also authorize its use.
-                    if (_msgSender() != IERC721(hook).ownerOf(userId)) {
-                        revert Banny721TokenUriResolver_UnauthorizedBackground();
-                    }
-                }
-
-                // Get the background's product info.
-                JB721Tier memory backgroundProduct = _productOfTokenId({hook: hook, tokenId: backgroundId});
-
-                // Background must exist and must be a background category.
-                if (backgroundProduct.id == 0 || backgroundProduct.category != _BACKGROUND_CATEGORY) {
-                    revert Banny721TokenUriResolver_UnrecognizedBackground();
-                }
-
-                // Effects: update all state before any external transfers (CEI pattern).
-                _attachedBackgroundIdOf[hook][bannyBodyId] = backgroundId;
-                _userOf[hook][backgroundId] = bannyBodyId;
-
-                // Interactions: try-transfer the previous background back (may have been burned).
-                if (userOfPreviousBackground == bannyBodyId) {
-                    _tryTransferFrom({hook: hook, from: address(this), to: _msgSender(), assetId: previousBackgroundId});
-                }
-
-                // Transfer the new background to this contract if it's not already owned by this contract.
-                if (owner != address(this)) {
-                    _transferFrom({hook: hook, from: _msgSender(), to: address(this), assetId: backgroundId});
-                }
-            } else {
-                // Effects: clear the background state before any external transfer.
-                _attachedBackgroundIdOf[hook][bannyBodyId] = 0;
-
-                // Interactions: try-transfer the previous background back (may have been burned).
-                if (userOfPreviousBackground == bannyBodyId) {
-                    _tryTransferFrom({hook: hook, from: address(this), to: _msgSender(), assetId: previousBackgroundId});
-                }
-            }
-        }
-    }
-
     /// @notice Transfer a token from one address to another.
     /// @param hook The 721 contract of the token being transferred.
     /// @param from The address to transfer the token from.

package/src/interfaces/IBanny721TokenUriResolver.sol

@@ -4,6 +4,12 @@ pragma solidity ^0.8.0;
 /// @notice Manages Banny NFT assets -- bodies, backgrounds, and outfits -- and resolves on-chain SVG token URIs for
 /// dressed Banny compositions.
 interface IBanny721TokenUriResolver {
+    /// @notice Emitted when a banny body is decorated with a background and outfits.
+    /// @param hook The hook address of the collection.
+    /// @param bannyBodyId The ID of the banny body that was decorated.
+    /// @param backgroundId The ID of the background attached.
+    /// @param outfitIds The IDs of the outfits attached.
+    /// @param caller The address that decorated the banny.
     event DecorateBanny(
         address indexed hook,
         uint256 indexed bannyBodyId,
@@ -11,33 +17,48 @@ interface IBanny721TokenUriResolver {
         uint256[] outfitIds,
         address caller
     );
-    event SetMetadata(string description, string externalUrl, string baseUri, address caller);
-    event SetProductName(uint256 indexed upc, string name, address caller);
-    event SetSvgContent(uint256 indexed upc, string svgContent, address caller);
-    event SetSvgHash(uint256 indexed upc, bytes32 indexed svgHash, address caller);
 
-    /// @notice The stored SVG content hash for a given product.
-    /// @param upc The universal product code to look up.
-    /// @return The SVG content hash.
-    function svgHashOf(uint256 upc) external view returns (bytes32);
+    /// @notice Emitted when metadata (description, external URL, base URI) is updated.
+    /// @param description The new description.
+    /// @param externalUrl The new external URL.
+    /// @param baseUri The new base URI.
+    /// @param caller The address that updated the metadata.
+    event SetMetadata(string description, string externalUrl, string baseUri, address caller);
 
-    /// @notice The base URI used to lazily resolve SVG content from IPFS.
-    /// @return The base URI string.
-    function svgBaseUri() external view returns (string memory);
+    /// @notice Emitted when a product name is set.
+    /// @param upc The universal product code.
+    /// @param name The name assigned to the product.
+    /// @param caller The address that set the name.
+    event SetProductName(uint256 indexed upc, string name, address caller);
 
-    /// @notice The description used in token metadata.
-    /// @return The description string.
-    function svgDescription() external view returns (string memory);
+    /// @notice Emitted when SVG content is stored for a product.
+    /// @param upc The universal product code.
+    /// @param svgContent The SVG content that was stored.
+    /// @param caller The address that stored the content.
+    event SetSvgContent(uint256 indexed upc, string svgContent, address caller);
 
-    /// @notice The external URL used in token metadata.
-    /// @return The external URL string.
-    function svgExternalUrl() external view returns (string memory);
+    /// @notice Emitted when an SVG content hash is stored for a product.
+    /// @param upc The universal product code.
+    /// @param svgHash The SVG content hash that was stored.
+    /// @param caller The address that stored the hash.
+    event SetSvgHash(uint256 indexed upc, bytes32 indexed svgHash, address caller);
 
-    /// @notice The timestamp until which a banny body's outfit is locked and cannot be changed.
+    /// @notice The background and outfit IDs currently attached to a banny body.
     /// @param hook The hook address of the collection.
-    /// @param upc The ID of the banny body.
-    /// @return The lock expiration timestamp, or 0 if not locked.
-    function outfitLockedUntil(address hook, uint256 upc) external view returns (uint256);
+    /// @param bannyBodyId The ID of the banny body.
+    /// @return backgroundId The ID of the attached background.
+    /// @return outfitIds The IDs of the attached outfits.
+    function assetIdsOf(
+        address hook,
+        uint256 bannyBodyId
+    )
+        external
+        view
+        returns (uint256 backgroundId, uint256[] memory outfitIds);
+
+    /// @notice The base SVG content for a banny body.
+    /// @return The SVG string.
+    function BANNY_BODY() external view returns (string memory);
 
     /// @notice The default SVG content for alien banny eyes.
     /// @return The SVG string.
@@ -55,34 +76,34 @@ interface IBanny721TokenUriResolver {
     /// @return The SVG string.
     function DEFAULT_STANDARD_EYES() external view returns (string memory);
 
-    /// @notice The base SVG content for a banny body.
-    /// @return The SVG string.
-    function BANNY_BODY() external view returns (string memory);
-
-    /// @notice The background and outfit IDs currently attached to a banny body.
+    /// @notice Get the names associated with a token (product name, category name, and display name).
     /// @param hook The hook address of the collection.
-    /// @param bannyBodyId The ID of the banny body.
-    /// @return backgroundId The ID of the attached background.
-    /// @return outfitIds The IDs of the attached outfits.
-    function assetIdsOf(
-        address hook,
-        uint256 bannyBodyId
-    )
-        external
-        view
-        returns (uint256 backgroundId, uint256[] memory outfitIds);
+    /// @param tokenId The token ID to look up.
+    /// @return The product name, the category name, and the display name.
+    function namesOf(address hook, uint256 tokenId) external view returns (string memory, string memory, string memory);
 
-    /// @notice The banny body ID that is currently using a given background.
+    /// @notice The timestamp until which a banny body's outfit is locked and cannot be changed.
     /// @param hook The hook address of the collection.
-    /// @param backgroundId The ID of the background.
-    /// @return The banny body ID using the background, or 0 if none.
-    function userOf(address hook, uint256 backgroundId) external view returns (uint256);
+    /// @param upc The ID of the banny body.
+    /// @return The lock expiration timestamp, or 0 if not locked.
+    function outfitLockedUntil(address hook, uint256 upc) external view returns (uint256);
 
-    /// @notice The banny body ID that is currently wearing a given outfit.
-    /// @param hook The hook address of the collection.
-    /// @param outfitId The ID of the outfit.
-    /// @return The banny body ID wearing the outfit, or 0 if none.
-    function wearerOf(address hook, uint256 outfitId) external view returns (uint256);
+    /// @notice The base URI used to lazily resolve SVG content from IPFS.
+    /// @return The base URI string.
+    function svgBaseUri() external view returns (string memory);
+
+    /// @notice The description used in token metadata.
+    /// @return The description string.
+    function svgDescription() external view returns (string memory);
+
+    /// @notice The external URL used in token metadata.
+    /// @return The external URL string.
+    function svgExternalUrl() external view returns (string memory);
+
+    /// @notice The stored SVG content hash for a given product.
+    /// @param upc The universal product code to look up.
+    /// @return The SVG content hash.
+    function svgHashOf(uint256 upc) external view returns (bytes32);
 
     /// @notice Get the composed SVG for a token, optionally dressed and with a background.
     /// @param hook The hook address of the collection.
@@ -100,11 +121,17 @@ interface IBanny721TokenUriResolver {
         view
         returns (string memory);
 
-    /// @notice Get the names associated with a token (product name, category name, and display name).
+    /// @notice The banny body ID that is currently using a given background.
     /// @param hook The hook address of the collection.
-    /// @param tokenId The token ID to look up.
-    /// @return The product name, the category name, and the display name.
-    function namesOf(address hook, uint256 tokenId) external view returns (string memory, string memory, string memory);
+    /// @param backgroundId The ID of the background.
+    /// @return The banny body ID using the background, or 0 if none.
+    function userOf(address hook, uint256 backgroundId) external view returns (uint256);
+
+    /// @notice The banny body ID that is currently wearing a given outfit.
+    /// @param hook The hook address of the collection.
+    /// @param outfitId The ID of the outfit.
+    /// @return The banny body ID wearing the outfit, or 0 if none.
+    function wearerOf(address hook, uint256 outfitId) external view returns (uint256);
 
     /// @notice Dress a banny body with a background and outfits.
     /// @param hook The hook address of the collection.
@@ -124,6 +151,18 @@ interface IBanny721TokenUriResolver {
     /// @param bannyBodyId The ID of the banny body to lock.
     function lockOutfitChangesFor(address hook, uint256 bannyBodyId) external;
 
+    /// @notice Set the token metadata description, external URL, and SVG base URI. Only the contract owner can call
+    /// this.
+    /// @param description The new description.
+    /// @param url The new external URL.
+    /// @param baseUri The new base URI.
+    function setMetadata(string calldata description, string calldata url, string calldata baseUri) external;
+
+    /// @notice Set custom display names for products. Only the contract owner can call this.
+    /// @param upcs The universal product codes to set names for.
+    /// @param names The names to assign to each product.
+    function setProductNames(uint256[] memory upcs, string[] memory names) external;
+
     /// @notice Store SVG contents for products, validated against previously stored hashes.
     /// @param upcs The universal product codes to store SVG contents for.
     /// @param svgContents The SVG contents to store (must match stored hashes).
@@ -133,16 +172,4 @@ interface IBanny721TokenUriResolver {
     /// @param upcs The universal product codes to store SVG hashes for.
     /// @param svgHashes The SVG content hashes to store.
     function setSvgHashesOf(uint256[] memory upcs, bytes32[] memory svgHashes) external;
-
-    /// @notice Set custom display names for products. Only the contract owner can call this.
-    /// @param upcs The universal product codes to set names for.
-    /// @param names The names to assign to each product.
-    function setProductNames(uint256[] memory upcs, string[] memory names) external;
-
-    /// @notice Set the token metadata description, external URL, and SVG base URI. Only the contract owner can call
-    /// this.
-    /// @param description The new description.
-    /// @param url The new external URL.
-    /// @param baseUri The new base URI.
-    function setMetadata(string calldata description, string calldata url, string calldata baseUri) external;
 }