@rev-net/core-v6 0.0.11 → 0.0.12

package/src/REVDeployer.sol

@@ -276,7 +276,7 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
         }
 
         // Get a reference to the number of tokens being used to pay the fee (out of the total being cashed out).
-        uint256 feeCashOutCount = mulDiv(context.cashOutCount, FEE, JBConstants.MAX_FEE);
+        uint256 feeCashOutCount = mulDiv({x: context.cashOutCount, y: FEE, denominator: JBConstants.MAX_FEE});
         uint256 nonFeeCashOutCount = context.cashOutCount - feeCashOutCount;
 
         // Keep a reference to the amount claimable with non-fee tokens.
@@ -353,7 +353,7 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
         if (projectAmount == 0) {
             weight = 0;
         } else if (projectAmount < context.amount.value) {
-            weight = mulDiv(weight, projectAmount, context.amount.value);
+            weight = mulDiv({x: weight, y: projectAmount, denominator: context.amount.value});
         }
 
         // Merge hook specifications: 721 hook spec first, then buyback hook spec.
@@ -565,7 +565,7 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
         uint256[] memory customSplitOperatorPermissionIndexes = _extraOperatorPermissions[revnetId];
 
         // Make the array that merges the default and custom operator permissions.
-        allOperatorPermissions = new uint256[](8 + customSplitOperatorPermissionIndexes.length);
+        allOperatorPermissions = new uint256[](9 + customSplitOperatorPermissionIndexes.length);
         allOperatorPermissions[0] = JBPermissionIds.SET_SPLIT_GROUPS;
         allOperatorPermissions[1] = JBPermissionIds.SET_BUYBACK_POOL;
         allOperatorPermissions[2] = JBPermissionIds.SET_BUYBACK_TWAP;
@@ -574,10 +574,11 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
         allOperatorPermissions[5] = JBPermissionIds.SUCKER_SAFETY;
         allOperatorPermissions[6] = JBPermissionIds.SET_BUYBACK_HOOK;
         allOperatorPermissions[7] = JBPermissionIds.SET_ROUTER_TERMINAL;
+        allOperatorPermissions[8] = JBPermissionIds.SET_TOKEN_METADATA;
 
         // Copy the custom permissions into the array.
         for (uint256 i; i < customSplitOperatorPermissionIndexes.length; i++) {
-            allOperatorPermissions[8 + i] = customSplitOperatorPermissionIndexes[i];
+            allOperatorPermissions[9 + i] = customSplitOperatorPermissionIndexes[i];
         }
     }
 
@@ -691,16 +692,21 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
     /// @param terminalConfigurations The terminals to set up for the revnet. Used for payments and cash outs.
     /// @param suckerDeploymentConfiguration The suckers to set up for the revnet. Suckers facilitate cross-chain
     /// token transfers between peer revnets on different networks.
+    /// @param tiered721HookConfiguration How to set up the tiered ERC-721 hook for the revnet.
+    /// @param allowedPosts Restrictions on which croptop posts are allowed on the revnet's ERC-721 tiers.
     /// @return revnetId The ID of the newly created revnet.
+    /// @return hook The address of the tiered ERC-721 hook that was deployed for the revnet.
     function deployFor(
         uint256 revnetId,
         REVConfig calldata configuration,
         JBTerminalConfig[] calldata terminalConfigurations,
-        REVSuckerDeploymentConfig calldata suckerDeploymentConfiguration
+        REVSuckerDeploymentConfig calldata suckerDeploymentConfiguration,
+        REVDeploy721TiersHookConfig calldata tiered721HookConfiguration,
+        REVCroptopAllowedPost[] calldata allowedPosts
     )
         external
         override
