@bananapus/router-terminal-v6 0.0.58 → 0.0.59

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/router-terminal-v6",
-  "version": "0.0.58",
+  "version": "0.0.59",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/JBRouterTerminal.sol

@@ -2,6 +2,7 @@
 pragma solidity 0.8.28;
 
 import {IJBCashOutTerminal} from "@bananapus/core-v6/src/interfaces/IJBCashOutTerminal.sol";
+import {IJBController} from "@bananapus/core-v6/src/interfaces/IJBController.sol";
 import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 import {IJBPermitTerminal} from "@bananapus/core-v6/src/interfaces/IJBPermitTerminal.sol";
 import {IJBTerminal} from "@bananapus/core-v6/src/interfaces/IJBTerminal.sol";
@@ -1180,6 +1181,8 @@ contract JBRouterTerminal is
                 sourceProjectId: sourceProjectId, destProjectId: destProjectId, preferredToken: preferredToken
             });
 
+            _claimRouterCreditsFor({projectId: sourceProjectId});
+
             uint256 cashOutCount = amount;
             uint256 balanceBefore = _balanceOf({token: tokenToReclaim, account: address(this)});
 
@@ -1235,6 +1238,20 @@ contract JBRouterTerminal is
         revert JBRouterTerminal_CashOutLoopLimit({maxIterations: _MAX_CASHOUT_ITERATIONS});
     }
 
+    /// @notice Converts this router's internal project-token credits into ERC-20s before a source cash-out.
+    /// @dev Core burns holder credits before ERC-20 balances. Normalizing first keeps a source cash-out scoped to
+    /// transferable token balances already visible to the router.
+    /// @param projectId The Juicebox project whose tokens are being cashed out.
+    function _claimRouterCreditsFor(uint256 projectId) internal {
+        uint256 creditCount = TOKENS.creditBalanceOf({holder: address(this), projectId: projectId});
+        if (creditCount == 0) return;
+
+        IJBController controller = IJBController(address(DIRECTORY.controllerOf(projectId)));
+        controller.claimTokensFor({
+            holder: address(this), projectId: projectId, tokenCount: creditCount, beneficiary: address(this)
+        });
+    }
+
     /// @notice Convert tokenIn to tokenOut. No-op if same, wrap/unwrap for native/wrapped-native, or swap via Uniswap.
     /// @param tokenIn The token to convert from.
     /// @param tokenOut The token to convert into.