@bananapus/router-terminal-v6 0.0.14 → 0.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/router-terminal-v6",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "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.20",
+    "@bananapus/core-v6": "^0.0.23",
     "@bananapus/permission-ids-v6": "^0.0.10",
     "@openzeppelin/contracts": "^5.6.1",
     "@uniswap/permit2": "github:Uniswap/permit2",

package/src/JBRouterTerminal.sol

@@ -14,7 +14,6 @@ import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
 import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
 import {JBMetadataResolver} from "@bananapus/core-v6/src/libraries/JBMetadataResolver.sol";
 import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
-import {JBCashOutHookSpecification} from "@bananapus/core-v6/src/structs/JBCashOutHookSpecification.sol";
 import {JBPayHookSpecification} from "@bananapus/core-v6/src/structs/JBPayHookSpecification.sol";
 import {JBRuleset} from "@bananapus/core-v6/src/structs/JBRuleset.sol";
 import {JBSingleAllowance} from "@bananapus/core-v6/src/structs/JBSingleAllowance.sol";
@@ -220,7 +219,7 @@ contract JBRouterTerminal is
     /// @notice This terminal holds no surplus. Always returns 0.
     function currentSurplusOf(
         uint256,
-        JBAccountingContext[] memory,
+        address[] calldata,
         uint256,
         uint256
     )
@@ -426,16 +425,12 @@ contract JBRouterTerminal is
         override
     {
         IJBTerminal destTerminal;
-        {
-            amount = _acceptFundsFor({token: token, amount: amount, metadata: metadata});
-
-            address tokenOut;
-            uint256 amountOut;
-            (destTerminal, tokenOut, amountOut) =
-                _route({destProjectId: projectId, tokenIn: token, amount: amount, metadata: metadata});
-            token = tokenOut;
-            amount = amountOut;
-        }
+        (destTerminal, token, amount) = _route({
+            destProjectId: projectId,
+            tokenIn: token,
+            amount: _acceptFundsFor({token: token, amount: amount, metadata: metadata}),
+            metadata: metadata
+        });
 
         uint256 payValue = _beforeTransferFor({to: address(destTerminal), token: token, amount: amount});
 
@@ -480,16 +475,12 @@ contract JBRouterTerminal is
         returns (uint256 beneficiaryTokenCount)
     {
         IJBTerminal destTerminal;
-        {
-            amount = _acceptFundsFor({token: token, amount: amount, metadata: metadata});
-
-            address tokenOut;
-            uint256 amountOut;
-            (destTerminal, tokenOut, amountOut) =
-                _route({destProjectId: projectId, tokenIn: token, amount: amount, metadata: metadata});
-            token = tokenOut;
-            amount = amountOut;
-        }
+        (destTerminal, token, amount) = _route({
+            destProjectId: projectId,
+            tokenIn: token,
+            amount: _acceptFundsFor({token: token, amount: amount, metadata: metadata}),
+            metadata: metadata
+        });
 
         uint256 payValue = _beforeTransferFor({to: address(destTerminal), token: token, amount: amount});
 
@@ -553,22 +544,20 @@ contract JBRouterTerminal is
         });
 
         // Determine input/output amounts from the delta.
+        int128 delta0 = delta.amount0();
+        int128 delta1 = delta.amount1();
         uint256 amountIn;
         uint256 amountOut;
-        {
-            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));
-            }
+        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));
         }
 
         if (amountOut < minAmountOut) revert JBRouterTerminal_SlippageExceeded(amountOut, minAmountOut);
