@bananapus/router-terminal-v6 0.0.61 → 0.0.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/router-terminal-v6",
-  "version": "0.0.61",
+  "version": "0.0.63",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -24,10 +24,10 @@
     "artifacts": "source ./.env && npx sphinx artifacts --org-id 'ea165b21-7cdc-4d7b-be59-ecdd4c26bee4' --project-name 'nana-router-terminal-v6'"
   },
   "dependencies": {
-    "@bananapus/buyback-hook-v6": "^0.0.66",
-    "@bananapus/core-v6": "^0.0.78",
+    "@bananapus/buyback-hook-v6": "^0.0.68",
+    "@bananapus/core-v6": "^0.0.81",
     "@bananapus/permission-ids-v6": "^0.0.28",
-    "@bananapus/univ4-router-v6": "^0.0.46",
+    "@bananapus/univ4-router-v6": "^0.0.51",
     "@openzeppelin/contracts": "5.6.1",
     "@uniswap/permit2": "github:Uniswap/permit2#cc56ad0f3439c502c246fc5cfcc3db92bb8b7219",
     "@uniswap/v3-core": "github:Uniswap/v3-core#6562c52e8f75f0c10f9deaf44861847585fc8129",

package/src/JBRouterTerminal.sol

@@ -1161,6 +1161,8 @@ contract JBRouterTerminal is
     /// @param token The current token to process.
     /// @param amount The amount of the current token.
     /// @param metadata Bytes in `JBMetadataResolver`'s format (may contain a `cashOut` reclaim floor).
+    /// @param refundTo The address that should receive any unsold source project tokens returned by a partial
+    /// buyback-hook cash-out fill (otherwise they would strand in this router).
     /// @return destTerminal The terminal that accepts the final token (address(0) if no direct acceptance found).
     /// @return finalToken The token after all cashouts.
     /// @return finalAmount The amount of the final token.
@@ -1169,7 +1171,8 @@ contract JBRouterTerminal is
         address token,
         uint256 amount,
         bytes calldata metadata,
-        address preferredToken
+        address preferredToken,
+        address payable refundTo
     )
         internal
         returns (IJBTerminal destTerminal, address finalToken, uint256 finalAmount)
@@ -1209,6 +1212,10 @@ contract JBRouterTerminal is
             uint256 cashOutCount = amount;
             uint256 balanceBefore = _balanceOf({token: tokenToReclaim, account: address(this)});
 
+            // Snapshot the source project-token balance so the unsold residue a partial buyback fill returns to this
+            // router can be measured precisely below (only this hop's residue, never pre-existing balances).
+            uint256 sourceBalanceBefore = _balanceOf({token: token, account: address(this)});
+
             // Cash out the source project's tokens.
             // Don't rely on the terminal return value here. Buyback-hook sell-side execution returns 0 reclaimAmount
             // from nana-core, then transfers the real proceeds during the hook callback.
@@ -1225,8 +1232,7 @@ contract JBRouterTerminal is
                 tokenToReclaim: tokenToReclaim,
                 minTokensReclaimed: 0,
                 beneficiary: payable(address(this)),
-                metadata: hopMetadata,
-                referralProjectId: 0
+                metadata: hopMetadata
             });
 
             // Measure the reclaimed-token balance delta so fee-on-transfer behavior cannot fake delivery.
@@ -1244,6 +1250,16 @@ contract JBRouterTerminal is
                 revert JBRouterTerminal_SlippageExceeded({amountOut: amount, minAmountOut: minTokensReclaimed});
             }
 
+            // Refund any unsold source project tokens the buyback hook returned on a partial fill. The terminal burned
+            // `cashOutCount` source tokens before the hook ran, so the post-cash-out source balance is
+            // `sourceBalanceBefore - cashOutCount + unsold`; recovering `unsold` refunds exactly this hop's residue to
+            // the route's refund recipient instead of stranding it, without sweeping any pre-existing balance.
+            uint256 sourceResidue =
+                _balanceOf({token: token, account: address(this)}) + cashOutCount - sourceBalanceBefore;
+            if (sourceResidue != 0) {
+                _transferFrom({from: address(this), to: refundTo, token: token, amount: sourceResidue});
+            }
+
             // Clear the reclaim minimum after the first hop.
             // Multi-hop routes can change token units between hops, so there is no sound generic way to rescale a
             // single metadata amount across the remaining path.
