@rev-net/core-v6 0.0.19 → 0.0.21

package/ADMINISTRATION.md

@@ -140,14 +140,14 @@ The following parameters are set at deployment and can never be changed:
 - `DEFAULT_BUYBACK_TWAP_WINDOW` -- 2 days
 - `OWNER()` -- view returning the REVOwner address
 
-### REVOwner (global, set at contract deployment + initialize)
+### REVOwner (global, set at contract deployment)
 - `BUYBACK_HOOK` -- the buyback hook (shared immutable with REVDeployer)
 - `DIRECTORY` -- the Juicebox directory (shared immutable with REVDeployer)
 - `FEE_REVNET_ID` -- the project ID that receives cash-out fees (shared immutable)
 - `SUCKER_REGISTRY` -- the sucker registry (shared immutable)
 - `LOANS` -- the loans contract address (shared immutable)
 - `FEE` -- the cash-out fee constant (2.5%)
-- `DEPLOYER` -- the REVDeployer address (storage variable, set once via `initialize()`)
+- `DEPLOYER` -- the REVDeployer address (storage variable, set once via `setDeployer()` called from REVDeployer's constructor)
 
 ### REVLoans (global, set at contract deployment)
 - `CONTROLLER`, `DIRECTORY`, `PRICES`, `PROJECTS` -- protocol infrastructure

package/ARCHITECTURE.md

@@ -143,7 +143,7 @@ Fields set automatically by the deployer (not configurable per stage):
 ## Key Design Decisions
 - Stages are immutable after deployment — no owner can change ruleset parameters
 - Matching hash ensures cross-chain deployments have identical economic parameters. It covers all economic fields (issuance, decay, tax rates, auto-issuances) but intentionally excludes split recipient addresses, which may differ by chain. The hash is used as a CREATE2 salt component for sucker deployment, so mismatched configs produce different sucker addresses that cannot peer with each other.
-- REVOwner is the data hook for all revnets — centralizes runtime behavioral control (pay hooks, cash-out hooks, mint permissions) and stores `cashOutDelayOf` and `tiered721HookOf` per revnet. REVDeployer handles deployment and configuration state storage. The split was necessary to stay under the EIP-170 contract size limit (24,576 bytes). Deploy order: REVOwner first, then REVDeployer(owner=REVOwner), then REVOwner.initialize(deployer). REVDeployer calls DEPLOYER-restricted setters on REVOwner (`setCashOutDelayOf`, `setTiered721HookOf`) during deployment.
+- REVOwner is the data hook for all revnets — centralizes runtime behavioral control (pay hooks, cash-out hooks, mint permissions) and stores `cashOutDelayOf` and `tiered721HookOf` per revnet. REVDeployer handles deployment and configuration state storage. The split was necessary to stay under the EIP-170 contract size limit (24,576 bytes). Deploy order: REVOwner first, then REVDeployer(owner=REVOwner) -- the constructor calls `REVOwner.setDeployer()` atomically. REVDeployer calls DEPLOYER-restricted setters on REVOwner (`setCashOutDelayOf`, `setTiered721HookOf`) during deployment.
 - Loans use bonding curve value, not market price — independent of external DEX pricing
 - Auto-issuance is deferred, not instant — token amounts are recorded at deploy time but minted via a separate `autoIssueFor` call after the stage starts. This separates deployment from issuance, allows anyone to trigger the mint permissionlessly, and ensures tokens are not minted before their stage is active.
 - No approval hook — revnet rulesets set `approvalHook` to `address(0)` because stages are configured immutably at deployment. There is no governance or owner who could queue a change that would need approval.

package/AUDIT_INSTRUCTIONS.md

@@ -11,7 +11,7 @@ Read [RISKS.md](./RISKS.md) for the trust model and known risks. Read [ARCHITECT
 | Contract | Lines | Role |
 |----------|-------|------|
 | `src/REVDeployer.sol` | ~19,746 bytes | Deploys revnets. Manages stages, splits, auto-issuance, buyback hook delegation, 721 hook deployment, suckers, split operator permissions, and all state storage. Split from original monolith to stay under EIP-170 (24,576 bytes). |
-| `src/REVOwner.sol` | ~8,353 bytes (~310 lines) | Runtime hook contract. Implements `IJBRulesetDataHook` + `IJBCashOutHook`. Set as the `dataHook` in each revnet's ruleset metadata. Handles `beforePayRecordedWith`, `beforeCashOutRecordedWith`, `afterCashOutRecordedWith`, `hasMintPermissionFor`, and sucker verification. Stores `cashOutDelayOf` and `tiered721HookOf` mappings (set by REVDeployer via DEPLOYER-restricted setters). **Key audit focus: the `initialize()` one-shot pattern, DEPLOYER-restricted setter access control, and circular dependency with REVDeployer.** |
+| `src/REVOwner.sol` | ~8,434 bytes (~310 lines) | Runtime hook contract. Implements `IJBRulesetDataHook` + `IJBCashOutHook`. Set as the `dataHook` in each revnet's ruleset metadata. Handles `beforePayRecordedWith`, `beforeCashOutRecordedWith`, `afterCashOutRecordedWith`, `hasMintPermissionFor`, and sucker verification. Stores `cashOutDelayOf` and `tiered721HookOf` mappings (set by REVDeployer via DEPLOYER-restricted setters). **Key audit focus: the `setDeployer()` one-shot pattern, DEPLOYER-restricted setter access control, and circular dependency with REVDeployer.** |
 | `src/REVLoans.sol` | ~1,359 lines | Token-collateralized lending. Burns collateral on borrow, re-mints on repay. ERC-721 loan NFTs. Three-layer fee model. Permit2 integration. |
 | `src/interfaces/` | ~525 | Interface definitions for both contracts |
 | `src/structs/` | ~212 | All struct definitions |
@@ -128,7 +128,7 @@ Borrower calls REVLoans.borrowFrom()
 
 | Variable | Purpose | Audit Focus |
 |----------|---------|-------------|
-| `DEPLOYER` | REVDeployer address | Set once via `initialize()`. **Not immutable** -- stored as a regular storage variable to break circular dependency. Verify `initialize()` can only be called once and with the correct address. Used to restrict access to `setCashOutDelayOf()` and `setTiered721HookOf()`. |
+| `DEPLOYER` | REVDeployer address | Set once via `setDeployer()` called from REVDeployer's constructor. **Not immutable** -- stored as a regular storage variable to break circular dependency. `setDeployer()` sets `msg.sender` as `DEPLOYER` and reverts if already set (`REVOwner_AlreadyInitialized`). Used to restrict access to `setCashOutDelayOf()` and `setTiered721HookOf()`. |
 | `cashOutDelayOf[revnetId]` | Timestamp when cash-outs unlock | Set by REVDeployer via `setCashOutDelayOf()` (DEPLOYER-restricted). Applied only for existing revnets deployed to new chains. **Read by REVLoans via IREVOwner.** Verify only DEPLOYER can call the setter. |
 | `tiered721HookOf[revnetId]` | 721 hook address | Set by REVDeployer via `setTiered721HookOf()` (DEPLOYER-restricted). Set once during deploy, never changed. **Read by REVOwner internally during pay hooks.** Verify only DEPLOYER can call the setter. |
 
@@ -274,12 +274,12 @@ Verify:
 
 ### 8. REVOwner initialization and circular dependency
 
-REVOwner and REVDeployer have a circular dependency broken by a one-shot `initialize()` call. Deploy order: REVOwner first, then REVDeployer(owner=REVOwner), then REVOwner.initialize(deployer). Verify:
+REVOwner and REVDeployer have a circular dependency broken by `setDeployer()`, called atomically from REVDeployer's constructor. Deploy order: REVOwner first, then REVDeployer(owner=REVOwner) -- the constructor calls `REVOwner.setDeployer()` atomically. Verify:
 
-- `initialize()` can only be called once (subsequent calls revert)
+- `setDeployer()` sets `msg.sender` as `DEPLOYER` and reverts if already set (`REVOwner_AlreadyInitialized`)
 - `DEPLOYER` is a storage variable, not immutable, to break the circular dependency
-- Before `initialize()` is called, the DEPLOYER-restricted setters (`setCashOutDelayOf`, `setTiered721HookOf`) would reject calls, leaving `cashOutDelayOf` and `tiered721HookOf` unpopulated
-- No path allows `initialize()` to be called with the wrong deployer address after the correct one is set
+- Before `setDeployer()` is called, the DEPLOYER-restricted setters (`setCashOutDelayOf`, `setTiered721HookOf`) would reject calls, leaving `cashOutDelayOf` and `tiered721HookOf` unpopulated
+- After `setDeployer()` has been called once, no subsequent call can change the `DEPLOYER` address
 - Only DEPLOYER can call `setCashOutDelayOf()` and `setTiered721HookOf()` -- verify access control on these setters
 - `cashOutDelayOf` and `tiered721HookOf` are stored on REVOwner (not REVDeployer) -- verify REVOwner reads from its own storage and the setters cannot be called by unauthorized addresses
 - Both contracts define `FEE = 25` independently -- verify they stay in sync
@@ -293,7 +293,7 @@ Fuzzable properties that should hold for all valid inputs:
 3. **Loan NFT ownership**: The ERC-721 owner of a loan NFT is the only address authorized to repay, reallocate, or manage that loan (absent ROOT or explicit permission grants).
 4. **No flash-loan profit**: Borrowing and repaying in the same block (zero time elapsed) should never yield a net profit to the borrower after all fees.
 5. **Stage monotonicity**: Stage transitions are monotonically increasing in time -- a later stage's `startsAtOrAfter` is always strictly greater than the previous stage's.
-6. **REVOwner initialization**: `DEPLOYER` is set exactly once via `initialize()` and matches the REVDeployer that references this REVOwner via `OWNER()`. Only the initialized `DEPLOYER` can call `setCashOutDelayOf()` and `setTiered721HookOf()`.
+6. **REVOwner initialization**: `DEPLOYER` is set exactly once via `setDeployer()` (called from REVDeployer's constructor) and matches the REVDeployer that references this REVOwner via `OWNER()`. Only the initialized `DEPLOYER` can call `setCashOutDelayOf()` and `setTiered721HookOf()`.
 
 ## How to Run Tests
 

package/CHANGE_LOG.md

@@ -11,7 +11,7 @@ REVDeployer exceeded the EIP-170 contract size limit (24,576 bytes) at 26,397 by
 | Contract | Size | Role |
 |----------|------|------|
 | `REVDeployer` | 19,746 bytes | Deployment, configuration, state storage, split operator management |
-| `REVOwner` | 8,353 bytes (~310 lines) | Runtime hook behavior: `IJBRulesetDataHook` + `IJBCashOutHook` |
+| `REVOwner` | 8,434 bytes (~310 lines) | Runtime hook behavior: `IJBRulesetDataHook` + `IJBCashOutHook` |
 
 ### What moved to REVOwner
 
@@ -51,10 +51,9 @@ The `cashOutDelayOf` and `tiered721HookOf` storage mappings were moved from REVD
 REVDeployer needs REVOwner (as the `dataHook` address and to set `cashOutDelayOf`/`tiered721HookOf` via restricted setters), and REVOwner references REVDeployer (to restrict setter access). This circular dependency is broken by:
 
 1. Deploy REVOwner first
-2. Deploy REVDeployer with `owner=REVOwner`
-3. Call `REVOwner.initialize(deployer)` to set the `DEPLOYER` storage variable
+2. Deploy REVDeployer with `owner=REVOwner` -- the constructor calls `REVOwner.setDeployer()` atomically
 
-`REVOwner.DEPLOYER` is a **storage variable** (not immutable) because the deployer address is not known at REVOwner construction time. The `initialize()` function can only be called once. After initialization, `DEPLOYER` is used to restrict access to `setCashOutDelayOf()` and `setTiered721HookOf()`.
+`REVOwner.DEPLOYER` is a **storage variable** (not immutable) because the deployer address is not known at REVOwner construction time. `setDeployer()` sets `msg.sender` as `DEPLOYER` and reverts if already set (`REVOwner_AlreadyInitialized`). After initialization, `DEPLOYER` is used to restrict access to `setCashOutDelayOf()` and `setTiered721HookOf()`.
 
 ### Shared immutables
 

package/README.md

@@ -96,7 +96,7 @@ Every revnet gets a tiered ERC-721 hook deployed automatically — even if no ti
 
 ### How They Relate
 
-`REVDeployer` owns every revnet's Juicebox project NFT and holds all administrative permissions. `REVOwner` is set as the `dataHook` for every revnet's rulesets, handling all runtime hook behavior (pay hooks, cash-out hooks, mint permissions) and storing `cashOutDelayOf` and `tiered721HookOf` per revnet (set by REVDeployer via DEPLOYER-restricted setters during deployment). Deploy order: REVOwner is deployed first, then REVDeployer (with `owner=REVOwner`), then `REVOwner.initialize(deployer)` is called to link them. Both contracts share immutables: `BUYBACK_HOOK`, `DIRECTORY`, `FEE_REVNET_ID`, `SUCKER_REGISTRY`, `LOANS`. During deployment, REVDeployer grants `REVLoans` the `USE_ALLOWANCE` permission so loans can pull funds from the revnet's terminal. `REVLoans` imports `IREVOwner` (not `IREVDeployer`) for `cashOutDelayOf` calls and verifies that a revnet was deployed by its expected `REVDeployer` before issuing any loan.
+`REVDeployer` owns every revnet's Juicebox project NFT and holds all administrative permissions. `REVOwner` is set as the `dataHook` for every revnet's rulesets, handling all runtime hook behavior (pay hooks, cash-out hooks, mint permissions) and storing `cashOutDelayOf` and `tiered721HookOf` per revnet (set by REVDeployer via DEPLOYER-restricted setters during deployment). Deploy order: REVOwner first, then REVDeployer(owner=REVOwner) -- the constructor calls `REVOwner.setDeployer()` atomically. Both contracts share immutables: `BUYBACK_HOOK`, `DIRECTORY`, `FEE_REVNET_ID`, `SUCKER_REGISTRY`, `LOANS`. During deployment, REVDeployer grants `REVLoans` the `USE_ALLOWANCE` permission so loans can pull funds from the revnet's terminal. `REVLoans` imports `IREVOwner` (not `IREVDeployer`) for `cashOutDelayOf` calls and verifies that a revnet was deployed by its expected `REVDeployer` before issuing any loan.
 
 ### Interfaces
 
@@ -209,7 +209,7 @@ Plus optional from 721 hook config: `ADJUST_721_TIERS`, `SET_721_METADATA`, `MIN
 ## Risks
 
 - **No human owner.** `REVDeployer` permanently holds the project NFT. There is no function to release it. This is by design -- revnets are ownerless. But it means bugs in stage configurations cannot be fixed after deployment.
-- **REVOwner circular dependency.** REVOwner and REVDeployer have a circular dependency broken by a one-shot `initialize()` call. `REVOwner.DEPLOYER` is a storage variable (not immutable) set via `initialize()`. If `initialize()` is never called or called with the wrong address, the DEPLOYER-restricted setters (`setCashOutDelayOf`, `setTiered721HookOf`) cannot be called correctly, and all runtime hook behavior breaks.
+- **REVOwner circular dependency.** REVOwner and REVDeployer have a circular dependency broken by `setDeployer()`, called atomically from REVDeployer's constructor. `REVOwner.DEPLOYER` is a storage variable (not immutable). `setDeployer()` sets `msg.sender` as `DEPLOYER` and reverts if already set. If `setDeployer()` is never called, the DEPLOYER-restricted setters (`setCashOutDelayOf`, `setTiered721HookOf`) cannot be called correctly, and all runtime hook behavior breaks.
 - **Loan flash-loan exposure.** `borrowableAmountFrom` reads live surplus, which can be inflated via flash loans. A borrower could temporarily inflate the treasury to borrow more than the sustained value would support.
 - **uint112 truncation.** `REVLoan.amount` and `REVLoan.collateral` are `uint112` -- values above ~5.19e33 truncate silently.
 - **Cash-out fee stacking.** Cash outs incur both the Juicebox terminal fee (2.5%) and the revnet cash-out fee (2.5% to fee revnet). These compound.

package/RISKS.md

@@ -11,7 +11,7 @@ Read [ARCHITECTURE.md](./ARCHITECTURE.md) and [SKILLS.md](./SKILLS.md) for proto
 ### What the system assumes to be correct
 
 - **REVOwner is a singleton data hook.** Every revnet shares one `beforePayRecordedWith` and `beforeCashOutRecordedWith` implementation in REVOwner. A bug in either function affects ALL revnets deployed by that deployer simultaneously. There is no per-project isolation and no circuit breaker.
-- **REVOwner circular dependency.** REVOwner and REVDeployer have a circular dependency broken by a one-shot `initialize()` call. `REVOwner.DEPLOYER` is a storage variable (not immutable) set via `initialize()`. If `initialize()` is never called, REVDeployer cannot call the DEPLOYER-restricted setters (`setCashOutDelayOf`, `setTiered721HookOf`) on REVOwner, and `cashOutDelayOf`/`tiered721HookOf` will never be populated, breaking all runtime hook behavior. If called with the wrong deployer address, an unauthorized address could set incorrect state. The `initialize()` function must be called exactly once with the correct address immediately after deploying both contracts.
+- **REVOwner circular dependency.** REVOwner and REVDeployer have a circular dependency broken by `setDeployer()`, called atomically from REVDeployer's constructor. `REVOwner.DEPLOYER` is a storage variable (not immutable). `setDeployer()` sets `msg.sender` as `DEPLOYER` and reverts if already set. If `setDeployer()` is never called, REVDeployer cannot call the DEPLOYER-restricted setters (`setCashOutDelayOf`, `setTiered721HookOf`) on REVOwner, and `cashOutDelayOf`/`tiered721HookOf` will never be populated, breaking all runtime hook behavior. Because the call is made atomically from REVDeployer's constructor, the correct deployer address is guaranteed to be set during deployment.
 - **Stage immutability is the trust model.** Once `deployFor()` completes, stage parameters (issuance, `cashOutTaxRate`, splits, auto-issuances) are locked forever. No owner, no governance, no upgrade path. A misconfigured deployment is permanent. This is intentional -- the absence of admin keys IS the security property.
 - **Bonding curve is the sole collateral oracle.** `REVLoans` uses `JBCashOuts.cashOutFrom` to value collateral. There is no external price oracle, no liquidation margin, and no health factor. The borrowable amount equals the cash-out value at the moment of borrowing.
 - **Juicebox core contracts are correct.** `JBController`, `JBMultiTerminal`, `JBTerminalStore`, `JBTokens`, `JBPrices` -- a bug in any of these is a bug in every revnet.

package/SKILLS.md

@@ -197,7 +197,7 @@ Deploy and manage Revnets -- autonomous, unowned Juicebox projects with staged i
 
 | Mapping | Visibility | Type | Purpose |
 |---------|-----------|------|---------|
-| `DEPLOYER` | `public` | `address` | REVDeployer address (storage variable, set once via `initialize()`) |
+| `DEPLOYER` | `public` | `address` | REVDeployer address (storage variable, set once via `setDeployer()` called from REVDeployer's constructor) |
 | `cashOutDelayOf` | `public` | `revnetId => uint256` | Timestamp when cash outs unlock (0 = no delay). Set by REVDeployer via `setCashOutDelayOf()`. |
 | `tiered721HookOf` | `public` | `revnetId => address` | Deployed 721 hook address (if any). Set by REVDeployer via `setTiered721HookOf()`. |
 
@@ -235,7 +235,7 @@ Deploy and manage Revnets -- autonomous, unowned Juicebox projects with staged i
 18. **Permit2 fallback.** `REVLoans` uses permit2 for ERC-20 transfers as a fallback when standard allowance is insufficient. Wrapped in try-catch.
 19. **39.16% cash-out tax crossover.** Below ~39% cash-out tax, cashing out is more capital-efficient than borrowing. Above ~39%, loans become more efficient because they preserve upside while providing liquidity. Based on CryptoEconLab academic research. Design implication: revnets intended for active token trading should consider this threshold when setting `cashOutTaxRate`.
 20. **REVDeployer always deploys a 721 hook** via `HOOK_DEPLOYER.deployHookFor` — even if `baseline721HookConfiguration` has empty tiers. This is correct by design: it lets the split operator add and sell NFTs later without migration. Non-revnet projects should follow the same pattern by using `JB721TiersHookProjectDeployer.launchProjectFor` (or `JBOmnichainDeployer.launchProjectFor`) instead of bare `launchProjectFor`.
-21. **REVOwner circular dependency.** REVOwner and REVDeployer have a circular dependency broken by a one-shot `initialize()` call. `REVOwner.DEPLOYER` is a storage variable (not immutable) set via `initialize()`. If `initialize()` is never called or called with the wrong address, all runtime hook behavior breaks. Deploy order: REVOwner first, then REVDeployer(owner=REVOwner), then REVOwner.initialize(deployer). REVOwner stores `cashOutDelayOf` and `tiered721HookOf` mappings, which are set by REVDeployer via DEPLOYER-restricted setters (`setCashOutDelayOf()`, `setTiered721HookOf()`).
+21. **REVOwner circular dependency.** REVOwner and REVDeployer have a circular dependency broken by `setDeployer()`, called atomically from REVDeployer's constructor. `REVOwner.DEPLOYER` is a storage variable (not immutable). `setDeployer()` sets `msg.sender` as `DEPLOYER` if not already set -- reverts if already set. If `setDeployer()` is never called, all runtime hook behavior breaks. Deploy order: REVOwner first, then REVDeployer(owner=REVOwner) -- the constructor calls `REVOwner.setDeployer()` atomically. REVOwner stores `cashOutDelayOf` and `tiered721HookOf` mappings, which are set by REVDeployer via DEPLOYER-restricted setters (`setCashOutDelayOf()`, `setTiered721HookOf()`).
 
 ### NATIVE_TOKEN Accounting on Non-ETH Chains
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rev-net/core-v6",
-    "version": "0.0.19",
+    "version": "0.0.21",
     "license": "MIT",
     "repository": {
         "type": "git",

package/script/Deploy.s.sol

@@ -491,11 +491,6 @@ contract DeployScript is Script, Sphinx {
                 owner: address(revOwner)
             });
 
-        // Link the REVOwner to the REVDeployer (can only be called once).
-        if (!_deployerIsDeployed) {
-            revOwner.initialize(IREVDeployer(address(_basicDeployer)));
-        }
-
         // Only configure the fee project if singletons were freshly deployed. Re-running `deployFor` on an
         // already-configured project would fail because the project is no longer blank.
         if (!_singletonsExist) {

package/script/helpers/RevnetCoreDeploymentLib.sol

@@ -7,11 +7,13 @@ import {SphinxConstants, NetworkInfo} from "@sphinx-labs/contracts/contracts/fou
 
 import {IREVDeployer} from "./../../src/interfaces/IREVDeployer.sol";
 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;
     IREVLoans loans;
+    REVOwner owner;
 }
 
 library RevnetCoreDeploymentLib {
@@ -58,6 +60,12 @@ library RevnetCoreDeploymentLib {
                 path: path, project_name: "revnet-core-v6", network_name: network_name, contractName: "REVLoans"
             })
         );
+
+        deployment.owner = REVOwner(
+            _getDeploymentAddress({
+                path: path, project_name: "revnet-core-v6", network_name: network_name, contractName: "REVOwner"
+            })
+        );
     }
 
     /// @notice Get the address of a contract that was deployed by the Deploy script.

package/src/REVDeployer.sol

@@ -210,6 +210,9 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
 
         // Give the buyback hook (registry) permission to configure pools on all revnets.
         _setPermission({operator: address(BUYBACK_HOOK), revnetId: 0, permissionId: JBPermissionIds.SET_BUYBACK_POOL});
+
+        // Link the REVOwner to this deployer so it can accept setter calls.
+        REVOwner(OWNER).setDeployer();
     }
 
     //*********************************************************************//

package/src/REVOwner.sol

@@ -80,7 +80,7 @@ contract REVOwner is IJBRulesetDataHook, IJBCashOutHook {
     mapping(uint256 revnetId => IJB721TiersHook tiered721Hook) public tiered721HookOf;
 
     /// @notice The deployer that manages revnet state.
-    /// @dev Set once via `initialize(…)` after deployment.
+    /// @dev Set once via `setDeployer()` from the REVDeployer's constructor. Reverts if called again.
     IREVDeployer public DEPLOYER;
 
     //*********************************************************************//
@@ -362,12 +362,11 @@ contract REVOwner is IJBRulesetDataHook, IJBCashOutHook {
         }
     }
 
-    /// @notice Link this contract to the REVDeployer that manages revnet state.
-    /// @dev Can only be called once.
-    /// @param deployer The REVDeployer to link to.
-    function initialize(IREVDeployer deployer) external {
+    /// @notice Set the caller as this contract's deployer.
+    /// @dev Called by the REVDeployer's constructor. Reverts if a deployer is already set.
+    function setDeployer() external {
         if (address(DEPLOYER) != address(0)) revert REVOwner_AlreadyInitialized();
-        DEPLOYER = deployer;
+        DEPLOYER = IREVDeployer(msg.sender);
     }
 
     /// @notice Store the cash out delay for a revnet.

package/test/REV.integrations.t.sol

@@ -241,8 +241,6 @@ contract REVnet_Integrations is TestBaseWorkflow {
             address(revOwner)
         );
 
-        revOwner.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         // Deploy the ARB sucker deployer.
         JBArbitrumSuckerDeployer _deployer =
             new JBArbitrumSuckerDeployer(jbDirectory(), jbPermissions(), jbTokens(), address(this), address(0));

package/test/REVAutoIssuanceFuzz.t.sol

@@ -104,8 +104,6 @@ contract REVAutoIssuanceFuzz_Local is TestBaseWorkflow {
             address(revOwner)
         );
 
-        revOwner.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
     }

package/test/REVDeployerRegressions.t.sol

@@ -119,8 +119,6 @@ contract REVDeployerRegressions is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
     }

package/test/REVInvincibility.t.sol

@@ -271,8 +271,6 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         // Deploy fee project
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
@@ -1055,8 +1053,6 @@ contract REVInvincibility_Invariants is StdInvariant, TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         // Deploy fee project
         {
             JBAccountingContext[] memory ctx = new JBAccountingContext[](1);

package/test/REVLifecycle.t.sol

@@ -127,8 +127,6 @@ contract REVLifecycle_Local is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
 

package/test/REVLoans.invariants.t.sol

@@ -569,8 +569,6 @@ contract InvariantREVLoansTests is StdInvariant, TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         // Approve the basic deployer to configure the project.
         vm.prank(address(multisig()));
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);

package/test/REVLoansAttacks.t.sol

@@ -410,8 +410,6 @@ contract REVLoansAttacks is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         // Deploy fee project
         vm.prank(address(multisig()));
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);

package/test/REVLoansFeeRecovery.t.sol

@@ -376,8 +376,6 @@ contract REVLoansFeeRecovery is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         // Deploy fee project.
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);

package/test/REVLoansFindings.t.sol

@@ -234,8 +234,6 @@ contract REVLoansFindings is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
 

package/test/REVLoansRegressions.t.sol

@@ -229,8 +229,6 @@ contract REVLoansRegressions is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
 

package/test/REVLoansSourceFeeRecovery.t.sol

@@ -256,8 +256,6 @@ contract REVLoansSourceFeeRecovery is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         // Deploy fee project.
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);

package/test/REVLoansSourced.t.sol

@@ -355,8 +355,6 @@ contract REVLoansSourcedTests is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         // Approve the basic deployer to configure the project.
         vm.prank(address(multisig()));
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);

package/test/REVLoansUnSourced.t.sol

@@ -331,8 +331,6 @@ contract REVLoansUnsourcedTests is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         // Approve the basic deployer to configure the project.
         vm.prank(address(multisig()));
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);

package/test/TestBurnHeldTokens.t.sol

@@ -234,8 +234,6 @@ contract TestBurnHeldTokens is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         // Deploy fee project.
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);

package/test/TestCEIPattern.t.sol

@@ -162,7 +162,6 @@ contract TestCEIPattern is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
         _deployFeeProject();

package/test/TestCashOutCallerValidation.t.sol

@@ -247,8 +247,6 @@ contract TestCashOutCallerValidation is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         // Approve the deployer to configure the fee project.
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);

package/test/TestConversionDocumentation.t.sol

@@ -177,8 +177,6 @@ contract TestConversionDocumentation is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         // Deploy fee project as revnet.
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);

package/test/TestCrossCurrencyReclaim.t.sol

@@ -128,8 +128,6 @@ contract TestCrossCurrencyReclaim is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
 

package/test/TestCrossSourceReallocation.t.sol

@@ -125,7 +125,6 @@ contract TestCrossSourceReallocation is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
         _deployFeeProject();

package/test/TestERC2771MetaTx.t.sol

@@ -318,8 +318,6 @@ contract TestERC2771MetaTx is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         // Approve the deployer to configure the project.
         vm.prank(address(multisig()));
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);

package/test/TestEmptyBuybackSpecs.t.sol

@@ -116,7 +116,6 @@ contract TestEmptyBuybackSpecs is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
     }

package/test/TestFlashLoanSurplus.t.sol

@@ -128,7 +128,6 @@ contract TestFlashLoanSurplus is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
         _deployFeeProject();

package/test/TestHookArrayOOB.t.sol

@@ -118,7 +118,6 @@ contract TestHookArrayOOB is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
     }

package/test/TestLiquidationBehavior.t.sol

@@ -126,7 +126,6 @@ contract TestLiquidationBehavior is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
         _deployFeeProject();

package/test/TestLoanSourceRotation.t.sol

@@ -135,8 +135,6 @@ contract TestLoanSourceRotation is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
 

package/test/TestLoansCashOutDelay.t.sol

@@ -238,8 +238,6 @@ contract TestLoansCashOutDelay is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         // Approve the deployer to configure the fee project.
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);

package/test/TestLongTailEconomics.t.sol

@@ -128,8 +128,6 @@ contract TestLongTailEconomics is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
 

package/test/TestLowFindings.t.sol

@@ -317,8 +317,6 @@ contract TestLowFindings is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         // Deploy fee project.
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);

package/test/TestMixedFixes.t.sol

@@ -124,7 +124,6 @@ contract TestMixedFixes is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
         _deployFeeProject();

package/test/TestPermit2Signatures.t.sol

@@ -285,8 +285,6 @@ contract TestPermit2Signatures is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         // Approve the basic deployer to configure the project.
         vm.prank(address(multisig()));
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);

package/test/TestReallocationSandwich.t.sol

@@ -179,7 +179,6 @@ contract TestReallocationSandwich is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
 

package/test/TestRevnetRegressions.t.sol

@@ -168,8 +168,6 @@ contract TestRevnetRegressions is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
     }

package/test/TestSplitWeightAdjustment.t.sol

@@ -117,7 +117,6 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
     }
@@ -341,7 +340,6 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
             TRUSTED_FORWARDER,
             address(ammOwner)
         );
-        ammOwner.initialize(IREVDeployer(address(ammDeployer)));
 
         vm.prank(multisig());
         jbProjects().approve(address(ammDeployer), FEE_PROJECT_ID);

package/test/TestSplitWeightE2E.t.sol

@@ -137,8 +137,6 @@ contract TestSplitWeightE2E is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
 
@@ -438,7 +436,6 @@ contract TestSplitWeightE2E is TestBaseWorkflow {
             TRUSTED_FORWARDER,
             address(ammOwner)
         );
-        ammOwner.initialize(IREVDeployer(address(ammDeployer)));
 
         vm.prank(multisig());
         jbProjects().approve(address(ammDeployer), FEE_PROJECT_ID);

package/test/TestSplitWeightFork.t.sol

@@ -349,8 +349,6 @@ contract TestSplitWeightFork is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
 

package/test/TestStageTransitionBorrowable.t.sol

@@ -172,7 +172,6 @@ contract TestStageTransitionBorrowable is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
 

package/test/TestSwapTerminalPermission.t.sol

@@ -113,7 +113,6 @@ contract TestSwapTerminalPermission is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
 

package/test/TestUint112Overflow.t.sol

@@ -133,8 +133,6 @@ contract TestUint112Overflow is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         // Deploy fee project
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);

package/test/TestZeroRepayment.t.sol

@@ -126,7 +126,6 @@ contract TestZeroRepayment is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
         _deployFeeProject();

package/test/audit/LoanIdOverflowGuard.t.sol

@@ -183,8 +183,6 @@ contract LoanIdOverflowGuard is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         // Approve the deployer to configure the fee project.
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);

package/test/fork/ForkTestBase.sol

@@ -354,8 +354,6 @@ abstract contract ForkTestBase is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
 

package/test/regression/TestBurnPermissionRequired.t.sol

@@ -128,7 +128,6 @@ contract TestBurnPermissionRequired is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
         _deployFeeProject();

package/test/regression/TestCashOutBuybackFeeLeak.t.sol

@@ -104,8 +104,6 @@ contract TestCashOutBuybackFeeLeak is TestBaseWorkflow {
             address(revOwner)
         );
 
-        revOwner.initialize(IREVDeployer(address(revDeployer)));
-
         vm.prank(multisig());
         jbProjects().approve(address(revDeployer), feeProjectId);
 

package/test/regression/TestCrossRevnetLiquidation.t.sol

@@ -126,7 +126,6 @@ contract TestCrossRevnetLiquidation is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
         _deployFeeProject();

package/test/regression/TestCumulativeLoanCounter.t.sol

@@ -130,7 +130,6 @@ contract TestCumulativeLoanCounter is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
         _deployFeeProject();

package/test/regression/TestLiquidateGapHandling.t.sol

@@ -132,7 +132,6 @@ contract TestLiquidateGapHandling is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
         _deployFeeProject();

package/test/regression/TestZeroPriceFeed.t.sol

@@ -141,8 +141,6 @@ contract TestZeroPriceFeed is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
-        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
-
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);