@bananapus/router-terminal-v6 0.0.9 → 0.0.11

package/STYLE_GUIDE.md

@@ -2,8 +2,6 @@
 
 How we write Solidity and organize repos across the Juicebox V6 ecosystem. `nana-core-v6` is the gold standard — when in doubt, match what it does.
 
-**This repo's deviations:** `evm_version = 'cancun'`, `via_ir = true` in ci_sizes profile.
-
 ## File Organization
 
 ```
@@ -19,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
@@ -108,14 +104,6 @@ contract JBExample is JBPermissioned, IJBExample {
     // -------------------------- constructor ---------------------------- //
     //*********************************************************************//
 
-    //*********************************************************************//
-    // ---------------------- receive / fallback ------------------------- //
-    //*********************************************************************//
-
-    //*********************************************************************//
-    // --------------------------- modifiers ----------------------------- //
-    //*********************************************************************//
-
     //*********************************************************************//
     // ---------------------- external transactions ---------------------- //
     //*********************************************************************//
@@ -143,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
@@ -214,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
 
@@ -270,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,
@@ -281,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
@@ -336,10 +332,6 @@ optimizer_runs = 200
 libs = ["node_modules", "lib"]
 fs_permissions = [{ access = "read-write", path = "./"}]
 
-[profile.ci_sizes]
-via_ir = true
-optimizer_runs = 200
-
 [fuzz]
 runs = 4096
 
@@ -354,10 +346,14 @@ multiline_func_header = "all"
 wrap_comments = true
 ```
 
-**Variations:**
-- `evm_version = 'cancun'` for repos using transient storage (buyback-hook, router-terminal, univ4-router)
-- `via_ir = true` for repos hitting stack-too-deep (buyback-hook, banny-retail, univ4-lp-split-hook, deploy-all)
-- `optimizer = false` only for deploy-all-v6 (stack-too-deep with optimization)
+**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
 
@@ -387,8 +383,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:**
@@ -410,11 +408,60 @@ 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/router-terminal-v6",
+  "name": "@bananapus/package-name-v6",
   "version": "x.x.x",
   "license": "MIT",
   "repository": { "type": "git", "url": "git+https://github.com/Org/repo.git" },
@@ -434,13 +481,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):
 
 ```
-@sphinx-labs/contracts/=lib/sphinx/packages/contracts/contracts/foundry
+forge-std/=lib/forge-std/src/
 ```
 