-        returns (uint256)
+        returns (uint256, IJB721TiersHook hook)
     {
         // Keep a reference to the revnet ID which was passed in.
         bool shouldDeployNewRevnet = revnetId == 0;
@@ -709,23 +715,69 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
         // (which will be 1 greater than the current count).
         if (shouldDeployNewRevnet) revnetId = _nextProjectId();
 
-        // Normalize and encode the configurations.
-        (JBRulesetConfig[] memory rulesetConfigurations, bytes32 encodedConfigurationHash) = _makeRulesetConfigurations({
-            revnetId: revnetId, configuration: configuration, terminalConfigurations: terminalConfigurations
+        // Deploy the revnet with the specified tiered ERC-721 hook and croptop posting criteria.
+        hook = _deploy721RevnetFor({
+            revnetId: revnetId,
+            shouldDeployNewRevnet: shouldDeployNewRevnet,
+            configuration: configuration,
+            terminalConfigurations: terminalConfigurations,
+            suckerDeploymentConfiguration: suckerDeploymentConfiguration,
+            tiered721HookConfiguration: tiered721HookConfiguration,
+            allowedPosts: allowedPosts
         });
 
-        // Deploy the revnet.
-        _deployRevnetFor({
+        return (revnetId, hook);
+    }
+
+    /// @inheritdoc IREVDeployer
+    function deployFor(
+        uint256 revnetId,
+        REVConfig calldata configuration,
+        JBTerminalConfig[] calldata terminalConfigurations,
+        REVSuckerDeploymentConfig calldata suckerDeploymentConfiguration
+    )
+        external
+        override
+        returns (uint256, IJB721TiersHook hook)
+    {
+        bool shouldDeployNewRevnet = revnetId == 0;
+        if (shouldDeployNewRevnet) revnetId = _nextProjectId();
+
+        // Deploy the revnet (project, rulesets, ERC-20, suckers, etc.).
+        bytes32 encodedConfigurationHash = _deployRevnetFor({
             revnetId: revnetId,
             shouldDeployNewRevnet: shouldDeployNewRevnet,
             configuration: configuration,
             terminalConfigurations: terminalConfigurations,
-            suckerDeploymentConfiguration: suckerDeploymentConfiguration,
-            rulesetConfigurations: rulesetConfigurations,
-            encodedConfigurationHash: encodedConfigurationHash
+            suckerDeploymentConfiguration: suckerDeploymentConfiguration
         });
 
-        return revnetId;
+        // Deploy a default empty 721 hook for the revnet.
+        {
+            JBDeploy721TiersHookConfig memory deployConfig;
+            deployConfig.tiersConfig.currency = configuration.baseCurrency;
+            deployConfig.tiersConfig.decimals = 18;
+
+            hook = HOOK_DEPLOYER.deployHookFor({
+                projectId: revnetId,
+                deployTiersHookConfig: deployConfig,
+                salt: keccak256(abi.encode(bytes32(0), encodedConfigurationHash, _msgSender()))
+            });
+        }
+
+        // Store the tiered ERC-721 hook.
+        tiered721HookOf[revnetId] = hook;
+
+        // Grant the split operator all 721 permissions (no prevent* flags for default config).
+        _extraOperatorPermissions[revnetId].push(JBPermissionIds.ADJUST_721_TIERS);
+        _extraOperatorPermissions[revnetId].push(JBPermissionIds.SET_721_METADATA);
+        _extraOperatorPermissions[revnetId].push(JBPermissionIds.MINT_721);
+        _extraOperatorPermissions[revnetId].push(JBPermissionIds.SET_721_DISCOUNT_PERCENT);
+
+        // Give the split operator their permissions (base + 721 extras).
+        _setSplitOperatorOf({revnetId: revnetId, operator: configuration.splitOperator});
+
+        return (revnetId, hook);
     }
 
     /// @notice Burn any of a revnet's tokens held by this contract.
@@ -775,51 +827,6 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
         });
     }
 
-    /// @notice Launch a revnet which sells tiered ERC-721s and (optionally) allows croptop posts to its ERC-721 tiers.
-    /// @dev When initializing an existing project (revnetId != 0), the project must be blank (no controller or
-    /// rulesets). The initialization is irreversible. See `deployFor` documentation for full details.
-    /// @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. Used for payments and cash outs.
-    /// @param suckerDeploymentConfiguration The suckers to set up for the revnet. Suckers facilitate cross-chain
-    /// token transfers between peer revnets on different networks.
-    /// @param tiered721HookConfiguration How to set up the tiered ERC-721 hook for the revnet.
-    /// @param allowedPosts Restrictions on which croptop posts are allowed on the revnet's ERC-721 tiers.
-    /// @return revnetId The ID of the newly created revnet.
-    /// @return hook The address of the tiered ERC-721 hook that was deployed for the revnet.
-    function deployWith721sFor(
-        uint256 revnetId,
-        REVConfig calldata configuration,
-        JBTerminalConfig[] calldata terminalConfigurations,
-        REVSuckerDeploymentConfig calldata suckerDeploymentConfiguration,
-        REVDeploy721TiersHookConfig calldata tiered721HookConfiguration,
-        REVCroptopAllowedPost[] calldata allowedPosts
-    )
-        external
-        override
-        returns (uint256, IJB721TiersHook hook)
-    {
-        // Keep a reference to the revnet ID which was passed in.
-        bool shouldDeployNewRevnet = revnetId == 0;
-
-        // If the caller is deploying a new revnet, calculate its ID
-        // (which will be 1 greater than the current count).
-        if (shouldDeployNewRevnet) revnetId = _nextProjectId();
-
-        // Deploy the revnet with the specified tiered ERC-721 hook and croptop posting criteria.
-        hook = _deploy721RevnetFor({
-            revnetId: revnetId,
-            shouldDeployNewRevnet: shouldDeployNewRevnet,
-            configuration: configuration,
-            terminalConfigurations: terminalConfigurations,
-            suckerDeploymentConfiguration: suckerDeploymentConfiguration,
-            tiered721HookConfiguration: tiered721HookConfiguration,
-            allowedPosts: allowedPosts
-        });
-
-        return (revnetId, hook);
-    }
-
     /// @notice Change a revnet's split operator.
     /// @dev Only a revnet's current split operator can set a new split operator.
     /// @param revnetId The ID of the revnet to set the split operator of.
@@ -852,91 +859,86 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
     function _beforeTransferTo(address to, address token, uint256 amount) internal returns (uint256) {
         // If the token is the native token, no allowance needed.
         if (token == JBConstants.NATIVE_TOKEN) return amount;
-        IERC20(token).safeIncreaseAllowance(to, amount);
+        IERC20(token).safeIncreaseAllowance({spender: to, value: amount});
         return 0;
     }
 
     /// @notice Deploy a revnet which sells tiered ERC-721s and (optionally) allows croptop posts to its ERC-721 tiers.
-    /// @param revnetId The ID of the Juicebox project to turn into a revnet. Send 0 to deploy a new revnet.
-    /// @param shouldDeployNewRevnet Whether to deploy a new revnet or convert an existing Juicebox project into a
-    /// revnet.
-    /// @param configuration Core revnet configuration. See `REVConfig`.
-    /// @param terminalConfigurations The terminals to set up for the revnet. Used for payments and cash outs.
-    /// @param suckerDeploymentConfiguration The suckers to set up for the revnet. Suckers facilitate cross-chain
-    /// token transfers between peer revnets on different networks.
-    /// @param tiered721HookConfiguration How to set up the tiered ERC-721 hook for the revnet.
-    /// @param allowedPosts Restrictions on which croptop posts are allowed on the revnet's ERC-721 tiers.
-    /// @return hook The address of the tiered ERC-721 hook that was deployed for the revnet.
     function _deploy721RevnetFor(
         uint256 revnetId,
         bool shouldDeployNewRevnet,
         REVConfig calldata configuration,
         JBTerminalConfig[] calldata terminalConfigurations,
         REVSuckerDeploymentConfig calldata suckerDeploymentConfiguration,
-        REVDeploy721TiersHookConfig calldata tiered721HookConfiguration,
-        REVCroptopAllowedPost[] calldata allowedPosts
+        REVDeploy721TiersHookConfig memory tiered721HookConfiguration,
+        REVCroptopAllowedPost[] memory allowedPosts
     )
         internal
         returns (IJB721TiersHook hook)
     {
-        // Normalize and encode the configurations.
-        (JBRulesetConfig[] memory rulesetConfigurations, bytes32 encodedConfigurationHash) = _makeRulesetConfigurations({
-            revnetId: revnetId, configuration: configuration, terminalConfigurations: terminalConfigurations
+        // Deploy the revnet (project, rulesets, ERC-20, suckers, etc.).
+        bytes32 encodedConfigurationHash = _deployRevnetFor({
+            revnetId: revnetId,
+            shouldDeployNewRevnet: shouldDeployNewRevnet,
+            configuration: configuration,
+            terminalConfigurations: terminalConfigurations,
+            suckerDeploymentConfiguration: suckerDeploymentConfiguration
         });
 
         // Convert the REVBaseline721HookConfig to JBDeploy721TiersHookConfig, forcing issueTokensForSplits to false.
         // Revnets do their own weight adjustment for splits, so the 721 hook must not also adjust.
-        JBDeploy721TiersHookConfig memory hookConfig = JBDeploy721TiersHookConfig({
-            name: tiered721HookConfiguration.baseline721HookConfiguration.name,
-            symbol: tiered721HookConfiguration.baseline721HookConfiguration.symbol,
-            baseUri: tiered721HookConfiguration.baseline721HookConfiguration.baseUri,
-            tokenUriResolver: tiered721HookConfiguration.baseline721HookConfiguration.tokenUriResolver,
-            contractUri: tiered721HookConfiguration.baseline721HookConfiguration.contractUri,
-            tiersConfig: tiered721HookConfiguration.baseline721HookConfiguration.tiersConfig,
-            reserveBeneficiary: tiered721HookConfiguration.baseline721HookConfiguration.reserveBeneficiary,
-            flags: JB721TiersHookFlags({
-                noNewTiersWithReserves: tiered721HookConfiguration.baseline721HookConfiguration.flags
-                .noNewTiersWithReserves,
-                noNewTiersWithVotes: tiered721HookConfiguration.baseline721HookConfiguration.flags.noNewTiersWithVotes,
-                noNewTiersWithOwnerMinting: tiered721HookConfiguration.baseline721HookConfiguration.flags
-                .noNewTiersWithOwnerMinting,
-                preventOverspending: tiered721HookConfiguration.baseline721HookConfiguration.flags.preventOverspending,
-                issueTokensForSplits: false
-            })
-        });
-
-        // Deploy the tiered ERC-721 hook contract.
-        // slither-disable-next-line reentrancy-benign
         hook = HOOK_DEPLOYER.deployHookFor({
             projectId: revnetId,
-            deployTiersHookConfig: hookConfig,
+            deployTiersHookConfig: JBDeploy721TiersHookConfig({
+                name: tiered721HookConfiguration.baseline721HookConfiguration.name,
+                symbol: tiered721HookConfiguration.baseline721HookConfiguration.symbol,
+                baseUri: tiered721HookConfiguration.baseline721HookConfiguration.baseUri,
+                tokenUriResolver: tiered721HookConfiguration.baseline721HookConfiguration.tokenUriResolver,
+                contractUri: tiered721HookConfiguration.baseline721HookConfiguration.contractUri,
+                tiersConfig: tiered721HookConfiguration.baseline721HookConfiguration.tiersConfig,
+                reserveBeneficiary: tiered721HookConfiguration.baseline721HookConfiguration.reserveBeneficiary,
+                flags: JB721TiersHookFlags({
+                    noNewTiersWithReserves: tiered721HookConfiguration.baseline721HookConfiguration.flags
+                    .noNewTiersWithReserves,
+                    noNewTiersWithVotes: tiered721HookConfiguration.baseline721HookConfiguration.flags
+                        .noNewTiersWithVotes,
+                    noNewTiersWithOwnerMinting: tiered721HookConfiguration.baseline721HookConfiguration.flags
+                        .noNewTiersWithOwnerMinting,
+                    preventOverspending: tiered721HookConfiguration.baseline721HookConfiguration.flags
+                        .preventOverspending,
+                    issueTokensForSplits: false
+                })
+            }),
             salt: keccak256(abi.encode(tiered721HookConfiguration.salt, encodedConfigurationHash, _msgSender()))
         });
 
         // Store the tiered ERC-721 hook.
         tiered721HookOf[revnetId] = hook;
 
-        // If specified, give the split operator permission to add and remove tiers.
-        if (tiered721HookConfiguration.splitOperatorCanAdjustTiers) {
+        // Give the split operator permission to add and remove tiers unless prevented.
+        if (!tiered721HookConfiguration.preventSplitOperatorAdjustingTiers) {
             _extraOperatorPermissions[revnetId].push(JBPermissionIds.ADJUST_721_TIERS);
         }
 
-        // If specified, give the split operator permission to set ERC-721 tier metadata.
-        if (tiered721HookConfiguration.splitOperatorCanUpdateMetadata) {
+        // Give the split operator permission to set ERC-721 tier metadata unless prevented.
+        if (!tiered721HookConfiguration.preventSplitOperatorUpdatingMetadata) {
             _extraOperatorPermissions[revnetId].push(JBPermissionIds.SET_721_METADATA);
         }
 
-        // If specified, give the split operator permission to mint ERC-721s (without a payment)
-        // from tiers with `allowOwnerMint` set to true.
-        if (tiered721HookConfiguration.splitOperatorCanMint) {
+        // Give the split operator permission to mint ERC-721s (without a payment)
+        // from tiers with `allowOwnerMint` set to true, unless prevented.
+        if (!tiered721HookConfiguration.preventSplitOperatorMinting) {
             _extraOperatorPermissions[revnetId].push(JBPermissionIds.MINT_721);
         }
 
-        // If specified, give the split operator permission to increase the discount of a tier.
-        if (tiered721HookConfiguration.splitOperatorCanIncreaseDiscountPercent) {
+        // Give the split operator permission to increase the discount of a tier unless prevented.
+        if (!tiered721HookConfiguration.preventSplitOperatorIncreasingDiscountPercent) {
             _extraOperatorPermissions[revnetId].push(JBPermissionIds.SET_721_DISCOUNT_PERCENT);
         }
 
+        // Give the split operator their permissions (base + 721 extras).
+        _setSplitOperatorOf({revnetId: revnetId, operator: configuration.splitOperator});
+
         // If there are posts to allow, configure them.
         if (allowedPosts.length != 0) {
             // Keep a reference to the formatted allowed posts.
@@ -945,7 +947,7 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
             // Iterate through each post to add it to the formatted list.
             for (uint256 i; i < allowedPosts.length; i++) {
                 // Set the post being iterated on.
-                REVCroptopAllowedPost calldata post = allowedPosts[i];
+                REVCroptopAllowedPost memory post = allowedPosts[i];
 
                 // Set the formatted post.
                 formattedAllowedPosts[i] = CTAllowedPost({
@@ -967,16 +969,6 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
                 operator: address(PUBLISHER), revnetId: revnetId, permissionId: JBPermissionIds.ADJUST_721_TIERS
             });
         }
-
-        _deployRevnetFor({
-            revnetId: revnetId,
-            shouldDeployNewRevnet: shouldDeployNewRevnet,
-            configuration: configuration,
-            terminalConfigurations: terminalConfigurations,
-            suckerDeploymentConfiguration: suckerDeploymentConfiguration,
-            rulesetConfigurations: rulesetConfigurations,
-            encodedConfigurationHash: encodedConfigurationHash
-        });
     }
 
     /// @notice Deploy a revnet, or initialize an existing Juicebox project as a revnet.
@@ -993,21 +985,22 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
     /// @param terminalConfigurations The terminals to set up for the revnet. Used for payments and cash outs.
     /// @param suckerDeploymentConfiguration The suckers to set up for the revnet. Suckers facilitate cross-chain
     /// token transfers between peer revnets on different networks.
-    /// @param rulesetConfigurations The rulesets to set up for the revnet.
-    /// @param encodedConfigurationHash A hash that represents the revnet's configuration.
-    /// See `_makeRulesetConfigurations(…)` for encoding details. Clients can read the encoded configuration
-    /// from the `DeployRevnet` event emitted by this contract.
+    /// @return encodedConfigurationHash A hash that represents the revnet's configuration.
     function _deployRevnetFor(
         uint256 revnetId,
         bool shouldDeployNewRevnet,
         REVConfig calldata configuration,
         JBTerminalConfig[] calldata terminalConfigurations,
-        REVSuckerDeploymentConfig calldata suckerDeploymentConfiguration,
-        JBRulesetConfig[] memory rulesetConfigurations,
-        bytes32 encodedConfigurationHash
+        REVSuckerDeploymentConfig calldata suckerDeploymentConfiguration
     )
         internal
+        returns (bytes32 encodedConfigurationHash)
     {
+        // Normalize and encode the configurations.
+        JBRulesetConfig[] memory rulesetConfigurations;
+        (rulesetConfigurations, encodedConfigurationHash) = _makeRulesetConfigurations({
+            revnetId: revnetId, configuration: configuration, terminalConfigurations: terminalConfigurations
+        });
         if (shouldDeployNewRevnet) {
             // If we're deploying a new revnet, launch a Juicebox project for it.
             // Sanity check that we deployed the `revnetId` that we expected to deploy.
@@ -1064,13 +1057,12 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
             JBTerminalConfig calldata terminalConfiguration = terminalConfigurations[i];
             for (uint256 j; j < terminalConfiguration.accountingContextsToAccept.length; j++) {
                 // slither-disable-next-line calls-loop
-                _tryInitializeBuybackPoolFor(revnetId, terminalConfiguration.accountingContextsToAccept[j].token);
+                _tryInitializeBuybackPoolFor({
+                    revnetId: revnetId, terminalToken: terminalConfiguration.accountingContextsToAccept[j].token
+                });
             }
         }
 
-        // Give the split operator their permissions.
-        _setSplitOperatorOf({revnetId: revnetId, operator: configuration.splitOperator});
-
         // Deploy the suckers (if applicable).
         if (suckerDeploymentConfiguration.salt != bytes32(0)) {
             _deploySuckersFor({

package/src/REVLoans.sol

@@ -255,7 +255,7 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
     /// @param amount The amount being paid off.
     /// @return sourceFeeAmount The source fee amount for the loan.
     function determineSourceFeeAmount(REVLoan memory loan, uint256 amount) public view returns (uint256) {
-        return _determineSourceFeeAmount(loan, amount);
+        return _determineSourceFeeAmount({loan: loan, amount: amount});
     }
 
     /// @notice The revnet ID for the loan with the provided loan ID.
@@ -426,15 +426,15 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
 
         uint256 fullSourceFeeAmount = JBFees.feeAmountFrom({
             amountBeforeFee: loan.amount - prepaid,
-            feePercent: mulDiv(
-                timeSinceLoanCreated - loan.prepaidDuration,
-                JBConstants.MAX_FEE,
-                LOAN_LIQUIDATION_DURATION - loan.prepaidDuration
-            )
+            feePercent: mulDiv({
+                x: timeSinceLoanCreated - loan.prepaidDuration,
+                y: JBConstants.MAX_FEE,
+                denominator: LOAN_LIQUIDATION_DURATION - loan.prepaidDuration
+            })
         });
 
         // Calculate the source fee amount for the amount being paid off.
-        return mulDiv(fullSourceFeeAmount, amount, loan.amount);
+        return mulDiv({x: fullSourceFeeAmount, y: amount, denominator: loan.amount});
     }
 
     /// @notice Generate a ID for a loan given a revnet ID and a loan number within that revnet.
@@ -519,7 +519,7 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
                     decimals: decimals
                 });
 
-                borrowedAmount += mulDiv(normalizedTokens, 10 ** decimals, pricePerUnit);
+                borrowedAmount += mulDiv({x: normalizedTokens, y: 10 ** decimals, denominator: pricePerUnit});
             }
         }
     }
@@ -558,7 +558,7 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
         if (collateralCount == 0) revert REVLoans_ZeroCollateralLoanIsInvalid();
 
         // Make sure the source terminal is registered in the directory for this revnet.
-        if (!DIRECTORY.isTerminalOf(revnetId, IJBTerminal(address(source.terminal)))) {
+        if (!DIRECTORY.isTerminalOf({projectId: revnetId, terminal: IJBTerminal(address(source.terminal))})) {
             revert REVLoans_InvalidTerminal(address(source.terminal), revnetId);
         }
 
@@ -581,7 +581,8 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
         loan.source = source;
         loan.createdAt = uint40(block.timestamp);
         loan.prepaidFeePercent = uint16(prepaidFeePercent);
-        loan.prepaidDuration = uint32(mulDiv(prepaidFeePercent, LOAN_LIQUIDATION_DURATION, MAX_PREPAID_FEE_PERCENT));
+        loan.prepaidDuration =
+            uint32(mulDiv({x: prepaidFeePercent, y: LOAN_LIQUIDATION_DURATION, denominator: MAX_PREPAID_FEE_PERCENT}));
 
         // Get the amount of the loan.
         uint256 borrowAmount = _borrowAmountFrom({loan: loan, revnetId: revnetId, collateralCount: collateralCount});
@@ -794,7 +795,7 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
         if (repayBorrowAmount == 0 && collateralCountToReturn == 0) revert REVLoans_NothingToRepay();
 
         // Keep a reference to the fee that'll be taken.
-        uint256 sourceFeeAmount = _determineSourceFeeAmount(loan, repayBorrowAmount);
+        uint256 sourceFeeAmount = _determineSourceFeeAmount({loan: loan, amount: repayBorrowAmount});
 
         // Add the fee to the repay amount.
         repayBorrowAmount += sourceFeeAmount;
@@ -1093,7 +1094,7 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
     function _beforeTransferTo(address to, address token, uint256 amount) internal returns (uint256) {
         // If the token is the native token, no allowance needed.
         if (token == JBConstants.NATIVE_TOKEN) return amount;
-        IERC20(token).safeIncreaseAllowance(to, amount);
+        IERC20(token).safeIncreaseAllowance({spender: to, value: amount});
         return 0;
     }
 
@@ -1342,7 +1343,7 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
         }
 
         // If there's sufficient approval, transfer normally.
-        if (IERC20(token).allowance(address(from), address(this)) >= amount) {
+        if (IERC20(token).allowance({owner: address(from), spender: address(this)}) >= amount) {
             return IERC20(token).safeTransferFrom({from: from, to: to, value: amount});
         }
 

package/src/interfaces/IREVDeployer.sol

@@ -182,52 +182,55 @@ interface IREVDeployer {
     /// @param revnetId The ID of the revnet whose tokens should be burned.
     function burnHeldTokensOf(uint256 revnetId) external;
 
-    /// @notice Deploy a revnet, or initialize an existing Juicebox project as a revnet.
+    /// @notice Deploy a revnet with a tiered ERC-721 hook and optional croptop posting support.
+    /// @dev Every revnet gets a 721 hook — pass an empty config if no tiers are needed initially.
     /// @param revnetId The ID of the Juicebox project to initialize. Send 0 to deploy a new revnet.
     /// @param configuration Core revnet configuration.
     /// @param terminalConfigurations The terminals to set up for the revnet.
     /// @param suckerDeploymentConfiguration The suckers to set up for cross-chain token transfers.
+    /// @param tiered721HookConfiguration How to set up the tiered ERC-721 hook for the revnet.
+    /// @param allowedPosts Restrictions on which croptop posts are allowed on the revnet's ERC-721 tiers.
     /// @return The ID of the newly created or initialized revnet.
+    /// @return hook The tiered ERC-721 hook that was deployed for the revnet.
     function deployFor(
         uint256 revnetId,
         REVConfig memory configuration,
         JBTerminalConfig[] memory terminalConfigurations,
-        REVSuckerDeploymentConfig memory suckerDeploymentConfiguration
-    )
-        external
-        returns (uint256);
-
-    /// @notice Deploy new suckers for an existing revnet.
-    /// @param revnetId The ID of the revnet to deploy suckers for.
-    /// @param suckerDeploymentConfiguration The suckers to set up for the revnet.
-    /// @return suckers The addresses of the deployed suckers.
-    function deploySuckersFor(
-        uint256 revnetId,
-        REVSuckerDeploymentConfig calldata suckerDeploymentConfiguration
+        REVSuckerDeploymentConfig memory suckerDeploymentConfiguration,
+        REVDeploy721TiersHookConfig memory tiered721HookConfiguration,
+        REVCroptopAllowedPost[] memory allowedPosts
     )
         external
-        returns (address[] memory suckers);
+        returns (uint256, IJB721TiersHook hook);
 
-    /// @notice Deploy a revnet with tiered ERC-721s and optional croptop posting support.
+    /// @notice Deploy a revnet with a default empty tiered ERC-721 hook.
+    /// @dev Convenience overload — constructs an empty 721 config internally and delegates to the 6-arg version.
     /// @param revnetId The ID of the Juicebox project to initialize. Send 0 to deploy a new revnet.
     /// @param configuration Core revnet configuration.
     /// @param terminalConfigurations The terminals to set up for the revnet.
     /// @param suckerDeploymentConfiguration The suckers to set up for cross-chain token transfers.
-    /// @param tiered721HookConfiguration How to set up the tiered ERC-721 hook.
-    /// @param allowedPosts Restrictions on which croptop posts are allowed on the revnet's ERC-721 tiers.
     /// @return The ID of the newly created or initialized revnet.
     /// @return hook The tiered ERC-721 hook that was deployed for the revnet.
-    function deployWith721sFor(
+    function deployFor(
         uint256 revnetId,
-        REVConfig calldata configuration,
+        REVConfig memory configuration,
         JBTerminalConfig[] memory terminalConfigurations,
-        REVSuckerDeploymentConfig memory suckerDeploymentConfiguration,
-        REVDeploy721TiersHookConfig memory tiered721HookConfiguration,
-        REVCroptopAllowedPost[] memory allowedPosts
+        REVSuckerDeploymentConfig memory suckerDeploymentConfiguration
     )
         external
         returns (uint256, IJB721TiersHook hook);
 
+    /// @notice Deploy new suckers for an existing revnet.
+    /// @param revnetId The ID of the revnet to deploy suckers for.
+    /// @param suckerDeploymentConfiguration The suckers to set up for the revnet.
+    /// @return suckers The addresses of the deployed suckers.
+    function deploySuckersFor(
+        uint256 revnetId,
+        REVSuckerDeploymentConfig calldata suckerDeploymentConfiguration
+    )
+        external
+        returns (address[] memory suckers);
+
     /// @notice Change a revnet's split operator. Only the current split operator can call this.
     /// @param revnetId The ID of the revnet.
     /// @param newSplitOperator The new split operator's address.

package/src/structs/REVDeploy721TiersHookConfig.sol

@@ -5,21 +5,19 @@ import {REVBaseline721HookConfig} from "./REVBaseline721HookConfig.sol";
 
 /// @custom:member baseline721HookConfiguration The baseline config.
 /// @custom:member salt The salt to base the collection's address on.
-/// @custom:member splitOperatorCanAdjustTiers A flag indicating if the revnet's split operator can add tiers and remove
-/// tiers if
-/// the tier is allowed to be removed
-/// @custom:member splitOperatorCanUpdateMetadata A flag indicating if the revnet's split operator can update the 721's
-/// metadata.
-/// @custom:member splitOperatorCanMint A flag indicating if the revnet's split operator can mint 721's from tiers that
-/// allow it.
-/// @custom:member splitOperatorCanIncreaseDiscountPercent A flag indicating if the revnet's split operator can increase
-/// the
-/// discount of a tier.
+/// @custom:member preventSplitOperatorAdjustingTiers A flag indicating if the revnet's split operator should be
+/// prevented from adding tiers and removing tiers that are allowed to be removed.
+/// @custom:member preventSplitOperatorUpdatingMetadata A flag indicating if the revnet's split operator should be
+/// prevented from updating the 721's metadata.
+/// @custom:member preventSplitOperatorMinting A flag indicating if the revnet's split operator should be prevented from
+/// minting 721's from tiers that allow it.
+/// @custom:member preventSplitOperatorIncreasingDiscountPercent A flag indicating if the revnet's split operator should
+/// be prevented from increasing the discount of a tier.
 struct REVDeploy721TiersHookConfig {
     REVBaseline721HookConfig baseline721HookConfiguration;
     bytes32 salt;
-    bool splitOperatorCanAdjustTiers;
-    bool splitOperatorCanUpdateMetadata;
-    bool splitOperatorCanMint;
-    bool splitOperatorCanIncreaseDiscountPercent;
+    bool preventSplitOperatorAdjustingTiers;
+    bool preventSplitOperatorUpdatingMetadata;
+    bool preventSplitOperatorMinting;
+    bool preventSplitOperatorIncreasingDiscountPercent;
 }