@bananapus/router-terminal-v6 0.0.1 → 0.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/router-terminal-v6",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -17,7 +17,7 @@
     "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.4",
+    "@bananapus/core-v6": "^0.0.5",
     "@openzeppelin/contracts": "^5.2.0",
     "@uniswap/permit2": "github:Uniswap/permit2",
     "@uniswap/v3-core": "github:Uniswap/v3-core#0.8",

package/script/helpers/RouterTerminalDeploymentLib.sol

@@ -45,9 +45,8 @@ library RouterTerminalDeploymentLib {
         view
         returns (RouterTerminalDeployment memory deployment)
     {
-        deployment.terminal = IJBRouterTerminal(
-            _getDeploymentAddress(path, "nana-router-terminal-v6", network_name, "JBRouterTerminal")
-        );
+        deployment.terminal =
+            IJBRouterTerminal(_getDeploymentAddress(path, "nana-router-terminal-v6", network_name, "JBRouterTerminal"));
 
         deployment.registry = IJBRouterTerminalRegistry(
             _getDeploymentAddress(path, "nana-router-terminal-v6", network_name, "JBRouterTerminalRegistry")

package/src/JBRouterTerminal.sol

@@ -402,9 +402,7 @@ contract JBRouterTerminal is
         BalanceDelta delta = POOL_MANAGER.swap({
             key: key,
             params: SwapParams({
-                zeroForOne: zeroForOne,
-                amountSpecified: amountSpecified,
-                sqrtPriceLimitX96: sqrtPriceLimitX96
+                zeroForOne: zeroForOne, amountSpecified: amountSpecified, sqrtPriceLimitX96: sqrtPriceLimitX96
             }),
             hookData: ""
         });
@@ -462,10 +460,8 @@ contract JBRouterTerminal is
         // Check for credit source override.
         uint256 sourceProjectIdOverride;
         {
-            (bool creditExists, bytes memory creditData) = JBMetadataResolver.getDataFor({
-                id: JBMetadataResolver.getId("cashOutSource"),
-                metadata: metadata
-            });
+            (bool creditExists, bytes memory creditData) =
+                JBMetadataResolver.getDataFor({id: JBMetadataResolver.getId("cashOutSource"), metadata: metadata});
             if (creditExists) {
                 (sourceProjectIdOverride,) = abi.decode(creditData, (uint256, uint256));
             }
@@ -501,11 +497,7 @@ contract JBRouterTerminal is
 
         // Convert tokenIn -> tokenOut (no-op if they match, wrap/unwrap, or swap).
         amountOut = _convert({
-            tokenIn: tokenIn,
-            tokenOut: tokenOut,
-            amount: amount,
-            projectId: destProjectId,
-            metadata: metadata
+            tokenIn: tokenIn, tokenOut: tokenOut, amount: amount, projectId: destProjectId, metadata: metadata
         });
     }
 
@@ -527,10 +519,8 @@ contract JBRouterTerminal is
     {
         // 1. Metadata override — payer specifies tokenOut explicitly.
         {
-            (bool exists, bytes memory routeData) = JBMetadataResolver.getDataFor({
-                id: JBMetadataResolver.getId("routeTokenOut"),
-                metadata: metadata
-            });
+            (bool exists, bytes memory routeData) =
+                JBMetadataResolver.getDataFor({id: JBMetadataResolver.getId("routeTokenOut"), metadata: metadata});
             if (exists) {
                 (tokenOut) = abi.decode(routeData, (address));
                 destTerminal = DIRECTORY.primaryTerminalOf({projectId: projectId, token: tokenOut});
@@ -694,13 +684,10 @@ contract JBRouterTerminal is
         }
 
         // Different tokens — swap via Uniswap (V3 or V4).
-        return _handleSwap({
-            projectId: projectId,
-            tokenIn: tokenIn,
-            tokenOut: tokenOut,
-            amount: amount,
-            metadata: metadata
-        });
+        return
+            _handleSwap({
+                projectId: projectId, tokenIn: tokenIn, tokenOut: tokenOut, amount: amount, metadata: metadata
+            });
     }
 
     /// @notice Execute a Uniswap swap from tokenIn to tokenOut (V3 or V4).
@@ -822,13 +809,10 @@ contract JBRouterTerminal is
         address v4In = normalizedTokenIn == address(WETH) ? address(0) : normalizedTokenIn;
         bool zeroForOne = Currency.unwrap(key.currency0) == v4In;
 
-        uint160 sqrtPriceLimitX96 = zeroForOne
-            ? TickMath.MIN_SQRT_RATIO + 1
-            : TickMath.MAX_SQRT_RATIO - 1;
+        uint160 sqrtPriceLimitX96 = zeroForOne ? TickMath.MIN_SQRT_RATIO + 1 : TickMath.MAX_SQRT_RATIO - 1;
 
-        bytes memory result = POOL_MANAGER.unlock(
-            abi.encode(key, zeroForOne, int256(amount), sqrtPriceLimitX96, minAmountOut)
-        );
+        bytes memory result =
+            POOL_MANAGER.unlock(abi.encode(key, zeroForOne, int256(amount), sqrtPriceLimitX96, minAmountOut));
 
         amountOut = abi.decode(result, (uint256));
     }
@@ -879,10 +863,8 @@ contract JBRouterTerminal is
         pool = _discoverPool(normalizedTokenIn, normalizedTokenOut);
 
         // Check for a user-provided quote.
-        (bool exists, bytes memory quote) = JBMetadataResolver.getDataFor({
-            id: JBMetadataResolver.getId("quoteForSwap"),
-            metadata: metadata
-        });
+        (bool exists, bytes memory quote) =
+            JBMetadataResolver.getDataFor({id: JBMetadataResolver.getId("quoteForSwap"), metadata: metadata});
 
         if (exists) {
             (minAmountOut) = abi.decode(quote, (uint256));
@@ -981,10 +963,7 @@ 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, baseAmount: uint128(amount), baseToken: normalizedTokenIn, quoteToken: normalizedTokenOut
         });
 
         minAmountOut -= (minAmountOut * slippageTolerance) / SLIPPAGE_DENOMINATOR;
@@ -1235,20 +1214,15 @@ contract JBRouterTerminal is
     function _acceptFundsFor(address token, uint256 amount, bytes calldata metadata) internal returns (uint256) {
         // Check for credit cash-out metadata.
         {
-            (bool creditExists, bytes memory creditData) = JBMetadataResolver.getDataFor({
-                id: JBMetadataResolver.getId("cashOutSource"),
-                metadata: metadata
-            });
+            (bool creditExists, bytes memory creditData) =
+                JBMetadataResolver.getDataFor({id: JBMetadataResolver.getId("cashOutSource"), metadata: metadata});
 
             if (creditExists) {
                 (uint256 sourceProjectId, uint256 creditAmount) = abi.decode(creditData, (uint256, uint256));
 
                 // Pull credits from the payer.
                 TOKENS.transferCreditsFrom({
-                    holder: _msgSender(),
-                    projectId: sourceProjectId,
-                    recipient: address(this),
-                    count: creditAmount
+                    holder: _msgSender(), projectId: sourceProjectId, recipient: address(this), count: creditAmount
                 });
 
                 return creditAmount;

package/test/RouterTerminal.t.sol

@@ -162,8 +162,7 @@ contract RouterTerminalTest is Test {
             abi.encode(mockTerminal)
         );
 
-        (address tokenOut, IJBTerminal destTerminal) =
-            routerTerminal.exposed_resolveTokenOut(projectId, tokenIn, "");
+        (address tokenOut, IJBTerminal destTerminal) = routerTerminal.exposed_resolveTokenOut(projectId, tokenIn, "");
 
         assertEq(tokenOut, tokenIn);
         assertEq(address(destTerminal), mockTerminal);
@@ -220,9 +219,7 @@ contract RouterTerminalTest is Test {
         JBAccountingContext[] memory contexts = new JBAccountingContext[](1);
         contexts[0] =
             JBAccountingContext({token: acceptedToken, decimals: 18, currency: uint32(uint160(acceptedToken))});
-        vm.mockCall(
-            mockTerminal, abi.encodeCall(IJBTerminal.accountingContextsOf, (projectId)), abi.encode(contexts)
-        );
+        vm.mockCall(mockTerminal, abi.encodeCall(IJBTerminal.accountingContextsOf, (projectId)), abi.encode(contexts));
 
         // Mock V3 pool discovery: pool exists at 0.3% fee tier with liquidity.
         vm.mockCall(
@@ -252,8 +249,7 @@ contract RouterTerminalTest is Test {
         // Mock V4 — no pools found (extsload returns 0 for all).
         _mockV4NoPools(tokenIn, acceptedToken);
 
-        (address tokenOut, IJBTerminal destTerminal) =
-            routerTerminal.exposed_resolveTokenOut(projectId, tokenIn, "");
+        (address tokenOut, IJBTerminal destTerminal) = routerTerminal.exposed_resolveTokenOut(projectId, tokenIn, "");
 
         assertEq(tokenOut, acceptedToken);
         assertEq(address(destTerminal), mockTerminal);
@@ -297,11 +293,7 @@ contract RouterTerminalTest is Test {
         vm.etch(tokenIn, hex"00");
 
         // Not a JB token.
-        vm.mockCall(
-            address(mockTokens),
-            abi.encodeWithSelector(IJBTokens.projectIdOf.selector),
-            abi.encode(uint256(0))
-        );
+        vm.mockCall(address(mockTokens), abi.encodeWithSelector(IJBTokens.projectIdOf.selector), abi.encode(uint256(0)));
 
         // Project accepts tokenIn directly.
         vm.mockCall(
@@ -311,18 +303,14 @@ contract RouterTerminalTest is Test {
         );
 
         // Mock token transfer from payer.
-        vm.mockCall(
-            tokenIn, abi.encodeCall(IERC20.allowance, (payer, address(routerTerminal))), abi.encode(amount)
-        );
+        vm.mockCall(tokenIn, abi.encodeCall(IERC20.allowance, (payer, address(routerTerminal))), abi.encode(amount));
         vm.mockCall(
             tokenIn, abi.encodeCall(IERC20.transferFrom, (payer, address(routerTerminal), amount)), abi.encode(true)
         );
 
         // Mock safeIncreaseAllowance: allowance check + approve.
         vm.mockCall(
-            tokenIn,
-            abi.encodeCall(IERC20.allowance, (address(routerTerminal), mockTerminal)),
-            abi.encode(uint256(0))
+            tokenIn, abi.encodeCall(IERC20.allowance, (address(routerTerminal), mockTerminal)), abi.encode(uint256(0))
         );
         vm.mockCall(tokenIn, abi.encodeCall(IERC20.approve, (mockTerminal, amount)), abi.encode(true));
 
@@ -414,9 +402,7 @@ contract RouterTerminalTest is Test {
         bytes memory data = abi.encode(uint256(1), tokenIn, tokenOut);
 
         vm.prank(fakePool);
-        vm.expectRevert(
-            abi.encodeWithSelector(IJBRouterTerminal.JBRouterTerminal_CallerNotPool.selector, fakePool)
-        );
+        vm.expectRevert(abi.encodeWithSelector(IJBRouterTerminal.JBRouterTerminal_CallerNotPool.selector, fakePool));
         routerTerminal.uniswapV3SwapCallback(int256(-200), int256(100), data);
     }
 
@@ -434,11 +420,7 @@ contract RouterTerminalTest is Test {
         vm.etch(tokenIn, hex"00");
 
         // Not a JB token.
-        vm.mockCall(
-            address(mockTokens),
-            abi.encodeWithSelector(IJBTokens.projectIdOf.selector),
-            abi.encode(uint256(0))
-        );
+        vm.mockCall(address(mockTokens), abi.encodeWithSelector(IJBTokens.projectIdOf.selector), abi.encode(uint256(0)));
 
         // Project accepts tokenIn.
         vm.mockCall(
@@ -448,18 +430,14 @@ contract RouterTerminalTest is Test {
         );
 
         // Mock token transfer.
-        vm.mockCall(
-            tokenIn, abi.encodeCall(IERC20.allowance, (payer, address(routerTerminal))), abi.encode(amount)
-        );
+        vm.mockCall(tokenIn, abi.encodeCall(IERC20.allowance, (payer, address(routerTerminal))), abi.encode(amount));
         vm.mockCall(
             tokenIn, abi.encodeCall(IERC20.transferFrom, (payer, address(routerTerminal), amount)), abi.encode(true)
         );
 
         // Mock safeIncreaseAllowance.
         vm.mockCall(
-            tokenIn,
-            abi.encodeCall(IERC20.allowance, (address(routerTerminal), mockTerminal)),
-            abi.encode(uint256(0))
+            tokenIn, abi.encodeCall(IERC20.allowance, (address(routerTerminal), mockTerminal)), abi.encode(uint256(0))
         );
         vm.mockCall(tokenIn, abi.encodeCall(IERC20.approve, (mockTerminal, amount)), abi.encode(true));
 
@@ -492,9 +470,7 @@ contract RouterTerminalTest is Test {
 
         // Pool at 0.05% has higher liquidity.
         vm.mockCall(
-            address(mockFactory),
-            abi.encodeCall(IUniswapV3Factory.getPool, (tokenA, tokenB, 500)),
-            abi.encode(pool500)
+            address(mockFactory), abi.encodeCall(IUniswapV3Factory.getPool, (tokenA, tokenB, 500)), abi.encode(pool500)
         );
         vm.mockCall(pool500, abi.encodeWithSignature("liquidity()"), abi.encode(uint128(500e18)));
 
@@ -530,9 +506,7 @@ contract RouterTerminalTest is Test {
         // No V4 pools.
         _mockV4NoPools(tokenA, tokenB);
 
-        vm.expectRevert(
-            abi.encodeWithSelector(IJBRouterTerminal.JBRouterTerminal_NoPoolFound.selector, tokenA, tokenB)
-        );
+        vm.expectRevert(abi.encodeWithSelector(IJBRouterTerminal.JBRouterTerminal_NoPoolFound.selector, tokenA, tokenB));
         routerTerminal.exposed_discoverPool(tokenA, tokenB);
     }
 
@@ -550,10 +524,7 @@ contract RouterTerminalTest is Test {
     //*********************************************************************//
 
     function test_migrateBalanceOf_returnsZero() public {
-        assertEq(
-            routerTerminal.migrateBalanceOf(1, makeAddr("token"), IJBTerminal(makeAddr("terminal"))),
-            0
-        );
+        assertEq(routerTerminal.migrateBalanceOf(1, makeAddr("token"), IJBTerminal(makeAddr("terminal"))), 0);
     }
 
     function test_addAccountingContextsFor_noOp() public {
@@ -573,9 +544,7 @@ contract RouterTerminalTest is Test {
 
         // V3 pool with moderate liquidity.
         vm.mockCall(
-            address(mockFactory),
-            abi.encodeCall(IUniswapV3Factory.getPool, (tokenA, tokenB, 3000)),
-            abi.encode(v3Pool)
+            address(mockFactory), abi.encodeCall(IUniswapV3Factory.getPool, (tokenA, tokenB, 3000)), abi.encode(v3Pool)
         );
         vm.mockCall(v3Pool, abi.encodeWithSignature("liquidity()"), abi.encode(uint128(100e18)));
 
@@ -609,7 +578,7 @@ contract RouterTerminalTest is Test {
         PoolId v4Id = v4Key.toId();
 
         // Mock getSlot0 via extsload — pool exists (sqrtPriceX96 != 0).
-        _mockV4PoolExists(v4Id, uint160(79228162514264337593543950336), 500e18);
+        _mockV4PoolExists(v4Id, uint160(79_228_162_514_264_337_593_543_950_336), 500e18);
 
         // Mock other V4 fee tiers as non-existent.
         _mockV4PoolNotExists(sorted0, sorted1, 500, int24(10));
@@ -631,9 +600,7 @@ contract RouterTerminalTest is Test {
 
         // V3 pool with high liquidity.
         vm.mockCall(
-            address(mockFactory),
-            abi.encodeCall(IUniswapV3Factory.getPool, (tokenA, tokenB, 3000)),
-            abi.encode(v3Pool)
+            address(mockFactory), abi.encodeCall(IUniswapV3Factory.getPool, (tokenA, tokenB, 3000)), abi.encode(v3Pool)
         );
         vm.mockCall(v3Pool, abi.encodeWithSignature("liquidity()"), abi.encode(uint128(1000e18)));
 
@@ -665,7 +632,7 @@ contract RouterTerminalTest is Test {
         });
         PoolId v4Id = v4Key.toId();
 
-        _mockV4PoolExists(v4Id, uint160(79228162514264337593543950336), 50e18);
+        _mockV4PoolExists(v4Id, uint160(79_228_162_514_264_337_593_543_950_336), 50e18);
 
         _mockV4PoolNotExists(sorted0, sorted1, 500, int24(10));
         _mockV4PoolNotExists(sorted0, sorted1, 10_000, int24(200));
@@ -699,7 +666,7 @@ contract RouterTerminalTest is Test {
         // First fee tier (3000/60) doesn't exist.
         _mockV4PoolNotExists(sorted0, sorted1, 3000, int24(60));
         // Second fee tier (500/10) exists.
-        _mockV4PoolExists(v4Id, uint160(79228162514264337593543950336), 200e18);
+        _mockV4PoolExists(v4Id, uint160(79_228_162_514_264_337_593_543_950_336), 200e18);
         // Other tiers don't exist.
         _mockV4PoolNotExists(sorted0, sorted1, 10_000, int24(200));
         _mockV4PoolNotExists(sorted0, sorted1, 100, int24(1));
@@ -732,9 +699,7 @@ contract RouterTerminalTest is Test {
 
         // V3 pool exists.
         vm.mockCall(
-            address(mockFactory),
-            abi.encodeCall(IUniswapV3Factory.getPool, (tokenA, tokenB, 3000)),
-            abi.encode(v3Pool)
+            address(mockFactory), abi.encodeCall(IUniswapV3Factory.getPool, (tokenA, tokenB, 3000)), abi.encode(v3Pool)
         );
         vm.mockCall(v3Pool, abi.encodeWithSignature("liquidity()"), abi.encode(uint128(100e18)));
 
@@ -797,7 +762,7 @@ contract RouterTerminalTest is Test {
             hooks: IHooks(address(0))
         });
         PoolId v4Id = v4Key.toId();
-        _mockV4PoolExists(v4Id, uint160(79228162514264337593543950336), 300e18);
+        _mockV4PoolExists(v4Id, uint160(79_228_162_514_264_337_593_543_950_336), 300e18);
 
         _mockV4PoolNotExists(sorted0, sorted1, 500, int24(10));
         _mockV4PoolNotExists(sorted0, sorted1, 10_000, int24(200));
@@ -821,9 +786,7 @@ contract RouterTerminalTest is Test {
         // Pack slot0: sqrtPriceX96 (160 bits) | tick (24 bits) | protocolFee (24 bits) | lpFee (24 bits)
         bytes32 slot0Data = bytes32(uint256(sqrtPriceX96));
         vm.mockCall(
-            address(mockPoolManager),
-            abi.encodeWithSignature("extsload(bytes32)", stateSlot),
-            abi.encode(slot0Data)
+            address(mockPoolManager), abi.encodeWithSignature("extsload(bytes32)", stateSlot), abi.encode(slot0Data)
         );
 
         // Liquidity is at stateSlot + 3.
@@ -848,9 +811,7 @@ contract RouterTerminalTest is Test {
         bytes32 stateSlot = keccak256(abi.encodePacked(PoolId.unwrap(id), bytes32(uint256(6))));
 
         vm.mockCall(
-            address(mockPoolManager),
-            abi.encodeWithSignature("extsload(bytes32)", stateSlot),
-            abi.encode(bytes32(0))
+            address(mockPoolManager), abi.encodeWithSignature("extsload(bytes32)", stateSlot), abi.encode(bytes32(0))
         );
     }
 

package/test/RouterTerminalRegistry.t.sol

@@ -256,9 +256,7 @@ contract RouterTerminalRegistryTest is Test {
 
         vm.prank(projectOwner);
         vm.expectRevert(
-            abi.encodeWithSelector(
-                JBRouterTerminalRegistry.JBRouterTerminalRegistry_TerminalNotSet.selector, projectId
-            )
+            abi.encodeWithSelector(JBRouterTerminalRegistry.JBRouterTerminalRegistry_TerminalNotSet.selector, projectId)
         );
         registry.lockTerminalFor(projectId);
     }
@@ -283,11 +281,7 @@ contract RouterTerminalRegistryTest is Test {
         registry.setDefaultTerminal(terminalA);
 
         // Mock the terminal's pay to return 100.
-        vm.mockCall(
-            address(terminalA),
-            abi.encodeWithSelector(IJBTerminal.pay.selector),
-            abi.encode(uint256(100))
-        );
+        vm.mockCall(address(terminalA), abi.encodeWithSelector(IJBTerminal.pay.selector), abi.encode(uint256(100)));
 
         // Send native tokens.
         vm.deal(address(this), 1 ether);
@@ -313,11 +307,7 @@ contract RouterTerminalRegistryTest is Test {
         registry.setDefaultTerminal(terminalA);
 
         // Mock the terminal's addToBalanceOf.
-        vm.mockCall(
-            address(terminalA),
-            abi.encodeWithSelector(IJBTerminal.addToBalanceOf.selector),
-            abi.encode()
-        );
+        vm.mockCall(address(terminalA), abi.encodeWithSelector(IJBTerminal.addToBalanceOf.selector), abi.encode());
 
         // Send native tokens.
         vm.deal(address(this), 1 ether);