@bananapus/721-hook-v6 0.0.4 → 0.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/721-hook-v6",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -17,10 +17,10 @@
     "artifacts": "source ./.env && npx sphinx artifacts --org-id 'ea165b21-7cdc-4d7b-be59-ecdd4c26bee4' --project-name 'nana-721-hook-v6'"
   },
   "dependencies": {
-    "@bananapus/address-registry-v6": "^0.0.1",
-    "@bananapus/core-v6": "^0.0.4",
-    "@bananapus/ownable-v6": "^0.0.1",
-    "@bananapus/permission-ids-v6": "^0.0.2",
+    "@bananapus/address-registry-v6": "^0.0.3",
+    "@bananapus/core-v6": "^0.0.5",
+    "@bananapus/ownable-v6": "^0.0.4",
+    "@bananapus/permission-ids-v6": "^0.0.3",
     "@openzeppelin/contracts": "5.2.0",
     "@prb/math": "^4.1.0",
     "solady": "^0.1.8"

package/src/JB721TiersHook.sol

@@ -31,7 +31,6 @@ import {IJB721TiersHookStore} from "./interfaces/IJB721TiersHookStore.sol";
 import {IJB721TokenUriResolver} from "./interfaces/IJB721TokenUriResolver.sol";
 import {JB721TiersHookLib} from "./libraries/JB721TiersHookLib.sol";
 import {JB721TiersRulesetMetadataResolver} from "./libraries/JB721TiersRulesetMetadataResolver.sol";
-import {JBIpfsDecoder} from "./libraries/JBIpfsDecoder.sol";
 import {JB721Tier} from "./structs/JB721Tier.sol";
 import {JB721TierConfig} from "./structs/JB721TierConfig.sol";
 import {JB721TiersSetDiscountPercentConfig} from "./structs/JB721TiersSetDiscountPercentConfig.sol";
@@ -350,16 +349,7 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, ERC721, IJB721TiersHook {
     /// @return The token URI from the `tokenUriResolver` if it is set. If it isn't set, the token URI for the NFT's
     /// tier.
     function tokenURI(uint256 tokenId) public view virtual override returns (string memory) {
-        // Get a reference to the `tokenUriResolver`.
-        IJB721TokenUriResolver resolver = STORE.tokenUriResolverOf(address(this));
-
-        // If a `tokenUriResolver` is set, use it to resolve the token URI.
-        if (address(resolver) != address(0)) return resolver.tokenUriOf({nft: address(this), tokenId: tokenId});
-
-        // Otherwise, return the token URI corresponding with the NFT's tier.
-        return JBIpfsDecoder.decode({
-            baseUri: baseURI, hexString: STORE.encodedTierIPFSUriOf({hook: address(this), tokenId: tokenId})
-        });
+        return JB721TiersHookLib.resolveTokenURI(STORE, address(this), baseURI, tokenId);
     }
 
     //*********************************************************************//

package/src/libraries/JB721TiersHookLib.sol

@@ -16,7 +16,9 @@ import {mulDiv} from "@prb/math/src/Common.sol";
 import {JBSplitGroup} from "@bananapus/core-v6/src/structs/JBSplitGroup.sol";
 
 import {IJB721TiersHookStore} from "../interfaces/IJB721TiersHookStore.sol";
+import {IJB721TokenUriResolver} from "../interfaces/IJB721TokenUriResolver.sol";
 import {JB721TierConfig} from "../structs/JB721TierConfig.sol";
+import {JBIpfsDecoder} from "./JBIpfsDecoder.sol";
 
 /// @notice External library for JB721TiersHook operations extracted to stay within the EIP-170 contract size limit.
 /// @dev Handles tier adjustments, split calculations, price normalization, and split fund distribution.
@@ -333,4 +335,34 @@ library JB721TiersHookLib {
             terminal.pay(projectId, token, amount, beneficiary, 0, "", bytes(""));
         }
     }
+
+    /// @notice Resolves the token URI for a given NFT token ID.
+    /// @dev Extracted to the library to keep JBIpfsDecoder bytecode out of the hook contract (EIP-170 compliance).
+    /// @param store The 721 tiers hook store.
+    /// @param hook The hook address.
+    /// @param baseUri The base URI for IPFS-based token URIs.
+    /// @param tokenId The token ID to resolve the URI for.
+    /// @return The resolved token URI string.
+    function resolveTokenURI(
+        IJB721TiersHookStore store,
+        address hook,
+        string memory baseUri,
+        uint256 tokenId
+    )
+        external
+        view
+        returns (string memory)
+    {
+        // Get a reference to the `tokenUriResolver`.
+        IJB721TokenUriResolver resolver = store.tokenUriResolverOf(hook);
+
+        // If a `tokenUriResolver` is set, use it to resolve the token URI.
+        if (address(resolver) != address(0)) return resolver.tokenUriOf({nft: hook, tokenId: tokenId});
+
+        // Otherwise, return the token URI corresponding with the NFT's tier.
+        return
+            JBIpfsDecoder.decode({
+                baseUri: baseUri, hexString: store.encodedTierIPFSUriOf({hook: hook, tokenId: tokenId})
+            });
+    }
 }