@bananapus/router-terminal-v6 0.0.21 → 0.0.22

package/test/audit/PayerTrackerRefund.t.sol

@@ -1,10 +1,18 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.28;
 
-import "forge-std/Test.sol";
+import {Test} from "forge-std/Test.sol";
 
-import "../../src/JBRouterTerminal.sol";
-import "../../src/interfaces/IJBPayerTracker.sol";
+import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
+import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
+import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
+import {IPermit2} from "@uniswap/permit2/src/interfaces/IPermit2.sol";
+import {IUniswapV3Factory} from "@uniswap/v3-core/contracts/interfaces/IUniswapV3Factory.sol";
+import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";
+
+import {JBRouterTerminal} from "../../src/JBRouterTerminal.sol";
+import {IJBPayerTracker} from "../../src/interfaces/IJBPayerTracker.sol";
+import {IWETH9} from "../../src/interfaces/IWETH9.sol";
 
 // ---------------------------------------------------------------------------
 // Harness – exposes the internal `_resolveRefundTo` for direct testing.
@@ -14,7 +22,6 @@ contract PayerTrackerRefundHarness is JBRouterTerminal {
     constructor(
         IJBDirectory directory,
         IJBPermissions permissions,
-        IJBProjects projects,
         IJBTokens tokens,
         IPermit2 permit2,
         address owner,
@@ -23,9 +30,7 @@ contract PayerTrackerRefundHarness 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)
     {}
 
     /// @notice Public wrapper so tests can call `_resolveRefundWithBackupRecipient` directly.
@@ -98,7 +103,6 @@ contract PayerTrackerRefundTest is Test {
         harness = new PayerTrackerRefundHarness(
             IJBDirectory(address(0)),
             IJBPermissions(address(0)),
-            IJBProjects(address(0)),
             IJBTokens(address(0)),
             IPermit2(address(0)),
             address(this), // owner

package/test/audit/RefundToBeneficiary.t.sol

@@ -9,7 +9,6 @@ import {IJBPayerTracker} from "../../src/interfaces/IJBPayerTracker.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 {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
 
 import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
@@ -57,7 +56,6 @@ contract HarnessRouterTerminal is JBRouterTerminal {
         JBRouterTerminal(
             IJBDirectory(address(0)),
             IJBPermissions(address(0)),
-            IJBProjects(address(0)),
             IJBTokens(address(0)),
             IPermit2(address(0)),
             address(this),

package/test/audit/RegistryAddToBalancePartialFill.t.sol

@@ -14,7 +14,6 @@ import {JBMetadataResolver} from "@bananapus/core-v6/src/libraries/JBMetadataRes
 import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
 import {JBPayHookSpecification} from "@bananapus/core-v6/src/structs/JBPayHookSpecification.sol";
 import {JBRuleset} from "@bananapus/core-v6/src/structs/JBRuleset.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {IPermit2} from "@uniswap/permit2/src/interfaces/IPermit2.sol";
 import {IUniswapV3Factory} from "@uniswap/v3-core/contracts/interfaces/IUniswapV3Factory.sol";
 import {IUniswapV3Pool} from "@uniswap/v3-core/contracts/interfaces/IUniswapV3Pool.sol";
@@ -27,7 +26,7 @@ import {IWETH9} from "../../src/interfaces/IWETH9.sol";
 contract AuditMockERC20 {
     string public name;
     string public symbol;
-    uint8 public constant decimals = 18;
+    uint8 public constant DECIMALS = 18;
 
     mapping(address => uint256) public balanceOf;
     mapping(address => mapping(address => uint256)) public allowance;
@@ -62,9 +61,9 @@ contract AuditMockERC20 {
 }
 
 contract AuditMockWETH is IWETH9 {
-    string public constant name = "Wrapped Ether";
-    string public constant symbol = "WETH";
-    uint8 public constant decimals = 18;
+    string public constant NAME = "Wrapped Ether";
+    string public constant SYMBOL = "WETH";
+    uint8 public constant DECIMALS = 18;
     uint256 public totalSupply;
 
     mapping(address => uint256) public balanceOf;
@@ -179,7 +178,22 @@ contract AuditMockDestTerminal 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) {
@@ -188,15 +202,17 @@ contract AuditMockDestTerminal is IJBTerminal {
 }
 
 contract AuditPartialFillPool is IUniswapV3Pool {
-    address internal immutable _token0;
-    address internal immutable _token1;
-    AuditMockERC20 internal immutable _zeroForOneOutputToken;
-    AuditMockERC20 internal immutable _oneForZeroOutputToken;
+    address internal immutable _TOKEN0;
+    address internal immutable _TOKEN1;
+    AuditMockERC20 internal immutable _ZERO_FOR_ONE_OUTPUT_TOKEN;
+    AuditMockERC20 internal immutable _ONE_FOR_ZERO_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_,
@@ -206,12 +222,12 @@ contract AuditPartialFillPool is IUniswapV3Pool {
         uint256 amountInUsed_,
         uint256 amountOutGiven_
     ) {
-        _token0 = token0_;
-        _token1 = token1_;
-        _zeroForOneOutputToken = zeroForOneOutputToken_;
-        _oneForZeroOutputToken = oneForZeroOutputToken_;
-        amountInUsed = amountInUsed_;
-        amountOutGiven = amountOutGiven_;
+        _TOKEN0 = token0_;
+        _TOKEN1 = token1_;
+        _ZERO_FOR_ONE_OUTPUT_TOKEN = zeroForOneOutputToken_;
+        _ONE_FOR_ZERO_OUTPUT_TOKEN = oneForZeroOutputToken_;
+        AMOUNT_IN_USED = amountInUsed_;
+        AMOUNT_OUT_GIVEN = amountOutGiven_;
     }
 
     function swap(
@@ -225,24 +241,28 @@ contract AuditPartialFillPool 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);
-            _zeroForOneOutputToken.mint(recipient, amountOutGiven);
-            return (int256(amountInUsed), -int256(amountOutGiven));
+            JBRouterTerminal(payable(msg.sender)).uniswapV3SwapCallback(signedIn, -signedOut, data);
+            _ZERO_FOR_ONE_OUTPUT_TOKEN.mint(recipient, AMOUNT_OUT_GIVEN);
+            return (signedIn, -signedOut);
         }
 
-        JBRouterTerminal(payable(msg.sender)).uniswapV3SwapCallback(-int256(amountOutGiven), int256(amountInUsed), data);
-        _oneForZeroOutputToken.mint(recipient, amountOutGiven);
-        return (-int256(amountOutGiven), int256(amountInUsed));
+        JBRouterTerminal(payable(msg.sender)).uniswapV3SwapCallback(-signedOut, signedIn, data);
+        _ONE_FOR_ZERO_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) {
@@ -318,16 +338,7 @@ contract RegistryAddToBalancePartialFillTest is Test {
         vm.etch(address(factory), hex"00");
 
         router = new JBRouterTerminal(
-            directory,
-            permissions,
-            projects,
-            tokens,
-            permit2,
-            owner,
-            weth,
-            factory,
-            IPoolManager(address(0)),
-            address(0)
+            directory, permissions, tokens, permit2, owner, weth, factory, IPoolManager(address(0)), address(0)
         );
         registry = new JBRouterTerminalRegistry(permissions, projects, permit2, owner, address(0));
 

package/test/fork/V4QuoteAndSettlementFork.t.sol

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

package/test/invariant/RouterTerminalInvariant.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 {IJBToken} from "@bananapus/core-v6/src/interfaces/IJBToken.sol";
 import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
@@ -475,7 +474,7 @@ contract RouterTerminalInvariant is Test {
     // Mocked protocol contracts.
     address public mockDirectory;
     address public mockPermissions;
-    address public mockProjects;
+
     address public mockTokens;
     address public mockPermit2;
     address public mockFactory;
@@ -499,8 +498,6 @@ contract RouterTerminalInvariant is Test {
         vm.etch(mockDirectory, hex"00");
         mockPermissions = makeAddr("mockPermissions");
         vm.etch(mockPermissions, hex"00");
-        mockProjects = makeAddr("mockProjects");
-        vm.etch(mockProjects, hex"00");
         mockTokens = makeAddr("mockTokens");
         vm.etch(mockTokens, hex"00");
         mockPermit2 = makeAddr("mockPermit2");
@@ -514,7 +511,6 @@ contract RouterTerminalInvariant is Test {
         router = new JBRouterTerminal(
             IJBDirectory(mockDirectory),
             IJBPermissions(mockPermissions),
-            IJBProjects(mockProjects),
             IJBTokens(mockTokens),
             IPermit2(mockPermit2),
             address(this), // owner

package/test/regression/CashOutLoopLimit.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";
@@ -54,7 +53,7 @@ contract CashOutLoopLimitTest is Test {
 
     IJBDirectory directory = IJBDirectory(makeAddr("directory"));
     IJBPermissions permissions = IJBPermissions(makeAddr("permissions"));
-    IJBProjects projects = IJBProjects(makeAddr("projects"));
+
     IJBTokens tokens = IJBTokens(makeAddr("tokens"));
     IPermit2 permit2 = IPermit2(makeAddr("permit2"));
     IWETH9 weth = IWETH9(makeAddr("weth"));
@@ -75,7 +74,6 @@ contract CashOutLoopLimitTest is Test {
     function setUp() public {
         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(weth), hex"00");
@@ -85,7 +83,6 @@ contract CashOutLoopLimitTest is Test {
         routerTerminal = new JBRouterTerminal(
             directory,
             permissions,
-            projects,
             tokens,
             permit2,
             owner,

package/test/regression/RouterTerminalEdgeCases.t.sol

@@ -26,7 +26,7 @@ import {IWETH9} from "../../src/interfaces/IWETH9.sol";
 contract MockERC20 {
     string public name;
     string public symbol;
-    uint8 public immutable decimals = 18;
+    uint8 public immutable DECIMALS = 18;
 
     mapping(address => uint256) public balanceOf;
     mapping(address => mapping(address => uint256)) public allowance;
@@ -61,9 +61,9 @@ contract MockERC20 {
 }
 
 contract MockWETH is IWETH9 {
-    string public constant name = "Wrapped Ether";
-    string public constant symbol = "WETH";
-    uint8 public constant decimals = 18;
+    string public constant NAME = "Wrapped Ether";
+    string public constant SYMBOL = "WETH";
+    uint8 public constant DECIMALS = 18;
     uint256 public totalSupply;
 
     mapping(address => uint256) public balanceOf;
@@ -133,6 +133,7 @@ contract MockDestTerminal is IJBTerminal {
         override
         returns (JBAccountingContext memory)
     {
+        // forge-lint: disable-next-line(unsafe-typecast)
         return JBAccountingContext({token: token, decimals: 18, currency: uint32(uint160(token))});
     }
 
@@ -177,7 +178,22 @@ contract MockDestTerminal 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) {
@@ -186,15 +202,17 @@ contract MockDestTerminal is IJBTerminal {
 }
 
 contract PartialFillPool is IUniswapV3Pool {
-    address internal immutable _token0;
-    address internal immutable _token1;
-    MockERC20 internal immutable _zeroForOneOutputToken;
-    MockERC20 internal immutable _oneForZeroOutputToken;
+    address internal immutable _TOKEN0;
+    address internal immutable _TOKEN1;
+    MockERC20 internal immutable _ZERO_FOR_ONE_OUTPUT_TOKEN;
+    MockERC20 internal immutable _ONE_FOR_ZERO_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_,
@@ -204,12 +222,12 @@ contract PartialFillPool is IUniswapV3Pool {
         uint256 amountInUsed_,
         uint256 amountOutGiven_
     ) {
-        _token0 = token0_;
-        _token1 = token1_;
-        _zeroForOneOutputToken = zeroForOneOutputToken_;
-        _oneForZeroOutputToken = oneForZeroOutputToken_;
-        amountInUsed = amountInUsed_;
-        amountOutGiven = amountOutGiven_;
+        _TOKEN0 = token0_;
+        _TOKEN1 = token1_;
+        _ZERO_FOR_ONE_OUTPUT_TOKEN = zeroForOneOutputToken_;
+        _ONE_FOR_ZERO_OUTPUT_TOKEN = oneForZeroOutputToken_;
+        AMOUNT_IN_USED = amountInUsed_;
+        AMOUNT_OUT_GIVEN = amountOutGiven_;
     }
 
     function swap(
@@ -223,24 +241,28 @@ contract PartialFillPool 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);
-            _zeroForOneOutputToken.mint(recipient, amountOutGiven);
-            return (int256(amountInUsed), -int256(amountOutGiven));
+            JBRouterTerminal(payable(msg.sender)).uniswapV3SwapCallback(signedIn, -signedOut, data);
+            _ZERO_FOR_ONE_OUTPUT_TOKEN.mint(recipient, AMOUNT_OUT_GIVEN);
+            return (signedIn, -signedOut);
         }
 
-        JBRouterTerminal(payable(msg.sender)).uniswapV3SwapCallback(-int256(amountOutGiven), int256(amountInUsed), data);
-        _oneForZeroOutputToken.mint(recipient, amountOutGiven);
-        return (-int256(amountOutGiven), int256(amountInUsed));
+        JBRouterTerminal(payable(msg.sender)).uniswapV3SwapCallback(-signedOut, signedIn, data);
+        _ONE_FOR_ZERO_OUTPUT_TOKEN.mint(recipient, AMOUNT_OUT_GIVEN);
+        return (-signedOut, signedIn);
     }
 
     function token0() external view override returns (address) {
-        return address(_token0);
+        return address(_TOKEN0);
     }
 
     function token1() external view override returns (address) {
-        return address(_token1);
+        return address(_TOKEN1);
     }
 
     function tickSpacing() external pure override returns (int24) {
@@ -318,7 +340,7 @@ contract RouterTerminalEdgeCasesTest is Test {
         vm.etch(address(factory), hex"00");
 
         router = new JBRouterTerminal(
-            directory, permissions, projects, tokens, permit2, owner, weth, factory, poolManager, address(0)
+            directory, permissions, tokens, permit2, owner, weth, factory, poolManager, address(0)
         );
         registry = new JBRouterTerminalRegistry(permissions, projects, permit2, owner, address(0));
     }