-Additional mappings as needed for repo-specific dependencies.
+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
+}
+```
+
+The endpoint name (e.g. `"ethereum"`) maps to an env var via `foundry.toml`:
+
+```toml
+[rpc_endpoints]
+ethereum = "${RPC_ETHEREUM_MAINNET}"
+```
+
+For multi-chain fork tests, add all needed endpoints.
 
 ### Formatting
 
@@ -468,4 +564,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,10 +5,6 @@ optimizer_runs = 200
 libs = ["node_modules", "lib"]
 fs_permissions = [{ access = "read-write", path = "./"}]
 
-[profile.ci_sizes]
-via_ir = true
-optimizer_runs = 200
-
 [fuzz]
 runs = 4096
 
@@ -21,3 +17,6 @@ fail_on_revert = false
 number_underscore = "thousands"
 multiline_func_header = "all"
 wrap_comments = true
+
+[rpc_endpoints]
+ethereum = "${RPC_ETHEREUM_MAINNET}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/router-terminal-v6",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -17,8 +17,9 @@
     "artifacts": "source ./.env && npx sphinx artifacts --org-id 'ea165b21-7cdc-4d7b-be59-ecdd4c26bee4' --project-name 'nana-router-terminal-v6'"
   },
   "dependencies": {
-    "@bananapus/core-v6": "^0.0.11",
-    "@openzeppelin/contracts": "^5.2.0",
+    "@bananapus/core-v6": "^0.0.16",
+    "@bananapus/permission-ids-v6": "^0.0.9",
+    "@openzeppelin/contracts": "^5.6.1",
     "@uniswap/permit2": "github:Uniswap/permit2",
     "@uniswap/v3-core": "github:Uniswap/v3-core#0.8",
     "@uniswap/v3-periphery": "github:Uniswap/v3-periphery#0.8",

package/script/Deploy.s.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
+import {CoreDeployment, CoreDeploymentLib} from "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
 
-import {Sphinx} from "@sphinx-labs/contracts/SphinxPlugin.sol";
+import {Sphinx} from "@sphinx-labs/contracts/contracts/foundry/SphinxPlugin.sol";
 import {Script} from "forge-std/Script.sol";
 
 import {JBRouterTerminal} from "../src/JBRouterTerminal.sol";
@@ -18,8 +18,8 @@ contract DeployScript is Script, Sphinx {
     CoreDeployment core;
 
     /// @notice the salts that are used to deploy the contracts.
-    bytes32 ROUTER_TERMINAL = "JBRouterTerminalV6";
-    bytes32 ROUTER_TERMINAL_REGISTRY = "JBRouterTerminalRegistryV6";
+    bytes32 constant ROUTER_TERMINAL = "JBRouterTerminalV6";
+    bytes32 constant ROUTER_TERMINAL_REGISTRY = "JBRouterTerminalRegistryV6";
 
     /// @notice tracks the addresses that are required for the chain we are deploying to.
     address weth;
@@ -38,7 +38,9 @@ contract DeployScript is Script, Sphinx {
         // Get the deployment addresses for the nana CORE for this chain.
         // We want to do this outside of the `sphinx` modifier.
         core = CoreDeploymentLib.getDeployment(
-            vm.envOr("NANA_CORE_DEPLOYMENT_PATH", string("node_modules/@bananapus/core-v6/deployments/"))
+            vm.envOr({
+                name: "NANA_CORE_DEPLOYMENT_PATH", defaultValue: string("node_modules/@bananapus/core-v6/deployments/")
+            })
         );
 
         trustedForwarder = core.permissions.trustedForwarder();
@@ -95,22 +97,26 @@ contract DeployScript is Script, Sphinx {
     }
 
     function deploy() public sphinx {
-        JBRouterTerminalRegistry registry = new JBRouterTerminalRegistry{salt: ROUTER_TERMINAL_REGISTRY}(
-            core.permissions, core.projects, IPermit2(permit2), safeAddress(), trustedForwarder
-        );
+        JBRouterTerminalRegistry registry = new JBRouterTerminalRegistry{salt: ROUTER_TERMINAL_REGISTRY}({
+            permissions: core.permissions,
+            projects: core.projects,
+            permit2: IPermit2(permit2),
+            owner: safeAddress(),
+            trustedForwarder: trustedForwarder
+        });
 
-        JBRouterTerminal terminal = new JBRouterTerminal{salt: ROUTER_TERMINAL}(
-            core.directory,
-            core.permissions,
-            core.projects,
-            core.tokens,
-            IPermit2(permit2),
-            safeAddress(),
-            IWETH9(weth),
-            IUniswapV3Factory(factory),
-            IPoolManager(poolManager),
-            trustedForwarder
-        );
+        JBRouterTerminal terminal = new JBRouterTerminal{salt: ROUTER_TERMINAL}({
+            directory: core.directory,
+            permissions: core.permissions,
+            projects: core.projects,
+            tokens: core.tokens,
+            permit2: IPermit2(permit2),
+            owner: safeAddress(),
+            weth: IWETH9(weth),
+            factory: IUniswapV3Factory(factory),
+            poolManager: IPoolManager(poolManager),
+            trustedForwarder: trustedForwarder
+        });
 
         // Set the terminal as the default for the registry.
         registry.setDefaultTerminal(terminal);

package/script/helpers/RouterTerminalDeploymentLib.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.26;
 import {stdJson} from "forge-std/Script.sol";
 import {Vm} from "forge-std/Vm.sol";
 
-import {SphinxConstants, NetworkInfo} from "@sphinx-labs/contracts/SphinxConstants.sol";
+import {SphinxConstants, NetworkInfo} from "@sphinx-labs/contracts/contracts/foundry/SphinxConstants.sol";
 
 import {IJBRouterTerminal} from "../../src/interfaces/IJBRouterTerminal.sol";
 import {IJBRouterTerminalRegistry} from "../../src/interfaces/IJBRouterTerminalRegistry.sol";
@@ -17,6 +17,7 @@ struct RouterTerminalDeployment {
 library RouterTerminalDeploymentLib {
     // 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(string memory path) internal returns (RouterTerminalDeployment memory deployment) {
@@ -30,7 +31,7 @@ library RouterTerminalDeploymentLib {
 
         for (uint256 _i; _i < networks.length; _i++) {
             if (networks[_i].chainId == chainId) {
-                return getDeployment(path, networks[_i].name);
+                return getDeployment({path: path, networkName: networks[_i].name});
             }
         }
 
@@ -39,17 +40,28 @@ library RouterTerminalDeploymentLib {
 
     function getDeployment(
         string memory path,
-        string memory network_name
+        string memory networkName
     )
         internal
         view
         returns (RouterTerminalDeployment memory deployment)
     {
-        deployment.terminal =
-            IJBRouterTerminal(_getDeploymentAddress(path, "nana-router-terminal-v6", network_name, "JBRouterTerminal"));
+        deployment.terminal = IJBRouterTerminal(
+            _getDeploymentAddress({
+                path: path,
+                projectName: "nana-router-terminal-v6",
+                networkName: networkName,
+                contractName: "JBRouterTerminal"
+            })
+        );
 
         deployment.registry = IJBRouterTerminalRegistry(
-            _getDeploymentAddress(path, "nana-router-terminal-v6", network_name, "JBRouterTerminalRegistry")
+            _getDeploymentAddress({
+                path: path,
+                projectName: "nana-router-terminal-v6",
+                networkName: networkName,
+                contractName: "JBRouterTerminalRegistry"
+            })
         );
     }
 
@@ -60,8 +72,8 @@ library RouterTerminalDeploymentLib {
     /// @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
@@ -69,7 +81,8 @@ library RouterTerminalDeploymentLib {
         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/src/JBRouterTerminal.sol

@@ -98,10 +98,13 @@ contract JBRouterTerminal is
 
     /// @notice The fee tiers to search when auto-discovering V3 pools, ordered by commonality.
     /// 3000 = 0.3%, 500 = 0.05%, 10000 = 1%, 100 = 0.01%.
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint24[4] internal _FEE_TIERS = [uint24(3000), uint24(500), uint24(10_000), uint24(100)];
 
     /// @notice The fee/tickSpacing pairings to search for V4 vanilla pools.
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint24[4] internal _V4_FEES = [uint24(3000), uint24(500), uint24(10_000), uint24(100)];
+    // forge-lint: disable-next-line(mixed-case-variable)
     int24[4] internal _V4_TICK_SPACINGS = [int24(60), int24(10), int24(200), int24(1)];
 
     //*********************************************************************//
@@ -186,6 +189,7 @@ contract JBRouterTerminal is
         override
         returns (JBAccountingContext memory context)
     {
+        // forge-lint: disable-next-line(unsafe-typecast)
         context = JBAccountingContext({token: token, decimals: 18, currency: uint32(uint160(token))});
     }
 
@@ -223,7 +227,10 @@ contract JBRouterTerminal is
         override
         returns (PoolInfo memory pool)
     {
-        return _discoverPool(normalizedTokenIn, normalizedTokenOut);
+        pool = _discoverPool(normalizedTokenIn, normalizedTokenOut);
+        if (!pool.isV4 && address(pool.v3Pool) == address(0)) {
+            revert JBRouterTerminal_NoPoolFound(normalizedTokenIn, normalizedTokenOut);
+        }
     }
 
     /// @notice Public wrapper for V3-only _discoverPool, useful for off-chain queries.
@@ -240,6 +247,9 @@ contract JBRouterTerminal is
         returns (IUniswapV3Pool pool)
     {
         PoolInfo memory info = _discoverPool(normalizedTokenIn, normalizedTokenOut);
+        if (!info.isV4 && address(info.v3Pool) == address(0)) {
+            revert JBRouterTerminal_NoPoolFound(normalizedTokenIn, normalizedTokenOut);
+        }
         if (!info.isV4) pool = info.v3Pool;
     }
 
@@ -277,6 +287,11 @@ contract JBRouterTerminal is
         return ERC2771Context._msgSender();
     }
 
+    /// @notice Normalize a token address by replacing the native token sentinel with WETH.
+    function _normalize(address token) internal view returns (address) {
+        return token == JBConstants.NATIVE_TOKEN ? address(WETH) : token;
+    }
+
     //*********************************************************************//
     // ---------------------- external transactions ---------------------- //
     //*********************************************************************//
@@ -328,7 +343,7 @@ contract JBRouterTerminal is
     }
 
     /// @notice Empty implementation to satisfy the interface. This terminal has no balance to migrate.
-    function migrateBalanceOf(uint256, address, IJBTerminal) external override returns (uint256 balance) {
+    function migrateBalanceOf(uint256, address, IJBTerminal) external pure override returns (uint256 balance) {
         return 0;
     }
 
@@ -392,22 +407,23 @@ contract JBRouterTerminal is
         (, address tokenIn, address tokenOut) = abi.decode(data, (uint256, address, address));
 
         // Normalize tokens (wrap native token if needed).
-        address normalizedTokenIn = tokenIn == JBConstants.NATIVE_TOKEN ? address(WETH) : tokenIn;
-        address normalizedTokenOut = tokenOut == JBConstants.NATIVE_TOKEN ? address(WETH) : tokenOut;
+        address normalizedTokenIn = _normalize(tokenIn);
+        address normalizedTokenOut = _normalize(tokenOut);
 
         // Verify caller is a legitimate pool via the factory.
         uint24 fee = IUniswapV3Pool(msg.sender).fee();
-        address expectedPool = FACTORY.getPool(normalizedTokenIn, normalizedTokenOut, fee);
+        address expectedPool = FACTORY.getPool({tokenA: normalizedTokenIn, tokenB: normalizedTokenOut, fee: fee});
         if (msg.sender != expectedPool) revert JBRouterTerminal_CallerNotPool(msg.sender);
 
         // Calculate the amount of tokens to send to the pool (the positive delta).
+        // forge-lint: disable-next-line(unsafe-typecast)
         uint256 amountToSendToPool = amount0Delta < 0 ? uint256(amount1Delta) : uint256(amount0Delta);
 
         // Wrap native tokens if needed.
         if (tokenIn == JBConstants.NATIVE_TOKEN) WETH.deposit{value: amountToSendToPool}();
 
         // Transfer the tokens to the pool.
-        IERC20(normalizedTokenIn).safeTransfer(msg.sender, amountToSendToPool);
+        IERC20(normalizedTokenIn).safeTransfer({to: msg.sender, value: amountToSendToPool});
     }
 
     /// @notice The Uniswap V4 unlock callback. Called by the PoolManager during `unlock()`.
@@ -436,10 +452,14 @@ contract JBRouterTerminal is
             int128 delta0 = delta.amount0();
             int128 delta1 = delta.amount1();
             if (zeroForOne) {
+                // forge-lint: disable-next-line(unsafe-typecast)
                 amountIn = uint256(uint128(-delta0));
+                // forge-lint: disable-next-line(unsafe-typecast)
                 amountOut = uint256(uint128(delta1));
             } else {
+                // forge-lint: disable-next-line(unsafe-typecast)
                 amountIn = uint256(uint128(-delta1));
+                // forge-lint: disable-next-line(unsafe-typecast)
                 amountOut = uint256(uint128(delta0));
             }
         }
@@ -448,11 +468,11 @@ contract JBRouterTerminal is
 
         // Settle input (pay what we owe to the PoolManager).
         Currency inputCurrency = zeroForOne ? key.currency0 : key.currency1;
-        _settleV4(inputCurrency, amountIn);
+        _settleV4({currency: inputCurrency, amount: amountIn});
 
         // Take output (receive what the PoolManager owes us).
         Currency outputCurrency = zeroForOne ? key.currency1 : key.currency0;
-        _takeV4(outputCurrency, amountOut);
+        _takeV4({currency: outputCurrency, amount: amountOut});
 
         return abi.encode(amountOut);
     }
@@ -543,7 +563,7 @@ contract JBRouterTerminal is
         if (token == JBConstants.NATIVE_TOKEN) return amount;
 
         // Otherwise, set the appropriate allowance for the recipient.
-        IERC20(token).safeIncreaseAllowance(to, amount);
+        IERC20(token).safeIncreaseAllowance({spender: to, value: amount});
 
         return 0;
     }
@@ -553,37 +573,9 @@ contract JBRouterTerminal is
     /// @param tokenB The other token in the pair.
     /// @return bestLiquidity The highest liquidity found, or 0 if no pool exists.
     function _bestPoolLiquidity(address tokenA, address tokenB) internal view returns (uint128 bestLiquidity) {
-        // Search V3.
-        for (uint256 i; i < 4; i++) {
-            // slither-disable-next-line calls-loop
-            address poolAddr = FACTORY.getPool(tokenA, tokenB, _FEE_TIERS[i]);
-            if (poolAddr == address(0)) continue;
-
-            // slither-disable-next-line calls-loop
-            uint128 liquidity = IUniswapV3Pool(poolAddr).liquidity();
-            if (liquidity > bestLiquidity) bestLiquidity = liquidity;
-        }
-
-        // Search V4 — reuse _discoverV4Pool with current best.
-        PoolInfo memory v4Result = _discoverV4Pool(
-            tokenA,
-            tokenB,
-            bestLiquidity,
-            PoolInfo({
-                isV4: false,
-                v3Pool: IUniswapV3Pool(address(0)),
-                v4Key: PoolKey({
-                    currency0: Currency.wrap(address(0)),
-                    currency1: Currency.wrap(address(0)),
-                    fee: 0,
-                    tickSpacing: 0,
-                    hooks: IHooks(address(0))
-                })
-            })
-        );
-        if (v4Result.isV4) {
-            bestLiquidity = POOL_MANAGER.getLiquidity(v4Result.v4Key.toId());
-        }
+        PoolInfo memory pool = _discoverPool(tokenA, tokenB);
+        if (pool.isV4) return POOL_MANAGER.getLiquidity(pool.v4Key.toId());
+        if (address(pool.v3Pool) != address(0)) return pool.v3Pool.liquidity();
     }
 
     /// @notice The maximum number of cashout iterations before reverting. Prevents infinite loops from circular
@@ -687,8 +679,8 @@ contract JBRouterTerminal is
         // Exact same token — no conversion needed.
         if (tokenIn == tokenOut) return amount;
 
-        address nIn = tokenIn == JBConstants.NATIVE_TOKEN ? address(WETH) : tokenIn;
-        address nOut = tokenOut == JBConstants.NATIVE_TOKEN ? address(WETH) : tokenOut;
+        address nIn = _normalize(tokenIn);
+        address nOut = _normalize(tokenOut);
 
         if (nIn == nOut) {
             // Same underlying token — just wrap or unwrap.
@@ -721,7 +713,7 @@ contract JBRouterTerminal is
         view
         returns (address tokenOut, IJBTerminal destTerminal)
     {
-        address normalizedTokenIn = tokenIn == JBConstants.NATIVE_TOKEN ? address(WETH) : tokenIn;
+        address normalizedTokenIn = _normalize(tokenIn);
         IJBTerminal[] memory terminals = DIRECTORY.terminalsOf(projectId);
 
         uint128 bestLiquidity;
@@ -733,8 +725,7 @@ contract JBRouterTerminal is
 
             for (uint256 j; j < contexts.length; j++) {
                 address candidateToken = contexts[j].token;
-                address normalizedCandidate =
-                    candidateToken == JBConstants.NATIVE_TOKEN ? address(WETH) : candidateToken;
+                address normalizedCandidate = _normalize(candidateToken);
 
                 if (normalizedCandidate == normalizedTokenIn) continue;
 
@@ -776,7 +767,8 @@ contract JBRouterTerminal is
         // Search V3.
         for (uint256 i; i < 4; i++) {
             // slither-disable-next-line calls-loop
-            address poolAddr = FACTORY.getPool(normalizedTokenIn, normalizedTokenOut, _FEE_TIERS[i]);
+            address poolAddr =
+                FACTORY.getPool({tokenA: normalizedTokenIn, tokenB: normalizedTokenOut, fee: _FEE_TIERS[i]});
 
             if (poolAddr == address(0)) continue;
 
@@ -801,10 +793,6 @@ contract JBRouterTerminal is
 
         // Search V4.
         bestPool = _discoverV4Pool(normalizedTokenIn, normalizedTokenOut, bestLiquidity, bestPool);
-
-        if (!bestPool.isV4 && address(bestPool.v3Pool) == address(0)) {
-            revert JBRouterTerminal_NoPoolFound(normalizedTokenIn, normalizedTokenOut);
-        }
     }
 
     /// @notice Search V4 vanilla pools and update bestPool if a V4 pool has higher liquidity.
@@ -873,11 +861,7 @@ contract JBRouterTerminal is
 
         if (pool.isV4) {
             return _executeV4Swap({
-                key: pool.v4Key,
-                normalizedTokenIn: normalizedTokenIn,
-                normalizedTokenOut: normalizedTokenOut,
-                amount: amount,
-                minAmountOut: minAmountOut
+                key: pool.v4Key, normalizedTokenIn: normalizedTokenIn, amount: amount, minAmountOut: minAmountOut
             });
         } else {
             return _executeV3Swap({
@@ -908,8 +892,11 @@ contract JBRouterTerminal is
         (int256 amount0, int256 amount1) = pool.swap({
             recipient: address(this),
             zeroForOne: zeroForOne,
+            // forge-lint: disable-next-line(unsafe-typecast)
             amountSpecified: int256(amount),
-            sqrtPriceLimitX96: JBSwapLib.sqrtPriceLimitFromAmounts(amount, minAmountOut, zeroForOne),
+            sqrtPriceLimitX96: JBSwapLib.sqrtPriceLimitFromAmounts({
+                amountIn: amount, minimumAmountOut: minAmountOut, zeroForOne: zeroForOne
+            }),
             data: callbackData
         });
 
@@ -921,7 +908,6 @@ contract JBRouterTerminal is
     function _executeV4Swap(
         PoolKey memory key,
         address normalizedTokenIn,
-        address normalizedTokenOut,
         uint256 amount,
         uint256 minAmountOut
     )
@@ -933,11 +919,14 @@ contract JBRouterTerminal is
         bool zeroForOne = Currency.unwrap(key.currency0) == v4In;
 
         // Use sqrtPriceLimitFromAmounts for partial-fill protection, consistent with V3 path.
-        uint160 sqrtPriceLimitX96 = JBSwapLib.sqrtPriceLimitFromAmounts(amount, minAmountOut, zeroForOne);
+        uint160 sqrtPriceLimitX96 = JBSwapLib.sqrtPriceLimitFromAmounts({
+            amountIn: amount, minimumAmountOut: minAmountOut, zeroForOne: zeroForOne
+        });
 
         // V4 sign convention: negative = exact input, positive = exact output.
         bytes memory result =
-            POOL_MANAGER.unlock(abi.encode(key, zeroForOne, -int256(amount), sqrtPriceLimitX96, minAmountOut));
+        // forge-lint: disable-next-line(unsafe-typecast)
+        POOL_MANAGER.unlock(abi.encode(key, zeroForOne, -int256(amount), sqrtPriceLimitX96, minAmountOut));
 
         amountOut = abi.decode(result, (uint256));
     }
@@ -1044,8 +1033,9 @@ contract JBRouterTerminal is
         uint160 sqrtP = TickMath.getSqrtRatioAtTick(arithmeticMeanTick);
         if (sqrtP == 0) return SLIPPAGE_DENOMINATOR;
 
-        uint256 impact = JBSwapLib.calculateImpact(amountIn, liquidity, sqrtP, zeroForOne);
-        return JBSwapLib.getSlippageTolerance(impact, poolFeeBps);
+        uint256 impact =
+            JBSwapLib.calculateImpact({amountIn: amountIn, liquidity: liquidity, sqrtP: sqrtP, zeroForOne: zeroForOne});
+        return JBSwapLib.getSlippageTolerance({impact: impact, poolFeeBps: poolFeeBps});
     }
 
     /// @notice Get a TWAP-based quote with dynamic slippage for a V3 pool.
@@ -1066,8 +1056,11 @@ contract JBRouterTerminal is
         uint256 twapWindow = DEFAULT_TWAP_WINDOW;
         if (oldestObservation < twapWindow) twapWindow = oldestObservation;
 
-        (int24 arithmeticMeanTick, uint128 liquidity) =
-            OracleLibrary.consult({pool: address(pool), secondsAgo: uint32(twapWindow)});
+        (
+            int24 arithmeticMeanTick,
+            uint128 liquidity
+            // forge-lint: disable-next-line(unsafe-typecast)
+        ) = OracleLibrary.consult({pool: address(pool), secondsAgo: uint32(twapWindow)});
 
         if (liquidity == 0) revert JBRouterTerminal_NoLiquidity();
 
@@ -1086,6 +1079,7 @@ contract JBRouterTerminal is
             if (amount > type(uint128).max) revert JBRouterTerminal_AmountOverflow(amount);
             minAmountOut = OracleLibrary.getQuoteAtTick({
                 tick: arithmeticMeanTick,
+                // forge-lint: disable-next-line(unsafe-typecast)
                 baseAmount: uint128(amount),
                 baseToken: normalizedTokenIn,
                 quoteToken: normalizedTokenOut
@@ -1146,7 +1140,11 @@ contract JBRouterTerminal is
 
         if (amount > type(uint128).max) revert JBRouterTerminal_AmountOverflow(amount);
         minAmountOut = OracleLibrary.getQuoteAtTick({
-            tick: tick, baseAmount: uint128(amount), baseToken: normalizedTokenIn, quoteToken: normalizedTokenOut
+            tick: tick,
+            // forge-lint: disable-next-line(unsafe-typecast)
+            baseAmount: uint128(amount),
+            baseToken: normalizedTokenIn,
+            quoteToken: normalizedTokenOut
         });
 
         minAmountOut -= (minAmountOut * slippageTolerance) / SLIPPAGE_DENOMINATOR;
@@ -1169,7 +1167,7 @@ contract JBRouterTerminal is
         internal
         returns (uint256 amountOut)
     {
-        address normalizedTokenIn = tokenIn == JBConstants.NATIVE_TOKEN ? address(WETH) : tokenIn;
+        address normalizedTokenIn = _normalize(tokenIn);
 
         // Snapshot the input token balance before the swap to compute the leftover delta accurately.
         uint256 balanceBefore = IERC20(normalizedTokenIn).balanceOf(address(this));
@@ -1177,7 +1175,7 @@ contract JBRouterTerminal is
         // Execute the swap in a scoped block to manage stack depth.
         amountOut = _executeSwap({
             normalizedTokenIn: normalizedTokenIn,
-            normalizedTokenOut: tokenOut == JBConstants.NATIVE_TOKEN ? address(WETH) : tokenOut,
+            normalizedTokenOut: _normalize(tokenOut),
             amount: amount,
             metadata: metadata,
             callbackData: abi.encode(projectId, tokenIn, tokenOut)
@@ -1231,6 +1229,9 @@ contract JBRouterTerminal is
     {
         // Discover the best pool across V3 and V4 fee tiers.
         pool = _discoverPool(normalizedTokenIn, normalizedTokenOut);
+        if (!pool.isV4 && address(pool.v3Pool) == address(0)) {
+            revert JBRouterTerminal_NoPoolFound(normalizedTokenIn, normalizedTokenOut);
+        }
 
         // Check for a user-provided quote.
         (bool exists, bytes memory quote) =
@@ -1376,7 +1377,7 @@ contract JBRouterTerminal is
         } else {
             // ERC20: sync then transfer then settle.
             POOL_MANAGER.sync(currency);
-            IERC20(Currency.unwrap(currency)).safeTransfer(address(POOL_MANAGER), amount);
+            IERC20(Currency.unwrap(currency)).safeTransfer({to: address(POOL_MANAGER), value: amount});
             // slither-disable-next-line unused-return
             POOL_MANAGER.settle();
         }
@@ -1384,7 +1385,7 @@ contract JBRouterTerminal is
 
     /// @notice Take the output side of a V4 swap (receive tokens from PoolManager).
     function _takeV4(Currency currency, uint256 amount) internal {
-        POOL_MANAGER.take(currency, address(this), amount);
+        POOL_MANAGER.take({currency: currency, to: address(this), amount: amount});
 
         // If native ETH output, wrap to WETH (downstream _handleSwap unwraps if needed).
         if (Currency.unwrap(currency) == address(0)) {
@@ -1400,19 +1401,20 @@ contract JBRouterTerminal is
     function _transferFrom(address from, address payable to, address token, uint256 amount) internal {
         if (from == address(this)) {
             // If the token is native token, assume the `sendValue` standard.
-            if (token == JBConstants.NATIVE_TOKEN) return Address.sendValue(to, amount);
+            if (token == JBConstants.NATIVE_TOKEN) return Address.sendValue({recipient: to, amount: amount});
 
             // If the transfer is from this terminal, use `safeTransfer`.
-            return IERC20(token).safeTransfer(to, amount);
+            return IERC20(token).safeTransfer({to: to, value: amount});
         }
 
         // If there's sufficient approval, transfer normally.
         if (IERC20(token).allowance({owner: address(from), spender: address(this)}) >= amount) {
-            return IERC20(token).safeTransferFrom(from, to, amount);
+            return IERC20(token).safeTransferFrom({from: from, to: to, value: amount});
         }
 
         // Otherwise, attempt to use the `permit2` method.
-        PERMIT2.transferFrom(from, to, uint160(amount), token);
+        // forge-lint: disable-next-line(unsafe-typecast)
+        PERMIT2.transferFrom({from: from, to: to, amount: uint160(amount), token: token});
     }
 
     //*********************************************************************//

package/src/JBRouterTerminalRegistry.sol

@@ -442,7 +442,7 @@ contract JBRouterTerminalRegistry is IJBRouterTerminalRegistry, JBPermissioned,
         if (token == JBConstants.NATIVE_TOKEN) return amount;
 
         // Otherwise, set the appropriate allowance for the recipient.
-        IERC20(token).safeIncreaseAllowance(to, amount);
+        IERC20(token).safeIncreaseAllowance({spender: to, value: amount});
 
         return 0;
     }
@@ -455,18 +455,19 @@ contract JBRouterTerminalRegistry is IJBRouterTerminalRegistry, JBPermissioned,
     function _transferFrom(address from, address payable to, address token, uint256 amount) internal virtual {
         if (from == address(this)) {
             // If the token is native token, assume the `sendValue` standard.
-            if (token == JBConstants.NATIVE_TOKEN) return Address.sendValue(to, amount);
+            if (token == JBConstants.NATIVE_TOKEN) return Address.sendValue({recipient: to, amount: amount});
 
             // If the transfer is from this terminal, use `safeTransfer`.
-            return IERC20(token).safeTransfer(to, amount);
+            return IERC20(token).safeTransfer({to: to, value: amount});
         }
 
         // If there's sufficient approval, transfer normally.
         if (IERC20(token).allowance({owner: address(from), spender: address(this)}) >= amount) {
-            return IERC20(token).safeTransferFrom(from, to, amount);
+            return IERC20(token).safeTransferFrom({from: from, to: to, value: amount});
         }
 
         // Otherwise, attempt to use the `permit2` method.
-        PERMIT2.transferFrom(from, to, uint160(amount), token);
+        // forge-lint: disable-next-line(unsafe-typecast)
+        PERMIT2.transferFrom({from: from, to: to, amount: uint160(amount), token: token});
     }
 }

package/src/libraries/JBSwapLib.sol

@@ -54,7 +54,7 @@ library JBSwapLib {
 
         // Sigmoid: minSlippage + (maxSlippage - minSlippage) * impact / (impact + K)
         uint256 range = MAX_SLIPPAGE - minSlippage;
-        uint256 tolerance = minSlippage + mulDiv(range, impact, impact + SIGMOID_K);
+        uint256 tolerance = minSlippage + mulDiv({x: range, y: impact, denominator: impact + SIGMOID_K});
 
         return tolerance;
     }
@@ -82,11 +82,11 @@ library JBSwapLib {
     {
         if (liquidity == 0 || sqrtP == 0) return 0;
 
-        uint256 base = mulDiv(amountIn, IMPACT_PRECISION, uint256(liquidity));
+        uint256 base = mulDiv({x: amountIn, y: IMPACT_PRECISION, denominator: uint256(liquidity)});
 
         impact = zeroForOne
-            ? mulDiv(base, uint256(sqrtP), uint256(1) << 96)
-            : mulDiv(base, uint256(1) << 96, uint256(sqrtP));
+            ? mulDiv({x: base, y: uint256(sqrtP), denominator: uint256(1) << 96})
+            : mulDiv({x: base, y: uint256(1) << 96, denominator: uint256(sqrtP)});
     }
 
     //*********************************************************************//
@@ -130,11 +130,11 @@ library JBSwapLib {
             return zeroForOne ? TickMath.MIN_SQRT_RATIO + 1 : TickMath.MAX_SQRT_RATIO - 1;
         } else if (num / den >= (uint256(1) << 64)) {
             // Extended range: use ratioX128 to avoid mulDiv overflow, then shift.
-            uint256 ratioX128 = mulDiv(num, uint256(1) << 128, den);
+            uint256 ratioX128 = mulDiv({x: num, y: uint256(1) << 128, denominator: den});
             sqrtResult = Math.sqrt(ratioX128) * (uint256(1) << 32);
         } else {
             // Normal range: full precision via ratioX192.
-            uint256 ratioX192 = mulDiv(num, uint256(1) << 192, den);
+            uint256 ratioX192 = mulDiv({x: num, y: uint256(1) << 192, denominator: den});
             sqrtResult = Math.sqrt(ratioX192);
         }
 
@@ -145,6 +145,7 @@ library JBSwapLib {
             if (sqrtResult >= uint256(TickMath.MAX_SQRT_RATIO)) {
                 return TickMath.MAX_SQRT_RATIO - 1;
             }
+            // forge-lint: disable-next-line(unsafe-typecast)
             return uint160(sqrtResult);
         } else {
             if (sqrtResult >= uint256(TickMath.MAX_SQRT_RATIO)) {
@@ -153,6 +154,7 @@ library JBSwapLib {
             if (sqrtResult <= uint256(TickMath.MIN_SQRT_RATIO)) {
                 return TickMath.MIN_SQRT_RATIO + 1;
             }
+            // forge-lint: disable-next-line(unsafe-typecast)
             return uint160(sqrtResult);
         }
     }

package/test/RouterTerminal.t.sol

@@ -94,9 +94,12 @@ contract RouterTerminalHarness is JBRouterTerminal {
     )
         external
         view
-        returns (PoolInfo memory)
+        returns (PoolInfo memory pool)
     {
-        return _discoverPool(normalizedTokenIn, normalizedTokenOut);
+        pool = _discoverPool(normalizedTokenIn, normalizedTokenOut);
+        if (!pool.isV4 && address(pool.v3Pool) == address(0)) {
+            revert JBRouterTerminal_NoPoolFound(normalizedTokenIn, normalizedTokenOut);
+        }
     }
 }
 

package/test/RouterTerminalFeeCashOutFork.t.sol

@@ -111,12 +111,7 @@ contract RouterTerminalFeeCashOutForkTest is Test {
     // ──────────────────────────
 
     function setUp() public {
-        string memory rpcUrl = vm.envOr("RPC_ETHEREUM_MAINNET", string(""));
-        if (bytes(rpcUrl).length == 0) {
-            vm.skip(true);
-            return;
-        }
-        vm.createSelectFork(rpcUrl, BLOCK_NUMBER);
+        vm.createSelectFork("ethereum", BLOCK_NUMBER);
 
         _deployJBCore();
 

package/test/RouterTerminalFork.t.sol

@@ -94,13 +94,7 @@ contract RouterTerminalForkTest is Test {
     // ──────────────────────────────────────
 
     function setUp() public {
-        // Skip fork tests in CI when no RPC URL is configured.
-        string memory rpcUrl = vm.envOr("RPC_ETHEREUM_MAINNET", string(""));
-        if (bytes(rpcUrl).length == 0) {
-            vm.skip(true);
-            return;
-        }
-        vm.createSelectFork(rpcUrl, BLOCK_NUMBER);
+        vm.createSelectFork("ethereum", BLOCK_NUMBER);
 
         // Deploy all JB core contracts fresh within the fork.
         _deployJBCore();

package/test/RouterTerminalSandwichFork.t.sol

@@ -305,12 +305,7 @@ contract RouterTerminalSandwichForkTest is Test {
     //*********************************************************************//
 
     function setUp() public {
-        string memory rpcUrl = vm.envOr("RPC_ETHEREUM_MAINNET", string(""));
-        if (bytes(rpcUrl).length == 0) {
-            vm.skip(true);
-            return;
-        }
-        vm.createSelectFork(rpcUrl, BLOCK_NUMBER);
+        vm.createSelectFork("ethereum", BLOCK_NUMBER);
 
         _deployJBCore();
 

package/test/regression/{L30_CashOutLoopLimit.t.sol → CashOutLoopLimit.t.sol}

@@ -51,7 +51,7 @@ contract MockToken {
 
 /// @notice _cashOutLoop should revert with CashOutLoopLimit when circular token
 /// dependencies cause more than 20 iterations, instead of consuming all gas.
-contract L30_CashOutLoopLimitTest is Test {
+contract CashOutLoopLimitTest is Test {
     JBRouterTerminal routerTerminal;
 
     IJBDirectory directory = IJBDirectory(makeAddr("directory"));

package/test/regression/{L29_LockTerminalRace.t.sol → LockTerminalRace.t.sol}

@@ -13,7 +13,7 @@ import {IPermit2} from "@uniswap/permit2/src/interfaces/IPermit2.sol";
 import {JBRouterTerminalRegistry} from "../../src/JBRouterTerminalRegistry.sol";
 
 /// @notice lockTerminalFor should revert if current terminal doesn't match expected.
-contract L29_LockTerminalRaceTest is Test {
+contract LockTerminalRaceTest is Test {
     JBRouterTerminalRegistry registry;
 
     IJBPermissions permissions = IJBPermissions(makeAddr("permissions"));

package/test/regression/{M3_V4SpotPriceSlippage.t.sol → V4SpotPriceSlippage.t.sol}

@@ -37,7 +37,7 @@ contract SwapLibHarness {
 /// Because setting up a full V4 PoolManager in unit tests requires significant infrastructure, these tests
 /// exercise the slippage math in isolation via JBSwapLib, which is the same code path used by
 /// `_getV4SpotQuote` and `_getV3TwapQuote`.
-contract M3_V4SpotPriceSlippageTest is Test {
+contract V4SpotPriceSlippageTest is Test {
     SwapLibHarness lib;
 
     /// @notice The same constants from JBSwapLib / JBRouterTerminal.