@rev-net/core-v6 0.0.57 → 0.0.61

package/src/REVDeployer.sol

@@ -12,6 +12,7 @@ import {IJBPermissioned} from "@bananapus/core-v6/src/interfaces/IJBPermissioned
 import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
 import {IJBProjects} from "@bananapus/core-v6/src/interfaces/IJBProjects.sol";
 import {IJBRulesetApprovalHook} from "@bananapus/core-v6/src/interfaces/IJBRulesetApprovalHook.sol";
+import {IJBTerminal} from "@bananapus/core-v6/src/interfaces/IJBTerminal.sol";
 import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
 import {JBSplitGroupIds} from "@bananapus/core-v6/src/libraries/JBSplitGroupIds.sol";
 import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
@@ -22,7 +23,6 @@ import {JBRuleset} from "@bananapus/core-v6/src/structs/JBRuleset.sol";
 import {JBRulesetConfig} from "@bananapus/core-v6/src/structs/JBRulesetConfig.sol";
 import {JBRulesetMetadata} from "@bananapus/core-v6/src/structs/JBRulesetMetadata.sol";
 import {JBSplitGroup} from "@bananapus/core-v6/src/structs/JBSplitGroup.sol";
-import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
 import {JBTerminalConfig} from "@bananapus/core-v6/src/structs/JBTerminalConfig.sol";
 import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
 import {IJBSuckerRegistry} from "@bananapus/suckers-v6/src/interfaces/IJBSuckerRegistry.sol";
@@ -115,6 +115,9 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
     /// Participants can borrow up to the current cash out value of their tokens.
     IREVLoans public immutable override LOANS;
 
+    /// @notice The canonical terminal that holds revnet treasury balances.
+    IJBTerminal public immutable override MULTI_TERMINAL;
+
     /// @notice The runtime data hook contract that handles pay and cash out callbacks for revnets.
     /// @dev Set as `dataHook` in each revnet's ruleset metadata. Implements `IJBRulesetDataHook` and `IJBCashOutHook`.
     address public immutable override OWNER;
@@ -128,6 +131,10 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
     /// @notice Manages the publishing of ERC-721 posts to revnet's tiered ERC-721 hooks.
     CTPublisher public immutable override PUBLISHER;
 
+    /// @notice The canonical router terminal registry installed as a project terminal for alternate payment routes.
+    /// @dev Deployments pass the router terminal registry here, not the underlying router terminal implementation.
+    IJBTerminal public immutable override ROUTER_TERMINAL_REGISTRY;
+
     /// @notice Deploys and tracks suckers for revnets.
     IJBSuckerRegistry public immutable override SUCKER_REGISTRY;
 
@@ -165,6 +172,10 @@ 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 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.
@@ -175,6 +186,8 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
     /// @param owner The runtime data hook contract (REVOwner) that handles pay and cash out callbacks.
     constructor(
         IJBController controller,
+        IJBTerminal multiTerminal,
+        IJBTerminal routerTerminalRegistry,
         IJBSuckerRegistry suckerRegistry,
         uint256 feeRevnetId,
         IJB721TiersHookDeployer hookDeployer,
@@ -190,6 +203,8 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
         DIRECTORY = controller.DIRECTORY();
         PROJECTS = controller.PROJECTS();
         PERMISSIONS = IJBPermissioned(address(CONTROLLER)).PERMISSIONS();
+        MULTI_TERMINAL = multiTerminal;
+        ROUTER_TERMINAL_REGISTRY = routerTerminalRegistry;
         SUCKER_REGISTRY = suckerRegistry;
         FEE_REVNET_ID = feeRevnetId;
         HOOK_DEPLOYER = hookDeployer;
@@ -259,49 +274,32 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
     }
 
     /// @notice Initialize fund access limits for the loan contract.
-    /// @dev Returns an unlimited surplus allowance for each terminal+token pair derived from the terminal
-    /// configurations.
-    /// @param terminalConfigurations The terminals to set up for the revnet.
+    /// @dev Returns an unlimited surplus allowance for each accepted token in the canonical multi terminal.
+    /// @param accountingContextsToAccept The accounting contexts the canonical multi terminal should accept.
     /// @return fundAccessLimitGroups The fund access limit groups for the loans.
