@rev-net/core-v6 0.0.61 → 0.0.63

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.0.62 — Omit unset router terminal registry
+
+- `REVDeployer` now omits `ROUTER_TERMINAL_REGISTRY` from the canonical terminal configuration when it was
+  constructed with `address(0)`.
+- This supports chains where the router terminal stack is unavailable while still launching revnets with the canonical
+  multi terminal.
+
 ## 0.0.56 — Bump v6 deps to nana-core-v6 0.0.53 cohort
 
 - `@bananapus/core-v6`: `^0.0.48 → ^0.0.53` ([PR #145](https://github.com/Bananapus/nana-core-v6/pull/145)).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rev-net/core-v6",
-  "version": "0.0.61",
+  "version": "0.0.63",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -28,11 +28,11 @@
   "dependencies": {
     "@bananapus/721-hook-v6": "^0.0.54",
     "@bananapus/buyback-hook-v6": "^0.0.49",
-    "@bananapus/core-v6": "^0.0.57",
+    "@bananapus/core-v6": "^0.0.59",
     "@bananapus/ownable-v6": "^0.0.27",
     "@bananapus/permission-ids-v6": "^0.0.26",
     "@bananapus/router-terminal-v6": "^0.0.46",
-    "@bananapus/suckers-v6": "^0.0.49",
+    "@bananapus/suckers-v6": "^0.0.50",
     "@croptop/core-v6": "^0.0.52",
     "@openzeppelin/contracts": "5.6.1",
     "@uniswap/permit2": "github:Uniswap/permit2#cc56ad0f3439c502c246fc5cfcc3db92bb8b7219"

package/src/REVDeployer.sol

@@ -174,8 +174,8 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
     /// @param controller The controller to use for launching and operating the Juicebox projects which will be revnets.
     /// @param multiTerminal The canonical terminal that holds revnet treasury balances. Assumed to be a valid
     /// deployment-time dependency.
-    /// @param routerTerminalRegistry The canonical router terminal registry used for alternate payment routes. Assumed
-    /// to be a valid deployment-time dependency.
+    /// @param routerTerminalRegistry The canonical router terminal registry used for alternate payment routes. May be
+    /// the zero address on chains where the router terminal stack is unavailable.
     /// @param suckerRegistry The registry to use for deploying and tracking each revnet's suckers.
     /// @param feeRevnetId The Juicebox project ID of the revnet that will receive fees.
     /// @param hookDeployer The deployer to use for revnet's tiered ERC-721 hooks.
@@ -353,9 +353,9 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
 
     /// @notice Build the canonical terminal configuration used by every revnet.
     /// @dev `MULTI_TERMINAL` accepts the revnet's accounting contexts and owns the treasury/loan accounting surface.
-    /// `ROUTER_TERMINAL_REGISTRY` is registered without accounting contexts so users can pay through the router path
-    /// without letting callers choose arbitrary terminals or loan sources. The deployer is constructed with distinct
-    /// addresses in the two slots; reusing the same address would be rejected by the directory's duplicate check.
+    /// When configured, `ROUTER_TERMINAL_REGISTRY` is registered without accounting contexts so users can pay through
+    /// the router path without letting callers choose arbitrary terminals or loan sources. Chains without the router
+    /// terminal stack use only `MULTI_TERMINAL`.
     /// @param accountingContextsToAccept The accounting contexts the canonical multi terminal should accept.
     /// @return terminalConfigurations The canonical terminal configuration for the revnet.
     function _makeTerminalConfigurations(JBAccountingContext[] calldata accountingContextsToAccept)
@@ -363,12 +363,15 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
         view
         returns (JBTerminalConfig[] memory terminalConfigurations)
     {
-        terminalConfigurations = new JBTerminalConfig[](2);
+        bool hasRouterTerminalRegistry = address(ROUTER_TERMINAL_REGISTRY) != address(0);
+        terminalConfigurations = new JBTerminalConfig[](hasRouterTerminalRegistry ? 2 : 1);
         terminalConfigurations[0] =
             JBTerminalConfig({terminal: MULTI_TERMINAL, accountingContextsToAccept: accountingContextsToAccept});
-        terminalConfigurations[1] = JBTerminalConfig({
-            terminal: ROUTER_TERMINAL_REGISTRY, accountingContextsToAccept: new JBAccountingContext[](0)
-        });
+        if (hasRouterTerminalRegistry) {
+            terminalConfigurations[1] = JBTerminalConfig({
+                terminal: ROUTER_TERMINAL_REGISTRY, accountingContextsToAccept: new JBAccountingContext[](0)
+            });
+        }
     }
 
     /// @notice Returns the permissions that the operator should have for a revnet.

package/src/REVLoans.sol

@@ -1055,7 +1055,16 @@ contract REVLoans is ERC721, ERC2771Context, JBPermissioned, Ownable, IREVLoans
             JBAccountingContext memory context =
                 TERMINAL.accountingContextForTokenOf({projectId: revnetId, token: sourceToken});
 
-            // Pull the amount to be loaned out of the revnet. This will incure the protocol fee.
+            // Pull the amount to be loaned out of the revnet. This will incure the protocol fee. Crediting `REV_ID`
+            // as the referrer attributes the protocol fee volume from every Revnet loan back to the REV revnet
+            // itself — REV is the project that facilitated the activity, regardless of which revnet is borrowing.
+            //
+            // The referrer reference is encoded as `(referralChainId << 48) | referralProjectId` per
+            // `JBMultiTerminal`'s `currentReferralProjectId` packing. REV lives on Ethereum mainnet, so we hard-code
+            // `referralChainId = 1`
+            // here: this ensures the protocol fee volume credit accrues to REV on mainnet regardless of which chain
+            // the loan originates from. (Auto-resolving to `block.chainid` would scatter credit across L2s where REV
+            // has no canonical project ID, so we pin mainnet explicitly.)
             netAmountPaidOut = TERMINAL.useAllowanceOf({
                 projectId: revnetId,
                 token: sourceToken,
@@ -1064,7 +1073,8 @@ contract REVLoans is ERC721, ERC2771Context, JBPermissioned, Ownable, IREVLoans
                 minTokensPaidOut: 0,
                 beneficiary: payable(address(this)),
                 feeBeneficiary: beneficiary,
-                memo: ""
+                memo: "",
+                referralProjectId: (uint256(1) << 48) | REV_ID
             });
         }
 

package/src/interfaces/IREVDeployer.sol

@@ -165,7 +165,7 @@ interface IREVDeployer {
     function PUBLISHER() external view returns (CTPublisher);
 
     /// @notice The canonical router terminal registry installed as a project terminal for alternate payment routes.
-    /// @return The router terminal registry contract, cast as a terminal.
+    /// @return The router terminal registry contract, cast as a terminal, or zero if unavailable on this chain.
     function ROUTER_TERMINAL_REGISTRY() external view returns (IJBTerminal);
 
     /// @notice The registry that deploys and tracks suckers for revnets.