@rev-net/core-v6 0.0.58 → 0.0.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rev-net/core-v6",
-  "version": "0.0.58",
+  "version": "0.0.61",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,19 +26,19 @@
     "artifacts": "source ./.env && npx sphinx artifacts --org-id 'ea165b21-7cdc-4d7b-be59-ecdd4c26bee4' --project-name 'revnet-core-v6'"
   },
   "dependencies": {
-    "@bananapus/721-hook-v6": "^0.0.51",
-    "@bananapus/buyback-hook-v6": "^0.0.47",
-    "@bananapus/core-v6": "^0.0.54",
-    "@bananapus/ownable-v6": "^0.0.25",
-    "@bananapus/permission-ids-v6": "^0.0.25",
-    "@bananapus/router-terminal-v6": "^0.0.44",
-    "@bananapus/suckers-v6": "^0.0.47",
-    "@croptop/core-v6": "^0.0.48",
+    "@bananapus/721-hook-v6": "^0.0.54",
+    "@bananapus/buyback-hook-v6": "^0.0.49",
+    "@bananapus/core-v6": "^0.0.57",
+    "@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",
+    "@croptop/core-v6": "^0.0.52",
     "@openzeppelin/contracts": "5.6.1",
     "@uniswap/permit2": "github:Uniswap/permit2#cc56ad0f3439c502c246fc5cfcc3db92bb8b7219"
   },
   "devDependencies": {
-    "@bananapus/address-registry-v6": "0.0.25",
+    "@bananapus/address-registry-v6": "0.0.26",
     "@sphinx-labs/plugins": "0.33.3",
     "@uniswap/v4-core": "1.0.2"
   }

package/references/operations.md

@@ -112,12 +112,12 @@ Use this file when you need revnet-specific risks, state reads, constants, or ex
 
 | Mapping | Visibility | Type | Purpose |
 |---------|-----------|------|---------|
-| `isLoanSourceOf` | `public` | `revnetId => terminal => token => bool` | Is this (terminal, token) pair used for loans? |
+| `isLoanSourceOf` | `public` | `revnetId => token => bool` | Is this token used for loans? |
 | `totalLoansBorrowedFor` | `public` | `revnetId => uint256` | Counter for loan numbering |
-| `totalBorrowedFrom` | `public` | `revnetId => terminal => token => uint256` | Tracks debt per loan source |
+| `totalBorrowedFrom` | `public` | `revnetId => token => uint256` | Tracks debt per loan source token |
 | `totalCollateralOf` | `public` | `revnetId => uint256` | Sum of all burned collateral |
 | `_loanOf` | `internal` | `loanId => REVLoan` | Per-loan state (use `loanOf(loanId)` view) |
-| `_loanSourcesOf` | `internal` | `revnetId => REVLoanSource[]` | Array of all loan sources used (use `loanSourcesOf(revnetId)` view) |
+| `_loanSourceTokensOf` | `internal` | `revnetId => address[]` | Array of all loan source tokens used (use `loanSourceTokensOf(revnetId)` view) |
 | `tokenUriResolver` | `public` | `IJBTokenUriResolver` | Resolver for loan NFT token URIs |
 
 ## Gotchas
@@ -133,7 +133,7 @@ Use this file when you need revnet-specific risks, state reads, constants, or ex
 9. **`cashOutTaxRate` cannot be MAX.** Must be strictly less than `MAX_CASH_OUT_TAX_RATE` (10,000). Revnets cannot fully disable cash outs.
 10. **Split operator is singular.** Only ONE address can be operator at a time. The operator can replace itself via `setOperatorOf` but cannot delegate or multi-sig.
 11. **NATIVE_TOKEN on non-ETH chains.** `JBConstants.NATIVE_TOKEN` on Celo means CELO, on Polygon means MATIC -- not ETH. Use ERC-20 WETH instead. The config matching hash does NOT catch terminal configuration differences.
-12. **Loan source array is unbounded.** `_loanSourcesOf[revnetId]` grows without limit. No validation that a terminal is actually registered for the project.
+12. **Loan source array is unbounded.** `_loanSourceTokensOf[revnetId]` grows without limit, bounded in practice by the token accounting contexts accepted by the canonical `MULTI_TERMINAL`.
 13. **Flash-loan surplus exposure.** `borrowableAmountFrom` reads live surplus. A flash loan can temporarily inflate the treasury to borrow more than the sustained value supports.
 14. **Fee revnet must have terminals.** Cash-out fees and loan protocol fees are paid to `FEE_REVNET_ID`. If that project has no terminal for the token, the fee silently fails (try-catch).
 15. **Buyback hook is immutable per deployer.** `BUYBACK_HOOK` is set at construction time on both REVDeployer and REVOwner. All revnets deployed by the same deployer share the same buyback hook.
