@bananapus/router-terminal-v6 0.0.45 → 0.0.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/router-terminal-v6",
-  "version": "0.0.45",
+  "version": "0.0.46",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,10 +26,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.47",
-    "@bananapus/core-v6": "^0.0.54",
-    "@bananapus/permission-ids-v6": "^0.0.22",
-    "@bananapus/univ4-router-v6": "^0.0.32",
+    "@bananapus/buyback-hook-v6": "^0.0.49",
+    "@bananapus/core-v6": "^0.0.57",
+    "@bananapus/permission-ids-v6": "^0.0.26",
+    "@bananapus/univ4-router-v6": "^0.0.34",
     "@openzeppelin/contracts": "5.6.1",
     "@uniswap/permit2": "github:Uniswap/permit2#cc56ad0f3439c502c246fc5cfcc3db92bb8b7219",
     "@uniswap/v3-core": "github:Uniswap/v3-core#6562c52e8f75f0c10f9deaf44861847585fc8129",

package/src/JBRouterTerminalRegistry.sol

@@ -151,7 +151,7 @@ contract JBRouterTerminalRegistry is IJBRouterTerminalRegistry, JBPermissioned,
         returns (JBAccountingContext memory context)
     {
         // Get the terminal for the project (falls back to the threshold-resolved default).
-        IJBTerminal terminal = _resolvedTerminalOf(projectId);
+        IJBTerminal terminal = _requireResolvedTerminalOf(projectId);
 
         // Get the accounting context for the token.
         return terminal.accountingContextForTokenOf({projectId: projectId, token: token});
@@ -167,7 +167,7 @@ contract JBRouterTerminalRegistry is IJBRouterTerminalRegistry, JBPermissioned,
         returns (JBAccountingContext[] memory contexts)
     {
         // Get the terminal for the project (falls back to the threshold-resolved default).
-        IJBTerminal terminal = _resolvedTerminalOf(projectId);
+        IJBTerminal terminal = _requireResolvedTerminalOf(projectId);
 
         // Get the accounting contexts.
         return terminal.accountingContextsOf(projectId);
@@ -254,7 +254,7 @@ contract JBRouterTerminalRegistry is IJBRouterTerminalRegistry, JBPermissioned,
     {
         // Read the terminal explicitly configured for this project, falling back to the
         // threshold-resolved default if none is pinned.
-        IJBTerminal terminal = _resolvedTerminalOf(projectId);
+        IJBTerminal terminal = _requireResolvedTerminalOf(projectId);
 
         // Forward the preview request unchanged to whichever terminal was resolved above.
         return terminal.previewPayFor({
@@ -387,6 +387,16 @@ contract JBRouterTerminalRegistry is IJBRouterTerminalRegistry, JBPermissioned,
         if (terminal == IJBTerminal(address(0))) terminal = _defaultTerminalFor(projectId);
     }
 
+    /// @notice Resolve the effective terminal for call paths that need to forward into a real terminal.
+    /// @dev `terminalOf`/`defaultTerminalFor` may intentionally return zero for the cold-start cohort. Transactional
+    /// and passthrough view paths must fail before accepting funds or calling address(0).
+    /// @param projectId The project to resolve the terminal for.
+    /// @return terminal The project-specific terminal or threshold-resolved default.
+    function _requireResolvedTerminalOf(uint256 projectId) internal view returns (IJBTerminal terminal) {
+        terminal = _resolvedTerminalOf(projectId);
+        if (terminal == IJBTerminal(address(0))) revert JBRouterTerminalRegistry_TerminalNotSet(projectId);
+    }
+
     //*********************************************************************//
     // ---------------------- external transactions ---------------------- //
     //*********************************************************************//
@@ -422,8 +432,8 @@ contract JBRouterTerminalRegistry is IJBRouterTerminalRegistry, JBPermissioned,
         payable
         override
     {
-        // Resolve the terminal that should receive this forwarded add-to-balance call.
-        IJBTerminal terminal = _resolvedTerminalOf(projectId);
+        // Resolve the terminal that should receive this forwarded add-to-balance call before accepting funds.
+        IJBTerminal terminal = _requireResolvedTerminalOf(projectId);
 
         // Accept the funds for the token.
         amount = _acceptFundsFor({token: token, amount: amount, metadata: metadata});
@@ -573,8 +583,8 @@ contract JBRouterTerminalRegistry is IJBRouterTerminalRegistry, JBPermissioned,
         override
         returns (uint256 result)
     {
-        // Resolve the terminal that should receive this forwarded payment.
-        IJBTerminal terminal = _resolvedTerminalOf(projectId);
+        // Resolve the terminal that should receive this forwarded payment before accepting funds.
+        IJBTerminal terminal = _requireResolvedTerminalOf(projectId);
 
         // Accept the funds for the token.
         amount = _acceptFundsFor({token: token, amount: amount, metadata: metadata});