@bananapus/core-v6 0.0.13 → 0.0.15

package/STYLE_GUIDE.md

@@ -17,8 +17,6 @@ src/
 
 One contract/interface/struct/enum per file. Name the file after the type it contains.
 
-**Structs, enums, libraries, and interfaces always go in their subdirectories** (`src/structs/`, `src/enums/`, `src/libraries/`, `src/interfaces/`) — never inline in contract files or placed in `src/` root. This keeps type definitions discoverable and import paths consistent across repos.
-
 ## Pragma Versions
 
 ```solidity
@@ -106,14 +104,6 @@ contract JBExample is JBPermissioned, IJBExample {
     // -------------------------- constructor ---------------------------- //
     //*********************************************************************//
 
-    //*********************************************************************//
-    // ---------------------- receive / fallback ------------------------- //
-    //*********************************************************************//
-
-    //*********************************************************************//
-    // --------------------------- modifiers ----------------------------- //
-    //*********************************************************************//
-
     //*********************************************************************//
     // ---------------------- external transactions ---------------------- //
     //*********************************************************************//
@@ -141,28 +131,23 @@ contract JBExample is JBPermissioned, IJBExample {
 ```
 
 **Section order:**
-1. `using` declarations
-2. Custom errors
-3. Public constants
-4. Internal constants
-5. Public immutable stored properties
-6. Internal immutable stored properties
-7. Public stored properties
-8. Internal stored properties
-9. Constructor
-10. `receive` / `fallback`
-11. Modifiers
-12. External transactions
-13. External views
-14. Public transactions
-15. Internal helpers
-16. Internal views
-17. Private helpers
+1. Custom errors
+2. Public constants
+3. Internal constants
+4. Public immutable stored properties
+5. Internal immutable stored properties
+6. Public stored properties
+7. Internal stored properties
+8. Constructor
+9. External transactions
+10. External views
+11. Public transactions
+12. Internal helpers
+13. Internal views
+14. Private helpers
 
 Functions are alphabetized within each section.
 
-**Events:** Events are declared in interfaces only, never in implementation contracts. Implementations inherit events from their interface and emit them unqualified. This keeps the ABI definition in one place and allows tests to use interface-qualified event expectations (e.g., `emit IJBController.LaunchProject(...)`).
-
 ## Interface Structure
 
 ```solidity
@@ -324,7 +309,7 @@ try hook.afterPayRecordedWith(context) {} catch (bytes memory reason) {
 
 ### foundry.toml
 
-Standard config for `@bananapus/core-v6`:
+Standard config across all repos:
 
 ```toml
 [profile.default]
@@ -334,9 +319,6 @@ optimizer_runs = 200
 libs = ["node_modules", "lib"]
 fs_permissions = [{ access = "read-write", path = "./"}]
 
-[profile.ci_sizes]
-optimizer_runs = 200
-
 [fuzz]
 runs = 4096
 
@@ -351,7 +333,14 @@ multiline_func_header = "all"
 wrap_comments = true
 ```
 
-This is the standard config with no deviations.
+**Optional sections (add only when needed):**
+- `[rpc_endpoints]` — repos with fork tests. Maps named endpoints to env vars (e.g. `ethereum = "${RPC_ETHEREUM_MAINNET}"`).
+- `[profile.ci_sizes]` — only when CI needs different optimizer settings than defaults for the size check step (e.g. `optimizer_runs = 200` when the default profile uses a lower value).
+
+**Common variations:**
+- `via_ir = true` when hitting stack-too-deep
+- `optimizer = false` when optimization causes stack-too-deep
+- `optimizer_runs` reduced when deep struct nesting causes stack-too-deep at 200 runs
 
 ### CI Workflows
 
@@ -381,8 +370,10 @@ jobs:
         uses: foundry-rs/foundry-toolchain@v1
       - name: Run tests
         run: forge test --fail-fast --summary --detailed --skip "*/script/**"
+        env:
+          RPC_ETHEREUM_MAINNET: ${{ secrets.RPC_ETHEREUM_MAINNET }}
       - name: Check contract sizes
-        run: FOUNDRY_PROFILE=ci_sizes forge build --sizes --skip "*/test/**" --skip "*/script/**" --skip SphinxUtils
+        run: forge build --sizes --skip "*/test/**" --skip "*/script/**" --skip SphinxUtils
 ```
 
 **lint.yml:**