-    function _makeLoanFundAccessLimits(JBTerminalConfig[] calldata terminalConfigurations)
+    function _makeLoanFundAccessLimits(JBAccountingContext[] calldata accountingContextsToAccept)
         internal
-        pure
+        view
         returns (JBFundAccessLimitGroup[] memory fundAccessLimitGroups)
     {
-        // Count the total number of accounting contexts across all terminals.
-        uint256 count;
-        for (uint256 i; i < terminalConfigurations.length;) {
-            count += terminalConfigurations[i].accountingContextsToAccept.length;
-            unchecked {
-                ++i;
-            }
-        }
-
         // Initialize the fund access limit groups.
-        fundAccessLimitGroups = new JBFundAccessLimitGroup[](count);
+        fundAccessLimitGroups = new JBFundAccessLimitGroup[](accountingContextsToAccept.length);
 
         // Set up the fund access limits.
-        uint256 index;
-        for (uint256 i; i < terminalConfigurations.length;) {
-            JBTerminalConfig calldata terminalConfiguration = terminalConfigurations[i];
-            for (uint256 j; j < terminalConfiguration.accountingContextsToAccept.length;) {
-                JBAccountingContext calldata accountingContext = terminalConfiguration.accountingContextsToAccept[j];
-
-                // Set up an unlimited allowance for the loan contract to use.
-                JBCurrencyAmount[] memory loanAllowances = new JBCurrencyAmount[](1);
-                loanAllowances[0] = JBCurrencyAmount({currency: accountingContext.currency, amount: type(uint224).max});
-
-                // Set up the fund access limits for the loans.
-                fundAccessLimitGroups[index++] = JBFundAccessLimitGroup({
-                    terminal: address(terminalConfiguration.terminal),
-                    token: accountingContext.token,
-                    payoutLimits: new JBCurrencyAmount[](0),
-                    surplusAllowances: loanAllowances
-                });
-                unchecked {
-                    ++j;
-                }
-            }
+        for (uint256 i; i < accountingContextsToAccept.length;) {
+            JBAccountingContext calldata accountingContext = accountingContextsToAccept[i];
+
+            // Set up an unlimited allowance for the loan contract to use.
+            JBCurrencyAmount[] memory loanAllowances = new JBCurrencyAmount[](1);
+            loanAllowances[0] = JBCurrencyAmount({currency: accountingContext.currency, amount: type(uint224).max});
+
+            // Set up the fund access limits for the loans.
+            fundAccessLimitGroups[i] = JBFundAccessLimitGroup({
+                terminal: address(MULTI_TERMINAL),
+                token: accountingContext.token,
+                payoutLimits: new JBCurrencyAmount[](0),
+                surplusAllowances: loanAllowances
+            });
             unchecked {
                 ++i;
             }
@@ -353,6 +351,26 @@ 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.
+    /// @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)
+        internal
+        view
+        returns (JBTerminalConfig[] memory terminalConfigurations)
+    {
+        terminalConfigurations = new JBTerminalConfig[](2);
+        terminalConfigurations[0] =
+            JBTerminalConfig({terminal: MULTI_TERMINAL, accountingContextsToAccept: accountingContextsToAccept});
+        terminalConfigurations[1] = JBTerminalConfig({
+            terminal: ROUTER_TERMINAL_REGISTRY, accountingContextsToAccept: new JBAccountingContext[](0)
+        });
+    }
+
     /// @notice Returns the permissions that the operator should have for a revnet.
     /// @param revnetId The ID of the revnet to look up.
     /// @return allOperatorPermissions The permissions the operator should have for the revnet,
@@ -415,10 +433,12 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
                 sqrtPriceX96 = uint160(1 << 96);
             } else if (normalizedTerminalToken < projectToken) {
                 // token0 = terminal, token1 = project → price = issuance / terminalTokenUnit
-                sqrtPriceX96 = uint160(sqrt(mulDiv(uint256(initialIssuance), 1 << 192, terminalTokenUnit)));
+                sqrtPriceX96 =
+                    uint160(sqrt(mulDiv({x: uint256(initialIssuance), y: 1 << 192, denominator: terminalTokenUnit})));
             } else {
                 // token0 = project, token1 = terminal → price = terminalTokenUnit / issuance
-                sqrtPriceX96 = uint160(sqrt(mulDiv(terminalTokenUnit, 1 << 192, uint256(initialIssuance))));
+                sqrtPriceX96 =
+                    uint160(sqrt(mulDiv({x: terminalTokenUnit, y: 1 << 192, denominator: uint256(initialIssuance)})));
             }
         }
 
@@ -510,7 +530,7 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
     ///   REVDeployer, and the project becomes subject to immutable revnet rules. This cannot be undone.
     /// @param revnetId The ID of the Juicebox project to initialize as a revnet. Send 0 to deploy a new revnet.
     /// @param configuration Core revnet configuration. See `REVConfig`.
-    /// @param terminalConfigurations The terminals to set up for the revnet.
+    /// @param accountingContextsToAccept The accounting contexts the canonical multi terminal should accept.
     /// @param suckerDeploymentConfiguration The suckers to set up for cross-chain token transfers.
     /// @param tiered721HookConfiguration How to configure the tiered ERC-721 hook for the revnet.
     /// @param allowedPosts Restrictions on which croptop posts to allow on the revnet's ERC-721 tiers.
@@ -520,7 +540,7 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
     function deployFor(
         uint256 revnetId,
         REVConfig calldata configuration,
-        JBTerminalConfig[] calldata terminalConfigurations,
+        JBAccountingContext[] calldata accountingContextsToAccept,
         REVSuckerDeploymentConfig calldata suckerDeploymentConfiguration,
         REVDeploy721TiersHookConfig calldata tiered721HookConfiguration,
         REVCroptopAllowedPost[] calldata allowedPosts
@@ -540,7 +560,7 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
             revnetId: revnetId,
             shouldDeployNewRevnet: shouldDeployNewRevnet,
             configuration: configuration,
-            terminalConfigurations: terminalConfigurations,
+            accountingContextsToAccept: accountingContextsToAccept,
             suckerDeploymentConfiguration: suckerDeploymentConfiguration,
             tiered721HookConfiguration: tiered721HookConfiguration,
             allowedPosts: allowedPosts
@@ -554,7 +574,7 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
     function deployFor(
         uint256 revnetId,
         REVConfig calldata configuration,
-        JBTerminalConfig[] calldata terminalConfigurations,
+        JBAccountingContext[] calldata accountingContextsToAccept,
         REVSuckerDeploymentConfig calldata suckerDeploymentConfiguration
     )
         external
@@ -569,7 +589,7 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
             revnetId: revnetId,
             shouldDeployNewRevnet: shouldDeployNewRevnet,
             configuration: configuration,
-            terminalConfigurations: terminalConfigurations,
+            accountingContextsToAccept: accountingContextsToAccept,
             suckerDeploymentConfiguration: suckerDeploymentConfiguration
         });
 
