@bananapus/router-terminal-v6 0.0.21 → 0.0.22

package/test/RouterTerminal.t.sol

@@ -6,7 +6,6 @@ import {Test} from "forge-std/Test.sol";
 import {IJBCashOutTerminal} from "@bananapus/core-v6/src/interfaces/IJBCashOutTerminal.sol";
 import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
-import {IJBProjects} from "@bananapus/core-v6/src/interfaces/IJBProjects.sol";
 import {IJBRulesetApprovalHook} from "@bananapus/core-v6/src/interfaces/IJBRulesetApprovalHook.sol";
 import {IJBTerminal} from "@bananapus/core-v6/src/interfaces/IJBTerminal.sol";
 import {IJBToken} from "@bananapus/core-v6/src/interfaces/IJBToken.sol";
@@ -65,14 +64,14 @@ contract MockERC20 {
 }
 
 contract MockERC20WithDecimals is MockERC20 {
-    uint8 internal immutable _decimals;
+    uint8 internal immutable _DECIMALS;
 
     constructor(uint8 decimals_) {
-        _decimals = decimals_;
+        _DECIMALS = decimals_;
     }
 
     function decimals() external view returns (uint8) {
-        return _decimals;
+        return _DECIMALS;
     }
 }
 
@@ -140,13 +139,13 @@ contract MockPoolManagerForSettle {
 }
 
 contract MockPreviewDestTerminal {
-    address public immutable acceptedToken;
-    uint256 public immutable previewedTokenCount;
+    address public immutable ACCEPTED_TOKEN;
+    uint256 public immutable PREVIEWED_TOKEN_COUNT;
     uint256 public totalReceived;
 
     constructor(address acceptedToken_, uint256 previewedTokenCount_) {
-        acceptedToken = acceptedToken_;
-        previewedTokenCount = previewedTokenCount_;
+        ACCEPTED_TOKEN = acceptedToken_;
+        PREVIEWED_TOKEN_COUNT = previewedTokenCount_;
     }
 
     function pay(
@@ -163,10 +162,11 @@ contract MockPreviewDestTerminal {
         returns (uint256)
     {
         if (token == JBConstants.NATIVE_TOKEN) require(msg.value == amount, "MockPreviewDestTerminal: ETH mismatch");
+        // forge-lint: disable-next-line(erc20-unchecked-transfer)
         else IERC20(token).transferFrom(msg.sender, address(this), amount);
 
         totalReceived += amount;
-        return previewedTokenCount;
+        return PREVIEWED_TOKEN_COUNT;
     }
 
     function previewPayFor(
@@ -192,13 +192,14 @@ contract MockPreviewDestTerminal {
             metadata: 0
         });
         hookSpecifications = new JBPayHookSpecification[](0);
-        return (ruleset, previewedTokenCount, 0, hookSpecifications);
+        return (ruleset, PREVIEWED_TOKEN_COUNT, 0, hookSpecifications);
     }
 
     function accountingContextsOf(uint256) external view returns (JBAccountingContext[] memory contexts) {
         contexts = new JBAccountingContext[](1);
-        contexts[0] =
-            JBAccountingContext({token: acceptedToken, decimals: 18, currency: uint32(uint160(acceptedToken))});
+        // forge-lint: disable-next-line(unsafe-typecast)
+        uint32 currency = uint32(uint160(ACCEPTED_TOKEN));
+        contexts[0] = JBAccountingContext({token: ACCEPTED_TOKEN, decimals: 18, currency: currency});
     }
 
     function supportsInterface(bytes4) external pure returns (bool) {
@@ -209,12 +210,12 @@ contract MockPreviewDestTerminal {
 }
 
 contract MockPreviewCashOutTerminal {
-    uint256 public immutable reclaimAmount;
-    MockERC20 public immutable token;
+    uint256 public immutable RECLAIM_AMOUNT;
+    MockERC20 public immutable TOKEN;
 
     constructor(MockERC20 token_, uint256 reclaimAmount_) payable {
-        token = token_;
-        reclaimAmount = reclaimAmount_;
+        TOKEN = token_;
+        RECLAIM_AMOUNT = reclaimAmount_;
     }
 
     function cashOutTokensOf(
@@ -229,13 +230,13 @@ contract MockPreviewCashOutTerminal {
         external
         returns (uint256)
     {
-        token.burn(holder, cashOutCount);
+        TOKEN.burn(holder, cashOutCount);
 
         if (tokenToReclaim == JBConstants.NATIVE_TOKEN) {
-            (bool success,) = beneficiary.call{value: reclaimAmount}("");
+            (bool success,) = beneficiary.call{value: RECLAIM_AMOUNT}("");
             require(success, "MockPreviewCashOutTerminal: ETH send failed");
         }
-        return reclaimAmount;
+        return RECLAIM_AMOUNT;
     }
 
     function previewCashOutFrom(
@@ -262,7 +263,7 @@ contract MockPreviewCashOutTerminal {
             metadata: 0
         });
         hookSpecifications = new JBCashOutHookSpecification[](0);
-        return (ruleset, reclaimAmount, 0, hookSpecifications);
+        return (ruleset, RECLAIM_AMOUNT, 0, hookSpecifications);
     }
 
     function supportsInterface(bytes4 interfaceId) external pure returns (bool) {
@@ -285,7 +286,6 @@ contract RouterTerminalHarness is JBRouterTerminal {
     constructor(
         IJBDirectory directory,
         IJBPermissions permissions,
-        IJBProjects projects,
         IJBTokens tokens,
         IPermit2 permit2,
         address owner,
@@ -294,9 +294,7 @@ contract RouterTerminalHarness is JBRouterTerminal {
         IPoolManager poolManager,
         address trustedForwarder
     )
-        JBRouterTerminal(
-            directory, permissions, projects, tokens, permit2, owner, weth, factory, poolManager, trustedForwarder
-        )
+        JBRouterTerminal(directory, permissions, tokens, permit2, owner, weth, factory, poolManager, trustedForwarder)
     {}
 
     function exposedResolveTokenOut(
@@ -338,7 +336,6 @@ contract RouterTerminalTest is Test {
     // Mocked dependencies
     IJBDirectory mockDirectory;
     IJBPermissions mockPermissions;
-    IJBProjects mockProjects;
     IJBTokens mockTokens;
     IPermit2 mockPermit2;
     IWETH9 mockWeth;
@@ -352,8 +349,6 @@ contract RouterTerminalTest is Test {
         vm.etch(address(mockDirectory), hex"00");
         mockPermissions = IJBPermissions(makeAddr("mockPermissions"));
         vm.etch(address(mockPermissions), hex"00");
-        mockProjects = IJBProjects(makeAddr("mockProjects"));
-        vm.etch(address(mockProjects), hex"00");
         mockTokens = IJBTokens(makeAddr("mockTokens"));
         vm.etch(address(mockTokens), hex"00");
         mockPermit2 = IPermit2(makeAddr("mockPermit2"));
@@ -370,7 +365,6 @@ contract RouterTerminalTest is Test {
         routerTerminal = new RouterTerminalHarness(
             mockDirectory,
             mockPermissions,
-            mockProjects,
             mockTokens,
             mockPermit2,
             terminalOwner,
@@ -836,6 +830,7 @@ contract RouterTerminalTest is Test {
         );
 
         JBAccountingContext[] memory contexts = new JBAccountingContext[](1);
+        // forge-lint: disable-next-line(unsafe-typecast)
         contexts[0] = JBAccountingContext({token: tokenIn, decimals: 18, currency: uint32(uint160(tokenIn))});
         vm.mockCall(destTerminal, abi.encodeCall(IJBTerminal.accountingContextsOf, (projectId)), abi.encode(contexts));
 
@@ -980,7 +975,17 @@ contract RouterTerminalTest is Test {
                 )
             ),
             abi.encode(
-                JBRuleset(0, 0, 0, 0, 0, 0, 0, IJBRulesetApprovalHook(address(0)), 0),
+                JBRuleset({
+                    cycleNumber: 0,
+                    id: 0,
+                    basedOnId: 0,
+                    start: 0,
+                    duration: 0,
+                    weight: 0,
+                    weightCutPercent: 0,
+                    approvalHook: IJBRulesetApprovalHook(address(0)),
+                    metadata: 0
+                }),
                 uint256(60),
                 uint256(0),
                 new JBCashOutHookSpecification[](0)
@@ -1166,7 +1171,17 @@ contract RouterTerminalTest is Test {
                 )
             ),
             abi.encode(
-                JBRuleset(0, 0, 0, 0, 0, 0, 0, IJBRulesetApprovalHook(address(0)), 0),
+                JBRuleset({
+                    cycleNumber: 0,
+                    id: 0,
+                    basedOnId: 0,
+                    start: 0,
+                    duration: 0,
+                    weight: 0,
+                    weightCutPercent: 0,
+                    approvalHook: IJBRulesetApprovalHook(address(0)),
+                    metadata: 0
+                }),
                 uint256(60),
                 uint256(0),
                 new JBCashOutHookSpecification[](0)
@@ -1277,7 +1292,17 @@ contract RouterTerminalTest is Test {
             destTerminal,
             abi.encodeCall(IJBTerminal.previewPayFor, (projectId, tokenOut, quotedAmountOut, beneficiary, metadata)),
             abi.encode(
-                JBRuleset(0, 1, 0, 0, 0, 0, 0, IJBRulesetApprovalHook(address(0)), 0),
+                JBRuleset({
+                    cycleNumber: 0,
+                    id: 1,
+                    basedOnId: 0,
+                    start: 0,
+                    duration: 0,
+                    weight: 0,
+                    weightCutPercent: 0,
+                    approvalHook: IJBRulesetApprovalHook(address(0)),
+                    metadata: 0
+                }),
                 quotedAmountOut,
                 uint256(0),
                 expectedSpecs
@@ -1513,7 +1538,6 @@ contract RouterTerminalTest is Test {
         RouterTerminalHarness noV4Router = new RouterTerminalHarness(
             mockDirectory,
             mockPermissions,
-            mockProjects,
             mockTokens,
             mockPermit2,
             terminalOwner,
@@ -1858,7 +1882,6 @@ contract SettleV4DeficitTest is Test {
     // Mocked JB dependencies (unused by _settleV4 but required for constructor).
     IJBDirectory mockDirectory;
     IJBPermissions mockPermissions;
-    IJBProjects mockProjects;
     IJBTokens mockTokens;
     IPermit2 mockPermit2;
     IUniswapV3Factory mockFactory;
@@ -1868,8 +1891,6 @@ contract SettleV4DeficitTest is Test {
         vm.etch(address(mockDirectory), hex"00");
         mockPermissions = IJBPermissions(makeAddr("mockPermissions"));
         vm.etch(address(mockPermissions), hex"00");
-        mockProjects = IJBProjects(makeAddr("mockProjects"));
-        vm.etch(address(mockProjects), hex"00");
         mockTokens = IJBTokens(makeAddr("mockTokens"));
         vm.etch(address(mockTokens), hex"00");
         mockPermit2 = IPermit2(makeAddr("mockPermit2"));
@@ -1884,7 +1905,6 @@ contract SettleV4DeficitTest is Test {
         routerTerminal = new RouterTerminalHarness(
             mockDirectory,
             mockPermissions,
-            mockProjects,
             mockTokens,
             mockPermit2,
             makeAddr("owner"),

package/test/RouterTerminalCashOutFork.t.sol

@@ -117,7 +117,6 @@ contract RouterTerminalCashOutForkTest is Test {
         routerTerminal = new JBRouterTerminal({
             directory: jbDirectory,
             permissions: jbPermissions,
-            projects: jbProjects,
             tokens: jbTokens,
             permit2: PERMIT2,
             owner: multisig,

package/test/RouterTerminalCreditCashout.t.sol

@@ -6,7 +6,6 @@ import {Test} from "forge-std/Test.sol";
 import {IJBCashOutTerminal} from "@bananapus/core-v6/src/interfaces/IJBCashOutTerminal.sol";
 import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
-import {IJBProjects} from "@bananapus/core-v6/src/interfaces/IJBProjects.sol";
 import {IJBTerminal} from "@bananapus/core-v6/src/interfaces/IJBTerminal.sol";
 import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
 import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
@@ -30,7 +29,6 @@ contract RouterTerminalCreditCashoutTest is Test {
     // Mocked dependencies.
     IJBDirectory mockDirectory;
     IJBPermissions mockPermissions;
-    IJBProjects mockProjects;
     IJBTokens mockTokens;
     IPermit2 mockPermit2;
     IWETH9 mockWeth;
@@ -44,8 +42,6 @@ contract RouterTerminalCreditCashoutTest is Test {
         vm.etch(address(mockDirectory), hex"00");
         mockPermissions = IJBPermissions(makeAddr("mockPermissions"));
         vm.etch(address(mockPermissions), hex"00");
-        mockProjects = IJBProjects(makeAddr("mockProjects"));
-        vm.etch(address(mockProjects), hex"00");
         mockTokens = IJBTokens(makeAddr("mockTokens"));
         vm.etch(address(mockTokens), hex"00");
         mockPermit2 = IPermit2(makeAddr("mockPermit2"));
@@ -62,7 +58,6 @@ contract RouterTerminalCreditCashoutTest is Test {
         routerTerminal = new JBRouterTerminal(
             mockDirectory,
             mockPermissions,
-            mockProjects,
             mockTokens,
             mockPermit2,
             terminalOwner,

package/test/RouterTerminalERC2771.t.sol

@@ -5,7 +5,6 @@ import {Test} from "forge-std/Test.sol";
 
 import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
-import {IJBProjects} from "@bananapus/core-v6/src/interfaces/IJBProjects.sol";
 import {IJBTerminal} from "@bananapus/core-v6/src/interfaces/IJBTerminal.sol";
 import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
 import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
@@ -85,7 +84,6 @@ contract RouterTerminalERC2771Test is Test {
     // Mocked dependencies.
     IJBDirectory mockDirectory;
     IJBPermissions mockPermissions;
-    IJBProjects mockProjects;
     IJBTokens mockTokens;
     IPermit2 mockPermit2;
     IUniswapV3Factory mockFactory;
@@ -101,8 +99,6 @@ contract RouterTerminalERC2771Test is Test {
         vm.etch(address(mockDirectory), hex"00");
         mockPermissions = IJBPermissions(makeAddr("mockPermissions"));
         vm.etch(address(mockPermissions), hex"00");
-        mockProjects = IJBProjects(makeAddr("mockProjects"));
-        vm.etch(address(mockProjects), hex"00");
         mockTokens = IJBTokens(makeAddr("mockTokens"));
         vm.etch(address(mockTokens), hex"00");
         mockPermit2 = IPermit2(makeAddr("mockPermit2"));
@@ -118,7 +114,6 @@ contract RouterTerminalERC2771Test is Test {
         routerTerminal = new JBRouterTerminal(
             mockDirectory,
             mockPermissions,
-            mockProjects,
             mockTokens,
             mockPermit2,
             terminalOwner,

package/test/RouterTerminalFeeCashOutFork.t.sol

@@ -116,7 +116,6 @@ contract RouterTerminalFeeCashOutForkTest is Test {
         routerTerminal = new JBRouterTerminal({
             directory: jbDirectory,
             permissions: jbPermissions,
-            projects: jbProjects,
             tokens: jbTokens,
             permit2: PERMIT2,
             owner: multisig,

package/test/RouterTerminalFork.t.sol

@@ -100,7 +100,6 @@ contract RouterTerminalForkTest is Test {
         routerTerminal = new JBRouterTerminal({
             directory: jbDirectory,
             permissions: jbPermissions,
-            projects: jbProjects,
             tokens: jbTokens,
             permit2: PERMIT2,
             owner: multisig,

package/test/RouterTerminalMultihopFork.t.sol

@@ -112,7 +112,6 @@ contract RouterTerminalMultihopForkTest is Test {
         routerTerminal = new JBRouterTerminal({
             directory: jbDirectory,
             permissions: jbPermissions,
-            projects: jbProjects,
             tokens: jbTokens,
             permit2: PERMIT2,
             owner: multisig,

package/test/RouterTerminalPreviewFork.t.sol

@@ -18,7 +18,7 @@ import {JBTerminalStore} from "@bananapus/core-v6/src/JBTerminalStore.sol";
 import {JBTokens} from "@bananapus/core-v6/src/JBTokens.sol";
 import {JBERC20} from "@bananapus/core-v6/src/JBERC20.sol";
 import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
-import {IJBProjects} from "@bananapus/core-v6/src/interfaces/IJBProjects.sol";
+
 import {IJBRulesetApprovalHook} from "@bananapus/core-v6/src/interfaces/IJBRulesetApprovalHook.sol";
 import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
 import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
@@ -78,7 +78,6 @@ contract RouterTerminalPreviewForkTest is Test {
         routerTerminal = new JBRouterTerminal({
             directory: jbDirectory,
             permissions: IJBPermissions(address(jbPermissions)),
-            projects: IJBProjects(address(jbProjects)),
             tokens: IJBTokens(address(jbTokens)),
             permit2: PERMIT2,
             owner: multisig,
@@ -286,10 +285,12 @@ contract RouterTerminalPreviewForkTest is Test {
         internal
         returns (uint256 projectId)
     {
+        // forge-lint: disable-next-line(unsafe-typecast)
+        uint32 baseCurrency = uint32(uint160(acceptedToken));
         JBRulesetMetadata memory metadata = JBRulesetMetadata({
             reservedPercent: 0,
             cashOutTaxRate: cashOutTaxRate,
-            baseCurrency: uint32(uint160(acceptedToken)),
+            baseCurrency: baseCurrency,
             pausePay: false,
             pauseCreditTransfers: false,
             allowOwnerMinting: false,
@@ -319,8 +320,9 @@ contract RouterTerminalPreviewForkTest is Test {
         rulesetConfigs[0].fundAccessLimitGroups = new JBFundAccessLimitGroup[](0);
 
         JBAccountingContext[] memory tokensToAccept = new JBAccountingContext[](1);
-        tokensToAccept[0] =
-            JBAccountingContext({token: acceptedToken, decimals: decimals, currency: uint32(uint160(acceptedToken))});
+        // forge-lint: disable-next-line(unsafe-typecast)
+        uint32 tokenCurrency = uint32(uint160(acceptedToken));
+        tokensToAccept[0] = JBAccountingContext({token: acceptedToken, decimals: decimals, currency: tokenCurrency});
 
         JBTerminalConfig[] memory terminalConfigs = new JBTerminalConfig[](1);
         terminalConfigs[0] = JBTerminalConfig({terminal: jbMultiTerminal, accountingContextsToAccept: tokensToAccept});

package/test/RouterTerminalReentrancy.t.sol

@@ -6,7 +6,6 @@ import {Test} from "forge-std/Test.sol";
 import {IJBCashOutTerminal} from "@bananapus/core-v6/src/interfaces/IJBCashOutTerminal.sol";
 import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
-import {IJBProjects} from "@bananapus/core-v6/src/interfaces/IJBProjects.sol";
 import {IJBTerminal} from "@bananapus/core-v6/src/interfaces/IJBTerminal.sol";
 import {IJBToken} from "@bananapus/core-v6/src/interfaces/IJBToken.sol";
 import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
@@ -242,7 +241,6 @@ contract RouterTerminalReentrancyTest is Test {
     // Mocked dependencies.
     IJBDirectory mockDirectory;
     IJBPermissions mockPermissions;
-    IJBProjects mockProjects;
     IJBTokens mockTokens;
     IPermit2 mockPermit2;
     IWETH9 mockWeth;
@@ -256,8 +254,6 @@ contract RouterTerminalReentrancyTest is Test {
         vm.etch(address(mockDirectory), hex"00");
         mockPermissions = IJBPermissions(makeAddr("mockPermissions"));
         vm.etch(address(mockPermissions), hex"00");
-        mockProjects = IJBProjects(makeAddr("mockProjects"));
-        vm.etch(address(mockProjects), hex"00");
         mockTokens = IJBTokens(makeAddr("mockTokens"));
         vm.etch(address(mockTokens), hex"00");
         mockPermit2 = IPermit2(makeAddr("mockPermit2"));
@@ -274,7 +270,6 @@ contract RouterTerminalReentrancyTest is Test {
         routerTerminal = new JBRouterTerminal(
             mockDirectory,
             mockPermissions,
-            mockProjects,
             mockTokens,
             mockPermit2,
             terminalOwner,

package/test/RouterTerminalRegistry.t.sol

@@ -150,8 +150,10 @@ contract RouterTerminalRegistryTest is Test {
 
     function test_accountingContext_passthroughDoesNotCorrectTerminalDecimals() public {
         address usdcLike = makeAddr("usdcLike");
+        // forge-lint: disable-next-line(unsafe-typecast)
+        uint32 usdcCurrency = uint32(uint160(usdcLike));
         JBAccountingContext memory expected =
-            JBAccountingContext({token: usdcLike, decimals: 18, currency: uint32(uint160(usdcLike))});
+            JBAccountingContext({token: usdcLike, decimals: 18, currency: usdcCurrency});
 
         vm.mockCall(
             address(terminalA),

package/test/RouterTerminalSandwichFork.t.sol

@@ -321,7 +321,6 @@ contract RouterTerminalSandwichForkTest is Test {
         routerTerminal = new JBRouterTerminal({
             directory: jbDirectory,
             permissions: jbPermissions,
-            projects: jbProjects,
             tokens: jbTokens,
             permit2: PERMIT2,
             owner: multisig,

package/test/TestAuditGaps.sol

@@ -102,7 +102,6 @@ contract AuditHarness is JBRouterTerminal {
     constructor(
         IJBDirectory d,
         IJBPermissions p,
-        IJBProjects pr,
         IJBTokens t,
         IPermit2 pm,
         address o,
@@ -111,7 +110,7 @@ contract AuditHarness is JBRouterTerminal {
         IPoolManager pm4,
         address tf
     )
-        JBRouterTerminal(d, p, pr, t, pm, o, w, f, pm4, tf)
+        JBRouterTerminal(d, p, t, pm, o, w, f, pm4, tf)
     {}
 
     function exposedAcceptFundsFor(
@@ -169,7 +168,7 @@ contract TestAuditGaps is Test {
         vm.etch(address(pm), hex"00");
         owner = makeAddr("owner");
 
-        router = new AuditHarness(dir, perms, proj, toks, permit2, owner, weth, factory, pm, address(0));
+        router = new AuditHarness(dir, perms, toks, permit2, owner, weth, factory, pm, address(0));
     }
 
     // ═══════════════════════════════════════════════════════════════════════
@@ -761,14 +760,13 @@ contract TestAuditGaps is Test {
     // GAP 6 (M-7): Registry receive() Accepts Native Token Refunds
     // ═══════════════════════════════════════════════════════════════════════
 
-    /// @notice Registry can receive native token transfers without reverting.
-    function test_registryReceive_acceptsNativeTokens() public {
+    /// @notice Registry reverts on bare native token transfers (no receive() function).
+    function test_registryReceive_revertsOnBareTransfer() public {
         JBRouterTerminalRegistry reg = new JBRouterTerminalRegistry(perms, proj, permit2, owner, address(0));
 
         vm.deal(address(this), 1 ether);
         (bool success,) = address(reg).call{value: 1 ether}("");
-        assertTrue(success, "Registry should accept native token transfers via receive()");
-        assertEq(address(reg).balance, 1 ether, "Registry should hold the received ETH");
+        assertFalse(success, "Registry should reject bare native token transfers");
     }
 
     /// @notice ETH that is directly deposited to the registry (not via partial-fill refund) is still stuck.

package/test/audit/LeftoverRefund.t.sol

@@ -5,7 +5,6 @@ import {Test} from "forge-std/Test.sol";
 
 import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
-import {IJBProjects} from "@bananapus/core-v6/src/interfaces/IJBProjects.sol";
 import {IJBRulesetApprovalHook} from "@bananapus/core-v6/src/interfaces/IJBRulesetApprovalHook.sol";
 import {IJBTerminal} from "@bananapus/core-v6/src/interfaces/IJBTerminal.sol";
 import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
@@ -116,6 +115,7 @@ contract AuditLeftoverDestTerminal is IJBTerminal {
         override
         returns (JBAccountingContext memory)
     {
+        // forge-lint: disable-next-line(unsafe-typecast)
         return JBAccountingContext({token: token, decimals: 18, currency: uint32(uint160(token))});
     }
 
@@ -159,7 +159,22 @@ contract AuditLeftoverDestTerminal is IJBTerminal {
         returns (JBRuleset memory, uint256, uint256, JBPayHookSpecification[] memory hookSpecifications)
     {
         hookSpecifications = new JBPayHookSpecification[](0);
-        return (JBRuleset(0, 0, 0, 0, 0, 0, 0, IJBRulesetApprovalHook(address(0)), 0), amount, 0, hookSpecifications);
+        return (
+            JBRuleset({
+                cycleNumber: 0,
+                id: 0,
+                basedOnId: 0,
+                start: 0,
+                duration: 0,
+                weight: 0,
+                weightCutPercent: 0,
+                approvalHook: IJBRulesetApprovalHook(address(0)),
+                metadata: 0
+            }),
+            amount,
+            0,
+            hookSpecifications
+        );
     }
 
     function supportsInterface(bytes4) external pure override returns (bool) {
@@ -168,14 +183,16 @@ contract AuditLeftoverDestTerminal is IJBTerminal {
 }
 
 contract AuditLeftoverPartialFillPool is IUniswapV3Pool {
-    address internal immutable _token0;
-    address internal immutable _token1;
-    AuditLeftoverMockERC20 internal immutable _outputToken;
+    address internal immutable _TOKEN0;
+    address internal immutable _TOKEN1;
+    AuditLeftoverMockERC20 internal immutable _OUTPUT_TOKEN;
+    // forge-lint: disable-next-line(screaming-snake-case-immutable)
     uint24 public immutable override fee = 3000;
+    // forge-lint: disable-next-line(screaming-snake-case-immutable)
     uint128 public immutable override liquidity = 1_000_000;
 
-    uint256 public immutable amountInUsed;
-    uint256 public immutable amountOutGiven;
+    uint256 public immutable AMOUNT_IN_USED;
+    uint256 public immutable AMOUNT_OUT_GIVEN;
 
     constructor(
         address token0_,
@@ -184,11 +201,11 @@ contract AuditLeftoverPartialFillPool is IUniswapV3Pool {
         uint256 amountInUsed_,
         uint256 amountOutGiven_
     ) {
-        _token0 = token0_;
-        _token1 = token1_;
-        _outputToken = outputToken_;
-        amountInUsed = amountInUsed_;
-        amountOutGiven = amountOutGiven_;
+        _TOKEN0 = token0_;
+        _TOKEN1 = token1_;
+        _OUTPUT_TOKEN = outputToken_;
+        AMOUNT_IN_USED = amountInUsed_;
+        AMOUNT_OUT_GIVEN = amountOutGiven_;
     }
 
     function swap(
@@ -202,24 +219,28 @@ contract AuditLeftoverPartialFillPool is IUniswapV3Pool {
         override
         returns (int256 amount0, int256 amount1)
     {
+        // forge-lint: disable-next-line(unsafe-typecast)
+        int256 signedIn = int256(AMOUNT_IN_USED);
+        // forge-lint: disable-next-line(unsafe-typecast)
+        int256 signedOut = int256(AMOUNT_OUT_GIVEN);
+
         if (zeroForOne) {
-            JBRouterTerminal(payable(msg.sender))
-                .uniswapV3SwapCallback(int256(amountInUsed), -int256(amountOutGiven), data);
-            _outputToken.mint(recipient, amountOutGiven);
-            return (int256(amountInUsed), -int256(amountOutGiven));
+            JBRouterTerminal(payable(msg.sender)).uniswapV3SwapCallback(signedIn, -signedOut, data);
+            _OUTPUT_TOKEN.mint(recipient, AMOUNT_OUT_GIVEN);
+            return (signedIn, -signedOut);
         }
 
-        JBRouterTerminal(payable(msg.sender)).uniswapV3SwapCallback(-int256(amountOutGiven), int256(amountInUsed), data);
-        _outputToken.mint(recipient, amountOutGiven);
-        return (-int256(amountOutGiven), int256(amountInUsed));
+        JBRouterTerminal(payable(msg.sender)).uniswapV3SwapCallback(-signedOut, signedIn, data);
+        _OUTPUT_TOKEN.mint(recipient, AMOUNT_OUT_GIVEN);
+        return (-signedOut, signedIn);
     }
 
     function token0() external view override returns (address) {
-        return _token0;
+        return _TOKEN0;
     }
 
     function token1() external view override returns (address) {
-        return _token1;
+        return _TOKEN1;
     }
 
     function tickSpacing() external pure override returns (int24) {
@@ -266,7 +287,7 @@ contract LeftoverRefundTest is Test {
     JBRouterTerminal internal router;
     IJBDirectory internal directory;
     IJBPermissions internal permissions;
-    IJBProjects internal projects;
+
     IJBTokens internal tokens;
     IPermit2 internal permit2;
     IUniswapV3Factory internal factory;
@@ -277,7 +298,7 @@ contract LeftoverRefundTest is Test {
     function setUp() public {
         directory = IJBDirectory(makeAddr("directory"));
         permissions = IJBPermissions(makeAddr("permissions"));
-        projects = IJBProjects(makeAddr("projects"));
+
         tokens = IJBTokens(makeAddr("tokens"));
         permit2 = IPermit2(makeAddr("permit2"));
         factory = IUniswapV3Factory(makeAddr("factory"));
@@ -285,7 +306,6 @@ contract LeftoverRefundTest is Test {
 
         vm.etch(address(directory), hex"00");
         vm.etch(address(permissions), hex"00");
-        vm.etch(address(projects), hex"00");
         vm.etch(address(tokens), hex"00");
         vm.etch(address(permit2), hex"00");
         vm.etch(address(factory), hex"00");
@@ -293,7 +313,6 @@ contract LeftoverRefundTest is Test {
         router = new JBRouterTerminal(
             directory,
             permissions,
-            projects,
             tokens,
             permit2,
             makeAddr("owner"),
@@ -341,6 +360,7 @@ contract LeftoverRefundTest is Test {
 
         tokenIn.mint(donor, 50 ether);
         vm.prank(donor);
+        // forge-lint: disable-next-line(erc20-unchecked-transfer)
         tokenIn.transfer(address(router), 50 ether);
 
         tokenIn.mint(attacker, 1000 ether);