@bannynet/core-v6 0.0.7 → 0.0.9

package/STYLE_GUIDE.md

@@ -197,7 +197,7 @@ interface IJBExample is IJBBase {
 | Public/external function | `camelCase` | `cashOutTokensOf` |
 | Internal/private function | `_camelCase` | `_processFee` |
 | Internal storage | `_camelCase` | `_accountingContextForTokenOf` |
-| Function parameter | `camelCase` | `projectId`, `cashOutCount` |
+| Function parameter | `camelCase` (no underscores) | `projectId`, `cashOutCount` |
 
 ## NatSpec
 
@@ -253,9 +253,12 @@ uint256 public constant MAX_RESERVED_PERCENT = 10_000;
 
 ## Function Calls
 
-Use named parameters for readability when calling functions with 3+ arguments:
+Use named arguments for all function calls with 2 or more arguments — in both `src/` and `script/`:
 
 ```solidity
+// Good — named arguments
+token.mint({account: beneficiary, amount: count});
+_transferOwnership({newOwner: address(0), projectId: 0});
 PERMISSIONS.hasPermission({
     operator: sender,
     account: account,
@@ -264,8 +267,18 @@ PERMISSIONS.hasPermission({
     includeRoot: true,
     includeWildcardProjectId: true
 });
+
+// Bad — positional arguments with 2+ args
+token.mint(beneficiary, count);
+_transferOwnership(address(0), 0);
 ```
 
+Single-argument calls use positional style: `_burn(amount)`.
+
+This also applies to constructor calls, struct literals, and inherited/library calls (e.g., OZ `_mint`, `_safeMint`, `safeTransfer`, `allowance`, `Clones.cloneDeterministic`).
+
+Named argument keys must use **camelCase** — never underscores. If a function's parameter names use underscores, rename them to camelCase first.
+
 ## Multiline Signatures
 
 ```solidity

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bannynet/core-v6",
-    "version": "0.0.7",
+    "version": "0.0.9",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -20,17 +20,17 @@
         "artifacts": "source ./.env && npx sphinx artifacts --org-id 'ea165b21-7cdc-4d7b-be59-ecdd4c26bee4' --project-name 'banny-core-v6'"
     },
     "dependencies": {
-        "@bananapus/721-hook-v6": "^0.0.14",
-        "@bananapus/core-v6": "^0.0.15",
-        "@bananapus/permission-ids-v6": "^0.0.7",
-        "@bananapus/router-terminal-v6": "^0.0.6",
-        "@bananapus/suckers-v6": "^0.0.7",
-        "@croptop/core-v6": "^0.0.12",
+        "@bananapus/721-hook-v6": "^0.0.16",
+        "@bananapus/core-v6": "^0.0.16",
+        "@bananapus/permission-ids-v6": "^0.0.9",
+        "@bananapus/router-terminal-v6": "^0.0.11",
+        "@bananapus/suckers-v6": "^0.0.10",
+        "@croptop/core-v6": "^0.0.15",
         "@openzeppelin/contracts": "^5.6.1",
-        "@rev-net/core-v6": "^0.0.10",
+        "@rev-net/core-v6": "^0.0.12",
         "keccak": "^3.0.4"
     },
     "devDependencies": {
         "@sphinx-labs/plugins": "^0.33.2"
     }
-}
+}

package/script/Add.Denver.s.sol

@@ -5,10 +5,11 @@ import {JB721TierConfig} from "@bananapus/721-hook-v6/src/structs/JB721TierConfi
 import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
 import {JB721TiersHook} from "@bananapus/721-hook-v6/src/JB721TiersHook.sol";
 
-import "./helpers/BannyverseDeploymentLib.sol";
-import "@rev-net/core-v6/script/helpers/RevnetCoreDeploymentLib.sol";
-import "@openzeppelin/contracts/utils/Strings.sol";
-
+import {BannyverseDeployment, BannyverseDeploymentLib} from "./helpers/BannyverseDeploymentLib.sol";
+import {
+    RevnetCoreDeployment,
+    RevnetCoreDeploymentLib
+} from "@rev-net/core-v6/script/helpers/RevnetCoreDeploymentLib.sol";
 import {Sphinx} from "@sphinx-labs/contracts/contracts/foundry/SphinxPlugin.sol";
 import {Script} from "forge-std/Script.sol";
 
@@ -78,13 +79,13 @@ contract Drop1Script is Script, Sphinx {
         // Get the next tier ID so we can set names and hashes for the new product.
         uint256 nextTierId = hook.STORE().maxTierIdOf(address(hook)) + 1;
 
-        hook.adjustTiers(products, new uint256[](0));
+        hook.adjustTiers({tiersToAdd: products, tierIdsToRemove: new uint256[](0)});
 
         // Build the product IDs array for the newly added tier(s).
         uint256[] memory productIds = new uint256[](1);
         productIds[0] = nextTierId;
 
-        bannyverse.resolver.setSvgHashesOf(productIds, svgHashes);
-        bannyverse.resolver.setProductNames(productIds, names);
+        bannyverse.resolver.setSvgHashesOf({upcs: productIds, svgHashes: svgHashes});
+        bannyverse.resolver.setProductNames({upcs: productIds, names: names});
     }
 }

package/script/Deploy.s.sol

@@ -1,18 +1,21 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
-import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
-import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
-import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
-import "@rev-net/core-v6/script/helpers/RevnetCoreDeploymentLib.sol";
+import {Hook721Deployment, Hook721DeploymentLib} from "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
+import {CoreDeployment, CoreDeploymentLib} from "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
+import {SuckerDeployment, SuckerDeploymentLib} from "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
+import {
+    RouterTerminalDeployment,
+    RouterTerminalDeploymentLib
+} from "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
+import {
+    RevnetCoreDeployment,
+    RevnetCoreDeploymentLib
+} from "@rev-net/core-v6/script/helpers/RevnetCoreDeploymentLib.sol";
 
 import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";
 import {JB721InitTiersConfig} from "@bananapus/721-hook-v6/src/structs/JB721InitTiersConfig.sol";
 import {JB721TierConfig} from "@bananapus/721-hook-v6/src/structs/JB721TierConfig.sol";
-import {REVBaseline721HookConfig} from "@rev-net/core-v6/src/structs/REVBaseline721HookConfig.sol";
-import {REV721TiersHookFlags} from "@rev-net/core-v6/src/structs/REV721TiersHookFlags.sol";
-import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
 import {IJBSplitHook} from "@bananapus/core-v6/src/interfaces/IJBSplitHook.sol";
 import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
 import {JBCurrencyIds} from "@bananapus/core-v6/src/libraries/JBCurrencyIds.sol";
@@ -23,8 +26,10 @@ import {JBTokenMapping} from "@bananapus/suckers-v6/src/structs/JBTokenMapping.s
 import {REVAutoIssuance} from "@rev-net/core-v6/src/structs/REVAutoIssuance.sol";
 import {REVConfig} from "@rev-net/core-v6/src/structs/REVConfig.sol";
 import {REVCroptopAllowedPost} from "@rev-net/core-v6/src/structs/REVCroptopAllowedPost.sol";
+import {REVBaseline721HookConfig} from "@rev-net/core-v6/src/structs/REVBaseline721HookConfig.sol";
 import {REVDeploy721TiersHookConfig} from "@rev-net/core-v6/src/structs/REVDeploy721TiersHookConfig.sol";
 import {REVDescription} from "@rev-net/core-v6/src/structs/REVDescription.sol";
+import {REV721TiersHookFlags} from "@rev-net/core-v6/src/structs/REV721TiersHookFlags.sol";
 import {REVStageConfig} from "@rev-net/core-v6/src/structs/REVStageConfig.sol";
 import {REVSuckerDeploymentConfig} from "@rev-net/core-v6/src/structs/REVSuckerDeploymentConfig.sol";
 import {JBSuckerDeployerConfig} from "@bananapus/suckers-v6/src/structs/JBSuckerDeployerConfig.sol";
@@ -56,27 +61,29 @@ contract DeployScript is Script, Sphinx {
 
     BannyverseRevnetConfig bannyverseConfig;
 
-    uint32 PREMINT_CHAIN_ID = 1;
-    bytes32 ERC20_SALT = "_BAN_ERC20V6_";
-    bytes32 SUCKER_SALT = "_BAN_SUCKERV6_";
-    bytes32 HOOK_SALT = "_BAN_HOOKV6_";
-    bytes32 RESOLVER_SALT = "_BAN_RESOLVERV6_";
-    string NAME = "Banny Network";
-    string SYMBOL = "BAN";
-    string PROJECT_URI = "ipfs://Qme34ww9HuwnsWF6sYDpDfpSdYHpPCGsEyJULk1BikCVYp";
-    string BASE_URI = "ipfs://";
-    uint32 NATIVE_CURRENCY = uint32(uint160(JBConstants.NATIVE_TOKEN));
-    uint32 ETH_CURRENCY = JBCurrencyIds.ETH;
-    uint8 DECIMALS = 18;
-    uint256 DECIMAL_MULTIPLIER = 10 ** DECIMALS;
-    uint24 BANNY_BODY_CATEGORY = 0;
-    address OPERATOR;
-    address TRUSTED_FORWARDER;
-    uint48 BAN_START_TIME = 1_740_435_044;
-    uint104 BAN_MAINNET_AUTO_ISSUANCE_ = 545_296_034_092_246_678_345_976;
-    uint104 BAN_BASE_AUTO_ISSUANCE_ = 10_097_684_379_816_492_953_872;
-    uint104 BAN_OP_AUTO_ISSUANCE_ = 328_366_065_858_064_488_000;
-    uint104 BAN_ARB_AUTO_ISSUANCE_ = 2_825_980_000_000_000_000_000;
+    uint32 constant PREMINT_CHAIN_ID = 1;
+    bytes32 constant ERC20_SALT = "_BAN_ERC20V6_";
+    bytes32 constant SUCKER_SALT = "_BAN_SUCKERV6_";
+    bytes32 constant HOOK_SALT = "_BAN_HOOKV6_";
+    bytes32 constant RESOLVER_SALT = "_BAN_RESOLVERV6_";
+    string constant NAME = "Banny Network";
+    string constant SYMBOL = "BAN";
+    string constant PROJECT_URI = "ipfs://Qme34ww9HuwnsWF6sYDpDfpSdYHpPCGsEyJULk1BikCVYp";
+    string constant BASE_URI = "ipfs://";
+    uint32 constant NATIVE_CURRENCY = uint32(uint160(JBConstants.NATIVE_TOKEN));
+    uint32 constant ETH_CURRENCY = JBCurrencyIds.ETH;
+    uint8 constant DECIMALS = 18;
+    uint256 constant DECIMAL_MULTIPLIER = 10 ** DECIMALS;
+    uint24 constant BANNY_BODY_CATEGORY = 0;
+    address operator;
+    address trustedForwarder;
+    uint48 constant BAN_START_TIME = 1_740_435_044;
+    uint104 constant BAN_MAINNET_AUTO_ISSUANCE = 545_296_034_092_246_678_345_976;
+    uint104 constant BAN_BASE_AUTO_ISSUANCE = 10_097_684_379_816_492_953_872;
+    uint104 constant BAN_OP_AUTO_ISSUANCE = 328_366_065_858_064_488_000;
+    uint104 constant BAN_ARB_AUTO_ISSUANCE = 2_825_980_000_000_000_000_000;
+    // forge-lint: disable-next-line(unsafe-typecast)
+    uint104 constant BAN_PREMINT_COUNT = uint104(1_000_000 * DECIMAL_MULTIPLIER);
 
     function configureSphinx() public override {
         sphinxConfig.projectName = "banny-core-v6";
@@ -86,7 +93,7 @@ contract DeployScript is Script, Sphinx {
 
     function run() public {
         // Get the operator address.
-        OPERATOR = safeAddress();
+        operator = safeAddress();
 
         // Get the deployment addresses for the nana CORE for this chain.
         // We want to do this outside of the `sphinx` modifier.
@@ -113,7 +120,7 @@ contract DeployScript is Script, Sphinx {
             )
         );
 
-        TRUSTED_FORWARDER = core.controller.trustedForwarder();
+        trustedForwarder = core.controller.trustedForwarder();
 
         bannyverseConfig = getBannyverseRevnetConfig();
 
@@ -142,7 +149,7 @@ contract DeployScript is Script, Sphinx {
         splits[0] = JBSplit({
             percent: JBConstants.SPLITS_TOTAL_PERCENT,
             projectId: 0,
-            beneficiary: payable(OPERATOR),
+            beneficiary: payable(operator),
             preferAddToBalance: false,
             lockedUntil: 0,
             hook: IJBSplitHook(address(0))
@@ -153,16 +160,17 @@ contract DeployScript is Script, Sphinx {
 
         {
             REVAutoIssuance[] memory autoIssuances = new REVAutoIssuance[](4);
-            autoIssuances[0] = REVAutoIssuance({chainId: 1, count: BAN_MAINNET_AUTO_ISSUANCE_, beneficiary: OPERATOR});
-            autoIssuances[1] = REVAutoIssuance({chainId: 8453, count: BAN_BASE_AUTO_ISSUANCE_, beneficiary: OPERATOR});
-            autoIssuances[2] = REVAutoIssuance({chainId: 10, count: BAN_OP_AUTO_ISSUANCE_, beneficiary: OPERATOR});
-            autoIssuances[3] = REVAutoIssuance({chainId: 42_161, count: BAN_ARB_AUTO_ISSUANCE_, beneficiary: OPERATOR});
+            autoIssuances[0] = REVAutoIssuance({chainId: 1, count: BAN_MAINNET_AUTO_ISSUANCE, beneficiary: operator});
+            autoIssuances[1] = REVAutoIssuance({chainId: 8453, count: BAN_BASE_AUTO_ISSUANCE, beneficiary: operator});
+            autoIssuances[2] = REVAutoIssuance({chainId: 10, count: BAN_OP_AUTO_ISSUANCE, beneficiary: operator});
+            autoIssuances[3] = REVAutoIssuance({chainId: 42_161, count: BAN_ARB_AUTO_ISSUANCE, beneficiary: operator});
 
             stageConfigurations[0] = REVStageConfig({
                 startsAtOrAfter: BAN_START_TIME,
                 autoIssuances: autoIssuances,
                 splitPercent: 3800, // 38%
                 splits: splits,
+                // forge-lint: disable-next-line(unsafe-typecast)
                 initialIssuance: uint112(10_000 * DECIMAL_MULTIPLIER),
                 issuanceCutFrequency: 60 days,
                 issuanceCutPercent: 380_000_000, // 38%,
@@ -173,9 +181,8 @@ contract DeployScript is Script, Sphinx {
 
         {
             REVAutoIssuance[] memory autoIssuances = new REVAutoIssuance[](1);
-            autoIssuances[0] = REVAutoIssuance({
-                chainId: PREMINT_CHAIN_ID, count: uint104(1_000_000 * DECIMAL_MULTIPLIER), beneficiary: OPERATOR
-            });
+            autoIssuances[0] =
+                REVAutoIssuance({chainId: PREMINT_CHAIN_ID, count: BAN_PREMINT_COUNT, beneficiary: operator});
 
             // decrease by a smaller percent more frequently. 30 days, 7%-ish.
             stageConfigurations[1] = REVStageConfig({
@@ -204,9 +211,9 @@ contract DeployScript is Script, Sphinx {
         });
 
         REVConfig memory revnetConfiguration = REVConfig({
-            description: REVDescription(NAME, SYMBOL, PROJECT_URI, ERC20_SALT),
+            description: REVDescription({name: NAME, ticker: SYMBOL, uri: PROJECT_URI, salt: ERC20_SALT}),
             baseCurrency: ETH_CURRENCY,
-            splitOperator: OPERATOR,
+            splitOperator: operator,
             stageConfigurations: stageConfigurations
         });
 
@@ -219,7 +226,7 @@ contract DeployScript is Script, Sphinx {
             votingUnits: 0,
             reserveFrequency: 0,
             reserveBeneficiary: address(0),
-            encodedIPFSUri: bytes32(""),
+            encodedIPFSUri: bytes32(0),
             category: BANNY_BODY_CATEGORY,
             discountPercent: 0,
             cannotIncreaseDiscountPercent: true,
@@ -237,7 +244,7 @@ contract DeployScript is Script, Sphinx {
             votingUnits: 0,
             reserveFrequency: 0,
             reserveBeneficiary: address(0),
-            encodedIPFSUri: bytes32(""),
+            encodedIPFSUri: bytes32(0),
             category: BANNY_BODY_CATEGORY,
             discountPercent: 0,
             cannotIncreaseDiscountPercent: true,
@@ -255,7 +262,7 @@ contract DeployScript is Script, Sphinx {
             votingUnits: 0,
             reserveFrequency: 0,
             reserveBeneficiary: address(0),
-            encodedIPFSUri: bytes32(""),
+            encodedIPFSUri: bytes32(0),
             category: BANNY_BODY_CATEGORY,
             discountPercent: 0,
             cannotIncreaseDiscountPercent: true,
@@ -273,7 +280,7 @@ contract DeployScript is Script, Sphinx {
             votingUnits: 0,
             reserveFrequency: 0,
             reserveBeneficiary: address(0),
-            encodedIPFSUri: bytes32(""),
+            encodedIPFSUri: bytes32(0),
             category: BANNY_BODY_CATEGORY,
             discountPercent: 0,
             cannotIncreaseDiscountPercent: true,
@@ -338,9 +345,7 @@ contract DeployScript is Script, Sphinx {
                     tokenUriResolver: IJB721TokenUriResolver(address(0)), // This will be replaced once we know the
                     // address.
                     contractUri: "https://jbm.infura-ipfs.io/ipfs/Qmd2hgb1E4caEB51VvoC3GvonhwkCoVyXjJ3zqsCxHPTKK",
-                    tiersConfig: JB721InitTiersConfig({
-                        tiers: tiers, currency: ETH_CURRENCY, decimals: DECIMALS, prices: core.prices
-                    }),
+                    tiersConfig: JB721InitTiersConfig({tiers: tiers, currency: ETH_CURRENCY, decimals: DECIMALS}),
                     reserveBeneficiary: address(0),
                     flags: REV721TiersHookFlags({
                         noNewTiersWithReserves: false,
@@ -350,10 +355,10 @@ contract DeployScript is Script, Sphinx {
                     })
                 }),
                 salt: HOOK_SALT,
-                splitOperatorCanAdjustTiers: true,
-                splitOperatorCanUpdateMetadata: true,
-                splitOperatorCanMint: true,
-                splitOperatorCanIncreaseDiscountPercent: true
+                preventSplitOperatorAdjustingTiers: false,
+                preventSplitOperatorUpdatingMetadata: false,
+                preventSplitOperatorMinting: false,
+                preventSplitOperatorIncreasingDiscountPercent: false
             })
         });
     }
@@ -362,15 +367,15 @@ contract DeployScript is Script, Sphinx {
         // Deploy the Banny URI Resolver.
         Banny721TokenUriResolver resolver;
 
-        string memory _BANNY_BODY =
+        string memory bannyBodySvg =
             '<g class="a1"><path d="M173 53h4v17h-4z"/></g><g class="a2"><path d="M167 57h3v10h-3z"/><path d="M169 53h4v17h-4z"/></g><g class="a3"><path d="M167 53h3v4h-3z"/><path d="M163 57h4v10h-4z"/><path d="M167 67h3v3h-3z"/></g><g class="b1"><path d="M213 253h-3v-3-3h-3v-7-3h-4v-10h-3v-7-7-3h-3v-73h-4v-10h-3v-10h-3v-7h-4v-7h-3v-3h-3v-3h-4v10h4v10h3v10h3v3h4v7 3 70 3h3v7h3v20h4v7h3v3h3v3h4v4h3v3h3v-3-4z"/><path d="M253 307v-4h-3v-3h-3v-3h-4v-4h-3v-3h-3v-3h-4v-4h-3v-3h-3v-3h-4v-4h-3v-6h-3v-7h-4v17h4v3h3v3h3 4v4h3v3h3v3h4v4h3v3h3v3h4v4h3v3h3v3h4v-6h-4z"/></g><g class="b2"><path d="M250 310v-3h-3v-4h-4v-3h-3v-3h-3v-4h-4v-3h-3v-3h-3v-4h-7v-3h-3v-3h-4v-17h-3v-3h-3v-4h-4v-3h-3v-3h-3v-7h-4v-20h-3v-7h-3v-73-3-7h-4v-3h-3v-10h-3v-10h-4V70h-3v-3l-3 100 3-100v40h-3v10h-4v6h-3v14h-3v3 13h-4v44h4v16h3v14h3v13h4v10h3v7h3v3h4v3h3v4h3v3h4v3h3v4h3v3h4v3h3v7h7v7h6v3h7v3h7v4h13v3h3v3h10v-3h-3zm-103-87v-16h3v-10h-3v6h-4v17h-3v10h3v-7h4z"/><path d="M143 230h4v7h-4zm4 10h3v3h-3zm3 7h3v3h-3zm3 6h4v4h-4z"/><path d="M163 257h-6v3h3v3h3v4h4v-4-3h-4v-3z"/></g><g class="b3"><path d="M143 197v6h4v-6h6v-44h4v-16h3v-14h3v-6h4v-10h3V97h-7v6h-3v4h-3v3h-4v3h-3v4 3h-3v3 4h-4v10h-3v16 4h-3v46h3v-6h3z"/><path d="M140 203h3v17h-3z"/><path d="M137 220h3v10h-3z"/><path d="M153 250h-3v-7h-3v-6h-4v-7h-3v10h3v7h4v6h3v4h3v-7zm-3 10h3v7h-3z"/><path d="M147 257h3v3h-3zm6 0h4v3h-4z"/><path d="M160 263v-3h-3v3 7h6v-7h-3zm-10-56v16h-3v7h3v10h3v7h4v6h6v4h7v-4-3h-3v-10h-4v-13h-3v-14h-3v-16h-4v10h-3z"/><path d="M243 313v-3h-3v-3h-10-3v-4h-7v-3h-7v-3h-6v-7h-7v-7h-3v-3h-4v-3h-3v-4h-3v-3h-4v-3h-3v-4h-3v-3h-4v-3h-3v10h-3v3h-4v3h-3v7h3v7h4v6h3v5h4v3h6v3h3v3h4 3v3h3 4v3h3 3v4h10v3h7 7 3v3h10 3v-3h10v-3h4v-4h-14z"/></g><g class="b4"><path d="M183 130h4v7h-4z"/><path d="M180 127h3v3h-3zm-27-4h4v7h-4z"/><path d="M157 117h3v6h-3z"/><path d="M160 110h3v7h-3z"/><path d="M163 107h4v3h-4zm-3 83h3v7h-3z"/><path d="M163 187h4v3h-4zm20 0h7v3h-7z"/><path d="M180 190h3v3h-3zm10-7h3v4h-3z"/><path d="M193 187h4v6h-4zm-20 53h4v7h-4z"/><path d="M177 247h3v6h-3z"/><path d="M180 253h3v7h-3z"/><path d="M183 260h7v3h-7z"/><path d="M190 263h3v4h-3zm0-20h3v4h-3z"/><path d="M187 240h3v3h-3z"/><path d="M190 237h3v3h-3zm13 23h4v3h-4z"/><path d="M207 263h3v7h-3z"/><path d="M210 270h3v3h-3zm-10 7h3v6h-3z"/><path d="M203 283h4v7h-4z"/><path d="M207 290h6v3h-6z"/></g><g class="o"><path d="M133 157h4v50h-4zm0 63h4v10h-4zm27-163h3v10h-3z"/><path d="M163 53h4v4h-4z"/><path d="M167 50h10v3h-10z"/><path d="M177 53h3v17h-3z"/><path d="M173 70h4v27h-4zm-6 0h3v27h-3z"/><path d="M163 67h4v3h-4zm0 30h4v3h-4z"/><path d="M160 100h3v3h-3z"/><path d="M157 103h3v4h-3z"/><path d="M153 107h4v3h-4z"/><path d="M150 110h3v3h-3z"/><path d="M147 113h3v7h-3z"/><path d="M143 120h4v7h-4z"/><path d="M140 127h3v10h-3z"/><path d="M137 137h3v20h-3zm56-10h4v10h-4z"/><path d="M190 117h3v10h-3z"/><path d="M187 110h3v7h-3z"/><path d="M183 103h4v7h-4z"/><path d="M180 100h3v3h-3z"/><path d="M177 97h3v3h-3zm-40 106h3v17h-3zm0 27h3v10h-3zm10 30h3v7h-3z"/><path d="M150 257v-4h-3v-6h-4v-7h-3v10h3v10h4v-3h3z"/><path d="M150 257h3v3h-3z"/><path d="M163 273v-3h-6v-10h-4v7h-3v3h3v3h4v7h3v-7h3z"/><path d="M163 267h4v3h-4z"/><path d="M170 257h-3-4v3h4v7h3v-10z"/><path d="M157 253h6v4h-6z"/><path d="M153 247h4v6h-4z"/><path d="M150 240h3v7h-3z"/><path d="M147 230h3v10h-3zm13 50h3v7h-3z"/><path d="M143 223h4v7h-4z"/><path d="M147 207h3v16h-3z"/><path d="M150 197h3v10h-3zm-10 0h3v6h-3zm50 113h7v3h-7zm23 10h17v3h-17z"/><path d="M230 323h13v4h-13z"/><path d="M243 320h10v3h-10z"/><path d="M253 317h4v3h-4z"/><path d="M257 307h3v10h-3z"/><path d="M253 303h4v4h-4z"/><path d="M250 300h3v3h-3z"/><path d="M247 297h3v3h-3z"/><path d="M243 293h4v4h-4z"/><path d="M240 290h3v3h-3z"/><path d="M237 287h3v3h-3z"/><path d="M233 283h4v4h-4z"/><path d="M230 280h3v3h-3z"/><path d="M227 277h3v3h-3z"/><path d="M223 273h4v4h-4z"/><path d="M220 267h3v6h-3z"/><path d="M217 260h3v7h-3z"/><path d="M213 253h4v7h-4z"/><path d="M210 247h3v6h-3z"/><path d="M207 237h3v10h-3z"/><path d="M203 227h4v10h-4zm-40 60h4v6h-4zm24 20h3v3h-3z"/><path d="M167 293h3v5h-3zm16 14h4v3h-4z"/><path d="M170 298h4v3h-4zm10 6h3v3h-3z"/><path d="M174 301h6v3h-6zm23 12h6v4h-6z"/><path d="M203 317h10v3h-10zm-2-107v-73h-4v73h3v17h3v-17h-2z"/></g><g class="o"><path d="M187 307v-4h3v-6h-3v-4h-4v-3h-3v-3h-7v-4h-6v4h-4v3h4v27h-4v13h-3v10h-4v7h4v3h3 10 14v-3h-4v-4h-3v-3h-3v-3h-4v-7h4v-10h3v-7h3v-3h7v-3h-3zm16 10v-4h-6v17h-4v10h-3v7h3v3h4 6 4 3 14v-3h-4v-4h-7v-3h-3v-3h-3v-10h3v-7h3v-3h-10z"/></g>';
-        string memory _DEFAULT_NECKLACE =
+        string memory defaultNecklaceSvg =
             '<g class="o"><path d="M190 173h-37v-3h-10v-4h-6v4h3v3h-3v4h6v3h10v4h37v-4h3v-3h-3v-4zm-40 4h-3v-4h3v4zm7 3v-3h3v3h-3zm6 0v-3h4v3h-4zm7 0v-3h3v3h-3zm7 0v-3h3v3h-3zm10 0h-4v-3h4v3z"/><path d="M190 170h3v3h-3z"/><path d="M193 166h4v4h-4zm0 7h4v4h-4z"/></g><g class="w"><path d="M137 170h3v3h-3zm10 3h3v4h-3zm10 4h3v3h-3zm6 0h4v3h-4zm7 0h3v3h-3zm7 0h3v3h-3zm6 0h4v3h-4zm7-4h3v4h-3z"/><path d="M193 170h4v3h-4z"/></g>';
-        string memory _DEFAULT_MOUTH =
+        string memory defaultMouthSvg =
             '<g class="o"><path d="M183 160v-4h-20v4h-3v3h3v4h24v-7h-4zm-13 3v-3h10v3h-10z" fill="#ad71c8"/><path d="M170 160h10v3h-10z"/></g>';
-        string memory _DEFAULT_STANDARD_EYES =
+        string memory defaultStandardEyesSvg =
             '<g class="o"><path d="M177 140v3h6v11h10v-11h4v-3h-20z"/><path d="M153 140v3h7v8 3h7 3v-11h3v-3h-20z"/></g><g class="w"><path d="M153 143h7v4h-7z"/><path d="M157 147h3v3h-3zm20-4h6v4h-6z"/><path d="M180 147h3v3h-3z"/></g>';
-        string memory _DEFAULT_ALIEN_EYES =
+        string memory defaultAlienEyesSvg =
             '<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..
@@ -378,40 +383,42 @@ contract DeployScript is Script, Sphinx {
                 RESOLVER_SALT,
                 type(Banny721TokenUriResolver).creationCode,
                 abi.encode(
-                    _BANNY_BODY,
-                    _DEFAULT_NECKLACE,
-                    _DEFAULT_MOUTH,
-                    _DEFAULT_STANDARD_EYES,
-                    _DEFAULT_ALIEN_EYES,
-                    OPERATOR,
-                    TRUSTED_FORWARDER
+                    bannyBodySvg,
+                    defaultNecklaceSvg,
+                    defaultMouthSvg,
+                    defaultStandardEyesSvg,
+                    defaultAlienEyesSvg,
+                    operator,
+                    trustedForwarder
                 )
             );
             // Deploy it if it has not been deployed yet.
             resolver = !_resolverIsDeployed
-                ? new Banny721TokenUriResolver{salt: RESOLVER_SALT}(
-                    _BANNY_BODY,
-                    _DEFAULT_NECKLACE,
-                    _DEFAULT_MOUTH,
-                    _DEFAULT_STANDARD_EYES,
-                    _DEFAULT_ALIEN_EYES,
-                    OPERATOR,
-                    TRUSTED_FORWARDER
-                )
+                ? new Banny721TokenUriResolver{salt: RESOLVER_SALT}({
+                    bannyBody: bannyBodySvg,
+                    defaultNecklace: defaultNecklaceSvg,
+                    defaultMouth: defaultMouthSvg,
+                    defaultStandardEyes: defaultStandardEyesSvg,
+                    defaultAlienEyes: defaultAlienEyesSvg,
+                    owner: operator,
+                    trustedForwarder: trustedForwarder
+                })
                 : Banny721TokenUriResolver(_resolver);
         }
 
         // Set the resolver's metadata.
-        resolver.setMetadata(
-            "A piece of Banny Retail.", "https://retail.banny.eth.shop", "https://bannyverse.infura-ipfs.io/ipfs/"
-        );
+        resolver.setMetadata({
+            description: "A piece of Banny Retail.",
+            url: "https://retail.banny.eth.shop",
+            baseUri: "https://bannyverse.infura-ipfs.io/ipfs/"
+        });
 
         // Update our config with its address.
         bannyverseConfig.hookConfiguration.baseline721HookConfiguration.tokenUriResolver = resolver;
 
         // Deploy the $BANNY Revnet.
         revnet.basic_deployer
-            .deployWith721sFor({
+            .deployFor({
                 revnetId: 0,
                 configuration: bannyverseConfig.configuration,
                 terminalConfigurations: bannyverseConfig.terminalConfigurations,

package/script/Drop1.s.sol

@@ -5,10 +5,11 @@ import {JB721TierConfig} from "@bananapus/721-hook-v6/src/structs/JB721TierConfi
 import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
 import {JB721TiersHook} from "@bananapus/721-hook-v6/src/JB721TiersHook.sol";
 
-import "./helpers/BannyverseDeploymentLib.sol";
-import "@rev-net/core-v6/script/helpers/RevnetCoreDeploymentLib.sol";
-import "@openzeppelin/contracts/utils/Strings.sol";
-
+import {BannyverseDeployment, BannyverseDeploymentLib} from "./helpers/BannyverseDeploymentLib.sol";
+import {
+    RevnetCoreDeployment,
+    RevnetCoreDeploymentLib
+} from "@rev-net/core-v6/script/helpers/RevnetCoreDeploymentLib.sol";
 import {Sphinx} from "@sphinx-labs/contracts/contracts/foundry/SphinxPlugin.sol";
 import {Script} from "forge-std/Script.sol";
 
@@ -1047,8 +1048,8 @@ contract Drop1Script is Script, Sphinx {
             productIds[i] = i + 5;
         }
 
-        hook.adjustTiers(products, new uint256[](0));
-        bannyverse.resolver.setSvgHashesOf(productIds, svgHashes);
-        bannyverse.resolver.setProductNames(productIds, names);
+        hook.adjustTiers({tiersToAdd: products, tierIdsToRemove: new uint256[](0)});
+        bannyverse.resolver.setSvgHashesOf({upcs: productIds, svgHashes: svgHashes});
+        bannyverse.resolver.setProductNames({upcs: productIds, names: names});
     }
 }

package/script/helpers/BannyverseDeploymentLib.sol

@@ -16,6 +16,7 @@ struct BannyverseDeployment {
 library BannyverseDeploymentLib {
     // Cheat code address, 0x7109709ECfa91a80626fF3989D68f67F5b1DD12D.
     address internal constant VM_ADDRESS = address(uint160(uint256(keccak256("hevm cheat code"))));
+    // forge-lint: disable-next-line(screaming-snake-case-const)
     Vm internal constant vm = Vm(VM_ADDRESS);
 
     function getDeployment(
@@ -35,7 +36,7 @@ library BannyverseDeploymentLib {
 
         for (uint256 _i; _i < networks.length; _i++) {
             if (networks[_i].chainId == chainId) {
-                return getDeployment(path, networks[_i].name, revnetId);
+                return getDeployment({path: path, networkName: networks[_i].name, revnetId: revnetId});
             }
         }
 
@@ -44,7 +45,7 @@ library BannyverseDeploymentLib {
 
     function getDeployment(
         string memory path,
-        string memory network_name,
+        string memory networkName,
         uint256 revnetId
     )
         internal
@@ -52,7 +53,12 @@ library BannyverseDeploymentLib {
         returns (BannyverseDeployment memory deployment)
     {
         deployment.resolver = Banny721TokenUriResolver(
-            _getDeploymentAddress(path, "banny-core-v6", network_name, "Banny721TokenUriResolver")
+            _getDeploymentAddress({
+                path: path,
+                projectName: "banny-core-v6",
+                networkName: networkName,
+                contractName: "Banny721TokenUriResolver"
+            })
         );
 
         deployment.revnetId = revnetId;
@@ -65,8 +71,8 @@ library BannyverseDeploymentLib {
     /// @return The address of the contract.
     function _getDeploymentAddress(
         string memory path,
-        string memory project_name,
-        string memory network_name,
+        string memory projectName,
+        string memory networkName,
         string memory contractName
     )
         internal
@@ -74,7 +80,8 @@ library BannyverseDeploymentLib {
         returns (address)
     {
         string memory deploymentJson =
-            vm.readFile(string.concat(path, project_name, "/", network_name, "/", contractName, ".json"));
-        return stdJson.readAddress(deploymentJson, ".address");
+        // forge-lint: disable-next-line(unsafe-cheatcode)
+        vm.readFile(string.concat(path, projectName, "/", networkName, "/", contractName, ".json"));
+        return stdJson.readAddress({json: deploymentJson, key: ".address"});
     }
 }

package/script/helpers/MigrationHelper.sol

@@ -7,7 +7,7 @@ import {IJB721TiersHookStore} from "@bananapus/721-hook-v6/src/interfaces/IJB721
 
 library MigrationHelper {
     /// @notice Get the UPC (tier ID) from a token ID
-    function _getUPC(address hook, uint256 tokenId) internal view returns (uint256) {
+    function _getUpc(address hook, uint256 tokenId) internal view returns (uint256) {
         IJB721TiersHookStore store = JB721TiersHook(hook).STORE();
         return store.tierOfTokenId({hook: hook, tokenId: tokenId, includeResolvedUri: false}).id;
     }
@@ -24,22 +24,24 @@ library MigrationHelper {
         view
     {
         // Get V5 asset token IDs (from V5 hook)
-        (uint256 v5BackgroundId, uint256[] memory v5OutfitIds) = resolver.assetIdsOf(hookAddress, tokenId);
+        (uint256 v5BackgroundId, uint256[] memory v5OutfitIds) =
+            resolver.assetIdsOf({hook: hookAddress, bannyBodyId: tokenId});
         // Get V4 asset token IDs (from V4 hook)
-        (uint256 v4BackgroundId, uint256[] memory v4OutfitIds) = v4Resolver.assetIdsOf(v4HookAddress, tokenId);
+        (uint256 v4BackgroundId, uint256[] memory v4OutfitIds) =
+            v4Resolver.assetIdsOf({hook: v4HookAddress, bannyBodyId: tokenId});
 
         // Compare background UPCs (not token IDs, since they may differ)
-        uint256 v5BackgroundUPC = v5BackgroundId == 0 ? 0 : _getUPC(hookAddress, v5BackgroundId);
-        uint256 v4BackgroundUPC = v4BackgroundId == 0 ? 0 : _getUPC(v4HookAddress, v4BackgroundId);
+        uint256 v5BackgroundUpc = v5BackgroundId == 0 ? 0 : _getUpc({hook: hookAddress, tokenId: v5BackgroundId});
+        uint256 v4BackgroundUpc = v4BackgroundId == 0 ? 0 : _getUpc({hook: v4HookAddress, tokenId: v4BackgroundId});
 
-        bool matches = v5BackgroundUPC == v4BackgroundUPC && v5OutfitIds.length == v4OutfitIds.length;
+        bool matches = v5BackgroundUpc == v4BackgroundUpc && v5OutfitIds.length == v4OutfitIds.length;
 
         if (matches) {
             // Compare outfit UPCs
             for (uint256 i = 0; i < v5OutfitIds.length; i++) {
-                uint256 v5OutfitUPC = _getUPC(hookAddress, v5OutfitIds[i]);
-                uint256 v4OutfitUPC = _getUPC(v4HookAddress, v4OutfitIds[i]);
-                if (v5OutfitUPC != v4OutfitUPC) {
+                uint256 v5OutfitUpc = _getUpc({hook: hookAddress, tokenId: v5OutfitIds[i]});
+                uint256 v4OutfitUpc = _getUpc({hook: v4HookAddress, tokenId: v4OutfitIds[i]});
+                if (v5OutfitUpc != v4OutfitUpc) {
                     matches = false;
                     break;
                 }
@@ -48,17 +50,17 @@ library MigrationHelper {
 
         if (!matches) {
             // Try fallback resolver
-            (v4BackgroundId, v4OutfitIds) = fallbackV4Resolver.assetIdsOf(v4HookAddress, tokenId);
-            v4BackgroundUPC = v4BackgroundId == 0 ? 0 : _getUPC(v4HookAddress, v4BackgroundId);
+            (v4BackgroundId, v4OutfitIds) = fallbackV4Resolver.assetIdsOf({hook: v4HookAddress, bannyBodyId: tokenId});
+            v4BackgroundUpc = v4BackgroundId == 0 ? 0 : _getUpc({hook: v4HookAddress, tokenId: v4BackgroundId});
 
             require(
-                v5BackgroundUPC == v4BackgroundUPC && v5OutfitIds.length == v4OutfitIds.length, "V4/V5 asset mismatch"
+                v5BackgroundUpc == v4BackgroundUpc && v5OutfitIds.length == v4OutfitIds.length, "V4/V5 asset mismatch"
             );
 
             for (uint256 i = 0; i < v5OutfitIds.length; i++) {
-                uint256 v5OutfitUPC = _getUPC(hookAddress, v5OutfitIds[i]);
-                uint256 v4OutfitUPC = _getUPC(v4HookAddress, v4OutfitIds[i]);
-                require(v5OutfitUPC == v4OutfitUPC, "V4/V5 asset mismatch");
+                uint256 v5OutfitUpc = _getUpc({hook: hookAddress, tokenId: v5OutfitIds[i]});
+                uint256 v4OutfitUpc = _getUpc({hook: v4HookAddress, tokenId: v4OutfitIds[i]});
+                require(v5OutfitUpc == v4OutfitUpc, "V4/V5 asset mismatch");
             }
         }
     }
@@ -91,14 +93,14 @@ library MigrationHelper {
                 // Check if this tier is owned by the fallback resolver in V4
                 // If so, skip verification (these are now owned by rightful owners in V5)
                 uint256 v4FallbackResolverBalance =
-                    v4Store.tierBalanceOf(v4HookAddress, v4FallbackResolverAddress, tierId);
+                    v4Store.tierBalanceOf({hook: v4HookAddress, owner: v4FallbackResolverAddress, tierId: tierId});
                 if (v4FallbackResolverBalance > 0) {
                     continue;
                 }
 
                 // Get V4 and V5 tier balances for this owner and tier
-                uint256 v4Balance = v4Store.tierBalanceOf(v4HookAddress, owner, tierId);
-                uint256 v5Balance = v5Store.tierBalanceOf(hookAddress, owner, tierId);
+                uint256 v4Balance = v4Store.tierBalanceOf({hook: v4HookAddress, owner: owner, tierId: tierId});
+                uint256 v5Balance = v5Store.tierBalanceOf({hook: hookAddress, owner: owner, tierId: tierId});
 
                 // Require that V5 balance is never greater than V4 balance
                 require(
@@ -146,6 +148,7 @@ library MigrationHelper {
         bytes memory buffer = new bytes(digits);
         while (value != 0) {
             digits -= 1;
+            // forge-lint: disable-next-line(unsafe-typecast)
             buffer[digits] = bytes1(uint8(48 + uint256(value % 10)));
             value /= 10;
         }

package/src/Banny721TokenUriResolver.sol

@@ -108,10 +108,15 @@ contract Banny721TokenUriResolver is
     /// @custom:param upc The universal product code that the SVG hash represent.
     mapping(uint256 upc => bytes32) public override svgHashOf;
 
+    // forge-lint: disable-next-line(mixed-case-variable)
     string public override DEFAULT_ALIEN_EYES;
+    // forge-lint: disable-next-line(mixed-case-variable)
     string public override DEFAULT_MOUTH;
+    // forge-lint: disable-next-line(mixed-case-variable)
     string public override DEFAULT_NECKLACE;
+    // forge-lint: disable-next-line(mixed-case-variable)
     string public override DEFAULT_STANDARD_EYES;
+    // forge-lint: disable-next-line(mixed-case-variable)
     string public override BANNY_BODY;
 
     //*********************************************************************//
@@ -299,7 +304,7 @@ contract Banny721TokenUriResolver is
 
         // Get a reference to the pricing context.
         // slither-disable-next-line unused-return
-        (uint256 currency, uint256 decimals,) = IJB721TiersHook(hook).pricingContext();
+        (uint256 currency, uint256 decimals) = IJB721TiersHook(hook).pricingContext();
 
         attributes = string.concat(
             attributes,

package/test/Banny721TokenUriResolver.t.sol

@@ -79,10 +79,12 @@ contract MockStore {
         return tiers[hook][tokenId];
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedTierIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }
@@ -166,7 +168,7 @@ contract TestBanny721TokenUriResolver is Test {
     // --- Constructor --------------------------------------------------- //
     //*********************************************************************//
 
-    function test_constructor_setsDefaults() public {
+    function test_constructor_setsDefaults() public view {
         assertEq(resolver.BANNY_BODY(), "<path/>");
         assertEq(resolver.DEFAULT_NECKLACE(), "<necklace/>");
         assertEq(resolver.DEFAULT_MOUTH(), "<mouth/>");
@@ -607,27 +609,27 @@ contract TestBanny721TokenUriResolver is Test {
         resolver.decorateBannyWith(address(hook), BODY_TOKEN, 0, outfitIds1);
 
         // Create a new necklace token.
-        uint256 NECKLACE_TOKEN_2 = 11_000_000_001;
-        _setupTier(NECKLACE_TOKEN_2, 11, 3); // Same category (3)
-        hook.setOwner(NECKLACE_TOKEN_2, alice);
+        uint256 necklaceToken2 = 11_000_000_001;
+        _setupTier(necklaceToken2, 11, 3); // Same category (3)
+        hook.setOwner(necklaceToken2, alice);
 
         // Replace with new necklace. Old one should be returned.
         uint256[] memory outfitIds2 = new uint256[](1);
-        outfitIds2[0] = NECKLACE_TOKEN_2;
+        outfitIds2[0] = necklaceToken2;
         vm.prank(alice);
         resolver.decorateBannyWith(address(hook), BODY_TOKEN, 0, outfitIds2);
 
         // Old necklace returned to alice.
         assertEq(hook.ownerOf(NECKLACE_TOKEN), alice, "old necklace should be returned");
         // New necklace held by resolver.
-        assertEq(hook.ownerOf(NECKLACE_TOKEN_2), address(resolver), "new necklace should be held");
+        assertEq(hook.ownerOf(necklaceToken2), address(resolver), "new necklace should be held");
     }
 
     //*********************************************************************//
     // --- onERC721Received ---------------------------------------------- //
     //*********************************************************************//
 
-    function test_onERC721Received_acceptsFromSelf() public {
+    function test_onERC721Received_acceptsFromSelf() public view {
         bytes4 result = resolver.onERC721Received(address(resolver), alice, 1, "");
         assertEq(result, IERC721Receiver.onERC721Received.selector, "should accept from self");
     }
@@ -641,7 +643,7 @@ contract TestBanny721TokenUriResolver is Test {
     // --- View: assetIdsOf with no outfits ------------------------------ //
     //*********************************************************************//
 
-    function test_assetIdsOf_empty() public {
+    function test_assetIdsOf_empty() public view {
         (uint256 backgroundId, uint256[] memory outfitIds) = resolver.assetIdsOf(address(hook), BODY_TOKEN);
         assertEq(backgroundId, 0, "no background initially");
         assertEq(outfitIds.length, 0, "no outfits initially");
@@ -651,11 +653,11 @@ contract TestBanny721TokenUriResolver is Test {
     // --- View: userOf / wearerOf --------------------------------------- //
     //*********************************************************************//
 
-    function test_userOf_returnsZeroIfNotAttached() public {
+    function test_userOf_returnsZeroIfNotAttached() public view {
         assertEq(resolver.userOf(address(hook), BACKGROUND_TOKEN), 0, "no user initially");
     }
 
-    function test_wearerOf_returnsZeroIfNotWorn() public {
+    function test_wearerOf_returnsZeroIfNotWorn() public view {
         assertEq(resolver.wearerOf(address(hook), NECKLACE_TOKEN), 0, "no wearer initially");
     }
 

package/test/BannyAttacks.t.sol

@@ -70,10 +70,12 @@ contract AttackMockStore {
         return tiers[hook][tokenId];
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedTierIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }

package/test/DecorateFlow.t.sol

@@ -70,10 +70,12 @@ contract DecorateFlowMockStore {
         return tiers[hook][tokenId];
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedTierIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }

package/test/Fork.t.sol

@@ -27,7 +27,6 @@ import {JB721TiersHookFlags} from "@bananapus/721-hook-v6/src/structs/JB721Tiers
 import {JBDeploy721TiersHookConfig} from "@bananapus/721-hook-v6/src/structs/JBDeploy721TiersHookConfig.sol";
 import {JB721Tier} from "@bananapus/721-hook-v6/src/structs/JB721Tier.sol";
 import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";
-import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
 import {JBCurrencyIds} from "@bananapus/core-v6/src/libraries/JBCurrencyIds.sol";
 import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
 
@@ -113,10 +112,12 @@ contract ReentrantMockStore {
         return tiers[hook][tokenId];
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedTierIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }
@@ -299,13 +300,13 @@ contract BannyForkTest is Test {
         assertEq(IERC721(address(bannyHook)).ownerOf(ORIGINAL_BODY_1), alice);
     }
 
-    function test_fork_e2e_alienBodyDefaultEyes() public {
+    function test_fork_e2e_alienBodyDefaultEyes() public view {
         // Alice owns ALIEN_BODY_1. Naked alien body should inject alien eyes in SVG.
         string memory svg = resolver.svgOf(address(bannyHook), ALIEN_BODY_1, true, false);
         assertGt(bytes(svg).length, 0, "alien body SVG should render");
     }
 
-    function test_fork_e2e_outfitRenderedOnMannequin() public {
+    function test_fork_e2e_outfitRenderedOnMannequin() public view {
         // Unequipped outfit token should render on mannequin.
         string memory uri = resolver.tokenUriOf(address(bannyHook), NECKLACE_1);
         assertGt(bytes(uri).length, 0, "outfit URI should render on mannequin");
@@ -781,14 +782,14 @@ contract BannyForkTest is Test {
     // 7. TOKEN URI RENDERING
     // ═══════════════════════════════════════════════════════════════════════
 
-    function test_fork_render_nakedBodyHasDefaultInjections() public {
+    function test_fork_render_nakedBodyHasDefaultInjections() public view {
         // A naked body should still render with default necklace, eyes, mouth.
         string memory svg = resolver.svgOf(address(bannyHook), ORIGINAL_BODY_1, true, false);
         assertGt(bytes(svg).length, 0, "naked body should render");
         // The SVG should contain the body path and defaults.
     }
 
-    function test_fork_render_allFourBodyTypes() public {
+    function test_fork_render_allFourBodyTypes() public view {
         // Each body type should render.
         string memory alienSvg = resolver.svgOf(address(bannyHook), ALIEN_BODY_1, true, false);
         string memory pinkSvg = resolver.svgOf(address(bannyHook), PINK_BODY_1, true, false);
@@ -1011,17 +1012,17 @@ contract BannyForkTest is Test {
         assertEq(outfitIds.length, 0);
     }
 
-    function test_fork_edge_assetIdsEmptyInitially() public {
+    function test_fork_edge_assetIdsEmptyInitially() public view {
         (uint256 bgId, uint256[] memory outfitIds) = resolver.assetIdsOf(address(bannyHook), ORIGINAL_BODY_1);
         assertEq(bgId, 0);
         assertEq(outfitIds.length, 0);
     }
 
-    function test_fork_edge_wearerOfUnwornReturnsZero() public {
+    function test_fork_edge_wearerOfUnwornReturnsZero() public view {
         assertEq(resolver.wearerOf(address(bannyHook), NECKLACE_1), 0);
     }
 
-    function test_fork_edge_userOfUnusedBackgroundReturnsZero() public {
+    function test_fork_edge_userOfUnusedBackgroundReturnsZero() public view {
         assertEq(resolver.userOf(address(bannyHook), BACKGROUND_1), 0);
     }
 
@@ -1136,7 +1137,7 @@ contract BannyForkTest is Test {
         resolver.decorateBannyWith(address(bannyHook), ORIGINAL_BODY_1, 0, outfits);
     }
 
-    function test_fork_edge_namesReturnsCorrectData() public {
+    function test_fork_edge_namesReturnsCorrectData() public view {
         // Verify namesOf returns correct product name for each body type.
         (string memory alienFull,,) = resolver.namesOf(address(bannyHook), ALIEN_BODY_1);
         assertGt(bytes(alienFull).length, 0, "alien name should not be empty");
@@ -1791,6 +1792,7 @@ contract BannyForkTest is Test {
     // Internal helpers
     // ═══════════════════════════════════════════════════════════════════════
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function _deployJBCore() internal {
         jbPermissions = new JBPermissions(trustedForwarder);
         jbProjects = new JBProjects(multisig, address(0), trustedForwarder);
@@ -1824,7 +1826,7 @@ contract BannyForkTest is Test {
         JBAddressRegistry addressRegistry = new JBAddressRegistry();
 
         JB721TiersHook hookImpl =
-            new JB721TiersHook(jbDirectory, jbPermissions, jbRulesets, store, jbSplits, trustedForwarder);
+            new JB721TiersHook(jbDirectory, jbPermissions, jbPrices, jbRulesets, store, jbSplits, trustedForwarder);
 
         hookDeployer = new JB721TiersHookDeployer(hookImpl, store, addressRegistry, trustedForwarder);
     }
@@ -1900,9 +1902,7 @@ contract BannyForkTest is Test {
             baseUri: "ipfs://",
             tokenUriResolver: IJB721TokenUriResolver(address(resolver)),
             contractUri: "",
-            tiersConfig: JB721InitTiersConfig({
-                tiers: tiers, currency: JBCurrencyIds.ETH, decimals: 18, prices: IJBPrices(address(0))
-            }),
+            tiersConfig: JB721InitTiersConfig({tiers: tiers, currency: JBCurrencyIds.ETH, decimals: 18}),
             reserveBeneficiary: address(0),
             flags: JB721TiersHookFlags({
                 noNewTiersWithReserves: false,
@@ -1946,6 +1946,7 @@ contract BannyForkTest is Test {
         });
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function _mintInitialNFTs() internal {
         // Mint bodies and outfits to alice, bob.
         vm.startPrank(multisig); // hook owner can mint

package/test/regression/BodyCategoryValidation.t.sol

@@ -62,6 +62,7 @@ contract MockStore57 {
         return tiers[hook][tokenId];
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }

package/test/regression/BurnedTokenCheck.t.sol

@@ -73,6 +73,7 @@ contract MockStore62 {
         return tiers[hook][tokenId];
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }

package/test/regression/CEIReorder.t.sol

@@ -70,6 +70,7 @@ contract MockStoreI25 {
         return tiers[hook][tokenId];
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }

package/test/regression/MsgSenderEvents.t.sol

@@ -63,6 +63,7 @@ contract MockStore56 {
         return tiers[hook][tokenId];
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }

package/test/regression/RemovedTierDesync.t.sol

@@ -77,6 +77,7 @@ contract MockStoreM8 {
         return tiers[hook][tokenId];
     }
 
+    // forge-lint: disable-next-line(mixed-case-function)
     function encodedIPFSUriOf(address, uint256) external pure returns (bytes32) {
         return bytes32(0);
     }