@@ -667,7 +687,7 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
         uint256 revnetId,
         bool shouldDeployNewRevnet,
         REVConfig calldata configuration,
-        JBTerminalConfig[] calldata terminalConfigurations,
+        JBAccountingContext[] calldata accountingContextsToAccept,
         REVSuckerDeploymentConfig calldata suckerDeploymentConfiguration,
         REVDeploy721TiersHookConfig memory tiered721HookConfiguration,
         REVCroptopAllowedPost[] memory allowedPosts
@@ -680,7 +700,7 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
             revnetId: revnetId,
             shouldDeployNewRevnet: shouldDeployNewRevnet,
             configuration: configuration,
-            terminalConfigurations: terminalConfigurations,
+            accountingContextsToAccept: accountingContextsToAccept,
             suckerDeploymentConfiguration: suckerDeploymentConfiguration
         });
 
@@ -786,14 +806,14 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
     /// @param shouldDeployNewRevnet Whether the revnet ID was reserved by this deployment call, or the caller is
     /// converting an existing Juicebox project into a revnet.
     /// @param configuration Core revnet configuration. See `REVConfig`.
-    /// @param terminalConfigurations The terminals to set up for the revnet.
+    /// @param accountingContextsToAccept The accounting contexts the canonical multi terminal should accept.
     /// @param suckerDeploymentConfiguration The suckers to set up for cross-chain token transfers.
     /// @return encodedConfigurationHash A hash that represents the revnet's configuration.
     function _deployRevnetFor(
         uint256 revnetId,
         bool shouldDeployNewRevnet,
         REVConfig calldata configuration,
-        JBTerminalConfig[] calldata terminalConfigurations,
+        JBAccountingContext[] calldata accountingContextsToAccept,
         REVSuckerDeploymentConfig calldata suckerDeploymentConfiguration
     )
         internal