@@ -595,23 +584,21 @@ contract JBRouterTerminal is
     /// @return The amount of tokens that have been accepted.
     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) {
-                // Credit cashouts don't use msg.value — revert if ETH was sent to prevent it being trapped.
-                if (msg.value != 0) revert JBRouterTerminal_NoMsgValueAllowed(msg.value);
+        if (creditExists) {
+            // Credit cashouts don't use msg.value — revert if ETH was sent to prevent it being trapped.
+            if (msg.value != 0) revert JBRouterTerminal_NoMsgValueAllowed(msg.value);
 
-                (uint256 sourceProjectId, uint256 creditAmount) = abi.decode(creditData, (uint256, uint256));
+            (uint256 sourceProjectId, uint256 creditAmount) = abi.decode(creditData, (uint256, uint256));
 
-                // Pull credits from the payer (requires payer to have granted TRANSFER_CREDITS to this contract).
-                TOKENS.transferCreditsFrom({
-                    holder: _msgSender(), projectId: sourceProjectId, recipient: address(this), count: creditAmount
-                });
+            // Pull credits from the payer (requires payer to have granted TRANSFER_CREDITS to this contract).
+            TOKENS.transferCreditsFrom({
+                holder: _msgSender(), projectId: sourceProjectId, recipient: address(this), count: creditAmount
+            });
 
-                return creditAmount;
-            }
+            return creditAmount;
         }
 
         // If native tokens are being paid in, return the `msg.value`.
@@ -676,6 +663,15 @@ contract JBRouterTerminal is
         return 0;
     }
 
+    /// @notice Parse the optional `cashOutMinReclaimed` metadata.
+    /// @param metadata The metadata to inspect for a minimum reclaim amount.
+    /// @return minTokensReclaimed The minimum reclaim amount, or 0 if none is specified.
+    function _minReclaimedFrom(bytes calldata metadata) internal view returns (uint256 minTokensReclaimed) {
+        (bool exists, bytes memory minData) =
+            JBMetadataResolver.getDataFor({id: JBMetadataResolver.getId("cashOutMinReclaimed"), metadata: metadata});
+        if (exists) minTokensReclaimed = abi.decode(minData, (uint256));
+    }
+
     /// @notice Parse the optional `cashOutSource` metadata.
     /// @param metadata The metadata to inspect for a credit cashout override.
     /// @return sourceProjectId The source project override, or 0 if none is specified.