@@ -404,14 +395,63 @@ jobs:
         run: forge fmt --check
 ```
 
+**slither.yml** (repos with `src/` contracts only):
+```yaml
+name: slither
+on:
+    pull_request:
+      branches:
+        - main
+    push:
+      branches:
+        - main
+jobs:
+  analyze:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+      - name: Install npm dependencies
+        run: npm install --omit=dev
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+      - name: Run slither
+        uses: crytic/slither-action@v0.3.1
+        with:
+            slither-config: slither-ci.config.json
+            fail-on: medium
+```
+
+**slither-ci.config.json:**
+```json
+{
+  "detectors_to_exclude": "timestamp,uninitialized-local,naming-convention,solc-version,shadowing-local",
+  "exclude_informational": true,
+  "exclude_low": false,
+  "exclude_medium": false,
+  "exclude_high": false,
+  "disable_color": false,
+  "filter_paths": "(mocks/|test/|node_modules/|lib/)",
+  "legacy_ast": false
+}
+```
+
+**Variations:**
+- Deployer-only repos (no `src/`, only `script/`) skip slither entirely — the action's internal `forge build` skips `test/` and `script/` by default, leaving nothing to compile.
+- Use inline `// slither-disable-next-line <detector>` to suppress known false positives rather than adding to `detectors_to_exclude` in the config. The comment must be on the line immediately before the flagged expression.
+
 ### package.json
 
 ```json
 {
-  "name": "@bananapus/core-v6",
+  "name": "@bananapus/package-name-v6",
   "version": "x.x.x",
   "license": "MIT",
-  "repository": { "type": "git", "url": "git+https://github.com/Bananapus/nana-core-v6.git" },
+  "repository": { "type": "git", "url": "git+https://github.com/Org/repo.git" },
   "engines": { "node": ">=20.0.0" },
   "scripts": {
     "test": "forge test",
@@ -428,13 +468,62 @@ jobs:
 
 ### remappings.txt
 
-Every repo has a `remappings.txt`. Minimal content:
+Every repo has a `remappings.txt` as the **single source of truth** for import remappings. Never add remappings to `foundry.toml`.
+
+**Principle:** Import paths in Solidity source must match npm package names exactly. With `libs = ["node_modules", "lib"]`, Foundry auto-resolves `@scope/package/path/File.sol` → `node_modules/@scope/package/path/File.sol`. No remapping needed for packages installed as real directories.
+
+**Note:** Auto-resolution does **not** work for symlinked packages (e.g. npm workspace links). Workspace repos like `deploy-all-v6` and `nana-cli-v6` need explicit `@scope/package/=node_modules/@scope/package/` remappings for each symlinked dependency.
+
+**Minimal content** (most repos):
+
+```
+forge-std/=lib/forge-std/src/
+```
+
+Only add extra remappings for:
+- **`forge-std`** — always needed (git submodule with `src/` subdirectory)
+- **Repo-specific `lib/` submodules** that have no npm package (e.g., `hookmate/=lib/hookmate/src/`)
+- **Symlinked npm packages** — need explicit `@scope/package/=node_modules/@scope/package/` entries
+- **Nested transitive deps** — e.g., `@chainlink/contracts-ccip/` nested inside `@bananapus/suckers-v6/node_modules/`
+
+**Never add remappings for:**
+- npm packages that match their import path and are installed as real directories — they auto-resolve
+- Short-form aliases (e.g., `@bananapus/core/` → `@bananapus/core-v6/src/`) — fix the import instead
+- Packages available via npm that are also git submodules — remove the submodule, use npm
 
+**Import path convention:**
+
+| Package | Import path | Resolves to |
+|---------|------------|-------------|
+| `@bananapus/core-v6` | `@bananapus/core-v6/src/libraries/JBConstants.sol` | `node_modules/@bananapus/core-v6/src/...` |
+| `@openzeppelin/contracts` | `@openzeppelin/contracts/token/ERC20/IERC20.sol` | `node_modules/@openzeppelin/contracts/...` |
+| `@uniswap/v4-core` | `@uniswap/v4-core/src/interfaces/IPoolManager.sol` | `node_modules/@uniswap/v4-core/src/...` |
+
+### Linting
+
+Solar (Foundry's built-in linter) runs automatically during `forge build`. It scans all `.sol` files in `libs` directories, including `node_modules`.
+
+**All test helpers must use relative imports** (e.g. `../../src/structs/JBRuleset.sol`), not bare `src/` imports. This ensures solar can resolve paths when the helper is consumed via npm in downstream repos.
+
+### Fork Tests
+
+Fork tests use named RPC endpoints defined in `[rpc_endpoints]` of `foundry.toml`. No skip guards — fork tests should hard-fail if the RPC endpoint is unavailable, making CI failures explicit.
+
+```solidity
+function setUp() public {
+    vm.createSelectFork("ethereum");
+    // ... setup code
+}
 ```
-@sphinx-labs/contracts/=lib/sphinx/packages/contracts/contracts/foundry
+
+The endpoint name (e.g. `"ethereum"`) maps to an env var via `foundry.toml`:
+
+```toml
+[rpc_endpoints]
+ethereum = "${RPC_ETHEREUM_MAINNET}"
 ```
 
-Additional mappings as needed for repo-specific dependencies.
+For multi-chain fork tests, add all needed endpoints.
 
 ### Formatting
 
@@ -462,4 +551,8 @@ CI checks formatting via `forge fmt --check`.
 
 ### Contract Size Checks
 
-CI runs `FOUNDRY_PROFILE=ci_sizes forge build --sizes` to catch contracts approaching the 24KB limit. The `ci_sizes` profile uses `optimizer_runs = 200` for realistic size measurement even when the default profile has different optimizer settings.
+CI runs `forge build --sizes` to catch contracts approaching the 24KB limit. When the repo's default `optimizer_runs` differs from what you want for size checking, use `FOUNDRY_PROFILE=ci_sizes forge build --sizes` with a `[profile.ci_sizes]` section in `foundry.toml`.
+
+## Repo-Specific Deviations
+
+None. This repo follows the standard configuration exactly.

package/foundry.toml

@@ -5,9 +5,6 @@ optimizer_runs = 200
 libs = ["node_modules", "lib"]
 fs_permissions = [{ access = "read-write", path = "./"}]
 
-[profile.ci_sizes]
-optimizer_runs = 200
-
 [fuzz]
 runs = 4096
 
@@ -16,6 +13,9 @@ runs = 1024
 depth = 100
 fail_on_revert = false
 
+[rpc_endpoints]
+ethereum = "${RPC_ETHEREUM_MAINNET}"
+
 [fmt]
 number_underscore = "thousands"
 multiline_func_header = "all"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/core-v6",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,10 +26,10 @@
     "artifacts": "source ./.env && npx sphinx artifacts --org-id 'ea165b21-7cdc-4d7b-be59-ecdd4c26bee4' --project-name 'nana-core-v6'"
   },
   "dependencies": {
-    "@bananapus/permission-ids-v6": "^0.0.6",
+    "@bananapus/permission-ids-v6": "^0.0.8",
     "@chainlink/contracts": "^1.3.0",
-    "@openzeppelin/contracts": "^5.2.0",
-    "@prb/math": "^4.1.0",
+    "@openzeppelin/contracts": "^5.6.1",
+    "@prb/math": "^4.1.1",
     "@uniswap/permit2": "github:Uniswap/permit2"
   },
   "devDependencies": {

package/remappings.txt

@@ -1 +1 @@
-@sphinx-labs/contracts/=lib/sphinx/packages/contracts/contracts/foundry
+forge-std/=lib/forge-std/src/

package/script/Deploy.s.sol

@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import "@sphinx-labs/contracts/SphinxPlugin.sol";
-import {Script, stdJson, VmSafe} from "forge-std/Script.sol";
-import {CoreDeploymentLib} from "./helpers/CoreDeploymentLib.sol";
+import "@sphinx-labs/contracts/contracts/foundry/SphinxPlugin.sol";
+import {Script} from "forge-std/Script.sol";
 
 import {IPermit2} from "@uniswap/permit2/src/interfaces/IPermit2.sol";
 import {JBPermissions} from "src/JBPermissions.sol";
@@ -16,7 +15,6 @@ import {JBTokens} from "src/JBTokens.sol";
 import {JBSplits} from "src/JBSplits.sol";
 import {JBFeelessAddresses} from "src/JBFeelessAddresses.sol";
 import {JBFundAccessLimits} from "src/JBFundAccessLimits.sol";
-import {JBController} from "src/JBController.sol";
 import {JBTerminalStore} from "src/JBTerminalStore.sol";
 import {JBMultiTerminal} from "src/JBMultiTerminal.sol";
 

package/script/DeployPeriphery.s.sol

@@ -1,15 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import "@sphinx-labs/contracts/SphinxPlugin.sol";
-import {Script, stdJson, VmSafe} from "forge-std/Script.sol";
+import "@sphinx-labs/contracts/contracts/foundry/SphinxPlugin.sol";
+import {Script} from "forge-std/Script.sol";
 import {CoreDeployment, CoreDeploymentLib} from "./helpers/CoreDeploymentLib.sol";
 
-import {IPermit2} from "@uniswap/permit2/src/interfaces/IPermit2.sol";
 import {IJBPriceFeed} from "src/interfaces/IJBPriceFeed.sol";
-import {JBPermissions} from "src/JBPermissions.sol";
-import {JBProjects} from "src/JBProjects.sol";
-import {JBPrices} from "src/JBPrices.sol";
 import {JBDeadline3Hours} from "src/periphery/JBDeadline3Hours.sol";
 import {JBDeadline1Day} from "src/periphery/JBDeadline1Day.sol";
 import {JBDeadline3Days} from "src/periphery/JBDeadline3Days.sol";
@@ -18,16 +14,7 @@ import {JBMatchingPriceFeed} from "src/periphery/JBMatchingPriceFeed.sol";
 import {JBChainlinkV3PriceFeed, AggregatorV3Interface} from "src/JBChainlinkV3PriceFeed.sol";
 import {AggregatorV2V3Interface} from "@chainlink/contracts/src/v0.8/shared/interfaces/AggregatorV2V3Interface.sol";
 import {JBChainlinkV3SequencerPriceFeed} from "src/JBChainlinkV3SequencerPriceFeed.sol";
-import {JBRulesets} from "src/JBRulesets.sol";
-import {JBDirectory} from "src/JBDirectory.sol";
-import {JBERC20} from "src/JBERC20.sol";
-import {JBTokens} from "src/JBTokens.sol";
-import {JBSplits} from "src/JBSplits.sol";
-import {JBFeelessAddresses} from "src/JBFeelessAddresses.sol";
-import {JBFundAccessLimits} from "src/JBFundAccessLimits.sol";
 import {JBController} from "src/JBController.sol";
-import {JBTerminalStore} from "src/JBTerminalStore.sol";
-import {JBMultiTerminal} from "src/JBMultiTerminal.sol";
 
 import {JBConstants} from "src/libraries/JBConstants.sol";
 import {JBCurrencyIds} from "src/libraries/JBCurrencyIds.sol";

package/script/helpers/CoreDeploymentLib.sol

@@ -16,9 +16,8 @@ import {JBFundAccessLimits} from "../../src/JBFundAccessLimits.sol";
 import {JBController} from "../../src/JBController.sol";
 import {JBTerminalStore} from "../../src/JBTerminalStore.sol";
 import {JBMultiTerminal} from "../../src/JBMultiTerminal.sol";
-import {ERC2771Forwarder} from "@openzeppelin/contracts/metatx/ERC2771Forwarder.sol";
 
-import {SphinxConstants, NetworkInfo} from "@sphinx-labs/contracts/SphinxConstants.sol";
+import {SphinxConstants, NetworkInfo} from "@sphinx-labs/contracts/contracts/foundry/SphinxConstants.sol";
 
 struct CoreDeployment {
     JBPermissions permissions;

package/src/JBController.sol

@@ -187,7 +187,7 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
     /// @dev Can only be called by the directory.
     /// @param from The controller being migrated from.
     /// @param projectId The ID of the project that migrated to this controller.
-    function afterReceiveMigrationFrom(IERC165 from, uint256 projectId) external override {
+    function afterReceiveMigrationFrom(IERC165 from, uint256 projectId) external view override {
         from; // Suppress unused variable warning.
         projectId; // Suppress unused variable warning.
 

package/src/interfaces/IJBController.sol

@@ -12,7 +12,6 @@ import {IJBProjects} from "./IJBProjects.sol";
 import {IJBProjectUriRegistry} from "./IJBProjectUriRegistry.sol";
 import {IJBRulesets} from "./IJBRulesets.sol";
 import {IJBSplits} from "./IJBSplits.sol";
-import {IJBTerminal} from "./IJBTerminal.sol";
 import {IJBToken} from "./IJBToken.sol";
 import {IJBTokens} from "./IJBTokens.sol";
 import {JBApprovalStatus} from "./../enums/JBApprovalStatus.sol";

package/src/interfaces/IJBPayoutTerminal.sol

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {IJBSplits} from "./IJBSplits.sol";
 import {IJBTerminal} from "./IJBTerminal.sol";
 import {JBSplit} from "../structs/JBSplit.sol";
 

package/test/ComprehensiveInvariant.t.sol

@@ -266,9 +266,6 @@ contract ComprehensiveInvariant_Local is StdInvariant, TestBaseWorkflow {
         uint256 totalOut =
             handler.ghost_totalCashedOut() + handler.ghost_totalPaidOut() + handler.ghost_totalAllowanceUsed();
 
-        uint256 projectBalance =
-            jbTerminalStore().balanceOf(address(jbMultiTerminal()), projectId, JBConstants.NATIVE_TOKEN);
-
         // Fees go to project #1, so total funds are conserved within the terminal
         assertGe(totalIn, totalOut, "COMP6: Ghost conservation - total funds in must be >= total funds out");
     }

package/test/{AuditExploits.t.sol → CoreExploitTests.t.sol}

@@ -682,7 +682,7 @@ contract EdgeCases_Local is TestBaseWorkflow {
         // Cash out all remaining tokens.
         uint256 tokenBalance = _tokens.totalBalanceOf(_beneficiary, projectId);
         vm.prank(_beneficiary);
-        uint256 reclaimAmount = _terminal.cashOutTokensOf({
+        _terminal.cashOutTokensOf({
             holder: _beneficiary,
             projectId: projectId,
             cashOutCount: tokenBalance,
@@ -1451,8 +1451,6 @@ contract EdgeCases_Local is TestBaseWorkflow {
         vm.warp(block.timestamp + 2_419_200 + 1); // 28 days + 1 second
 
         // Record terminal ETH before processing.
-        uint256 terminalBalanceBefore = address(_terminal).balance;
-
         // Process both held fees.
         _terminal.processHeldFeesOf(projectId, JBConstants.NATIVE_TOKEN, 100);
 

package/test/EntryPointPermutations.t.sol

@@ -4,7 +4,6 @@ pragma solidity ^0.8.6;
 import /* {*} from */ "./helpers/TestBaseWorkflow.sol";
 import {JBAccountingContext} from "../src/structs/JBAccountingContext.sol";
 import {JBConstants} from "../src/libraries/JBConstants.sol";
-import {JBFees} from "../src/libraries/JBFees.sol";
 
 /// @title EntryPointPermutations
 /// @notice Systematically tests every JBMultiTerminal external function with edge-case parameters
@@ -452,7 +451,7 @@ contract EntryPointPermutations_Local is TestBaseWorkflow {
         );
 
         // Held fees should be reduced (partially or fully returned)
-        JBFee[] memory feesAfter = jbMultiTerminal().heldFeesOf(projectStandard, JBConstants.NATIVE_TOKEN, 100);
+        jbMultiTerminal().heldFeesOf(projectStandard, JBConstants.NATIVE_TOKEN, 100);
 
         if (feesBefore.length > 0) {
             // Either fewer fees or smaller amounts

package/test/FlashLoanAttacks.t.sol

@@ -254,7 +254,6 @@ contract FlashLoanAttacks_Local is TestBaseWorkflow {
 
         // Both should get proportional shares (with cashOutTax reducing it)
         // Key check: they should get roughly equal amounts since they have equal tokens
-        uint256 diff = aliceReclaim > bobReclaim ? aliceReclaim - bobReclaim : bobReclaim - aliceReclaim;
         // Alice cashes out first, so she gets slightly more due to reduced supply.
         // But the proportional split should be reasonable.
         assertTrue(aliceReclaim > 0, "Alice should get some reclaim");

package/test/PermissionEscalation.t.sol

@@ -500,7 +500,7 @@ contract PermissionEscalation_Local is TestBaseWorkflow {
     //  Test 10: ROOT on project 2 has no power over project 3
     // ═══════════════════════════════════════════════════════════════════
 
-    function test_permission_rootOnProject_doesNotAffectOtherProject() public {
+    function test_permission_rootOnProject_doesNotAffectOtherProject() public view {
         // Alice has ROOT on project 2 (from setUp)
         // Alice should NOT have any permissions on project 3
         bool hasPermOnProject3 = jbPermissions()
@@ -638,17 +638,6 @@ contract PermissionEscalation_Local is TestBaseWorkflow {
         // Verify the forwarder is set up correctly
         assertTrue(forwarder != address(0), "Trusted forwarder should be set");
 
-        // Construct the calldata with Bob's address appended (ERC2771 pattern)
-        bytes memory callData = abi.encodeWithSelector(
-            IJBPermissions.hasPermission.selector,
-            bob,
-            projectOwner,
-            projectId2,
-            JBPermissionIds.CASH_OUT_TOKENS,
-            false,
-            false
-        );
-
         // Direct call should return true
         bool hasPerm = jbPermissions()
             .hasPermission({

package/test/SplitLoopTests.t.sol

@@ -463,10 +463,8 @@ contract SplitLoopTests_Local is TestBaseWorkflow {
 
         _payProject(pid, address(0xBA1E), 10 ether);
 
-        uint256 totalBefore = address(jbMultiTerminal()).balance;
-
         vm.prank(projectOwner);
-        uint256 netLeftover = jbMultiTerminal()
+        jbMultiTerminal()
             .sendPayoutsOf({
                 projectId: pid,
                 token: JBConstants.NATIVE_TOKEN,

package/test/TestCashOut.sol

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.6;
 
 import /* {*} from */ "./helpers/TestBaseWorkflow.sol";
-import {JBCashOuts} from "../src/libraries/JBCashOuts.sol";
 
 // Projects can issue a token, be paid to receieve claimed tokens,  burn some of the claimed tokens, cash out the rest
 // of

package/test/TestCashOutCountFor.sol

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.17;
 
 import "forge-std/Test.sol";
-import {mulDiv} from "@prb/math/src/Common.sol";
 import {JBCashOuts} from "../src/libraries/JBCashOuts.sol";
 import {JBConstants} from "../src/libraries/JBConstants.sol";
 

package/test/TestFeeProcessingFailure.sol

@@ -153,9 +153,6 @@ contract TestFeeProcessingFailure_Local is TestBaseWorkflow {
         // For this test, verify the FeeReverted event is emitted when fee processing fails.
         // We'll manipulate the directory to return address(0) for fee project's terminal.
 
-        // Record balance before payout.
-        uint256 projectBalanceBefore = _store.balanceOf(address(_terminal), _projectId, JBConstants.NATIVE_TOKEN);
-
         // The fee is taken during sendPayoutsOf. Under normal conditions, it goes to project #1.
         // The _processFee try-catch handles failures gracefully.
         // We verify that the normal path works (fee is deducted from payout and sent to fee project).
@@ -168,8 +165,6 @@ contract TestFeeProcessingFailure_Local is TestBaseWorkflow {
             minTokensPaidOut: 0
         });
 
-        uint256 projectBalanceAfter = _store.balanceOf(address(_terminal), _projectId, JBConstants.NATIVE_TOKEN);
-
         // Fee was deducted from the payout — project balance is now only the surplus (if any).
         // The fee was 2.5% of the payout amount.
         uint256 feeAmount = JBFees.feeAmountFrom({amountBeforeFee: PAY_AMOUNT, feePercent: _terminal.FEE()});
@@ -178,7 +173,7 @@ contract TestFeeProcessingFailure_Local is TestBaseWorkflow {
 
     /// @notice Held fee processing: when fee payment reverts, the FeeReverted event is emitted
     /// and the fee amount is credited back to the project balance via _recordAddedBalanceFor.
-    function test_heldFeeProcessing_revert_refundsToProject() external {
+    function test_heldFeeProcessing_revert_refundsToProject() external view {
         // This test requires holdFees=true ruleset — we test the principle:
         // When _processFee's try block reverts, the catch block calls _recordAddedBalanceFor.
         // This returns the fee amount to the project's terminal store balance.

package/test/TestMigrationHeldFees.sol

@@ -144,11 +144,8 @@ contract TestMigrationHeldFees_Local is TestBaseWorkflow {
         assertGt(heldFees.length, 0, "Should have held fees after payout");
 
         // Step 3: Migrate balance to terminal2.
-        uint256 balanceBefore = _store.balanceOf(address(_terminal), _projectId, JBConstants.NATIVE_TOKEN);
-
         vm.prank(_projectOwner);
-        uint256 migrated =
-            _terminal.migrateBalanceOf(_projectId, JBConstants.NATIVE_TOKEN, IJBTerminal(address(_terminal2)));
+        _terminal.migrateBalanceOf(_projectId, JBConstants.NATIVE_TOKEN, IJBTerminal(address(_terminal2)));
 
         // Step 4: Verify old terminal has no balance but still has held fees.
         uint256 balanceAfter = _store.balanceOf(address(_terminal), _projectId, JBConstants.NATIVE_TOKEN);
@@ -231,16 +228,10 @@ contract TestMigrationHeldFees_Local is TestBaseWorkflow {
         // Warp past holding period.
         vm.warp(block.timestamp + 28 days + 1);
 
-        // Fee project balance before attempting to process.
-        uint256 feeBalanceBefore = _store.balanceOf(address(_terminal), 1, JBConstants.NATIVE_TOKEN);
-
         // Try to process held fees — the fees still exist but the old terminal has no ETH.
         // The _processFee try-catch will catch the revert and credit the fee amount back to the project.
         _terminal.processHeldFeesOf(_projectId, JBConstants.NATIVE_TOKEN, 100);
 
-        // Fee project should NOT have received fees (old terminal had no ETH to transfer).
-        uint256 feeBalanceAfter = _store.balanceOf(address(_terminal), 1, JBConstants.NATIVE_TOKEN);
-
         // The fee processing attempted but the terminal has no actual ETH.
         // The _recordAddedBalanceFor in the catch block inflates the store balance
         // without actual funds — this is a phantom balance.

package/test/TestPermissions.sol

@@ -2,9 +2,8 @@
 pragma solidity ^0.8.6;
 
 import /* {*} from */ "./helpers/TestBaseWorkflow.sol";
-import {JBTest} from "./helpers/JBTest.sol";
 
-contract TestPermissions_Local is TestBaseWorkflow, JBTest {
+contract TestPermissions_Local is TestBaseWorkflow {
     IJBController private _controller;
     JBRulesetMetadata private _metadata;
     IJBTerminal private _terminal;

package/test/TestRulesetQueuingStress.sol

@@ -709,7 +709,14 @@ contract MockApprovalHookConfigurable is IJBRulesetApprovalHook {
         }
 
         /// @notice Fuzz: deriveStartFrom always returns a value >= mustStartAtOrAfter and aligned to duration.
-        function testFuzz_deriveStartFrom_alignment(uint48 baseStart, uint32 duration, uint48 mustStartAfter) external {
+        function testFuzz_deriveStartFrom_alignment(
+            uint48 baseStart,
+            uint32 duration,
+            uint48 mustStartAfter
+        )
+            external
+            view
+        {
             // Bound to reasonable values.
             baseStart = uint48(bound(baseStart, 1, type(uint48).max / 2));
             duration = uint32(bound(duration, 1, type(uint32).max / 2));

package/test/TestRulesetWeightCaching.sol

@@ -2,7 +2,6 @@
 pragma solidity >=0.8.6;
 
 import /* {*} from */ "./helpers/TestBaseWorkflow.sol";
-import {MockPriceFeed} from "./mock/MockPriceFeed.sol";
 
 // A ruleset's weight can be cached to make larger intervals calculable while staying within the gas limit.
 contract TestRulesetWeightCaching_Local is TestBaseWorkflow {

package/test/WeirdTokenTests.t.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.6;
 
 import /* {*} from */ "./helpers/TestBaseWorkflow.sol";
 import {JBAccountingContext} from "../src/structs/JBAccountingContext.sol";
-import {ERC20, IERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 /// @notice Tests for weird/non-standard ERC-20 tokens: fee-on-transfer, rebasing, return-false, low/high decimals.
 contract WeirdTokenTests_Local is TestBaseWorkflow {

package/test/fork/TestChainlinkPriceFeedFork.sol

@@ -0,0 +1,249 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.26;
+
+import "forge-std/Test.sol";
+
+import {AggregatorV3Interface} from "@chainlink/contracts/src/v0.8/shared/interfaces/AggregatorV3Interface.sol";
+
+import {JBChainlinkV3PriceFeed} from "../../src/JBChainlinkV3PriceFeed.sol";
+import {JBPrices} from "../../src/JBPrices.sol";
+import {IJBDirectory} from "../../src/interfaces/IJBDirectory.sol";
+import {IJBPermissions} from "../../src/interfaces/IJBPermissions.sol";
+import {IJBPriceFeed} from "../../src/interfaces/IJBPriceFeed.sol";
+import {IJBProjects} from "../../src/interfaces/IJBProjects.sol";
+
+/// @notice Fork tests for JBChainlinkV3PriceFeed and JBPrices against live Chainlink oracles on Ethereum mainnet.
+contract TestChainlinkPriceFeedFork is Test {
+    // Chainlink feed addresses (Ethereum mainnet).
+    address constant ETH_USD_FEED = 0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419;
+    address constant BTC_USD_FEED = 0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c;
+
+    // Staleness threshold (1 hour).
+    uint256 constant THRESHOLD = 3600;
+
+    // Currency identifiers (arbitrary nonzero values for JBPrices mapping keys).
+    uint256 constant CURRENCY_ETH = 1;
+    uint256 constant CURRENCY_USD = 2;
+    uint256 constant CURRENCY_BTC = 3;
+
+    // Pinned block for reproducibility.
+    uint256 constant FORK_BLOCK = 22_000_000;
+
+    JBChainlinkV3PriceFeed ethUsdPriceFeed;
+    JBChainlinkV3PriceFeed btcUsdPriceFeed;
+    JBPrices prices;
+    address owner;
+
+    function setUp() public {
+        vm.createSelectFork("ethereum", FORK_BLOCK);
+
+        owner = makeAddr("owner");
+
+        // Deploy price feeds against real Chainlink aggregators.
+        ethUsdPriceFeed = new JBChainlinkV3PriceFeed(AggregatorV3Interface(ETH_USD_FEED), THRESHOLD);
+        btcUsdPriceFeed = new JBChainlinkV3PriceFeed(AggregatorV3Interface(BTC_USD_FEED), THRESHOLD);
+
+        // Deploy JBPrices with mock directory/permissions/projects (only price resolution is tested).
+        prices = new JBPrices(
+            IJBDirectory(makeAddr("directory")),
+            IJBPermissions(makeAddr("permissions")),
+            IJBProjects(makeAddr("projects")),
+            owner,
+            address(0)
+        );
+    }
+
+    // ------------------------------------------------------------------
+    // Live feed sanity checks
+    // ------------------------------------------------------------------
+
+    /// @notice Verify currentUnitPrice returns a sane ETH/USD price at the pinned block.
+    function test_currentUnitPrice_liveEthUsd() public view {
+        uint256 price18 = ethUsdPriceFeed.currentUnitPrice(18);
+
+        // ETH price should be between $500 and $50,000.
+        assertGt(price18, 500e18, "ETH price too low");
+        assertLt(price18, 50_000e18, "ETH price too high");
+
+        // Cross-check against raw latestRoundData.
+        (, int256 rawPrice,,,) = AggregatorV3Interface(ETH_USD_FEED).latestRoundData();
+        uint256 feedDecimals = AggregatorV3Interface(ETH_USD_FEED).decimals();
+        uint256 expected18 = uint256(rawPrice) * 10 ** (18 - feedDecimals);
+        assertEq(price18, expected18, "Price mismatch vs raw feed");
+    }
+
+    // ------------------------------------------------------------------
+    // Decimal scaling
+    // ------------------------------------------------------------------
+
+    /// @notice Verify correct scaling across 6, 8, 18, and 27 decimals.
+    function test_currentUnitPrice_differentDecimals() public view {
+        uint256 price6 = ethUsdPriceFeed.currentUnitPrice(6);
+        uint256 price8 = ethUsdPriceFeed.currentUnitPrice(8);
+        uint256 price18 = ethUsdPriceFeed.currentUnitPrice(18);
+        uint256 price27 = ethUsdPriceFeed.currentUnitPrice(27);
+
+        // Raw feed is 8 decimals — price8 should match it exactly.
+        (, int256 rawPrice,,,) = AggregatorV3Interface(ETH_USD_FEED).latestRoundData();
+        assertEq(price8, uint256(rawPrice), "8-decimal mismatch");
+
+        // 6 decimals = raw / 100 (truncated).
+        assertEq(price6, uint256(rawPrice) / 1e2, "6-decimal mismatch");
+
+        // 18 decimals = raw * 1e10.
+        assertEq(price18, uint256(rawPrice) * 1e10, "18-decimal mismatch");
+
+        // 27 decimals = raw * 1e19.
+        assertEq(price27, uint256(rawPrice) * 1e19, "27-decimal mismatch");
+    }
+
+    // ------------------------------------------------------------------
+    // JBPrices integration — direct feed
+    // ------------------------------------------------------------------
+
+    /// @notice Register ETH/USD feed and resolve via pricePerUnitOf.
+    function test_pricePerUnitOf_directFeed() public {
+        vm.prank(owner);
+        prices.addPriceFeedFor(0, CURRENCY_USD, CURRENCY_ETH, IJBPriceFeed(address(ethUsdPriceFeed)));
+
+        uint256 priceFromPrices = prices.pricePerUnitOf(0, CURRENCY_USD, CURRENCY_ETH, 18);
+        uint256 priceFromFeed = ethUsdPriceFeed.currentUnitPrice(18);
+
+        assertEq(priceFromPrices, priceFromFeed, "Direct feed mismatch");
+    }
+
+    // ------------------------------------------------------------------
+    // JBPrices integration — inverse feed
+    // ------------------------------------------------------------------
+
+    /// @notice Register ETH/USD feed but query USD/ETH — verify inverse calculation.
+    function test_pricePerUnitOf_inverseFeed() public {
+        vm.prank(owner);
+        prices.addPriceFeedFor(0, CURRENCY_USD, CURRENCY_ETH, IJBPriceFeed(address(ethUsdPriceFeed)));
+
+        uint256 inversePrice = prices.pricePerUnitOf(0, CURRENCY_ETH, CURRENCY_USD, 18);
+
+        // inverse = (1e18 * 1e18) / ethUsdPrice. For ETH ~$2000, inverse ~0.0005e18 = 5e14.
+        // Sane range: $500–$50k → inverse 2e13–2e15.
+        assertGt(inversePrice, 2e13, "Inverse price too low");
+        assertLt(inversePrice, 2e15, "Inverse price too high");
+
+        // Verify round-trip: price * inverse ≈ 1e18 (within mulDiv rounding).
+        uint256 directPrice = ethUsdPriceFeed.currentUnitPrice(18);
+        uint256 product = (directPrice * inversePrice) / 1e18;
+        // mulDiv truncation can cause up to ~1e4 wei error at these magnitudes.
+        assertApproxEqAbs(product, 1e18, 1e4, "Round-trip mismatch");
+    }
+
+    // ------------------------------------------------------------------
+    // JBPrices — same currency
+    // ------------------------------------------------------------------
+
+    /// @notice pricePerUnitOf(X, X, 18) should return 1e18 without any feed.
+    function test_pricePerUnitOf_sameCurrency() public view {
+        uint256 price = prices.pricePerUnitOf(0, CURRENCY_ETH, CURRENCY_ETH, 18);
+        assertEq(price, 1e18, "Same currency should be 1e18");
+    }
+
+    // ------------------------------------------------------------------
+    // JBPrices — default fallback
+    // ------------------------------------------------------------------
+
+    /// @notice Feed registered at projectId=0 should be used when querying projectId=99.
+    function test_pricePerUnitOf_defaultFallback() public {
+        vm.prank(owner);
+        prices.addPriceFeedFor(0, CURRENCY_USD, CURRENCY_ETH, IJBPriceFeed(address(ethUsdPriceFeed)));
+
+        uint256 defaultPrice = prices.pricePerUnitOf(0, CURRENCY_USD, CURRENCY_ETH, 18);
+        uint256 fallbackPrice = prices.pricePerUnitOf(99, CURRENCY_USD, CURRENCY_ETH, 18);
+
+        assertEq(fallbackPrice, defaultPrice, "Fallback should match default");
+    }
+
+    // ------------------------------------------------------------------
+    // Stale price revert
+    // ------------------------------------------------------------------
+
+    /// @notice Warping past the threshold should cause a StalePrice revert.
+    function test_stalePriceReverts() public {
+        // Snapshot updatedAt from the feed at this block.
+        (,,, uint256 updatedAt,) = AggregatorV3Interface(ETH_USD_FEED).latestRoundData();
+
+        // Warp far enough that the feed's updatedAt + threshold < block.timestamp.
+        uint256 warpTo = block.timestamp + 7200;
+        vm.warp(warpTo);
+
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                JBChainlinkV3PriceFeed.JBChainlinkV3PriceFeed_StalePrice.selector, warpTo, THRESHOLD, updatedAt
+            )
+        );
+        ethUsdPriceFeed.currentUnitPrice(18);
+    }
+
+    // ------------------------------------------------------------------
+    // Feed immutability
+    // ------------------------------------------------------------------
+
+    /// @notice Registering the same currency pair twice should revert.
+    function test_feedImmutability() public {
+        vm.prank(owner);
+        prices.addPriceFeedFor(0, CURRENCY_USD, CURRENCY_ETH, IJBPriceFeed(address(ethUsdPriceFeed)));
+
+        vm.prank(owner);
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                JBPrices.JBPrices_PriceFeedAlreadyExists.selector, IJBPriceFeed(address(ethUsdPriceFeed))
+            )
+        );
+        prices.addPriceFeedFor(0, CURRENCY_USD, CURRENCY_ETH, IJBPriceFeed(address(btcUsdPriceFeed)));
+    }
+
+    // ------------------------------------------------------------------
+    // Multiple feeds
+    // ------------------------------------------------------------------
+
+    /// @notice Register both ETH/USD and BTC/USD and verify independent resolution.
+    function test_multipleFeeds_ethUsd_btcUsd() public {
+        vm.startPrank(owner);
+        prices.addPriceFeedFor(0, CURRENCY_USD, CURRENCY_ETH, IJBPriceFeed(address(ethUsdPriceFeed)));
+        prices.addPriceFeedFor(0, CURRENCY_USD, CURRENCY_BTC, IJBPriceFeed(address(btcUsdPriceFeed)));
+        vm.stopPrank();
+
+        uint256 ethUsd = prices.pricePerUnitOf(0, CURRENCY_USD, CURRENCY_ETH, 18);
+        uint256 btcUsd = prices.pricePerUnitOf(0, CURRENCY_USD, CURRENCY_BTC, 18);
+
+        // ETH/USD: $500–$50,000.
+        assertGt(ethUsd, 500e18, "ETH/USD too low");
+        assertLt(ethUsd, 50_000e18, "ETH/USD too high");
+
+        // BTC/USD: $10,000–$500,000.
+        assertGt(btcUsd, 10_000e18, "BTC/USD too low");
+        assertLt(btcUsd, 500_000e18, "BTC/USD too high");
+
+        // BTC should be more expensive than ETH.
+        assertGt(btcUsd, ethUsd, "BTC should cost more than ETH");
+    }
+
+    // ------------------------------------------------------------------
+    // Cross-price derivation
+    // ------------------------------------------------------------------
+
+    /// @notice Derive ETH/BTC price from ETH/USD and BTC/USD feeds.
+    function test_crossPriceDerived() public {
+        vm.startPrank(owner);
+        prices.addPriceFeedFor(0, CURRENCY_USD, CURRENCY_ETH, IJBPriceFeed(address(ethUsdPriceFeed)));
+        prices.addPriceFeedFor(0, CURRENCY_USD, CURRENCY_BTC, IJBPriceFeed(address(btcUsdPriceFeed)));
+        vm.stopPrank();
+
+        uint256 ethUsd = prices.pricePerUnitOf(0, CURRENCY_USD, CURRENCY_ETH, 18);
+        uint256 btcUsd = prices.pricePerUnitOf(0, CURRENCY_USD, CURRENCY_BTC, 18);
+
+        // ETH/BTC = ethUsd / btcUsd (how many BTC per 1 ETH).
+        uint256 ethPerBtc = (ethUsd * 1e18) / btcUsd;
+
+        // Should be between 0.01 and 0.1 (at 18 decimals: 1e16–1e17).
+        assertGt(ethPerBtc, 1e16, "ETH/BTC ratio too low");
+        assertLt(ethPerBtc, 1e17, "ETH/BTC ratio too high");
+    }
+}

package/test/formal/BondingCurveProperties.t.sol

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.17;
 
 import "forge-std/Test.sol";
-import {mulDiv} from "@prb/math/src/Common.sol";
 import {JBCashOuts} from "../../src/libraries/JBCashOuts.sol";
 import {JBFees} from "../../src/libraries/JBFees.sol";
 import {JBConstants} from "../../src/libraries/JBConstants.sol";

package/test/helpers/JBTest.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import {JBRuleset} from "src/structs/JBRuleset.sol";
-import {JBRulesetMetadata} from "src/structs/JBRulesetMetadata.sol";
-import {JBRulesetMetadataResolver} from "src/libraries/JBRulesetMetadataResolver.sol";
-import {JBConstants} from "src/libraries/JBConstants.sol";
-import {IJBRulesetApprovalHook} from "src/interfaces/IJBRulesetApprovalHook.sol";
+import {JBRuleset} from "../../src/structs/JBRuleset.sol";
+import {JBRulesetMetadata} from "../../src/structs/JBRulesetMetadata.sol";
+import {JBRulesetMetadataResolver} from "../../src/libraries/JBRulesetMetadataResolver.sol";
+import {JBConstants} from "../../src/libraries/JBConstants.sol";
+import {IJBRulesetApprovalHook} from "../../src/interfaces/IJBRulesetApprovalHook.sol";
 import "lib/forge-std/src/Test.sol";
 
 contract JBTest is Test {
@@ -65,7 +65,7 @@ contract JBTest is Test {
         });
     }
 
-    function generateEmptyMetadata() public view returns (JBRulesetMetadata memory) {
+    function generateEmptyMetadata() public pure returns (JBRulesetMetadata memory) {
         return JBRulesetMetadata({
             reservedPercent: 0,
             cashOutTaxRate: 0,

package/test/helpers/TestBaseWorkflow.sol

@@ -94,6 +94,7 @@ import {IPermit2, IAllowanceTransfer} from "@uniswap/permit2/src/interfaces/IPer
 import {DeployPermit2} from "@uniswap/permit2/test/utils/DeployPermit2.sol";
 
 import {MetadataResolverHelper} from "./MetadataResolverHelper.sol";
+import {JBTest} from "./JBTest.sol";
 
 import {MockERC20} from "./../mock/MockERC20.sol";
 
@@ -102,7 +103,7 @@ import {mul as UD60x18mul, wrap as UD60x18wrap, unwrap as UD60x18unwrap} from "@
 
 // Base contract for Juicebox system tests.
 // Provides common functionality, such as deploying contracts on test setup.
-contract TestBaseWorkflow is Test, DeployPermit2 {
+contract TestBaseWorkflow is JBTest, DeployPermit2 {
     // Multisig address used for testing.
     address private _multisig = address(123);
     address private _beneficiary = address(69_420);

package/test/invariants/Phase3DeepInvariant.t.sol

@@ -6,8 +6,6 @@ import /* {*} from */ "../helpers/TestBaseWorkflow.sol";
 import {Phase3Handler} from "./handlers/Phase3Handler.sol";
 import {JBAccountingContext} from "../../src/structs/JBAccountingContext.sol";
 import {JBConstants} from "../../src/libraries/JBConstants.sol";
-import {JBFee} from "../../src/structs/JBFee.sol";
-import {JBSplitGroupIds} from "../../src/libraries/JBSplitGroupIds.sol";
 
 /// @title Phase3DeepInvariant
 /// @notice Multi-project deep invariant tests with strict equality checks.
@@ -362,7 +360,6 @@ contract Phase3DeepInvariant_Local is StdInvariant, TestBaseWorkflow {
     /// @notice After addToBalance(shouldReturn=true), returned fees must not exceed held fees.
     function invariant_P3_6_heldFeeReturnBounded() public view {
         uint256 returned = handler.ghost_totalReturnedFees(project2);
-        uint256 heldTotal = handler.ghost_totalHeldFeeAmounts(project2);
 
         // Returned fees should never exceed what was held
         // (heldTotal may be 0 if we never tracked, so only check when both nonzero)

package/test/invariants/handlers/Phase3Handler.sol

@@ -9,7 +9,6 @@ import {IJBMultiTerminal} from "../../../src/interfaces/IJBMultiTerminal.sol";
 import {IJBTerminalStore} from "../../../src/interfaces/IJBTerminalStore.sol";
 import {IJBController} from "../../../src/interfaces/IJBController.sol";
 import {IJBTokens} from "../../../src/interfaces/IJBTokens.sol";
-import {JBMultiTerminal} from "../../../src/JBMultiTerminal.sol";
 
 /// @title Phase3Handler
 /// @notice Stateful fuzzing handler with ghost variable tracking for strict invariant verification.

package/test/invariants/handlers/TokensHandler.sol

@@ -6,7 +6,6 @@ import {JBConstants} from "../../../src/libraries/JBConstants.sol";
 import {IJBMultiTerminal} from "../../../src/interfaces/IJBMultiTerminal.sol";
 import {IJBController} from "../../../src/interfaces/IJBController.sol";
 import {IJBTokens} from "../../../src/interfaces/IJBTokens.sol";
-import {IJBToken} from "../../../src/interfaces/IJBToken.sol";
 
 /// @notice Handler contract for JBTokens invariant testing.
 /// @dev Drives mint, burn, claim, and transfer operations; tracks holders for sum-of-balances checks.

package/test/mock/ERC2771ForwarderMock.sol

@@ -22,7 +22,7 @@ contract ERC2771ForwarderMock is ERC2771Forwarder {
         return _hashTypedDataV4(
             keccak256(
                 abi.encode(
-                    _FORWARD_REQUEST_TYPEHASH,
+                    FORWARD_REQUEST_TYPEHASH,
                     request.from,
                     request.to,
                     request.value,

package/test/mock/MockERC20.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.26;
 
 import /* {*} from */ "../helpers/TestBaseWorkflow.sol";
 
-import {ERC20, IERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 contract MockERC20 is ERC20 {
     function decimals() public view virtual override returns (uint8) {

package/test/mock/MockMaliciousBeneficiary.sol

@@ -3,7 +3,6 @@ pragma solidity 0.8.26;
 
 import /* {*} from */ "../helpers/TestBaseWorkflow.sol";
 import {IJBMultiTerminal} from "../../src/interfaces/IJBMultiTerminal.sol";
-import {JBMultiTerminal} from "../../src/JBMultiTerminal.sol";
 import {JBConstants} from "../../src/libraries/JBConstants.sol";
 import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 

package/test/units/static/JBDeadline/TestDeadlineFuzz.sol

@@ -46,7 +46,7 @@ contract TestDeadlineFuzz_Local is JBTest {
     }
 
     /// @notice Ruleset queued too close to start returns Failed.
-    function test_insufficientGap_isFailed() external {
+    function test_insufficientGap_isFailed() external view {
         uint48 start = uint48(block.timestamp + 1 days);
         uint48 queued = start - uint48(DURATION) + 1; // 1 second short of required gap
 
@@ -56,7 +56,7 @@ contract TestDeadlineFuzz_Local is JBTest {
     }
 
     /// @notice Ruleset with exactly enough gap and deadline not yet passed returns ApprovalExpected.
-    function test_exactGap_deadlineNotPassed_isApprovalExpected() external {
+    function test_exactGap_deadlineNotPassed_isApprovalExpected() external view {
         // queue far enough in advance, and start is still far in the future
         uint48 start = uint48(block.timestamp + 2 * DURATION + 100);
         uint48 queued = start - uint48(DURATION);
@@ -67,7 +67,7 @@ contract TestDeadlineFuzz_Local is JBTest {
     }
 
     /// @notice Ruleset with enough gap and deadline passed returns Approved.
-    function test_gapSufficient_deadlinePassed_isApproved() external {
+    function test_gapSufficient_deadlinePassed_isApproved() external view {
         uint48 start = uint48(block.timestamp + 1); // start is very soon
         uint48 queued = start - uint48(DURATION) - 1; // plenty of gap
 

package/test/units/static/JBMetadataResolver/{TestMetadataResolverM20M21.sol → TestMetadataResolverEdgeCases.sol}

@@ -7,7 +7,7 @@ import {JBMetadataResolver} from "../../../../src/libraries/JBMetadataResolver.s
 
 /// @notice Harness that exposes JBMetadataResolver internals and adds a combined operation
 /// to test memory corruption from _sliceBytes within a single execution context.
-contract M20M21Harness {
+contract MetadataResolverEdgeCaseHarness {
     function createMetadata(bytes4[] memory ids, bytes[] memory datas) external pure returns (bytes memory) {
         return JBMetadataResolver.createMetadata(ids, datas);
     }
@@ -64,11 +64,11 @@ contract M20M21Harness {
 }
 
 /// @notice Tests for _sliceBytes over-copy and addToMetadata offset overflow.
-contract TestMetadataResolverM20M21 is JBTest {
-    M20M21Harness harness;
+contract TestMetadataResolverEdgeCases is JBTest {
+    MetadataResolverEdgeCaseHarness harness;
 
     function setUp() external {
-        harness = new M20M21Harness();
+        harness = new MetadataResolverEdgeCaseHarness();
     }
 
     //*********************************************************************//

package/test/units/static/JBRulesets/TestRulesets.sol

@@ -3,7 +3,6 @@ pragma solidity 0.8.26;
 
 import /* {*} from */ "../../../helpers/TestBaseWorkflow.sol";
 import {JBTest} from "../../../helpers/JBTest.sol";
-import {JBRulesetWeightCache} from "src/structs/JBRulesetWeightCache.sol";
 
 contract TestJBRulesetsUnits_Local is JBTest {
     // Contracts

package/test/units/static/JBSurplus/TestSurplusFuzz.sol

@@ -53,7 +53,7 @@ contract MockSurplusTerminal is ERC165, IJBTerminal {
         override
     {}
 
-    function migrateBalanceOf(uint256, address, IJBTerminal) external override returns (uint256) {
+    function migrateBalanceOf(uint256, address, IJBTerminal) external pure override returns (uint256) {
         return 0;
     }