@@ -802,9 +822,13 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
         // Normalize and encode the configurations.
         JBRulesetConfig[] memory rulesetConfigurations;
         (rulesetConfigurations, encodedConfigurationHash) = _makeRulesetConfigurations({
-            revnetId: revnetId, configuration: configuration, terminalConfigurations: terminalConfigurations
+            revnetId: revnetId, configuration: configuration, accountingContextsToAccept: accountingContextsToAccept
         });
 
+        // Build the canonical terminal set from the deployer's immutable terminal choices.
+        JBTerminalConfig[] memory terminalConfigurations =
+            _makeTerminalConfigurations({accountingContextsToAccept: accountingContextsToAccept});
+
         address owner;
         if (!shouldDeployNewRevnet) {
             // Keep a reference to the Juicebox project's owner.
@@ -846,20 +870,14 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
             salt: keccak256(abi.encode(configuration.description.salt, encodedConfigurationHash, _msgSender()))
         });
 
-        // Now that the ERC-20 exists, initialize buyback pools for each terminal token.
-        for (uint256 i; i < terminalConfigurations.length;) {
-            JBTerminalConfig calldata terminalConfiguration = terminalConfigurations[i];
-            for (uint256 j; j < terminalConfiguration.accountingContextsToAccept.length;) {
-                _tryInitializeBuybackPoolFor({
-                    revnetId: revnetId,
-                    terminalToken: terminalConfiguration.accountingContextsToAccept[j].token,
-                    terminalTokenDecimals: terminalConfiguration.accountingContextsToAccept[j].decimals,
-                    initialIssuance: configuration.stageConfigurations[0].initialIssuance
-                });
-                unchecked {
-                    ++j;
-                }
-            }
+        // Now that the ERC-20 exists, initialize buyback pools for each accepted treasury token.
+        for (uint256 i; i < accountingContextsToAccept.length;) {
+            _tryInitializeBuybackPoolFor({
+                revnetId: revnetId,
+                terminalToken: accountingContextsToAccept[i].token,
+                terminalTokenDecimals: accountingContextsToAccept[i].decimals,
+                initialIssuance: configuration.stageConfigurations[0].initialIssuance
+            });
             unchecked {
                 ++i;
             }
@@ -924,13 +942,13 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
     /// configured immutably at deployment time.
     /// @param revnetId The ID of the revnet to build rulesets for.
     /// @param configuration The configuration containing the revnet's stages.
-    /// @param terminalConfigurations The terminals to set up for the revnet.
+    /// @param accountingContextsToAccept The accounting contexts the canonical multi terminal should accept.
     /// @return rulesetConfigurations A list of ruleset configurations derived from the stages.
     /// @return encodedConfigurationHash A hash that represents the revnet's configuration.
     function _makeRulesetConfigurations(
         uint256 revnetId,
         REVConfig calldata configuration,
-        JBTerminalConfig[] calldata terminalConfigurations
+        JBAccountingContext[] calldata accountingContextsToAccept
     )
         internal
         returns (JBRulesetConfig[] memory rulesetConfigurations, bytes32 encodedConfigurationHash)
@@ -952,19 +970,9 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
             configuration.description.salt
         );
 
-        // Include terminal addresses in the hash so cross-chain expansions must use the same terminals.
-        // Terminal addresses are deterministic across chains. Accounting contexts are excluded because
-        // token addresses (e.g. USDC) legitimately differ per chain.
-        for (uint256 i; i < terminalConfigurations.length;) {
-            encodedConfiguration = abi.encode(encodedConfiguration, terminalConfigurations[i].terminal);
-            unchecked {
-                ++i;
-            }
-        }
-
         // Initialize fund access limit groups for the loan contract.
         JBFundAccessLimitGroup[] memory fundAccessLimitGroups =
-            _makeLoanFundAccessLimits({terminalConfigurations: terminalConfigurations});
+            _makeLoanFundAccessLimits({accountingContextsToAccept: accountingContextsToAccept});
 
         // Track the previous stage's effective start time for ordering validation.
         // When stage 0 uses `startsAtOrAfter == 0`, the effective value is `block.timestamp`.