@@ -1545,7 +1561,8 @@ contract JBRouterTerminal is
             tokenIn: tokenIn,
             amount: amount,
             metadata: metadata,
-            preferredToken: address(0)
+            preferredToken: address(0),
+            refundTo: refundTo
         });
 
         // If the cashout loop found a destination terminal, the route is already complete.
@@ -1605,7 +1622,12 @@ contract JBRouterTerminal is
 
         // First route through any source-project cashout path so project-token inputs are converted before swap logic.
         (cashOutResolvedTerminal, tokenIn, amount) = _routeInputFromSource({
-            destProjectId: destProjectId, tokenIn: tokenIn, amount: amount, metadata: metadata, preferredToken: tokenOut
+            destProjectId: destProjectId,
+            tokenIn: tokenIn,
+            amount: amount,
+            metadata: metadata,
+            preferredToken: tokenOut,
+            refundTo: refundTo
         });
 
         // Return early when the source cashout path already reached the final destination terminal.
@@ -1629,6 +1651,7 @@ contract JBRouterTerminal is
     /// @param amount The current route input amount.
     /// @param metadata Metadata that may include a `cashOut` reclaim floor.
     /// @param preferredToken The preferred token to target during any cashout loop.
+    /// @param refundTo The address that should receive any unsold source project tokens from a partial buyback fill.
     /// @return resolvedTerminal The terminal found by the cashout loop, or address(0) if conversion should continue.
     /// @return routedTokenIn The token that remains to be routed after the cashout step.
     /// @return routedAmountIn The amount of `routedTokenIn` that remains to be routed.
@@ -1637,7 +1660,8 @@ contract JBRouterTerminal is
         address tokenIn,
         uint256 amount,
         bytes calldata metadata,
-        address preferredToken
+        address preferredToken,
+        address payable refundTo
     )
         internal
         returns (IJBTerminal resolvedTerminal, address routedTokenIn, uint256 routedAmountIn)
@@ -1651,7 +1675,8 @@ contract JBRouterTerminal is
             token: tokenIn,
             amount: amount,
             metadata: metadata,
-            preferredToken: preferredToken
+            preferredToken: preferredToken,
+            refundTo: refundTo
         });
     }
 

package/src/JBRouterTerminalRegistry.sol

@@ -153,8 +153,15 @@ contract JBRouterTerminalRegistry is IJBRouterTerminalRegistry, JBPermissioned,
         override
         returns (JBAccountingContext memory context)
     {
-        // Get the terminal for the project (falls back to the threshold-resolved default).
-        IJBTerminal terminal = _requireResolvedTerminalOf(projectId);
+        // Discovery view, fail-open: resolve the project's effective terminal WITHOUT reverting. When no terminal can
+        // be resolved (e.g. no default terminal has been set on this chain yet), return an empty context
+        // (`token == address(0)`) rather than reverting. Callers such as `JBDirectory.primaryTerminalOf` read this to
+        // decide whether the registry accepts the token; an empty context means "not accepted", letting them fall
+        // through to `address(0)` instead of propagating a revert that would brick the originating operation (e.g. a
+        // protocol-fee cash out/payout routed to project #1). Transactional paths keep `_requireResolvedTerminalOf`
+        // and still revert before accepting funds or forwarding into `address(0)`.
+        IJBTerminal terminal = _resolvedTerminalOf(projectId);
+        if (terminal == IJBTerminal(address(0))) return context;
 
         // Get the accounting context for the token.
         return terminal.accountingContextForTokenOf({projectId: projectId, token: token});
@@ -169,8 +176,11 @@ contract JBRouterTerminalRegistry is IJBRouterTerminalRegistry, JBPermissioned,
         override
         returns (JBAccountingContext[] memory contexts)
     {
-        // Get the terminal for the project (falls back to the threshold-resolved default).
-        IJBTerminal terminal = _requireResolvedTerminalOf(projectId);
+        // Discovery view, fail-open: resolve WITHOUT reverting and return an empty array when no terminal can be
+        // resolved on this chain (see `accountingContextForTokenOf`). Transactional paths keep
+        // `_requireResolvedTerminalOf` and still revert.
+        IJBTerminal terminal = _resolvedTerminalOf(projectId);
+        if (terminal == IJBTerminal(address(0))) return contexts;
 
         // Get the accounting contexts.
         return terminal.accountingContextsOf(projectId);