@rev-net/core-v6 0.0.18 → 0.0.19

package/src/REVDeployer.sol

@@ -6,26 +6,17 @@ import {IJB721TiersHookDeployer} from "@bananapus/721-hook-v6/src/interfaces/IJB
 import {JB721TiersHookFlags} from "@bananapus/721-hook-v6/src/structs/JB721TiersHookFlags.sol";
 import {JBDeploy721TiersHookConfig} from "@bananapus/721-hook-v6/src/structs/JBDeploy721TiersHookConfig.sol";
 import {IJBBuybackHookRegistry} from "@bananapus/buyback-hook-v6/src/interfaces/IJBBuybackHookRegistry.sol";
-import {IJBCashOutHook} from "@bananapus/core-v6/src/interfaces/IJBCashOutHook.sol";
 import {IJBController} from "@bananapus/core-v6/src/interfaces/IJBController.sol";
 import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 import {IJBPermissioned} from "@bananapus/core-v6/src/interfaces/IJBPermissioned.sol";
 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 {IJBRulesetDataHook} from "@bananapus/core-v6/src/interfaces/IJBRulesetDataHook.sol";
-import {IJBTerminal} from "@bananapus/core-v6/src/interfaces/IJBTerminal.sol";
-import {JBCashOuts} from "@bananapus/core-v6/src/libraries/JBCashOuts.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";
-import {JBAfterCashOutRecordedContext} from "@bananapus/core-v6/src/structs/JBAfterCashOutRecordedContext.sol";
-import {JBBeforeCashOutRecordedContext} from "@bananapus/core-v6/src/structs/JBBeforeCashOutRecordedContext.sol";
-import {JBBeforePayRecordedContext} from "@bananapus/core-v6/src/structs/JBBeforePayRecordedContext.sol";
-import {JBCashOutHookSpecification} from "@bananapus/core-v6/src/structs/JBCashOutHookSpecification.sol";
 import {JBCurrencyAmount} from "@bananapus/core-v6/src/structs/JBCurrencyAmount.sol";
 import {JBFundAccessLimitGroup} from "@bananapus/core-v6/src/structs/JBFundAccessLimitGroup.sol";
-import {JBPayHookSpecification} from "@bananapus/core-v6/src/structs/JBPayHookSpecification.sol";
 import {JBPermissionsData} from "@bananapus/core-v6/src/structs/JBPermissionsData.sol";
 import {JBRuleset} from "@bananapus/core-v6/src/structs/JBRuleset.sol";
 import {JBRulesetConfig} from "@bananapus/core-v6/src/structs/JBRulesetConfig.sol";
@@ -37,13 +28,12 @@ import {IJBSuckerRegistry} from "@bananapus/suckers-v6/src/interfaces/IJBSuckerR
 import {CTPublisher} from "@croptop/core-v6/src/CTPublisher.sol";
 import {CTAllowedPost} from "@croptop/core-v6/src/structs/CTAllowedPost.sol";
 import {ERC2771Context} from "@openzeppelin/contracts/metatx/ERC2771Context.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 import {mulDiv, sqrt} from "@prb/math/src/Common.sol";
 
 import {IREVDeployer} from "./interfaces/IREVDeployer.sol";
+import {REVOwner} from "./REVOwner.sol";
 import {REVAutoIssuance} from "./structs/REVAutoIssuance.sol";
 import {REVConfig} from "./structs/REVConfig.sol";
 import {REVCroptopAllowedPost} from "./structs/REVCroptopAllowedPost.sol";
@@ -53,16 +43,12 @@ import {REVSuckerDeploymentConfig} from "./structs/REVSuckerDeploymentConfig.sol
 
 /// @notice `REVDeployer` deploys, manages, and operates Revnets.
 /// @dev Revnets are unowned Juicebox projects which operate autonomously after deployment.
-contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCashOutHook, IERC721Receiver {
-    // A library that adds default safety checks to ERC20 functionality.
-    using SafeERC20 for IERC20;
-
+contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
     //*********************************************************************//
     // --------------------------- custom errors ------------------------- //
     //*********************************************************************//
 
     error REVDeployer_AutoIssuanceBeneficiaryZeroAddress();
-    error REVDeployer_CashOutDelayNotFinished(uint256 cashOutDelay, uint256 blockTimestamp);
     error REVDeployer_CashOutsCantBeTurnedOffCompletely(uint256 cashOutTaxRate, uint256 maxCashOutTaxRate);
     error REVDeployer_MustHaveSplits();
     error REVDeployer_NothingToAutoIssue();
@@ -126,6 +112,10 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
     /// Participants can borrow up to the current cash out value of their tokens.
     address public immutable override LOANS;
 
+    /// @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;
+
     /// @notice Stores Juicebox project (and revnet) access permissions.
     IJBPermissions public immutable override PERMISSIONS;
 
@@ -152,22 +142,12 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
         public
         override amountToAutoIssue;
 
-    /// @notice The timestamp of when cashouts will become available to a specific revnet's participants.
-    /// @dev Only applies to existing revnets which are deploying onto a new network.
-    /// @custom:param revnetId The ID of the revnet to get the cash out delay for.
-    mapping(uint256 revnetId => uint256 cashOutDelay) public override cashOutDelayOf;
-
     /// @notice The hashed encoded configuration of each revnet.
     /// @dev This is used to ensure that the encoded configuration of a revnet is the same when deploying suckers for
     /// omnichain operations.
     /// @custom:param revnetId The ID of the revnet to get the hashed encoded configuration for.
     mapping(uint256 revnetId => bytes32 hashedEncodedConfiguration) public override hashedEncodedConfigurationOf;
 
-    /// @notice Each revnet's tiered ERC-721 hook.
-    /// @custom:param revnetId The ID of the revnet to get the tiered ERC-721 hook for.
-    // slither-disable-next-line uninitialized-state
-    mapping(uint256 revnetId => IJB721TiersHook tiered721Hook) public override tiered721HookOf;
-
     //*********************************************************************//
     // ------------------- internal stored properties -------------------- //
     //*********************************************************************//
@@ -190,6 +170,7 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
     /// @param buybackHook The buyback hook used as a data hook to route payments through buyback pools.
     /// @param loans The loan contract used by all revnets.
     /// @param trustedForwarder The trusted forwarder for the ERC2771Context.
+    /// @param owner The runtime data hook contract (REVOwner) that handles pay and cash out callbacks.
     constructor(
         IJBController controller,
         IJBSuckerRegistry suckerRegistry,
@@ -198,7 +179,8 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
         CTPublisher publisher,
         IJBBuybackHookRegistry buybackHook,
         address loans,
-        address trustedForwarder
+        address trustedForwarder,
+        address owner
     )
         ERC2771Context(trustedForwarder)
     {
@@ -213,6 +195,8 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
         BUYBACK_HOOK = buybackHook;
         // slither-disable-next-line missing-zero-check
         LOANS = loans;
+        // slither-disable-next-line missing-zero-check
+        OWNER = owner;
 
         // Give the sucker registry permission to map tokens for all revnets.
         _setPermission({
@@ -232,195 +216,6 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
     // ------------------------- external views -------------------------- //
     //*********************************************************************//
 
-    /// @notice Determine how a cash out from a revnet should be processed.
-    /// @dev This function is part of `IJBRulesetDataHook`, and gets called before the revnet processes a cash out.
-    /// @dev If a sucker is cashing out, no taxes or fees are imposed.
-    /// @dev REVDeployer is intentionally not registered as a feeless address. The protocol fee (2.5%) applies on top
-    /// of the rev fee — this is by design. The fee hook spec amount sent to `afterCashOutRecordedWith` will have the
-    /// protocol fee deducted by the terminal before reaching this contract, so the rev fee is computed on the
-    /// post-protocol-fee amount.
-    /// @param context Standard Juicebox cash out context. See `JBBeforeCashOutRecordedContext`.
-    /// @return cashOutTaxRate The cash out tax rate, which influences the amount of terminal tokens which get cashed
-    /// out.
-    /// @return cashOutCount The number of revnet tokens that are cashed out.
-    /// @return totalSupply The total revnet token supply.
-    /// @return hookSpecifications The amount of funds and the data to send to cash out hooks (this contract).
-    function beforeCashOutRecordedWith(JBBeforeCashOutRecordedContext calldata context)
-        external
-        view
-        override
-        returns (
-            uint256 cashOutTaxRate,
-            uint256 cashOutCount,
-            uint256 totalSupply,
-            JBCashOutHookSpecification[] memory hookSpecifications
-        )
-    {
-        // If the cash out is from a sucker, return the full cash out amount without taxes or fees.
-        // This relies on the sucker registry to only contain trusted sucker contracts deployed via
-        // the registry's own deploySuckersFor flow — external addresses cannot register as suckers.
-        if (_isSuckerOf({revnetId: context.projectId, addr: context.holder})) {
-            return (0, context.cashOutCount, context.totalSupply, hookSpecifications);
-        }
-
-        // Keep a reference to the cash out delay of the revnet.
-        uint256 cashOutDelay = cashOutDelayOf[context.projectId];
-
-        // Enforce the cash out delay.
-        if (cashOutDelay > block.timestamp) {
-            revert REVDeployer_CashOutDelayNotFinished(cashOutDelay, block.timestamp);
-        }
-
-        // Get the terminal that will receive the cash out fee.
-        IJBTerminal feeTerminal = DIRECTORY.primaryTerminalOf({projectId: FEE_REVNET_ID, token: context.surplus.token});
-
-        // If there's no cash out tax (100% cash out tax rate), if there's no fee terminal, or if the beneficiary is
-        // feeless (e.g. the router terminal routing value between projects), proxy directly to the buyback hook.
-        if (context.cashOutTaxRate == 0 || address(feeTerminal) == address(0) || context.beneficiaryIsFeeless) {
-            // slither-disable-next-line unused-return
-            return BUYBACK_HOOK.beforeCashOutRecordedWith(context);
-        }
-
-        // Split the cashed-out tokens into a fee portion and a non-fee portion.
-        // The fee is applied to TOKEN COUNT (2.5% of tokens), not to value. The fee revnet receives the bonding-curve
-        // reclaim of its 2.5% token share regardless of whether the remaining 97.5% routes through a buyback pool at
-        // a better price. This is by design.
-        // Micro cash outs (< 40 wei at 2.5% fee) round feeCashOutCount to zero, bypassing the fee.
-        // Economically insignificant: the gas cost of the transaction far exceeds the bypassed fee. No fix needed.
-        uint256 feeCashOutCount = mulDiv({x: context.cashOutCount, y: FEE, denominator: JBConstants.MAX_FEE});
-        uint256 nonFeeCashOutCount = context.cashOutCount - feeCashOutCount;
-
-        // Calculate how much surplus the non-fee tokens can reclaim via the bonding curve.
-        uint256 postFeeReclaimedAmount = JBCashOuts.cashOutFrom({
-            surplus: context.surplus.value,
-            cashOutCount: nonFeeCashOutCount,
-            totalSupply: context.totalSupply,
-            cashOutTaxRate: context.cashOutTaxRate
-        });
-
-        // Calculate how much the fee tokens reclaim from the remaining surplus after the non-fee reclaim.
-        uint256 feeAmount = JBCashOuts.cashOutFrom({
-            surplus: context.surplus.value - postFeeReclaimedAmount,
-            cashOutCount: feeCashOutCount,
-            totalSupply: context.totalSupply - nonFeeCashOutCount,
-            cashOutTaxRate: context.cashOutTaxRate
-        });
-
-        // Build a context for the buyback hook using only the non-fee token count.
-        JBBeforeCashOutRecordedContext memory buybackHookContext = context;
-        buybackHookContext.cashOutCount = nonFeeCashOutCount;
-
-        // Let the buyback hook adjust the cash out parameters and optionally return a hook specification.
-        JBCashOutHookSpecification[] memory buybackHookSpecifications;
-        (cashOutTaxRate, cashOutCount, totalSupply, buybackHookSpecifications) =
-            BUYBACK_HOOK.beforeCashOutRecordedWith(buybackHookContext);
-
-        // If the fee rounds down to zero, return the buyback hook's response directly — no fee to process.
-        if (feeAmount == 0) return (cashOutTaxRate, cashOutCount, totalSupply, buybackHookSpecifications);
-
-        // Build a hook spec that routes the fee amount to this contract's `afterCashOutRecordedWith` for processing.
-        JBCashOutHookSpecification memory feeSpec = JBCashOutHookSpecification({
-            hook: IJBCashOutHook(address(this)), noop: false, amount: feeAmount, metadata: abi.encode(feeTerminal)
-        });
-
-        // Compose the final hook specifications: buyback spec (if any) + fee spec.
-        // NOTE: Only buybackHookSpecifications[0] is used. If the buyback hook returns multiple
-        // specs, the additional ones are silently dropped. This is intentional — the buyback hook is
-        // expected to return at most one spec for the cash-out buyback swap.
-        if (buybackHookSpecifications.length > 0) {
-            // The buyback hook returned a spec — include it before the fee spec.
-            hookSpecifications = new JBCashOutHookSpecification[](2);
-            hookSpecifications[0] = buybackHookSpecifications[0];
-            hookSpecifications[1] = feeSpec;
-        } else {
-            // No buyback spec — only the fee spec.
-            hookSpecifications = new JBCashOutHookSpecification[](1);
-            hookSpecifications[0] = feeSpec;
-        }
-
-        return (cashOutTaxRate, cashOutCount, totalSupply, hookSpecifications);
-    }
-
-    /// @notice Before a revnet processes an incoming payment, determine the weight and pay hooks to use.
-    /// @dev This function is part of `IJBRulesetDataHook`, and gets called before the revnet processes a payment.
-    /// @param context Standard Juicebox payment context. See `JBBeforePayRecordedContext`.
-    /// @return weight The weight which revnet tokens are minted relative to. This can be used to customize how many
-    /// tokens get minted by a payment.
-    /// @return hookSpecifications Amounts (out of what's being paid in) to be sent to pay hooks instead of being paid
-    /// into the revnet. Useful for automatically routing funds from a treasury as payments come in.
-    function beforePayRecordedWith(JBBeforePayRecordedContext calldata context)
-        external
-        view
-        override
-        returns (uint256 weight, JBPayHookSpecification[] memory hookSpecifications)
-    {
-        // Get the 721 hook's spec and total split amount.
-        IJB721TiersHook tiered721Hook = tiered721HookOf[context.projectId];
-        JBPayHookSpecification memory tiered721HookSpec;
-        uint256 totalSplitAmount;
-        bool usesTiered721Hook = address(tiered721Hook) != address(0);
-        if (usesTiered721Hook) {
-            JBPayHookSpecification[] memory specs;
-            // slither-disable-next-line unused-return
-            (, specs) = IJBRulesetDataHook(address(tiered721Hook)).beforePayRecordedWith(context);
-            // The 721 hook returns a single spec (itself) whose amount is the total split amount.
-            if (specs.length > 0) {
-                tiered721HookSpec = specs[0];
-                totalSplitAmount = tiered721HookSpec.amount;
-            }
-        }
-
-        // The amount entering the project after tier splits.
-        uint256 projectAmount = totalSplitAmount >= context.amount.value ? 0 : context.amount.value - totalSplitAmount;
-
-        // Get the buyback hook's weight and specs. Reduce the amount so it only considers funds entering the project.
-        JBPayHookSpecification[] memory buybackHookSpecs;
-        {
-            JBBeforePayRecordedContext memory buybackHookContext = context;
-            buybackHookContext.amount.value = projectAmount;
-            (weight, buybackHookSpecs) = BUYBACK_HOOK.beforePayRecordedWith(buybackHookContext);
-        }
-
-        // Scale the buyback hook's weight for splits so the terminal mints tokens only for the project's share.
-        // The terminal uses the full context.amount.value for minting (tokenCount = amount * weight / weightRatio),
-        // but only projectAmount actually enters the project. Without scaling, payers get token credit for the split
-        // portion too. Preserves weight=0 from the buyback hook (buying back, not minting).
-        if (projectAmount == 0) {
-            weight = 0;
-        } else if (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.
-        bool usesBuybackHook = buybackHookSpecs.length > 0;
-        hookSpecifications = new JBPayHookSpecification[]((usesTiered721Hook ? 1 : 0) + (usesBuybackHook ? 1 : 0));
-
-        if (usesTiered721Hook) hookSpecifications[0] = tiered721HookSpec;
-        if (usesBuybackHook) hookSpecifications[usesTiered721Hook ? 1 : 0] = buybackHookSpecs[0];
-    }
-
-    /// @notice A flag indicating whether an address has permission to mint a revnet's tokens on-demand.
-    /// @dev Required by the `IJBRulesetDataHook` interface.
-    /// @param revnetId The ID of the revnet to check permissions for.
-    /// @param ruleset The ruleset to check the mint permission for.
-    /// @param addr The address to check the mint permission of.
-    /// @return flag A flag indicating whether the address has permission to mint the revnet's tokens on-demand.
-    function hasMintPermissionFor(
-        uint256 revnetId,
-        JBRuleset calldata ruleset,
-        address addr
-    )
-        external
-        view
-        override
-        returns (bool)
-    {
-        // The loans contract, buyback hook (and its delegates), and suckers are allowed to mint the revnet's tokens.
-        return addr == LOANS || addr == address(BUYBACK_HOOK)
-            || BUYBACK_HOOK.hasMintPermissionFor({projectId: revnetId, ruleset: ruleset, addr: addr})
-            || _isSuckerOf({revnetId: revnetId, addr: addr});
-    }
-
     /// @dev Make sure this contract can only receive project NFTs from `JBProjects`.
     function onERC721Received(address, address, uint256, bytes calldata) external view returns (bytes4) {
         // Make sure the 721 received is from the `JBProjects` contract.
@@ -451,9 +246,8 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
     /// @notice Indicates if this contract adheres to the specified interface.
     /// @dev See `IERC165.supportsInterface`.
     /// @return A flag indicating if the provided interface ID is supported.
-    function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
-        return interfaceId == type(IREVDeployer).interfaceId || interfaceId == type(IJBRulesetDataHook).interfaceId
-            || interfaceId == type(IJBCashOutHook).interfaceId || interfaceId == type(IERC721Receiver).interfaceId;
+    function supportsInterface(bytes4 interfaceId) public view virtual returns (bool) {
+        return interfaceId == type(IREVDeployer).interfaceId || interfaceId == type(IERC721Receiver).interfaceId;
     }
 
     //*********************************************************************//
@@ -469,14 +263,6 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
         }
     }
 
-    /// @notice A flag indicating whether an address is a revnet's sucker.
-    /// @param revnetId The ID of the revnet to check sucker status for.
-    /// @param addr The address being checked.
-    /// @return isSucker A flag indicating whether the address is one of the revnet's suckers.
-    function _isSuckerOf(uint256 revnetId, address addr) internal view returns (bool) {
-        return SUCKER_REGISTRY.isSuckerOf({projectId: revnetId, addr: addr});
-    }
-
     /// @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.
@@ -542,7 +328,7 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
         metadata.useDataHookForPay = true; // Call this contract's `beforePayRecordedWith(…)` callback on payments.
         metadata.useDataHookForCashOut = true; // Call this contract's `beforeCashOutRecordedWith(…)` callback on cash
         // outs.
-        metadata.dataHook = address(this); // This contract is the data hook.
+        metadata.dataHook = OWNER; // The REVOwner contract is the data hook.
         metadata.metadata = stageConfiguration.extraMetadata;
 
         // Package the reserved token splits.
@@ -641,64 +427,6 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
     // --------------------- external transactions ----------------------- //
     //*********************************************************************//
 
-    /// @notice Processes the fee from a cash out.
-    /// @param context Cash out context passed in by the terminal.
-    function afterCashOutRecordedWith(JBAfterCashOutRecordedContext calldata context) external payable {
-        // No caller validation needed — this hook only pays fees to the fee project using funds forwarded by the
-        // caller. A non-terminal caller would just be donating their own funds as fees. There's nothing to exploit.
-
-        // If there's sufficient approval, transfer normally.
-        if (context.forwardedAmount.token != JBConstants.NATIVE_TOKEN) {
-            IERC20(context.forwardedAmount.token)
-                .safeTransferFrom({from: msg.sender, to: address(this), value: context.forwardedAmount.value});
-        }
-
-        // Parse the metadata forwarded from the data hook to get the fee terminal.
-        // See `beforeCashOutRecordedWith(…)`.
-        (IJBTerminal feeTerminal) = abi.decode(context.hookMetadata, (IJBTerminal));
-
-        // Determine how much to pay in `msg.value` (in the native currency).
-        uint256 payValue = _beforeTransferTo({
-            to: address(feeTerminal), token: context.forwardedAmount.token, amount: context.forwardedAmount.value
-        });
-
-        // Pay the fee.
-        // slither-disable-next-line arbitrary-send-eth,unused-return
-        try feeTerminal.pay{value: payValue}({
-            projectId: FEE_REVNET_ID,
-            token: context.forwardedAmount.token,
-            amount: context.forwardedAmount.value,
-            beneficiary: context.holder,
-            minReturnedTokens: 0,
-            memo: "",
-            metadata: bytes(abi.encodePacked(context.projectId))
-        }) {}
-        catch (bytes memory) {
-            // Decrease the allowance for the fee terminal if the token is not the native token.
-            if (context.forwardedAmount.token != JBConstants.NATIVE_TOKEN) {
-                IERC20(context.forwardedAmount.token)
-                    .safeDecreaseAllowance({
-                        spender: address(feeTerminal), requestedDecrease: context.forwardedAmount.value
-                    });
-            }
-
-            // If the fee can't be processed, return the funds to the project.
-            payValue = _beforeTransferTo({
-                to: msg.sender, token: context.forwardedAmount.token, amount: context.forwardedAmount.value
-            });
-
-            // slither-disable-next-line arbitrary-send-eth
-            IJBTerminal(msg.sender).addToBalanceOf{value: payValue}({
-                projectId: context.projectId,
-                token: context.forwardedAmount.token,
-                amount: context.forwardedAmount.value,
-                shouldReturnHeldFees: false,
-                memo: "",
-                metadata: bytes(abi.encodePacked(FEE_REVNET_ID))
-            });
-        }
-    }
-
     /// @notice Auto-mint a revnet's tokens from a stage for a beneficiary.
     /// @param revnetId The ID of the revnet to auto-mint tokens from.
     /// @param stageId The ID of the stage auto-mint tokens are available from.
@@ -837,8 +565,8 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
             });
         }
 
-        // Store the tiered ERC-721 hook.
-        tiered721HookOf[revnetId] = hook;
+        // Store the tiered ERC-721 hook in the owner contract.
+        REVOwner(OWNER).setTiered721HookOf(revnetId, hook);
 
         // Grant the split operator all 721 permissions (no prevent* flags for default config).
         _extraOperatorPermissions[revnetId].push(JBPermissionIds.ADJUST_721_TIERS);
@@ -913,19 +641,6 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
     // --------------------- internal transactions ----------------------- //
     //*********************************************************************//
 
-    /// @notice Logic to be triggered before transferring tokens from this contract.
-    /// @param to The address the transfer is going to.
-    /// @param token The token being transferred.
-    /// @param amount The number of tokens being transferred, as a fixed point number with the same number of decimals
-    /// as the token specifies.
-    /// @return payValue The value to attach to the transaction being sent.
-    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({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.
     function _deploy721RevnetFor(
         uint256 revnetId,
@@ -974,8 +689,8 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
             salt: keccak256(abi.encode(tiered721HookConfiguration.salt, encodedConfigurationHash, _msgSender()))
         });
 
-        // Store the tiered ERC-721 hook.
-        tiered721HookOf[revnetId] = hook;
+        // Store the tiered ERC-721 hook in the owner contract.
+        REVOwner(OWNER).setTiered721HookOf(revnetId, hook);
 
         // Give the split operator permission to add and remove tiers unless prevented.
         if (!tiered721HookConfiguration.preventSplitOperatorAdjustingTiers) {
@@ -1323,8 +1038,8 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
         // Calculate the timestamp at which the cash out delay ends.
         uint256 cashOutDelay = block.timestamp + CASH_OUT_DELAY;
 
-        // Store the cash out delay.
-        cashOutDelayOf[revnetId] = cashOutDelay;
+        // Store the cash out delay in the owner contract.
+        REVOwner(OWNER).setCashOutDelayOf(revnetId, cashOutDelay);
 
         emit SetCashOutDelay({revnetId: revnetId, cashOutDelay: cashOutDelay, caller: _msgSender()});
     }

package/src/REVLoans.sol

@@ -27,8 +27,8 @@ import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingCo
 import {JBRuleset} from "@bananapus/core-v6/src/structs/JBRuleset.sol";
 import {JBSingleAllowance} from "@bananapus/core-v6/src/structs/JBSingleAllowance.sol";
 
-import {IREVDeployer} from "./interfaces/IREVDeployer.sol";
 import {IREVLoans} from "./interfaces/IREVLoans.sol";
+import {IREVOwner} from "./interfaces/IREVOwner.sol";
 import {REVLoan} from "./structs/REVLoan.sol";
 import {REVLoanSource} from "./structs/REVLoanSource.sol";
 
@@ -227,21 +227,8 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
         view
         returns (uint256)
     {
-        // Get the current ruleset to resolve the deployer from its data hook.
-        // slither-disable-next-line unused-return
-        (JBRuleset memory currentRuleset,) = CONTROLLER.currentRulesetOf(revnetId);
-
-        // The ruleset's data hook is the REVDeployer that configured this revnet.
-        address deployer = currentRuleset.dataHook();
-
-        // Only check the delay if a deployer is set.
-        if (deployer != address(0)) {
-            // Get the timestamp after which cash outs (and loans) are allowed.
-            uint256 cashOutDelay = IREVDeployer(deployer).cashOutDelayOf(revnetId);
-
-            // If the delay hasn't passed yet, no amount is borrowable.
-            if (cashOutDelay > block.timestamp) return 0;
-        }
+        // If the cash out delay hasn't passed yet, no amount is borrowable.
+        if (_cashOutDelayOf(revnetId) > block.timestamp) return 0;
 
         return _borrowableAmountFrom({
             revnetId: revnetId,
@@ -303,6 +290,24 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
     // -------------------------- internal views ------------------------- //
     //*********************************************************************//
 
+    /// @notice Returns the cash out delay timestamp for a revnet by resolving the data hook from the current ruleset.
+    /// @param revnetId The ID of the revnet.
+    /// @return The cash out delay timestamp. Returns 0 if no data hook is set or no delay exists.
+    function _cashOutDelayOf(uint256 revnetId) internal view returns (uint256) {
+        // Get the revnet's current ruleset to find its data hook (the REVOwner contract).
+        // slither-disable-next-line unused-return
+        (JBRuleset memory currentRuleset,) = CONTROLLER.currentRulesetOf(revnetId);
+
+        // Extract the data hook address from the ruleset's packed metadata.
+        address dataHook = currentRuleset.dataHook();
+
+        // If there's no data hook, this isn't a revnet — no cash out delay applies.
+        if (dataHook == address(0)) return 0;
+
+        // Read the cash out delay from the REVOwner contract (the data hook).
+        return IREVOwner(dataHook).cashOutDelayOf(revnetId);
+    }
+
     /// @notice Checks this contract's balance of a specific token.
     /// @param token The address of the token to get this contract's balance of.
     /// @return This contract's balance.
@@ -598,19 +603,9 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
             );
         }
 
-        // Get the current ruleset to resolve the deployer from its data hook.
-        // slither-disable-next-line unused-return
-        (JBRuleset memory currentRuleset,) = CONTROLLER.currentRulesetOf(revnetId);
-
-        // The ruleset's data hook is the REVDeployer that configured this revnet.
-        address deployer = currentRuleset.dataHook();
-
-        // Only check the delay if a deployer is set.
-        if (deployer != address(0)) {
-            // Get the timestamp after which cash outs (and loans) are allowed.
-            uint256 cashOutDelay = IREVDeployer(deployer).cashOutDelayOf(revnetId);
-
-            // Revert if the delay hasn't passed yet.
+        // Enforce the cash out delay.
+        {
+            uint256 cashOutDelay = _cashOutDelayOf(revnetId);
             if (cashOutDelay > block.timestamp) {
                 revert REVLoans_CashOutDelayNotFinished(cashOutDelay, block.timestamp);
             }