@@ -740,12 +736,7 @@ contract JBRouterTerminal is
         returns (IJBTerminal destTerminal, address finalToken, uint256 finalAmount)
     {
         // Check for a user-provided minimum cashout reclaim amount (slippage protection).
-        uint256 minTokensReclaimed;
-        {
-            (bool exists, bytes memory minData) =
-                JBMetadataResolver.getDataFor({id: JBMetadataResolver.getId("cashOutMinReclaimed"), metadata: metadata});
-            if (exists) minTokensReclaimed = abi.decode(minData, (uint256));
-        }
+        uint256 minTokensReclaimed = _minReclaimedFrom(metadata);
 
         // Intermediate steps have no per-step slippage protection. The final output amount is
         // checked against the user's minReclaimed parameter, providing end-to-end slippage protection. Per-step
@@ -817,15 +808,7 @@ contract JBRouterTerminal is
         returns (IJBTerminal destTerminal, address finalToken, uint256 finalAmount)
     {
         // Track the one-time minimum reclaim amount that the caller may require on the first hop.
-        uint256 minTokensReclaimed;
-        {
-            // Read the optional `cashOutMinReclaimed` payload from metadata.
-            (bool exists, bytes memory minData) =
-                JBMetadataResolver.getDataFor({id: JBMetadataResolver.getId("cashOutMinReclaimed"), metadata: metadata});
-
-            // Decode the first-hop minimum reclaim amount if the payload is present.
-            if (exists) minTokensReclaimed = abi.decode(minData, (uint256));
-        }
+        uint256 minTokensReclaimed = _minReclaimedFrom(metadata);
 
         // Walk the same cash-out path execution would take, bounded to prevent circular routes.
         for (uint256 i; i < _MAX_CASHOUT_ITERATIONS; i++) {
@@ -1199,15 +1182,13 @@ contract JBRouterTerminal is
 
         for (uint256 i; i < terminals.length; i++) {
             // Check if this terminal supports the IJBCashOutTerminal interface.
-            {
-                // slither-disable-next-line calls-loop
-                try IERC165(address(terminals[i])).supportsInterface(type(IJBCashOutTerminal).interfaceId) returns (
-                    bool supported
-                ) {
-                    if (!supported) continue;
-                } catch {
-                    continue;
-                }
+            // slither-disable-next-line calls-loop
+            try IERC165(address(terminals[i])).supportsInterface(type(IJBCashOutTerminal).interfaceId) returns (
+                bool supported
+            ) {
+                if (!supported) continue;
+            } catch {
+                continue;
             }
 
             IJBCashOutTerminal terminal = IJBCashOutTerminal(address(terminals[i]));
@@ -1218,12 +1199,10 @@ contract JBRouterTerminal is
                 address contextToken = contexts[j].token;
 
                 // Priority 1: Does the destination project directly accept this token?
-                {
-                    // slither-disable-next-line calls-loop
-                    IJBTerminal destTerminal =
-                        DIRECTORY.primaryTerminalOf({projectId: destProjectId, token: contextToken});
-                    if (address(destTerminal) != address(0)) return (contextToken, terminal);
-                }
+                // slither-disable-next-line calls-loop
+                IJBTerminal destTerminal =
+                    DIRECTORY.primaryTerminalOf({projectId: destProjectId, token: contextToken});
+                if (address(destTerminal) != address(0)) return (contextToken, terminal);
 
                 // Priority 2: Is this a JB project token (so we can recurse)?
                 if (address(fallbackTerminal) == address(0) && contextToken != JBConstants.NATIVE_TOKEN) {
@@ -1493,15 +1472,13 @@ contract JBRouterTerminal is
         returns (address tokenOut, IJBTerminal destTerminal)
     {
         // 1. Metadata override — payer specifies tokenOut explicitly.
-        {
-            (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});
-                if (address(destTerminal) == address(0)) revert JBRouterTerminal_NoRouteFound(projectId, tokenOut);
-                return (tokenOut, destTerminal);
-            }
+        (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});
+            if (address(destTerminal) == address(0)) revert JBRouterTerminal_NoRouteFound(projectId, tokenOut);
+            return (tokenOut, destTerminal);
         }
 
         // 2. Direct acceptance — project accepts tokenIn as-is.
@@ -1540,14 +1517,7 @@ contract JBRouterTerminal is
         returns (IJBTerminal destTerminal, address tokenOut, uint256 amountOut)
     {
         // Check for credit source override.
-        uint256 sourceProjectIdOverride;
-        {
-            (bool creditExists, bytes memory creditData) =
-                JBMetadataResolver.getDataFor({id: JBMetadataResolver.getId("cashOutSource"), metadata: metadata});
-            if (creditExists) {
-                (sourceProjectIdOverride,) = abi.decode(creditData, (uint256, uint256));
-            }
-        }
+        (uint256 sourceProjectIdOverride,) = _cashOutSourceFrom(metadata);
 
         // Check if input is a JB project token (credit or ERC-20).
         uint256 sourceProjectId = sourceProjectIdOverride;

package/src/JBRouterTerminalRegistry.sol

@@ -142,13 +142,13 @@ contract JBRouterTerminalRegistry is IJBRouterTerminalRegistry, JBPermissioned,
 
     /// @notice Empty implementation to satisfy the interface. This terminal has no surplus.
     function currentSurplusOf(
-        uint256 projectId,
-        JBAccountingContext[] memory accountingContexts,
-        uint256 decimals,
-        uint256 currency
+        uint256,
+        address[] calldata,
+        uint256,
+        uint256
     )
         external
-        view
+        pure
         override
         returns (uint256)
     {}

package/test/RouterTerminal.t.sol

@@ -419,7 +419,7 @@ contract RouterTerminalTest is Test {
     }
 
     function test_currentSurplus_zero() public view {
-        assertEq(routerTerminal.currentSurplusOf(1, new JBAccountingContext[](0), 18, 1), 0);
+        assertEq(routerTerminal.currentSurplusOf(1, new address[](0), 18, 1), 0);
     }
 
     //*********************************************************************//