@@ -202,10 +202,10 @@ Quick-reference for common read operations. All functions are `view`/`pure` and
 | What | Call | Returns |
 |------|------|---------|
 | Borrowable amount for collateral | `REVLoans.borrowableAmountFrom(revnetId, collateralCount, decimals, currency)` | `uint256` |
-| Total borrowed (per source) | `REVLoans.totalBorrowedFrom(revnetId, terminal, token)` | `uint256` |
+| Total borrowed (per source token) | `REVLoans.totalBorrowedFrom(revnetId, token)` | `uint256` |
 | Total collateral locked | `REVLoans.totalCollateralOf(revnetId)` | `uint256` |
 | Loan details | `REVLoans.loanOf(loanId)` | `REVLoan` struct |
-| All loan sources | `REVLoans.loanSourcesOf(revnetId)` | `REVLoanSource[]` |
+| All loan source tokens | `REVLoans.loanSourceTokensOf(revnetId)` | `address[]` |
 | Loan count | `REVLoans.totalLoansBorrowedFor(revnetId)` | `uint256` |
 | Source fee for repayment | `REVLoans.determineSourceFeeAmount(loan, amount)` | `uint256` |
 | Revnet ID from loan ID | `REVLoans.revnetIdOfLoanWith(loanId)` | `uint256` (pure) |
