@rev-net/core-v6 0.0.25 → 0.0.26

package/ADMINISTRATION.md

@@ -174,7 +174,7 @@ The following parameters are set at deployment and can never be changed:
 - `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 `setDeployer()` called from REVDeployer's constructor)
+- `DEPLOYER` -- the REVDeployer address (storage variable, set once by the REVOwner initializer account using the precomputed canonical deployer address)
 
 ### REVLoans (global, set at contract deployment)
 - `CONTROLLER`, `DIRECTORY`, `PRICES`, `PROJECTS` -- protocol infrastructure

package/RISKS.md

@@ -23,7 +23,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 `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.
+- **REVOwner deployer binding is precomputed.** REVOwner records the account that deployed it as an internal one-time binder, and only that account can bind `DEPLOYER`. Deployment tooling must precompute the canonical REVDeployer address and call `setDeployer(...)` before constructing REVDeployer. This removes the old frontrunnable ambient initializer, but it also means deployment scripts must not skip the prebind step.
 - **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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rev-net/core-v6",
-    "version": "0.0.25",
+  "version": "0.0.26",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -20,11 +20,11 @@
     },
     "dependencies": {
         "@bananapus/721-hook-v6": "^0.0.30",
-        "@bananapus/buyback-hook-v6": "^0.0.24",
-        "@bananapus/core-v6": "^0.0.30",
+        "@bananapus/buyback-hook-v6": "^0.0.25",
+        "@bananapus/core-v6": "^0.0.31",
         "@bananapus/ownable-v6": "^0.0.16",
         "@bananapus/permission-ids-v6": "^0.0.15",
-        "@bananapus/router-terminal-v6": "^0.0.24",
+        "@bananapus/router-terminal-v6": "^0.0.25",
         "@bananapus/suckers-v6": "^0.0.20",
         "@croptop/core-v6": "^0.0.28",
         "@openzeppelin/contracts": "^5.6.1",

package/references/operations.md

@@ -104,7 +104,7 @@ Use this file when you need revnet-specific risks, state reads, constants, or ex
 
 | Mapping | Visibility | Type | Purpose |
 |---------|-----------|------|---------|
-| `DEPLOYER` | `public` | `address` | REVDeployer address (storage variable, set once via `setDeployer()` called from REVDeployer's constructor) |
+| `DEPLOYER` | `public` | `address` | REVDeployer address (storage variable, set once by the REVOwner initializer using the precomputed canonical deployer address) |
 | `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()`. |
 
@@ -142,7 +142,7 @@ Use this file when you need revnet-specific risks, state reads, constants, or ex
 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 `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()`).
+21. **REVOwner deployer binding is precomputed.** REVOwner records the account that created it as an internal one-time binder. That account must call `setDeployer(precomputedRevDeployerAddress)` exactly once before the canonical REVDeployer is deployed. This avoids an ambient public initializer while keeping the circular dependency manageable. If `setDeployer(...)` is never called, all DEPLOYER-gated runtime configuration breaks.
 
 ### NATIVE_TOKEN Accounting on Non-ETH Chains
 

package/script/Deploy.s.sol

@@ -368,8 +368,9 @@ contract DeployScript is Script, Sphinx {
         uint256 _nextProjectId = core.projects.count() + 1;
 
         // Try to find an existing deployment by checking all project IDs that have already been created.
-        // Whether previously deployed singletons were found.
-        bool _singletonsExist;
+        bool _revloansExists;
+        bool _revOwnerExists;
+        bool _revDeployerExists;
         // The address of the previously deployed REVLoans, if found.
         address _existingRevloansAddr;
         // The address of the previously deployed REVOwner, if found.
@@ -394,12 +395,10 @@ contract DeployScript is Script, Sphinx {
                     FEE_PROJECT_ID = _candidateId;
                     // Record the existing REVLoans address.
                     _existingRevloansAddr = _candidateRevloansAddr;
-                    // Flag that singletons were found.
-                    _singletonsExist = true;
+                    _revloansExists = true;
 
                     // Also predict and verify the owner.
-                    bool _ownerDeployed;
-                    (_existingOwnerAddr, _ownerDeployed) = _isDeployed({
+                    (_existingOwnerAddr, _revOwnerExists) = _isDeployed({
                         salt: REVOWNER_SALT,
                         creationCode: type(REVOwner).creationCode,
                         arguments: abi.encode(
@@ -412,8 +411,7 @@ contract DeployScript is Script, Sphinx {
                     });
 
                     // Also predict and verify the deployer.
-                    bool _deployerDeployed;
-                    (_existingDeployerAddr, _deployerDeployed) = _isDeployed({
+                    (_existingDeployerAddr, _revDeployerExists) = _isDeployed({
                         salt: DEPLOYER_SALT,
                         creationCode: type(REVDeployer).creationCode,
                         arguments: abi.encode(
@@ -429,16 +427,14 @@ contract DeployScript is Script, Sphinx {
                         )
                     });
 
-                    // If either singleton is missing, we cannot reuse the set.
-                    if (!_ownerDeployed || !_deployerDeployed) _singletonsExist = false;
                     // Stop searching — we found the deployed singletons.
                     break;
                 }
             }
         }
 
-        // Only create a new fee project if no singletons were found.
-        if (!_singletonsExist) {
+        // Only create a new fee project if no singleton state was found.
+        if (!_revloansExists) {
             // Check if safeAddress() already owns a blank project (from a previous interrupted run).
             bool _foundExisting;
             for (uint256 i = _nextProjectId - 1; i >= 1; i--) {
@@ -457,7 +453,7 @@ contract DeployScript is Script, Sphinx {
         }
 
         // Deploy REVLoans first — it only depends on the controller.
-        REVLoans revloans = _singletonsExist
+        REVLoans revloans = _revloansExists
             ? REVLoans(payable(_existingRevloansAddr))
             : new REVLoans{salt: REVLOANS_SALT}({
                 controller: core.controller,
@@ -469,7 +465,7 @@ contract DeployScript is Script, Sphinx {
             });
 
         // Deploy REVOwner — the runtime data hook that handles pay and cash out callbacks.
-        REVOwner revOwner = _singletonsExist
+        REVOwner revOwner = _revOwnerExists
             ? REVOwner(_existingOwnerAddr)
             : new REVOwner{salt: REVOWNER_SALT}({
                 buybackHook: IJBBuybackHookRegistry(address(buybackHook.registry)),
@@ -480,21 +476,26 @@ contract DeployScript is Script, Sphinx {
             });
 
         // Deploy REVDeployer with the REVLoans, buyback hook, and REVOwner addresses.
-        (address _deployerAddr, bool _deployerIsDeployed) = _isDeployed({
-            salt: DEPLOYER_SALT,
-            creationCode: type(REVDeployer).creationCode,
-            arguments: abi.encode(
-                core.controller,
-                suckers.registry,
-                FEE_PROJECT_ID,
-                hook.hook_deployer,
-                croptop.publisher,
-                IJBBuybackHookRegistry(address(buybackHook.registry)),
-                address(revloans),
-                TRUSTED_FORWARDER,
-                address(revOwner)
-            )
-        });
+        (address _deployerAddr, bool _deployerIsDeployed) = _revDeployerExists
+            ? (_existingDeployerAddr, true)
+            : _isDeployed({
+                salt: DEPLOYER_SALT,
+                creationCode: type(REVDeployer).creationCode,
+                arguments: abi.encode(
+                    core.controller,
+                    suckers.registry,
+                    FEE_PROJECT_ID,
+                    hook.hook_deployer,
+                    croptop.publisher,
+                    IJBBuybackHookRegistry(address(buybackHook.registry)),
+                    address(revloans),
+                    TRUSTED_FORWARDER,
+                    address(revOwner)
+                )
+            });
+        if (address(revOwner.DEPLOYER()) == address(0)) {
+            revOwner.setDeployer(IREVDeployer(_deployerAddr));
+        }
         REVDeployer _basicDeployer = _deployerIsDeployed
             ? REVDeployer(payable(_deployerAddr))
             : new REVDeployer{salt: DEPLOYER_SALT}({

package/src/REVDeployer.sol

@@ -210,9 +210,6 @@ 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,9 +80,16 @@ contract REVOwner is IJBRulesetDataHook, IJBCashOutHook {
     mapping(uint256 revnetId => IJB721TiersHook tiered721Hook) public tiered721HookOf;
 
     /// @notice The deployer that manages revnet state.
-    /// @dev Set once via `setDeployer()` from the REVDeployer's constructor. Reverts if called again.
+    /// @dev Set once via `setDeployer()` using the precomputed canonical REVDeployer address.
     IREVDeployer public DEPLOYER;
 
+    //*********************************************************************//
+    // -------------------- private stored properties -------------------- //
+    //*********************************************************************//
+
+    /// @notice The account allowed to bind the canonical deployer exactly once.
+    address private immutable _DEPLOYER_BINDER;
+
     //*********************************************************************//
     // -------------------------- constructor ---------------------------- //
     //*********************************************************************//
@@ -105,6 +112,7 @@ contract REVOwner is IJBRulesetDataHook, IJBCashOutHook {
         SUCKER_REGISTRY = suckerRegistry;
         // slither-disable-next-line missing-zero-check
         LOANS = loans;
+        _DEPLOYER_BINDER = msg.sender;
     }
 
     //*********************************************************************//
@@ -335,8 +343,9 @@ contract REVOwner is IJBRulesetDataHook, IJBCashOutHook {
             minReturnedTokens: 0,
             memo: "",
             metadata: bytes(abi.encodePacked(context.projectId))
-        }) {}
-        catch (bytes memory) {
+        }) {
+            _afterTransferTo({to: address(feeTerminal), token: context.forwardedAmount.token});
+        } 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)
@@ -359,14 +368,22 @@ contract REVOwner is IJBRulesetDataHook, IJBCashOutHook {
                 memo: "",
                 metadata: bytes(abi.encodePacked(FEE_REVNET_ID))
             });
+            _afterTransferTo({to: msg.sender, token: context.forwardedAmount.token});
         }
     }
 
-    /// @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 {
+    /// @notice Bind the canonical deployer address exactly once.
+    /// @dev The deployer address is precomputed and supplied by the account that created this REVOwner instance.
+    /// Only that deploy-time binder may call this, which avoids an ambient public initializer where any first caller
+    /// could seize the deployer role before the deterministic REVDeployer is actually deployed.
+    /// @param deployer The canonical REVDeployer instance that will manage revnet runtime state.
+    function setDeployer(IREVDeployer deployer) external {
+        // Only the account that deployed this REVOwner may complete the one-time deployer binding.
+        if (msg.sender != _DEPLOYER_BINDER) revert REVOwner_Unauthorized();
+        // Prevent the deployer binding from being overwritten after initialization.
         if (address(DEPLOYER) != address(0)) revert REVOwner_AlreadyInitialized();
-        DEPLOYER = IREVDeployer(msg.sender);
+        // Store the canonical REVDeployer that is authorized to manage runtime hook state.
+        DEPLOYER = deployer;
     }
 
     /// @notice Store the cash out delay for a revnet.
@@ -426,4 +443,10 @@ contract REVOwner is IJBRulesetDataHook, IJBCashOutHook {
         IERC20(token).safeIncreaseAllowance({spender: to, value: amount});
         return 0;
     }
+
+    /// @notice Clears any token allowance granted by `_beforeTransferTo`.
+    function _afterTransferTo(address to, address token) internal {
+        if (token == JBConstants.NATIVE_TOKEN) return;
+        IERC20(token).forceApprove({spender: to, value: 0});
+    }
 }

package/src/interfaces/IREVOwner.sol

@@ -1,10 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
+import {IREVDeployer} from "./IREVDeployer.sol";
+
 /// @notice Interface for the REVOwner contract that handles runtime data hook and cash out hook behavior for revnets.
 interface IREVOwner {
     /// @notice The timestamp of when cashouts will become available to a specific revnet's participants.
     /// @param revnetId The ID of the revnet.
     /// @return The cash out delay timestamp.
     function cashOutDelayOf(uint256 revnetId) external view returns (uint256);
+
+    /// @notice Bind the canonical deployer exactly once.
+    /// @param deployer The revnet deployer instance.
+    function setDeployer(IREVDeployer deployer) external;
 }

package/test/REV.integrations.t.sol

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

package/test/REVAutoIssuanceFuzz.t.sol

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

package/test/REVDeployerRegressions.t.sol

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

package/test/REVInvincibility.t.sol

@@ -271,6 +271,8 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
+        REV_OWNER.setDeployer(REV_DEPLOYER);
+
         // Deploy fee project
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
@@ -1052,6 +1054,7 @@ contract REVInvincibility_Invariants is StdInvariant, TestBaseWorkflow {
             TRUSTED_FORWARDER,
             address(REV_OWNER)
         );
+        REV_OWNER.setDeployer(REV_DEPLOYER);
 
         // Deploy fee project
         {

package/test/REVLifecycle.t.sol

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

package/test/REVLoans.invariants.t.sol

@@ -569,6 +569,8 @@ contract InvariantREVLoansTests is StdInvariant, TestBaseWorkflow {
             address(REV_OWNER)
         );
 
+        REV_OWNER.setDeployer(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,6 +410,8 @@ contract REVLoansAttacks is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
+        REV_OWNER.setDeployer(REV_DEPLOYER);
+
         // Deploy fee project
         vm.prank(address(multisig()));
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);

package/test/REVLoansFeeRecovery.t.sol

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

package/test/REVLoansFindings.t.sol

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

package/test/REVLoansRegressions.t.sol

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

package/test/REVLoansSourceFeeRecovery.t.sol

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

package/test/REVLoansSourced.t.sol

@@ -355,6 +355,8 @@ contract REVLoansSourcedTests is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
+        REV_OWNER.setDeployer(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,6 +331,8 @@ contract REVLoansUnsourcedTests is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
+        REV_OWNER.setDeployer(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,6 +234,8 @@ contract TestBurnHeldTokens is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
+        REV_OWNER.setDeployer(REV_DEPLOYER);
+
         // Deploy fee project.
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);

package/test/TestCEIPattern.t.sol

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

package/test/TestCashOutCallerValidation.t.sol

@@ -247,6 +247,8 @@ contract TestCashOutCallerValidation is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
+        REV_OWNER.setDeployer(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,6 +177,8 @@ contract TestConversionDocumentation is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
+        REV_OWNER.setDeployer(REV_DEPLOYER);
+
         // Deploy fee project as revnet.
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);

package/test/TestCrossCurrencyReclaim.t.sol

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

package/test/TestCrossSourceReallocation.t.sol

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

package/test/TestERC2771MetaTx.t.sol

@@ -318,6 +318,8 @@ contract TestERC2771MetaTx is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
+        REV_OWNER.setDeployer(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,6 +116,8 @@ contract TestEmptyBuybackSpecs is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
+        REV_OWNER.setDeployer(REV_DEPLOYER);
+
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
     }

package/test/TestFlashLoanSurplus.t.sol

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

package/test/TestHookArrayOOB.t.sol

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

package/test/TestLiquidationBehavior.t.sol

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

package/test/TestLoanSourceRotation.t.sol

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

package/test/TestLoansCashOutDelay.t.sol

@@ -238,6 +238,8 @@ contract TestLoansCashOutDelay is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
+        REV_OWNER.setDeployer(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,6 +128,8 @@ contract TestLongTailEconomics is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
+        REV_OWNER.setDeployer(REV_DEPLOYER);
+
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
 

package/test/TestLowFindings.t.sol

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

package/test/TestMixedFixes.t.sol

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

package/test/TestPermit2Signatures.t.sol

@@ -285,6 +285,8 @@ contract TestPermit2Signatures is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
+        REV_OWNER.setDeployer(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,6 +179,8 @@ contract TestReallocationSandwich is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
+        REV_OWNER.setDeployer(REV_DEPLOYER);
+
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
 

package/test/TestRevnetRegressions.t.sol

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

package/test/TestSplitWeightAdjustment.t.sol

@@ -117,6 +117,8 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
+        REV_OWNER.setDeployer(REV_DEPLOYER);
+
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
     }
@@ -341,6 +343,8 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
             address(ammOwner)
         );
 
+        ammOwner.setDeployer(ammDeployer);
+
         vm.prank(multisig());
         jbProjects().approve(address(ammDeployer), FEE_PROJECT_ID);
 

package/test/TestSplitWeightE2E.t.sol

@@ -138,6 +138,8 @@ contract TestSplitWeightE2E is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
+        REV_OWNER.setDeployer(REV_DEPLOYER);
+
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
 
@@ -441,6 +443,8 @@ contract TestSplitWeightE2E is TestBaseWorkflow {
             address(ammOwner)
         );
 
+        ammOwner.setDeployer(ammDeployer);
+
         vm.prank(multisig());
         jbProjects().approve(address(ammDeployer), FEE_PROJECT_ID);
 

package/test/TestSplitWeightFork.t.sol

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

package/test/TestStageTransitionBorrowable.t.sol

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

package/test/TestSwapTerminalPermission.t.sol

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

package/test/TestUint112Overflow.t.sol

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

package/test/TestZeroAmountLoanGuard.t.sol

@@ -126,6 +126,8 @@ contract TestZeroAmountLoanGuard is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
+        REV_OWNER.setDeployer(REV_DEPLOYER);
+
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
         _deployFeeProject();

package/test/TestZeroRepayment.t.sol

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

package/test/audit/LoanIdOverflowGuard.t.sol

@@ -183,6 +183,8 @@ contract LoanIdOverflowGuard is TestBaseWorkflow {
             address(REV_OWNER)
         );
 
+        REV_OWNER.setDeployer(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

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

package/test/regression/TestBurnPermissionRequired.t.sol

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

package/test/regression/TestCashOutBuybackFeeLeak.t.sol

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

package/test/regression/TestCrossRevnetLiquidation.t.sol

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

package/test/regression/TestCumulativeLoanCounter.t.sol

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

package/test/regression/TestLiquidateGapHandling.t.sol

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

package/test/regression/TestZeroPriceFeed.t.sol

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