@rev-net/core-v6 0.0.57 → 0.0.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rev-net/core-v6",
-  "version": "0.0.57",
+  "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,56 +64,33 @@ 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;
-
-    // forge-lint: disable-next-line(mixed-case-variable)
-    uint32 PREMINT_CHAIN_ID = 1;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    string NAME = "Revnet";
-    // forge-lint: disable-next-line(mixed-case-variable)
-    string SYMBOL = "REV";
-    // forge-lint: disable-next-line(mixed-case-variable)
-    string PROJECT_URI = "ipfs://QmcCBD5fM927LjkLDSJWtNEU9FohcbiPSfqtGRHXFHzJ4W";
-    // forge-lint: disable-next-line(mixed-case-variable)
-    uint32 NATIVE_CURRENCY = uint32(uint160(JBConstants.NATIVE_TOKEN));
-    // forge-lint: disable-next-line(mixed-case-variable)
-    uint32 ETH_CURRENCY = JBCurrencyIds.ETH;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    uint8 DECIMALS = 18;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    uint256 DECIMAL_MULTIPLIER = 10 ** DECIMALS;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    bytes32 ERC20_SALT = "_REV_ERC20_SALT_V6_";
-    // forge-lint: disable-next-line(mixed-case-variable)
-    bytes32 SUCKER_SALT = "_REV_SUCKER_SALT_V6_";
-    // forge-lint: disable-next-line(mixed-case-variable)
-    bytes32 DEPLOYER_SALT = "_REV_DEPLOYER_SALT_V6_";
-    // forge-lint: disable-next-line(mixed-case-variable)
-    bytes32 REVLOANS_SALT = "_REV_LOANS_SALT_V6_";
-    // forge-lint: disable-next-line(mixed-case-variable)
-    bytes32 REVOWNER_SALT = "_REV_OWNER_SALT_V6_";
-    // forge-lint: disable-next-line(mixed-case-variable)
-    address LOANS_OWNER;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    address OPERATOR;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    address TRUSTED_FORWARDER;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    IPermit2 PERMIT2;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    uint48 REV_START_TIME = 1_740_089_444;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    uint104 REV_MAINNET_AUTO_ISSUANCE_ = 1_050_482_341_387_116_262_330_122;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    uint104 REV_BASE_AUTO_ISSUANCE_ = 38_544_322_230_437_559_731_228;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    uint104 REV_OP_AUTO_ISSUANCE_ = 32_069_388_242_375_817_844;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    uint104 REV_ARB_AUTO_ISSUANCE_ = 3_479_431_776_906_850_000_000;
+    uint32 private constant _PREMINT_CHAIN_ID = 1;
+    string private constant _NAME = "Revnet";
+    string private constant _SYMBOL = "REV";
+    string private constant _PROJECT_URI = "ipfs://QmcCBD5fM927LjkLDSJWtNEU9FohcbiPSfqtGRHXFHzJ4W";
+    uint32 private constant _NATIVE_CURRENCY = uint32(uint160(JBConstants.NATIVE_TOKEN));
+    uint32 private constant _ETH_CURRENCY = JBCurrencyIds.ETH;
+    uint8 private constant _DECIMALS = 18;
+    uint256 private constant _DECIMAL_MULTIPLIER = 10 ** _DECIMALS;
+    bytes32 private constant _ERC20_SALT = "_REV_ERC20_SALT_V6_";
+    bytes32 private constant _SUCKER_SALT = "_REV_SUCKER_SALT_V6_";
+    bytes32 private constant _DEPLOYER_SALT = "_REV_DEPLOYER_SALT_V6_";
+    bytes32 private constant _REVLOANS_SALT = "_REV_LOANS_SALT_V6_";
+    bytes32 private constant _REVOWNER_SALT = "_REV_OWNER_SALT_V6_";
+    address private loansOwner;
+    address private operator;
+    address private trustedForwarder;
+    IPermit2 private permit2;
+    uint48 private constant _REV_START_TIME = 1_740_089_444;
+    uint104 private constant _REV_MAINNET_AUTO_ISSUANCE = 1_050_482_341_387_116_262_330_122;
+    uint104 private constant _REV_BASE_AUTO_ISSUANCE = 38_544_322_230_437_559_731_228;
+    uint104 private constant _REV_OP_AUTO_ISSUANCE = 32_069_388_242_375_817_844;
+    uint104 private constant _REV_ARB_AUTO_ISSUANCE = 3_479_431_776_906_850_000_000;
 
     function configureSphinx() public override {
-        // TODO: Update to contain revnet devs.
+        // Safe owners and threshold are resolved by the Sphinx project config.
         sphinxConfig.projectName = "revnet-core-v6";
         sphinxConfig.mainnets = ["ethereum", "optimism", "base", "arbitrum"];
         sphinxConfig.testnets = ["ethereum_sepolia", "optimism_sepolia", "base_sepolia", "arbitrum_sepolia"];
@@ -122,9 +98,9 @@ contract DeployScript is Script, Sphinx {
 
     function run() public {
         // Get the operator address.
-        OPERATOR = safeAddress();
+        operator = safeAddress();
         // Get the loans owner address.
-        LOANS_OWNER = safeAddress();
+        loansOwner = safeAddress();
 
         // Get the deployment addresses for the nana CORE for this chain.
         // We want to do this outside of the `sphinx` modifier.
@@ -153,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",
@@ -169,8 +145,8 @@ contract DeployScript is Script, Sphinx {
         );
 
         // We use the same trusted forwarder and permit2 as the core deployment.
-        TRUSTED_FORWARDER = core.controller.trustedForwarder();
-        PERMIT2 = core.terminal.PERMIT2();
+        trustedForwarder = core.controller.trustedForwarder();
+        permit2 = core.terminal.PERMIT2();
 
         // Perform the deployment transactions.
         deploy();
@@ -182,16 +158,7 @@ contract DeployScript is Script, Sphinx {
 
         // Accept the chain's native currency through the multi terminal.
         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)
-        });
+            JBAccountingContext({token: JBConstants.NATIVE_TOKEN, decimals: _DECIMALS, currency: _NATIVE_CURRENCY});
 
         // The project's revnet stage configurations.
         REVStageConfig[] memory stageConfigurations = new REVStageConfig[](3);
@@ -202,25 +169,25 @@ contract DeployScript is Script, Sphinx {
             preferAddToBalance: false,
             percent: JBConstants.SPLITS_TOTAL_PERCENT,
             projectId: 0,
-            beneficiary: payable(OPERATOR),
+            beneficiary: payable(operator),
             lockedUntil: 0,
             hook: IJBSplitHook(address(0))
         });
 
         {
             REVAutoIssuance[] memory issuanceConfs = new REVAutoIssuance[](4);
-            issuanceConfs[0] = REVAutoIssuance({chainId: 1, count: REV_MAINNET_AUTO_ISSUANCE_, beneficiary: OPERATOR});
-            issuanceConfs[1] = REVAutoIssuance({chainId: 8453, count: REV_BASE_AUTO_ISSUANCE_, beneficiary: OPERATOR});
-            issuanceConfs[2] = REVAutoIssuance({chainId: 10, count: REV_OP_AUTO_ISSUANCE_, beneficiary: OPERATOR});
-            issuanceConfs[3] = REVAutoIssuance({chainId: 42_161, count: REV_ARB_AUTO_ISSUANCE_, beneficiary: OPERATOR});
+            issuanceConfs[0] = REVAutoIssuance({chainId: 1, count: _REV_MAINNET_AUTO_ISSUANCE, beneficiary: operator});
+            issuanceConfs[1] = REVAutoIssuance({chainId: 8453, count: _REV_BASE_AUTO_ISSUANCE, beneficiary: operator});
+            issuanceConfs[2] = REVAutoIssuance({chainId: 10, count: _REV_OP_AUTO_ISSUANCE, beneficiary: operator});
+            issuanceConfs[3] = REVAutoIssuance({chainId: 42_161, count: _REV_ARB_AUTO_ISSUANCE, beneficiary: operator});
 
             stageConfigurations[0] = REVStageConfig({
-                startsAtOrAfter: REV_START_TIME,
+                startsAtOrAfter: _REV_START_TIME,
                 autoIssuances: issuanceConfs,
                 splitPercent: 3800, // 38%
                 splits: splits,
                 // forge-lint: disable-next-line(unsafe-typecast)
-                initialIssuance: uint112(10_000 * DECIMAL_MULTIPLIER),
+                initialIssuance: uint112(10_000 * _DECIMAL_MULTIPLIER),
                 issuanceCutFrequency: 90 days,
                 issuanceCutPercent: 380_000_000, // 38%
                 cashOutTaxRate: 1000, // 0.1
@@ -232,10 +199,10 @@ contract DeployScript is Script, Sphinx {
             REVAutoIssuance[] memory issuanceConfs = new REVAutoIssuance[](1);
             issuanceConfs[0] = REVAutoIssuance({
                 // forge-lint: disable-next-line(unsafe-typecast)
-                chainId: PREMINT_CHAIN_ID,
+                chainId: _PREMINT_CHAIN_ID,
                 // forge-lint: disable-next-line(unsafe-typecast)
-                count: uint104(1_550_000 * DECIMAL_MULTIPLIER),
-                beneficiary: OPERATOR
+                count: uint104(1_550_000 * _DECIMAL_MULTIPLIER),
+                beneficiary: operator
             });
 
             stageConfigurations[1] = REVStageConfig({
@@ -265,9 +232,9 @@ contract DeployScript is Script, Sphinx {
 
         // The project's revnet configuration
         REVConfig memory revnetConfiguration = REVConfig({
-            description: REVDescription({name: NAME, ticker: SYMBOL, uri: PROJECT_URI, salt: ERC20_SALT}),
-            baseCurrency: ETH_CURRENCY,
-            operator: OPERATOR,
+            description: REVDescription({name: _NAME, ticker: _SYMBOL, uri: _PROJECT_URI, salt: _ERC20_SALT}),
+            baseCurrency: _ETH_CURRENCY,
+            operator: operator,
             scopeCashOutsToLocalBalances: false,
             stageConfigurations: stageConfigurations
         });
@@ -314,12 +281,12 @@ contract DeployScript is Script, Sphinx {
             }
             // Specify all sucker deployments.
             suckerDeploymentConfiguration =
-                REVSuckerDeploymentConfig({deployerConfigurations: suckerDeployerConfigurations, salt: SUCKER_SALT});
+                REVSuckerDeploymentConfig({deployerConfigurations: suckerDeployerConfigurations, salt: _SUCKER_SALT});
         }
 
         return FeeProjectConfig({
             configuration: revnetConfiguration,
-            terminalConfigurations: terminalConfigurations,
+            accountingContextsToAccept: accountingContextsToAccept,
             suckerDeploymentConfiguration: suckerDeploymentConfiguration,
             tiered721HookConfiguration: REVDeploy721TiersHookConfig({
                 baseline721HookConfiguration: REVBaseline721HookConfig({
@@ -329,7 +296,7 @@ contract DeployScript is Script, Sphinx {
                     tokenUriResolver: IJB721TokenUriResolver(address(0)),
                     contractUri: "",
                     tiersConfig: JB721InitTiersConfig({
-                        tiers: new JB721TierConfig[](0), currency: ETH_CURRENCY, decimals: 18
+                        tiers: new JB721TierConfig[](0), currency: _ETH_CURRENCY, decimals: 18
                     }),
                     flags: REV721TiersHookFlags({
                         noNewTiersWithReserves: false,
@@ -351,8 +318,7 @@ contract DeployScript is Script, Sphinx {
     function deploy() public sphinx {
         // Check if singletons are already deployed before creating a new fee project.
         // This prevents creating orphan projects on script restarts.
-        // forge-lint: disable-next-line(mixed-case-variable)
-        uint256 FEE_PROJECT_ID;
+        uint256 feeProjectId;
 
         // Predict the REVLoans address for an arbitrary fee project ID to check if it exists.
         // We can't predict without a fee project ID, so we first check the REVDeployer which also stores it.
@@ -360,7 +326,7 @@ contract DeployScript is Script, Sphinx {
 
         // First, check if REVLoans is already deployed by trying with project ID = 0 (placeholder).
         // We need to iterate: if either singleton exists, extract the fee project ID from it.
-        // Since both encode FEE_PROJECT_ID, we check if any code exists at the predicted address
+        // Since both encode feeProjectId, we check if any code exists at the predicted address
         // for sequential project IDs starting from 1.
 
         // A simpler approach: predict the REVDeployer address for each possible fee project ID
@@ -385,10 +351,16 @@ contract DeployScript is Script, Sphinx {
         for (uint256 _candidateId = 1; _candidateId < _nextProjectId; _candidateId++) {
             // Predict REVLoans address for this candidate fee project ID.
             (address _candidateRevloansAddr, bool _candidateRevloansDeployed) = _isDeployed({
-                salt: REVLOANS_SALT,
+                salt: _REVLOANS_SALT,
                 creationCode: type(REVLoans).creationCode,
                 arguments: abi.encode(
-                    core.controller, suckers.registry, _candidateId, LOANS_OWNER, PERMIT2, TRUSTED_FORWARDER
+                    core.controller,
+                    core.terminal,
+                    suckers.registry,
+                    _candidateId,
+                    loansOwner,
+                    permit2,
+                    trustedForwarder
                 )
             });
 
@@ -396,14 +368,14 @@ contract DeployScript is Script, Sphinx {
                 // Verify the fee project ID matches by reading the immutable.
                 if (REVLoans(payable(_candidateRevloansAddr)).REV_ID() == _candidateId) {
                     // Record the fee project ID from the existing deployment.
-                    FEE_PROJECT_ID = _candidateId;
+                    feeProjectId = _candidateId;
                     // Record the existing REVLoans address.
                     _existingRevloansAddr = _candidateRevloansAddr;
                     _revloansExists = true;
 
                     // Also predict and verify the owner.
                     (_existingOwnerAddr, _revOwnerExists) = _isDeployed({
-                        salt: REVOWNER_SALT,
+                        salt: _REVOWNER_SALT,
                         creationCode: type(REVOwner).creationCode,
                         arguments: abi.encode(
                             IJBBuybackHookRegistry(address(buybackHook.registry)),
@@ -417,17 +389,19 @@ contract DeployScript is Script, Sphinx {
 
                     // Also predict and verify the deployer.
                     (_existingDeployerAddr, _revDeployerExists) = _isDeployed({
-                        salt: DEPLOYER_SALT,
+                        salt: _DEPLOYER_SALT,
                         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,
-                            TRUSTED_FORWARDER,
+                            trustedForwarder,
                             _existingOwnerAddr
                         )
                     });
@@ -445,93 +419,97 @@ contract DeployScript is Script, Sphinx {
             for (uint256 i = _nextProjectId - 1; i >= 1; i--) {
                 if (core.projects.ownerOf(i) == safeAddress()) {
                     if (address(core.controller.DIRECTORY().controllerOf(i)) == address(0)) {
-                        FEE_PROJECT_ID = i;
+                        feeProjectId = i;
                         _foundExisting = true;
                         break;
                     }
                 }
             }
             if (!_foundExisting) {
-                // forge-lint: disable-next-line(mixed-case-variable)
-                FEE_PROJECT_ID = core.projects.createFor(safeAddress());
+                feeProjectId = core.projects.createFor(safeAddress());
             }
         }
 
-        // 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}({
+            : new REVLoans{salt: _REVLOANS_SALT}({
                 controller: core.controller,
+                terminal: core.terminal,
                 suckerRegistry: suckers.registry,
-                revId: FEE_PROJECT_ID,
-                owner: LOANS_OWNER,
-                permit2: PERMIT2,
-                trustedForwarder: TRUSTED_FORWARDER
+                revId: feeProjectId,
+                owner: loansOwner,
+                permit2: permit2,
+                trustedForwarder: trustedForwarder
             });
 
         // Deploy REVOwner — the runtime data hook that handles pay and cash out callbacks.
         REVOwner revOwner = _revOwnerExists
             ? REVOwner(_existingOwnerAddr)
-            : new REVOwner{salt: REVOWNER_SALT}({
+            : new REVOwner{salt: _REVOWNER_SALT}({
                 buybackHook: IJBBuybackHookRegistry(address(buybackHook.registry)),
                 directory: core.controller.DIRECTORY(),
-                feeRevnetId: FEE_PROJECT_ID,
+                feeRevnetId: feeProjectId,
                 suckerRegistry: suckers.registry,
                 loans: revloans,
-                deployer: msg.sender
+                deployerAddress: msg.sender
             });
 
         // Deploy REVDeployer with the REVLoans, buyback hook, and REVOwner addresses.
         (address _deployerAddr, bool _deployerIsDeployed) = _revDeployerExists
             ? (_existingDeployerAddr, true)
             : _isDeployed({
-                salt: DEPLOYER_SALT,
+                salt: _DEPLOYER_SALT,
                 creationCode: type(REVDeployer).creationCode,
                 arguments: abi.encode(
                     core.controller,
+                    core.terminal,
+                    IJBTerminal(address(routerTerminal.registry)),
                     suckers.registry,
-                    FEE_PROJECT_ID,
-                    hook.hook_deployer,
+                    feeProjectId,
+                    hook.hookDeployer,
                     croptop.publisher,
                     IJBBuybackHookRegistry(address(buybackHook.registry)),
                     revloans,
-                    TRUSTED_FORWARDER,
+                    trustedForwarder,
                     address(revOwner)
                 )
             });
-        if (address(revOwner.DEPLOYER()) == address(0)) {
+        if (address(revOwner.deployer()) == address(0)) {
             revOwner.setDeployer(IREVDeployer(_deployerAddr));
         }
         REVDeployer _basicDeployer = _deployerIsDeployed
             ? REVDeployer(payable(_deployerAddr))
-            : new REVDeployer{salt: DEPLOYER_SALT}({
+            : new REVDeployer{salt: _DEPLOYER_SALT}({
                 controller: core.controller,
+                multiTerminal: core.terminal,
+                routerTerminalRegistry: IJBTerminal(address(routerTerminal.registry)),
                 suckerRegistry: suckers.registry,
-                feeRevnetId: FEE_PROJECT_ID,
-                hookDeployer: hook.hook_deployer,
+                feeRevnetId: feeProjectId,
+                hookDeployer: hook.hookDeployer,
                 publisher: croptop.publisher,
                 buybackHook: IJBBuybackHookRegistry(address(buybackHook.registry)),
                 loans: revloans,
-                trustedForwarder: TRUSTED_FORWARDER,
+                trustedForwarder: trustedForwarder,
                 owner: address(revOwner)
             });
 
         // Only configure the fee project if it doesn't already have a controller.
         // This handles both fresh deploys and restarts where singletons exist but the fee project
         // was not yet configured.
-        bool _feeProjectConfigured = address(core.controller.DIRECTORY().controllerOf(FEE_PROJECT_ID)) != address(0);
+        bool _feeProjectConfigured = address(core.controller.DIRECTORY().controllerOf(feeProjectId)) != address(0);
         if (!_feeProjectConfigured) {
             // Approve the basic deployer to configure the project.
-            core.projects.approve({to: address(_basicDeployer), tokenId: FEE_PROJECT_ID});
+            core.projects.approve({to: address(_basicDeployer), tokenId: feeProjectId});
 
             // Build the config.
             FeeProjectConfig memory feeProjectConfig = getFeeProjectConfig();
 
             // Configure the project.
             _basicDeployer.deployFor({
-                revnetId: FEE_PROJECT_ID,
+                revnetId: feeProjectId,
                 configuration: feeProjectConfig.configuration,
-                terminalConfigurations: feeProjectConfig.terminalConfigurations,
+                accountingContextsToAccept: feeProjectConfig.accountingContextsToAccept,
                 suckerDeploymentConfiguration: feeProjectConfig.suckerDeploymentConfiguration,
                 tiered721HookConfiguration: feeProjectConfig.tiered721HookConfiguration,
                 allowedPosts: feeProjectConfig.allowedPosts

package/script/helpers/RevnetCoreDeploymentLib.sol

@@ -10,8 +10,7 @@ import {IREVLoans} from "./../../src/interfaces/IREVLoans.sol";
 import {REVOwner} from "./../../src/REVOwner.sol";
 
 struct RevnetCoreDeployment {
-    // forge-lint: disable-next-line(mixed-case-variable)
-    IREVDeployer basic_deployer;
+    IREVDeployer basicDeployer;
     IREVLoans loans;
     REVOwner owner;
 }
@@ -23,17 +22,16 @@ library RevnetCoreDeploymentLib {
     Vm internal constant vm = Vm(VM_ADDRESS);
 
     function getDeployment(string memory path) internal returns (RevnetCoreDeployment memory deployment) {
-        // get chainId for which we need to get the deployment.
+        // Match the current chain ID to the Sphinx network name used in deployment artifacts.
         uint256 chainId = block.chainid;
 
-        // Deploy to get the constants.
-        // TODO: get constants without deploy.
+        // `SphinxConstants` exposes Sphinx's supported chain ID to network name mapping.
         SphinxConstants sphinxConstants = new SphinxConstants();
         NetworkInfo[] memory networks = sphinxConstants.getNetworkInfoArray();
 
         for (uint256 _i; _i < networks.length; _i++) {
             if (networks[_i].chainId == chainId) {
-                return getDeployment({path: path, network_name: networks[_i].name});
+                return getDeployment({path: path, networkName: networks[_i].name});
             }
         }
 
@@ -42,28 +40,27 @@ library RevnetCoreDeploymentLib {
 
     function getDeployment(
         string memory path,
-        // forge-lint: disable-next-line(mixed-case-variable)
-        string memory network_name
+        string memory networkName
     )
         internal
         view
         returns (RevnetCoreDeployment memory deployment)
     {
-        deployment.basic_deployer = IREVDeployer(
+        deployment.basicDeployer = IREVDeployer(
             _getDeploymentAddress({
-                path: path, project_name: "revnet-core-v6", network_name: network_name, contractName: "REVDeployer"
+                path: path, projectName: "revnet-core-v6", networkName: networkName, contractName: "REVDeployer"
             })
         );
 
         deployment.loans = IREVLoans(
             _getDeploymentAddress({
-                path: path, project_name: "revnet-core-v6", network_name: network_name, contractName: "REVLoans"
+                path: path, projectName: "revnet-core-v6", networkName: networkName, contractName: "REVLoans"
             })
         );
 
         deployment.owner = REVOwner(
             _getDeploymentAddress({
-                path: path, project_name: "revnet-core-v6", network_name: network_name, contractName: "REVOwner"
+                path: path, projectName: "revnet-core-v6", networkName: networkName, contractName: "REVOwner"
             })
         );
     }
@@ -75,10 +72,8 @@ library RevnetCoreDeploymentLib {
     /// @return The address of the contract.
     function _getDeploymentAddress(
         string memory path,
-        // forge-lint: disable-next-line(mixed-case-variable)
-        string memory project_name,
-        // forge-lint: disable-next-line(mixed-case-variable)
-        string memory network_name,
+        string memory projectName,
+        string memory networkName,
         string memory contractName
     )
         internal
@@ -87,7 +82,7 @@ library RevnetCoreDeploymentLib {
     {
         string memory deploymentJson =
         // forge-lint: disable-next-line(unsafe-cheatcode)
-        vm.readFile(string.concat(path, project_name, "/", network_name, "/", contractName, ".json"));
+        vm.readFile(string.concat(path, projectName, "/", networkName, "/", contractName, ".json"));
         return stdJson.readAddress({json: deploymentJson, key: ".address"});
     }
 }