@@ -276,7 +276,7 @@ deployer.deployFor({
 
 loans.borrowFrom({
     revnetId: revnetId,
-    source: REVLoanSource({ token: JBConstants.NATIVE_TOKEN, terminal: terminal }),
+    token: JBConstants.NATIVE_TOKEN,
     minBorrowAmount: 0,
     collateralCount: 1000e18,              // Burn 1000 tokens as collateral
     beneficiary: msg.sender,               // Receive borrowed funds
@@ -290,7 +290,7 @@ loans.borrowFrom({
 (uint256 reallocatedLoanId, uint256 newLoanId, , ) = loans.reallocateCollateralFromLoan({
     loanId: loanId,
     collateralCountToTransfer: 500e18,     // Move 500 tokens out of existing loan
-    source: REVLoanSource({ token: JBConstants.NATIVE_TOKEN, terminal: terminal }),
+    token: JBConstants.NATIVE_TOKEN,
     minBorrowAmount: 0,
     collateralCountToAdd: 200e18,          // Add 200 fresh tokens on top
     beneficiary: payable(msg.sender),      // Receive new loan proceeds

package/references/runtime.md

@@ -64,7 +64,7 @@ Deploy and manage Revnets -- autonomous, unowned Juicebox projects with staged i
 | `REVLoans.borrowableAmountFrom(revnetId, collateralCount, decimals, currency)` | Calculate how much can be borrowed for a given collateral amount. Returns 0 during the cash-out delay period. Aggregates surplus from all terminals, applies bonding curve. |
 | `REVLoans.determineSourceFeeAmount(loan, amount)` | Calculate the time-proportional source fee for a loan repayment. Zero during prepaid window, linear accrual after. |
 | `REVLoans.loanOf(loanId)` | Returns the full `REVLoan` struct for a loan. |
-| `REVLoans.loanSourcesOf(revnetId)` | Returns all `(terminal, token)` pairs used for loans by a revnet. |
+| `REVLoans.loanSourceTokensOf(revnetId)` | Returns all token sources used for loans by a revnet. Loans always source funds from the canonical `MULTI_TERMINAL`. |
 | `REVLoans.revnetIdOfLoanWith(loanId)` | Decode the revnet ID from a loan ID (`loanId / 1_000_000_000_000`). |
 ## Integration Points
 
@@ -88,8 +88,7 @@ Deploy and manage Revnets -- autonomous, unowned Juicebox projects with staged i
 | `REVStageConfig` | `startsAtOrAfter` (uint48), `initialIssuance` (uint112), `issuanceCutFrequency` (uint32), `issuanceCutPercent` (uint32), `cashOutTaxRate` (uint16), `splitPercent` (uint16), `splits[]`, `autoIssuances[]`, `extraMetadata` (uint16) | Translated into `JBRulesetConfig` |
 | `REVDescription` | `name`, `ticker`, `uri`, `salt` | ERC-20 token deployment and project metadata |
 | `REVAutoIssuance` | `chainId` (uint32), `count` (uint104), `beneficiary` | Per-stage cross-chain token auto-minting |
-| `REVLoan` | `amount` (uint112), `collateral` (uint112), `createdAt` (uint48), `prepaidFeePercent` (uint16), `prepaidDuration` (uint32), `source` (REVLoanSource) | Per-loan state in `REVLoans` |
-| `REVLoanSource` | `token`, `terminal` (IJBPayoutTerminal) | Identifies which terminal and token a loan draws from |
+| `REVLoan` | `amount` (uint112), `collateral` (uint112), `createdAt` (uint48), `prepaidFeePercent` (uint16), `prepaidDuration` (uint32), `sourceToken` (address) | Per-loan state in `REVLoans` |
 | `REVDeploy721TiersHookConfig` | `baseline721HookConfiguration` (REVBaseline721HookConfig), `salt`, `preventOperatorAdjustingTiers`, `preventOperatorUpdatingMetadata`, `preventOperatorMinting`, `preventOperatorIncreasingDiscountPercent` | 721 hook deployment with operator permissions (preventive flags — `false` = allowed). Uses `REVBaseline721HookConfig` (not `JBDeploy721TiersHookConfig`) to omit `issueTokensForSplits` — revnets always force it to `false`. |
 | `REVBaseline721HookConfig` | `name`, `symbol`, `baseUri`, `tokenUriResolver`, `contractUri`, `tiersConfig`, `reserveBeneficiary`, `flags` (REV721TiersHookFlags) | Same as `JBDeploy721TiersHookConfig` but uses `REV721TiersHookFlags` which omits `issueTokensForSplits`. |
 | `REV721TiersHookFlags` | `noNewTiersWithReserves`, `noNewTiersWithVotes`, `noNewTiersWithOwnerMinting`, `preventOverspending` | Same as `JB721TiersHookFlags` minus `issueTokensForSplits`. Revnets do their own weight adjustment for splits. |

package/script/Deploy.s.sol

@@ -20,7 +20,6 @@ import {Script} from "forge-std/Script.sol";
 import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
 import {JBCurrencyIds} from "@bananapus/core-v6/src/libraries/JBCurrencyIds.sol";
 import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
-import {JBTerminalConfig} from "@bananapus/core-v6/src/structs/JBTerminalConfig.sol";
 import {JBSuckerDeployerConfig} from "@bananapus/suckers-v6/src/structs/JBSuckerDeployerConfig.sol";
 import {JBTokenMapping} from "@bananapus/suckers-v6/src/structs/JBTokenMapping.sol";
 import {IPermit2} from "@uniswap/permit2/src/interfaces/IPermit2.sol";
@@ -48,7 +47,7 @@ import {REV721TiersHookFlags} from "../src/structs/REV721TiersHookFlags.sol";
 
 struct FeeProjectConfig {
     REVConfig configuration;
-    JBTerminalConfig[] terminalConfigurations;
+    JBAccountingContext[] accountingContextsToAccept;
     REVSuckerDeploymentConfig suckerDeploymentConfiguration;
     REVDeploy721TiersHookConfig tiered721HookConfiguration;
     REVCroptopAllowedPost[] allowedPosts;
@@ -65,7 +64,7 @@ contract DeployScript is Script, Sphinx {
     Hook721Deployment hook;
     /// @notice tracks the deployment of the sucker contracts for the chain we are deploying to.
     SuckerDeployment suckers;
-    /// @notice tracks the deployment of the router terminal.
+    /// @notice tracks the deployment of the router terminal registry package.
     RouterTerminalDeployment routerTerminal;
     uint32 private constant _PREMINT_CHAIN_ID = 1;
     string private constant _NAME = "Revnet";
@@ -130,7 +129,7 @@ contract DeployScript is Script, Sphinx {
                 defaultValue: string("node_modules/@bananapus/721-hook-v6/deployments/")
             })
         );
-        // Get the deployment addresses for the router terminal contracts for this chain.
+        // Get the deployment addresses for the router terminal registry package for this chain.
         routerTerminal = RouterTerminalDeploymentLib.getDeployment(
             vm.envOr({
                 name: "NANA_ROUTER_TERMINAL_DEPLOYMENT_PATH",
@@ -161,15 +160,6 @@ contract DeployScript is Script, Sphinx {
         accountingContextsToAccept[0] =
             JBAccountingContext({token: JBConstants.NATIVE_TOKEN, decimals: _DECIMALS, currency: _NATIVE_CURRENCY});
 
-        // The terminals that the project will accept funds through.
-        JBTerminalConfig[] memory terminalConfigurations = new JBTerminalConfig[](2);
-        terminalConfigurations[0] =
-            JBTerminalConfig({terminal: core.terminal, accountingContextsToAccept: accountingContextsToAccept});
-        terminalConfigurations[1] = JBTerminalConfig({
-            terminal: IJBTerminal(address(routerTerminal.registry)),
-            accountingContextsToAccept: new JBAccountingContext[](0)
-        });
-
         // The project's revnet stage configurations.
         REVStageConfig[] memory stageConfigurations = new REVStageConfig[](3);
 
@@ -296,7 +286,7 @@ contract DeployScript is Script, Sphinx {
 
         return FeeProjectConfig({
             configuration: revnetConfiguration,
-            terminalConfigurations: terminalConfigurations,
+            accountingContextsToAccept: accountingContextsToAccept,
             suckerDeploymentConfiguration: suckerDeploymentConfiguration,
             tiered721HookConfiguration: REVDeploy721TiersHookConfig({
                 baseline721HookConfiguration: REVBaseline721HookConfig({
@@ -364,7 +354,13 @@ contract DeployScript is Script, Sphinx {
                 salt: _REVLOANS_SALT,
                 creationCode: type(REVLoans).creationCode,
                 arguments: abi.encode(
-                    core.controller, suckers.registry, _candidateId, loansOwner, permit2, trustedForwarder
+                    core.controller,
+                    core.terminal,
+                    suckers.registry,
+                    _candidateId,
+                    loansOwner,
+                    permit2,
+                    trustedForwarder
                 )
             });
 
@@ -397,9 +393,11 @@ contract DeployScript is Script, Sphinx {
                         creationCode: type(REVDeployer).creationCode,
                         arguments: abi.encode(
                             core.controller,
+                            core.terminal,
+                            IJBTerminal(address(routerTerminal.registry)),
                             suckers.registry,
                             _candidateId,
-                            hook.hook_deployer,
+                            hook.hookDeployer,
                             croptop.publisher,
                             IJBBuybackHookRegistry(address(buybackHook.registry)),
                             _candidateRevloansAddr,
@@ -432,11 +430,12 @@ contract DeployScript is Script, Sphinx {
             }
         }
 
-        // Deploy REVLoans first — it only depends on the controller.
+        // Deploy REVLoans first — it depends on the canonical controller and multi terminal.
         REVLoans revloans = _revloansExists
             ? REVLoans(payable(_existingRevloansAddr))
             : new REVLoans{salt: _REVLOANS_SALT}({
                 controller: core.controller,
+                terminal: core.terminal,
                 suckerRegistry: suckers.registry,
                 revId: feeProjectId,
                 owner: loansOwner,
@@ -464,9 +463,11 @@ contract DeployScript is Script, Sphinx {
                 creationCode: type(REVDeployer).creationCode,
                 arguments: abi.encode(
                     core.controller,
+                    core.terminal,
+                    IJBTerminal(address(routerTerminal.registry)),
                     suckers.registry,
                     feeProjectId,
-                    hook.hook_deployer,
+                    hook.hookDeployer,
                     croptop.publisher,
                     IJBBuybackHookRegistry(address(buybackHook.registry)),
                     revloans,
@@ -481,9 +482,11 @@ contract DeployScript is Script, Sphinx {
             ? REVDeployer(payable(_deployerAddr))
             : new REVDeployer{salt: _DEPLOYER_SALT}({
                 controller: core.controller,
+                multiTerminal: core.terminal,
+                routerTerminalRegistry: IJBTerminal(address(routerTerminal.registry)),
                 suckerRegistry: suckers.registry,
                 feeRevnetId: feeProjectId,
-                hookDeployer: hook.hook_deployer,
+                hookDeployer: hook.hookDeployer,
                 publisher: croptop.publisher,
                 buybackHook: IJBBuybackHookRegistry(address(buybackHook.registry)),
                 loans: revloans,
@@ -506,7 +509,7 @@ contract DeployScript is Script, Sphinx {
             _basicDeployer.deployFor({
                 revnetId: feeProjectId,
                 configuration: feeProjectConfig.configuration,
-                terminalConfigurations: feeProjectConfig.terminalConfigurations,
+                accountingContextsToAccept: feeProjectConfig.accountingContextsToAccept,
                 suckerDeploymentConfiguration: feeProjectConfig.suckerDeploymentConfiguration,
                 tiered721HookConfiguration: feeProjectConfig.tiered721HookConfiguration,
                 allowedPosts: feeProjectConfig.allowedPosts

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,
@@ -512,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.
@@ -522,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
@@ -542,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
@@ -556,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
@@ -571,7 +589,7 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
             revnetId: revnetId,
             shouldDeployNewRevnet: shouldDeployNewRevnet,
             configuration: configuration,
-            terminalConfigurations: terminalConfigurations,
+            accountingContextsToAccept: accountingContextsToAccept,
             suckerDeploymentConfiguration: suckerDeploymentConfiguration
         });
 
@@ -669,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
@@ -682,7 +700,7 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
             revnetId: revnetId,
             shouldDeployNewRevnet: shouldDeployNewRevnet,
             configuration: configuration,
-            terminalConfigurations: terminalConfigurations,
+            accountingContextsToAccept: accountingContextsToAccept,
             suckerDeploymentConfiguration: suckerDeploymentConfiguration
         });
 
@@ -788,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
@@ -804,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.
@@ -848,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;
             }
@@ -926,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)
@@ -954,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`.