@bannynet/core-v6 0.0.27 → 0.0.29

package/README.md

@@ -50,8 +50,8 @@ It does not own mint pricing, tier issuance, or treasury accounting.
 
 1. `test/DecorateFlow.t.sol`
 2. `test/OutfitTransferLifecycle.t.sol`
-3. `test/audit/BurnedBodyStrandsAssets.t.sol`
-4. `test/audit/TryTransferFromStrandsAssets.t.sol`
+3. `test/regression/BurnedBodyStrandsAssets.t.sol`
+4. `test/regression/TryTransferFromStrandsAssets.t.sol`
 5. `test/TestQALastMile.t.sol`
 
 ## Integration Traps
@@ -102,7 +102,7 @@ src/
   Banny721TokenUriResolver.sol
   interfaces/
 test/
-  unit, attack, fork, audit, QA, and regression coverage
+  unit, attack, fork, review, QA, and regression coverage
 script/
   Deploy.s.sol
   Drop1.s.sol

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bannynet/core-v6",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "license": "MIT",
   "repository": {
     "type": "git",

package/references/operations.md

@@ -21,5 +21,5 @@
 
 ## Useful Proof Points
 
-- [`test/BannyAttacks.t.sol`](../test/BannyAttacks.t.sol) and [`test/TestAuditGaps.sol`](../test/TestAuditGaps.sol) for security-sensitive assumptions.
+- [`test/BannyAttacks.t.sol`](../test/BannyAttacks.t.sol) and [`test/TestRegressionGaps.sol`](../test/TestRegressionGaps.sol) for security-sensitive assumptions.
 - [`script/Drop1.s.sol`](../script/Drop1.s.sol) and [`script/Add.Denver.s.sol`](../script/Add.Denver.s.sol) when a deployment issue is really a script/config problem.

package/references/runtime.md

@@ -24,4 +24,4 @@
 - [`test/DecorateFlow.t.sol`](../test/DecorateFlow.t.sol) for the main equip/unequip lifecycle.
 - [`test/OutfitTransferLifecycle.t.sol`](../test/OutfitTransferLifecycle.t.sol) for custody and return behavior.
 - [`test/BannyAttacks.t.sol`](../test/BannyAttacks.t.sol) for adversarial flows.
-- [`test/Fork.t.sol`](../test/Fork.t.sol), [`test/TestAuditGaps.sol`](../test/TestAuditGaps.sol), and [`test/TestQALastMile.t.sol`](../test/TestQALastMile.t.sol) for integration and pinned edge cases.
+- [`test/Fork.t.sol`](../test/Fork.t.sol), [`test/TestRegressionGaps.sol`](../test/TestRegressionGaps.sol), and [`test/TestQALastMile.t.sol`](../test/TestQALastMile.t.sol) for integration and pinned edge cases.

package/script/Add.Denver.s.sol

@@ -80,6 +80,10 @@ contract Drop1Script is Script, Sphinx {
             splits: new JBSplit[](0)
         });
 
+        // Capture pre-existing maxTierIdOf so we can detect drift between Sphinx proposal-time simulation and
+        // execution (see Drop1.s.sol for the same pattern).
+        uint256 maxTierIdBeforeAdjust = hook.STORE().maxTierIdOf(address(hook));
+
         hook.adjustTiers({tiersToAdd: products, tierIdsToRemove: new uint256[](0)});
 
         // Read maxTierIdOf after adjustTiers so the value reflects our newly added tiers,
@@ -87,6 +91,9 @@ contract Drop1Script is Script, Sphinx {
         // the read and the adjustTiers call.
         uint256 maxTierId = hook.STORE().maxTierIdOf(address(hook));
 
+        // Drift detection: our single tier should occupy exactly maxTierIdBeforeAdjust + 1.
+        require(maxTierId == maxTierIdBeforeAdjust + 1, "Add.Denver: maxTierIdOf drift between proposal and execution");
+
         // Build the product IDs array for the newly added tier(s).
         uint256[] memory productIds = new uint256[](1);
         productIds[0] = maxTierId;

package/script/Deploy.s.sol

@@ -319,13 +319,13 @@ contract DeployScript is Script, Sphinx {
             suckerDeployerConfigurations = new JBSuckerDeployerConfig[](3);
             // OP
             suckerDeployerConfigurations[0] =
-                JBSuckerDeployerConfig({deployer: suckers.optimismDeployer, mappings: tokenMappings});
+                JBSuckerDeployerConfig({deployer: suckers.optimismDeployer, peer: bytes32(0), mappings: tokenMappings});
 
             suckerDeployerConfigurations[1] =
-                JBSuckerDeployerConfig({deployer: suckers.baseDeployer, mappings: tokenMappings});
+                JBSuckerDeployerConfig({deployer: suckers.baseDeployer, peer: bytes32(0), mappings: tokenMappings});
 
             suckerDeployerConfigurations[2] =
-                JBSuckerDeployerConfig({deployer: suckers.arbitrumDeployer, mappings: tokenMappings});
+                JBSuckerDeployerConfig({deployer: suckers.arbitrumDeployer, peer: bytes32(0), mappings: tokenMappings});
         } else {
             suckerDeployerConfigurations = new JBSuckerDeployerConfig[](1);
             // L2 -> Mainnet
@@ -333,6 +333,7 @@ contract DeployScript is Script, Sphinx {
                 deployer: address(suckers.optimismDeployer) != address(0)
                     ? suckers.optimismDeployer
                     : address(suckers.baseDeployer) != address(0) ? suckers.baseDeployer : suckers.arbitrumDeployer,
+                peer: bytes32(0),
                 mappings: tokenMappings
             });
 
@@ -390,10 +391,10 @@ contract DeployScript is Script, Sphinx {
             '<g class="o"><path d="M190 127h3v3h-3zm3 13h4v3h-4zm-42 0h6v6h-6z"/><path d="M151 133h3v7h-3zm10 0h6v4h-6z"/><path d="M157 137h17v6h-17zm3 13h14v3h-14zm17-13h7v16h-7z"/><path d="M184 137h6v6h-6zm0 10h10v6h-10z"/><path d="M187 143h10v4h-10z"/><path d="M190 140h3v3h-3zm-6-10h3v7h-3z"/><path d="M187 130h6v3h-6zm-36 0h10v3h-10zm16 13h7v7h-7zm-10 0h7v7h-7z"/><path d="M164 147h3v3h-3zm29-20h4v6h-4z"/><path d="M194 133h3v7h-3z"/></g><g class="w"><path d="M154 133h7v4h-7z"/><path d="M154 137h3v3h-3zm10 6h3v4h-3zm20 0h3v4h-3zm3-10h7v4h-7z"/><path d="M190 137h4v3h-4z"/></g>';
         {
             // Perform the check for the resolver..
-            (address _resolver, bool _resolverIsDeployed) = _isDeployed(
-                RESOLVER_SALT,
-                type(Banny721TokenUriResolver).creationCode,
-                abi.encode(
+            (address _resolver, bool _resolverIsDeployed) = _isDeployed({
+                salt: RESOLVER_SALT,
+                creationCode: type(Banny721TokenUriResolver).creationCode,
+                arguments: abi.encode(
                     bannyBodySvg,
                     defaultNecklaceSvg,
                     defaultMouthSvg,
@@ -402,7 +403,7 @@ contract DeployScript is Script, Sphinx {
                     operator,
                     trustedForwarder
                 )
-            );
+            });
             // Deploy it if it has not been deployed yet.
             resolver = !_resolverIsDeployed
                 ? new Banny721TokenUriResolver{salt: RESOLVER_SALT}({

package/script/Drop1.s.sol

@@ -1185,6 +1185,12 @@ contract Drop1Script is Script, Sphinx {
             splits: new JBSplit[](0)
         });
 
+        // Capture the pre-existing maxTierIdOf so we can detect drift between Sphinx proposal-time simulation and
+        // execution. Without this guard, an authorized `ADJUST_721_TIERS` call landing between proposal and
+        // execution would shift our 47 new tier IDs upward, and the metadata writes below would silently target
+        // the wrong UPC range (or land on tiers that did not get our SVG/name data).
+        uint256 maxTierIdBeforeAdjust = hook.STORE().maxTierIdOf(address(hook));
+
         hook.adjustTiers({tiersToAdd: products, tierIdsToRemove: new uint256[](0)});
 
         // Read maxTierIdOf after adjustTiers so the value reflects our newly added tiers,
@@ -1192,6 +1198,11 @@ contract Drop1Script is Script, Sphinx {
         // the read and the adjustTiers call.
         uint256 maxTierId = hook.STORE().maxTierIdOf(address(hook));
 
+        // Drift detection: our 47 tiers should occupy exactly the range (maxTierIdBeforeAdjust, maxTierId]. If
+        // another transaction added tiers between proposal and execution, the range no longer matches the 47-tier
+        // assumption and the metadata writes would target the wrong UPCs.
+        require(maxTierId == maxTierIdBeforeAdjust + 47, "Drop1: maxTierIdOf drift between proposal and execution");
+
         // Build the product IDs array for the newly added tiers.
         // The last 47 tier IDs correspond to the 47 tiers we just added.
         uint256[] memory productIds = new uint256[](47);

package/src/Banny721TokenUriResolver.sol

@@ -35,25 +35,31 @@ contract Banny721TokenUriResolver is
     // --------------------------- custom errors ------------------------- //
     //*********************************************************************//
 
-    error Banny721TokenUriResolver_ArrayLengthMismatch();
-    error Banny721TokenUriResolver_BannyBodyNotBodyCategory();
-    error Banny721TokenUriResolver_CantAccelerateTheLock();
-    error Banny721TokenUriResolver_ContentsAlreadyStored();
-    error Banny721TokenUriResolver_ContentsMismatch();
-    error Banny721TokenUriResolver_DuplicateCategory();
-    error Banny721TokenUriResolver_HashAlreadyStored();
-    error Banny721TokenUriResolver_HashNotFound();
-    error Banny721TokenUriResolver_HeadAlreadyAdded();
-    error Banny721TokenUriResolver_OutfitChangesLocked();
-    error Banny721TokenUriResolver_SuitAlreadyAdded();
-    error Banny721TokenUriResolver_UnauthorizedBackground();
-    error Banny721TokenUriResolver_UnauthorizedBannyBody();
-    error Banny721TokenUriResolver_UnauthorizedOutfit();
-    error Banny721TokenUriResolver_UnauthorizedTransfer();
-    error Banny721TokenUriResolver_UnorderedCategories();
-    error Banny721TokenUriResolver_UnrecognizedBackground();
-    error Banny721TokenUriResolver_UnrecognizedCategory();
-    error Banny721TokenUriResolver_UnrecognizedProduct();
+    error Banny721TokenUriResolver_ArrayLengthMismatch(uint256 firstLength, uint256 secondLength);
+    error Banny721TokenUriResolver_BannyBodyNotBodyCategory(address hook, uint256 bannyBodyId, uint256 category);
+    error Banny721TokenUriResolver_CantAccelerateTheLock(
+        address hook, uint256 bannyBodyId, uint256 currentLockedUntil, uint256 newLockUntil
+    );
+    error Banny721TokenUriResolver_ContentsAlreadyStored(uint256 upc);
+    error Banny721TokenUriResolver_ContentsMismatch(uint256 upc, bytes32 expectedHash, bytes32 actualHash);
+    error Banny721TokenUriResolver_DuplicateCategory(uint256 category);
+    error Banny721TokenUriResolver_HashAlreadyStored(uint256 upc, bytes32 existingHash);
+    error Banny721TokenUriResolver_HashNotFound(uint256 upc);
+    error Banny721TokenUriResolver_HeadAlreadyAdded(uint256 category);
+    error Banny721TokenUriResolver_OutfitChangesLocked(address hook, uint256 bannyBodyId, uint256 lockedUntil);
+    error Banny721TokenUriResolver_SuitAlreadyAdded(uint256 category);
+    error Banny721TokenUriResolver_UnauthorizedBackground(
+        address hook, uint256 backgroundId, address sender, address owner
+    );
+    error Banny721TokenUriResolver_UnauthorizedBannyBody(
+        address hook, uint256 bannyBodyId, address sender, address owner
+    );
+    error Banny721TokenUriResolver_UnauthorizedOutfit(address hook, uint256 outfitId, address sender, address owner);
+    error Banny721TokenUriResolver_UnauthorizedTransfer(address operator, address expectedOperator);
+    error Banny721TokenUriResolver_UnorderedCategories(uint256 previousCategory, uint256 nextCategory);
+    error Banny721TokenUriResolver_UnrecognizedBackground(address hook, uint256 backgroundId, uint256 category);
+    error Banny721TokenUriResolver_UnrecognizedCategory(uint256 category);
+    error Banny721TokenUriResolver_UnrecognizedProduct(uint256 upc);
 
     //*********************************************************************//
     // ------------------------ private constants ------------------------ //
@@ -112,10 +118,19 @@ contract Banny721TokenUriResolver is
     /// @custom:param upc The universal product code that the SVG hash represent.
     mapping(uint256 upc => bytes32) public override svgHashOf;
 
+    /// @notice The default alien-eye SVG fragment used when rendering a Banny without custom alien eyes.
     string public override DEFAULT_ALIEN_EYES;
+
+    /// @notice The default mouth SVG fragment used when rendering a Banny without a custom mouth.
     string public override DEFAULT_MOUTH;
+
+    /// @notice The default necklace SVG fragment used when rendering a Banny without a custom necklace.
     string public override DEFAULT_NECKLACE;
+
+    /// @notice The default standard-eye SVG fragment used when rendering a Banny without custom standard eyes.
     string public override DEFAULT_STANDARD_EYES;
+
+    /// @notice The base Banny body SVG fragment used as the starting layer for token rendering.
     string public override BANNY_BODY;
 
     //*********************************************************************//
@@ -317,7 +332,6 @@ contract Banny721TokenUriResolver is
         }
 
         // Get a reference to the pricing context.
-        // slither-disable-next-line unused-return
         (uint256 currency, uint256 decimals) = IJB721TiersHook(hook).pricingContext();
 
         attributes = string.concat(
@@ -627,7 +641,12 @@ contract Banny721TokenUriResolver is
     /// @param hook The 721 contract of the token having ownership checked.
     /// @param upc The product's UPC to check ownership of.
     function _checkIfSenderIsOwner(address hook, uint256 upc) internal view {
-        if (IERC721(hook).ownerOf(upc) != _msgSender()) revert Banny721TokenUriResolver_UnauthorizedBannyBody();
+        address owner = IERC721(hook).ownerOf(upc);
+        if (owner != _msgSender()) {
+            revert Banny721TokenUriResolver_UnauthorizedBannyBody({
+                hook: hook, bannyBodyId: upc, sender: _msgSender(), owner: owner
+            });
+        }
     }
 
     /// @notice The length of the context suffix appended by a trusted forwarder.
@@ -656,7 +675,6 @@ contract Banny721TokenUriResolver is
         view
         returns (string memory)
     {
-        // slither-disable-next-line encode-packed-collision
         return string.concat(
             "data:application/json;base64,",
             Base64.encode(
@@ -716,7 +734,7 @@ contract Banny721TokenUriResolver is
             return ("ffe900", "ffc700", "f3a603", "965a1a", "ffe900", "ffc700", "f3a603");
         }
 
-        revert Banny721TokenUriResolver_UnrecognizedProduct();
+        revert Banny721TokenUriResolver_UnrecognizedProduct({upc: upc});
     }
 
     /// @notice The full name of each product, including category and inventory.
@@ -953,7 +971,9 @@ contract Banny721TokenUriResolver is
         // Outfit locks are user-selected display locks; timestamp tolerance is acceptable here.
         // forge-lint: disable-next-line(block-timestamp)
         if (bannyBodyId != 0 && bannyBodyId != exemptBodyId && outfitLockedUntil[hook][bannyBodyId] > block.timestamp) {
-            revert Banny721TokenUriResolver_OutfitChangesLocked();
+            revert Banny721TokenUriResolver_OutfitChangesLocked({
+                hook: hook, bannyBodyId: bannyBodyId, lockedUntil: outfitLockedUntil[hook][bannyBodyId]
+            });
         }
     }
 
@@ -1067,9 +1087,9 @@ contract Banny721TokenUriResolver is
         }
 
         // A full HEAD and individual head accessories cannot coexist — the head would hide the accessories.
-        if (hasHead && hasHeadAccessory) revert Banny721TokenUriResolver_HeadAlreadyAdded();
+        if (hasHead && hasHeadAccessory) revert Banny721TokenUriResolver_HeadAlreadyAdded({category: _HEAD_CATEGORY});
         // A full SUIT and individual suit pieces cannot coexist — the suit would hide the pieces.
-        if (hasSuit && hasSuitPiece) revert Banny721TokenUriResolver_SuitAlreadyAdded();
+        if (hasSuit && hasSuitPiece) revert Banny721TokenUriResolver_SuitAlreadyAdded({category: _SUIT_CATEGORY});
     }
 
     //*********************************************************************//
@@ -1117,18 +1137,28 @@ contract Banny721TokenUriResolver is
         // Cache the sender once to avoid repeated ERC-2771 context reads throughout the call chain.
         address sender = _msgSender();
 
-        if (IERC721(hook).ownerOf(bannyBodyId) != sender) revert Banny721TokenUriResolver_UnauthorizedBannyBody();
+        address bannyBodyOwner = IERC721(hook).ownerOf(bannyBodyId);
+        if (bannyBodyOwner != sender) {
+            revert Banny721TokenUriResolver_UnauthorizedBannyBody({
+                hook: hook, bannyBodyId: bannyBodyId, sender: sender, owner: bannyBodyOwner
+            });
+        }
 
         // Make sure the bannyBodyId belongs to a body-category tier.
-        if (_productOfTokenId({hook: hook, tokenId: bannyBodyId}).category != _BODY_CATEGORY) {
-            revert Banny721TokenUriResolver_BannyBodyNotBodyCategory();
+        uint256 bannyBodyCategory = _productOfTokenId({hook: hook, tokenId: bannyBodyId}).category;
+        if (bannyBodyCategory != _BODY_CATEGORY) {
+            revert Banny721TokenUriResolver_BannyBodyNotBodyCategory({
+                hook: hook, bannyBodyId: bannyBodyId, category: bannyBodyCategory
+            });
         }
 
         // Can't decorate a banny that's locked.
         // Outfit locks are user-selected display locks; timestamp tolerance is acceptable here.
         // forge-lint: disable-next-line(block-timestamp)
         if (outfitLockedUntil[hook][bannyBodyId] > block.timestamp) {
-            revert Banny721TokenUriResolver_OutfitChangesLocked();
+            revert Banny721TokenUriResolver_OutfitChangesLocked({
+                hook: hook, bannyBodyId: bannyBodyId, lockedUntil: outfitLockedUntil[hook][bannyBodyId]
+            });
         }
 
         emit DecorateBanny({
@@ -1156,7 +1186,11 @@ contract Banny721TokenUriResolver is
         uint256 newLockUntil = block.timestamp + _LOCK_DURATION;
 
         // Make sure the new lock is at least as big as the current lock.
-        if (currentLockedUntil > newLockUntil) revert Banny721TokenUriResolver_CantAccelerateTheLock();
+        if (currentLockedUntil > newLockUntil) {
+            revert Banny721TokenUriResolver_CantAccelerateTheLock({
+                hook: hook, bannyBodyId: bannyBodyId, currentLockedUntil: currentLockedUntil, newLockUntil: newLockUntil
+            });
+        }
 
         // Set the lock.
         outfitLockedUntil[hook][bannyBodyId] = newLockUntil;
@@ -1188,7 +1222,9 @@ contract Banny721TokenUriResolver is
         data; // unused.
 
         // Make sure the transaction's operator is this contract.
-        if (operator != address(this)) revert Banny721TokenUriResolver_UnauthorizedTransfer();
+        if (operator != address(this)) {
+            revert Banny721TokenUriResolver_UnauthorizedTransfer({operator: operator, expectedOperator: address(this)});
+        }
 
         return IERC721Receiver.onERC721Received.selector;
     }
@@ -1221,7 +1257,9 @@ contract Banny721TokenUriResolver is
     /// @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();
+        if (upcs.length != names.length) {
+            revert Banny721TokenUriResolver_ArrayLengthMismatch({firstLength: upcs.length, secondLength: names.length});
+        }
 
         address sender = _msgSender();
         for (uint256 i; i < upcs.length;) {
@@ -1241,7 +1279,11 @@ contract Banny721TokenUriResolver is
     /// @param upcs The universal product codes of the products having SVGs stored.
     /// @param svgContents The svg contents to store, not including the parent <svg></svg> element.
     function setSvgContentsOf(uint256[] memory upcs, string[] calldata svgContents) external override {
-        if (upcs.length != svgContents.length) revert Banny721TokenUriResolver_ArrayLengthMismatch();
+        if (upcs.length != svgContents.length) {
+            revert Banny721TokenUriResolver_ArrayLengthMismatch({
+                firstLength: upcs.length, secondLength: svgContents.length
+            });
+        }
 
         address sender = _msgSender();
         for (uint256 i; i < upcs.length;) {
@@ -1249,16 +1291,23 @@ contract Banny721TokenUriResolver is
             string memory svgContent = svgContents[i];
 
             // Make sure there isn't already contents for the specified universal product code.
-            if (bytes(_svgContentOf[upc]).length != 0) revert Banny721TokenUriResolver_ContentsAlreadyStored();
+            if (bytes(_svgContentOf[upc]).length != 0) {
+                revert Banny721TokenUriResolver_ContentsAlreadyStored({upc: upc});
+            }
 
             // Get the stored svg hash for the product.
             bytes32 svgHash = svgHashOf[upc];
 
             // Make sure a hash exists.
-            if (svgHash == bytes32(0)) revert Banny721TokenUriResolver_HashNotFound();
+            if (svgHash == bytes32(0)) revert Banny721TokenUriResolver_HashNotFound({upc: upc});
 
             // Make sure the content matches the hash.
-            if (keccak256(abi.encodePacked(svgContent)) != svgHash) revert Banny721TokenUriResolver_ContentsMismatch();
+            bytes32 actualHash = keccak256(abi.encodePacked(svgContent));
+            if (actualHash != svgHash) {
+                revert Banny721TokenUriResolver_ContentsMismatch({
+                    upc: upc, expectedHash: svgHash, actualHash: actualHash
+                });
+            }
 
             // Store the svg contents.
             _svgContentOf[upc] = svgContent;
@@ -1275,7 +1324,11 @@ contract Banny721TokenUriResolver is
     /// @param upcs The universal product codes of the products having SVG hashes stored.
     /// @param svgHashes The svg hashes to store, not including the parent <svg></svg> element.
     function setSvgHashesOf(uint256[] memory upcs, bytes32[] memory svgHashes) external override onlyOwner {
-        if (upcs.length != svgHashes.length) revert Banny721TokenUriResolver_ArrayLengthMismatch();
+        if (upcs.length != svgHashes.length) {
+            revert Banny721TokenUriResolver_ArrayLengthMismatch({
+                firstLength: upcs.length, secondLength: svgHashes.length
+            });
+        }
 
         address sender = _msgSender();
         for (uint256 i; i < upcs.length;) {
@@ -1283,7 +1336,9 @@ contract Banny721TokenUriResolver is
             bytes32 svgHash = svgHashes[i];
 
             // Make sure there isn't already contents for the specified universal product code.
-            if (svgHashOf[upc] != bytes32(0)) revert Banny721TokenUriResolver_HashAlreadyStored();
+            if (svgHashOf[upc] != bytes32(0)) {
+                revert Banny721TokenUriResolver_HashAlreadyStored({upc: upc, existingHash: svgHashOf[upc]});
+            }
 
             // Store the svg contents.
             svgHashOf[upc] = svgHash;
@@ -1331,11 +1386,18 @@ contract Banny721TokenUriResolver is
                     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 (userId == 0) {
+                        revert Banny721TokenUriResolver_UnauthorizedBackground({
+                            hook: hook, backgroundId: backgroundId, sender: sender, owner: owner
+                        });
+                    }
 
                     // If the background is used, the banny body's owner can also authorize its use.
-                    if (sender != IERC721(hook).ownerOf(userId)) {
-                        revert Banny721TokenUriResolver_UnauthorizedBackground();
+                    address userOwner = IERC721(hook).ownerOf(userId);
+                    if (sender != userOwner) {
+                        revert Banny721TokenUriResolver_UnauthorizedBackground({
+                            hook: hook, backgroundId: backgroundId, sender: sender, owner: userOwner
+                        });
                     }
 
                     // A locked source body keeps its equipped background until the lock expires.
@@ -1347,7 +1409,9 @@ contract Banny721TokenUriResolver is
 
                 // Background must exist and must be a background category.
                 if (backgroundProduct.id == 0 || backgroundProduct.category != _BACKGROUND_CATEGORY) {
-                    revert Banny721TokenUriResolver_UnrecognizedBackground();
+                    revert Banny721TokenUriResolver_UnrecognizedBackground({
+                        hook: hook, backgroundId: backgroundId, category: backgroundProduct.category
+                    });
                 }
 
                 // Try to transfer the previous background back before updating state.
@@ -1434,18 +1498,23 @@ contract Banny721TokenUriResolver is
 
             // Check if the call is being made either by the outfit's owner or the owner of the banny body currently
             // wearing it.
-            // slither-disable-next-line calls-loop
             if (sender != IERC721(hook).ownerOf(outfitId)) {
                 // Get the banny body currently wearing this outfit.
                 uint256 wearerId = wearerOf({hook: hook, outfitId: outfitId});
 
                 // If the outfit is not currently worn, only the outfit's owner can use it for decoration.
-                if (wearerId == 0) revert Banny721TokenUriResolver_UnauthorizedOutfit();
+                if (wearerId == 0) {
+                    revert Banny721TokenUriResolver_UnauthorizedOutfit({
+                        hook: hook, outfitId: outfitId, sender: sender, owner: IERC721(hook).ownerOf(outfitId)
+                    });
+                }
 
                 // If the outfit is worn, the banny body's owner can also authorize its use.
-                // slither-disable-next-line calls-loop
-                if (sender != IERC721(hook).ownerOf(wearerId)) {
-                    revert Banny721TokenUriResolver_UnauthorizedOutfit();
+                address wearerOwner = IERC721(hook).ownerOf(wearerId);
+                if (sender != wearerOwner) {
+                    revert Banny721TokenUriResolver_UnauthorizedOutfit({
+                        hook: hook, outfitId: outfitId, sender: sender, owner: wearerOwner
+                    });
                 }
 
                 // A locked source body keeps its equipped outfits until the lock expires.
@@ -1457,12 +1526,14 @@ contract Banny721TokenUriResolver is
 
             // The product's category must be a known category.
             if (outfitProductCategory < _BACKSIDE_CATEGORY || outfitProductCategory > _SPECIAL_BODY_CATEGORY) {
-                revert Banny721TokenUriResolver_UnrecognizedCategory();
+                revert Banny721TokenUriResolver_UnrecognizedCategory({category: outfitProductCategory});
             }
 
             // Make sure the category is an increment of the previous outfit's category.
             if (i != 0 && outfitProductCategory <= lastAssetCategory) {
-                revert Banny721TokenUriResolver_UnorderedCategories();
+                revert Banny721TokenUriResolver_UnorderedCategories({
+                    previousCategory: lastAssetCategory, nextCategory: outfitProductCategory
+                });
             }
 
             if (outfitProductCategory == _HEAD_CATEGORY) {
@@ -1475,12 +1546,12 @@ contract Banny721TokenUriResolver is
                         || outfitProductCategory == _MOUTH_CATEGORY
                         || outfitProductCategory == _HEADTOP_CATEGORY) && hasHead
             ) {
-                revert Banny721TokenUriResolver_HeadAlreadyAdded();
+                revert Banny721TokenUriResolver_HeadAlreadyAdded({category: outfitProductCategory});
             } else if (
                 (outfitProductCategory == _SUIT_TOP_CATEGORY || outfitProductCategory == _SUIT_BOTTOM_CATEGORY)
                     && hasSuit
             ) {
-                revert Banny721TokenUriResolver_SuitAlreadyAdded();
+                revert Banny721TokenUriResolver_SuitAlreadyAdded({category: outfitProductCategory});
             }
 
             // Remove all previous assets up to and including the current category being iterated on.
@@ -1523,7 +1594,6 @@ contract Banny721TokenUriResolver is
                 _wearerOf[hook][outfitId] = bannyBodyId;
 
                 // Transfer the outfit to this contract.
-                // slither-disable-next-line reentrancy-no-eth,calls-loop
                 if (IERC721(hook).ownerOf(outfitId) != address(this)) {
                     _transferFrom({hook: hook, from: sender, to: address(this), assetId: outfitId});
                 }
@@ -1632,7 +1702,9 @@ contract Banny721TokenUriResolver is
                     _productOfTokenId({hook: hook, tokenId: mergedOutfitIds[i]}).category
                         == _productOfTokenId({hook: hook, tokenId: mergedOutfitIds[i - 1]}).category
                 ) {
-                    revert Banny721TokenUriResolver_DuplicateCategory();
+                    revert Banny721TokenUriResolver_DuplicateCategory({
+                        category: _productOfTokenId({hook: hook, tokenId: mergedOutfitIds[i]}).category
+                    });
                 }
                 unchecked {
                     ++i;
@@ -1661,7 +1733,6 @@ contract Banny721TokenUriResolver is
     /// @param assetId The ID of the token to transfer.
     /// @return success Whether the transfer succeeded.
     function _tryTransferFrom(address hook, address from, address to, uint256 assetId) internal returns (bool success) {
-        // slither-disable-next-line reentrancy-no-eth
         try IERC721(hook).safeTransferFrom({from: from, to: to, tokenId: assetId}) {
             success = true;
         } catch {}