@rev-net/core-v6 0.0.18 → 0.0.19

package/test/TestLowFindings.t.sol

@@ -40,6 +40,8 @@ import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStor
 import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
 import {REVEmpty721Config} from "./helpers/REVEmpty721Config.sol";
+import {REVOwner} from "../src/REVOwner.sol";
+import {IREVDeployer} from "../src/interfaces/IREVDeployer.sol";
 
 struct FeeProjectConfig {
     REVConfig configuration;
@@ -56,6 +58,8 @@ contract TestLowFindings is TestBaseWorkflow {
     // forge-lint: disable-next-line(mixed-case-variable)
     REVDeployer REV_DEPLOYER;
     // forge-lint: disable-next-line(mixed-case-variable)
+    REVOwner REV_OWNER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     JB721TiersHook EXAMPLE_HOOK;
     // forge-lint: disable-next-line(mixed-case-variable)
     IJB721TiersHookDeployer HOOK_DEPLOYER;
@@ -293,6 +297,14 @@ contract TestLowFindings is TestBaseWorkflow {
             trustedForwarder: TRUSTED_FORWARDER
         });
 
+        REV_OWNER = new REVOwner(
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
+            jbDirectory(),
+            FEE_PROJECT_ID,
+            SUCKER_REGISTRY,
+            address(LOANS_CONTRACT)
+        );
+
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
             jbController(),
             SUCKER_REGISTRY,
@@ -301,9 +313,12 @@ contract TestLowFindings is TestBaseWorkflow {
             PUBLISHER,
             IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
             address(LOANS_CONTRACT),
-            TRUSTED_FORWARDER
+            TRUSTED_FORWARDER,
+            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

@@ -38,6 +38,8 @@ import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStor
 import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
 import {REVEmpty721Config} from "./helpers/REVEmpty721Config.sol";
+import {REVOwner} from "../src/REVOwner.sol";
+import {IREVDeployer} from "../src/interfaces/IREVDeployer.sol";
 
 /// @notice Tests for PR #32: liquidation boundary, reallocate msg.value, and decimal normalization fixes.
 contract TestMixedFixes is TestBaseWorkflow {
@@ -47,6 +49,8 @@ contract TestMixedFixes is TestBaseWorkflow {
     // forge-lint: disable-next-line(mixed-case-variable)
     REVDeployer REV_DEPLOYER;
     // forge-lint: disable-next-line(mixed-case-variable)
+    REVOwner REV_OWNER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     JB721TiersHook EXAMPLE_HOOK;
     // forge-lint: disable-next-line(mixed-case-variable)
     IJB721TiersHookDeployer HOOK_DEPLOYER;
@@ -100,6 +104,14 @@ contract TestMixedFixes is TestBaseWorkflow {
             permit2: permit2(),
             trustedForwarder: TRUSTED_FORWARDER
         });
+        REV_OWNER = new REVOwner(
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
+            jbDirectory(),
+            FEE_PROJECT_ID,
+            SUCKER_REGISTRY,
+            address(LOANS_CONTRACT)
+        );
+
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
             jbController(),
             SUCKER_REGISTRY,
@@ -108,8 +120,11 @@ contract TestMixedFixes is TestBaseWorkflow {
             PUBLISHER,
             IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
             address(LOANS_CONTRACT),
-            TRUSTED_FORWARDER
+            TRUSTED_FORWARDER,
+            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

@@ -45,6 +45,8 @@ import {IAllowanceTransfer} from "@uniswap/permit2/src/interfaces/IAllowanceTran
 import {IPermit2} from "@uniswap/permit2/src/interfaces/IPermit2.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {JBFees} from "@bananapus/core-v6/src/libraries/JBFees.sol";
+import {REVOwner} from "../src/REVOwner.sol";
+import {IREVDeployer} from "../src/interfaces/IREVDeployer.sol";
 
 struct Permit2ProjectConfig {
     REVConfig configuration;
@@ -64,6 +66,8 @@ contract TestPermit2Signatures is TestBaseWorkflow {
     // forge-lint: disable-next-line(mixed-case-variable)
     REVDeployer REV_DEPLOYER;
     // forge-lint: disable-next-line(mixed-case-variable)
+    REVOwner REV_OWNER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     JB721TiersHook EXAMPLE_HOOK;
     // forge-lint: disable-next-line(mixed-case-variable)
     IJB721TiersHookDeployer HOOK_DEPLOYER;
@@ -261,6 +265,14 @@ contract TestPermit2Signatures is TestBaseWorkflow {
             trustedForwarder: TRUSTED_FORWARDER
         });
 
+        REV_OWNER = new REVOwner(
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
+            jbDirectory(),
+            FEE_PROJECT_ID,
+            SUCKER_REGISTRY,
+            address(LOANS_CONTRACT)
+        );
+
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
             jbController(),
             SUCKER_REGISTRY,
@@ -269,9 +281,12 @@ contract TestPermit2Signatures is TestBaseWorkflow {
             PUBLISHER,
             IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
             address(LOANS_CONTRACT),
-            TRUSTED_FORWARDER
+            TRUSTED_FORWARDER,
+            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

@@ -37,6 +37,8 @@ import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStor
 import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
 import {REVEmpty721Config} from "./helpers/REVEmpty721Config.sol";
+import {REVOwner} from "../src/REVOwner.sol";
+import {IREVDeployer} from "../src/interfaces/IREVDeployer.sol";
 
 /// @notice Deterministic test for the reallocation sandwich at stage boundaries.
 /// Documents that a borrower can extract additional value by calling `reallocateCollateralFromLoan` immediately
@@ -50,6 +52,8 @@ contract TestReallocationSandwich is TestBaseWorkflow {
     // forge-lint: disable-next-line(mixed-case-variable)
     REVDeployer REV_DEPLOYER;
     // forge-lint: disable-next-line(mixed-case-variable)
+    REVOwner REV_OWNER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     JB721TiersHook EXAMPLE_HOOK;
     // forge-lint: disable-next-line(mixed-case-variable)
     IJB721TiersHookDeployer HOOK_DEPLOYER;
@@ -155,6 +159,14 @@ contract TestReallocationSandwich is TestBaseWorkflow {
             permit2: permit2(),
             trustedForwarder: TRUSTED_FORWARDER
         });
+        REV_OWNER = new REVOwner(
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
+            jbDirectory(),
+            FEE_PROJECT_ID,
+            SUCKER_REGISTRY,
+            address(LOANS_CONTRACT)
+        );
+
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
             jbController(),
             SUCKER_REGISTRY,
@@ -163,8 +175,11 @@ contract TestReallocationSandwich is TestBaseWorkflow {
             PUBLISHER,
             IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
             address(LOANS_CONTRACT),
-            TRUSTED_FORWARDER
+            TRUSTED_FORWARDER,
+            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

@@ -40,6 +40,8 @@ import {JB721TiersHook} from "@bananapus/721-hook-v6/src/JB721TiersHook.sol";
 import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStore.sol";
 import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
+import {REVOwner} from "../src/REVOwner.sol";
+import {IREVDeployer} from "../src/interfaces/IREVDeployer.sol";
 
 /// @notice A test harness that exposes REVLoans internal functions for direct testing.
 /// Used to test _totalBorrowedFrom without needing to set up a full borrow flow.
@@ -97,6 +99,8 @@ contract TestRevnetRegressions is TestBaseWorkflow {
     // forge-lint: disable-next-line(mixed-case-variable)
     REVDeployer REV_DEPLOYER;
     // forge-lint: disable-next-line(mixed-case-variable)
+    REVOwner REV_OWNER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     JB721TiersHook EXAMPLE_HOOK;
     // forge-lint: disable-next-line(mixed-case-variable)
     IJB721TiersHookDeployer HOOK_DEPLOYER;
@@ -144,6 +148,14 @@ contract TestRevnetRegressions is TestBaseWorkflow {
             trustedForwarder: TRUSTED_FORWARDER
         });
 
+        REV_OWNER = new REVOwner(
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
+            jbDirectory(),
+            FEE_PROJECT_ID,
+            SUCKER_REGISTRY,
+            address(LOANS_CONTRACT)
+        );
+
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
             jbController(),
             SUCKER_REGISTRY,
@@ -152,9 +164,12 @@ contract TestRevnetRegressions is TestBaseWorkflow {
             PUBLISHER,
             IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
             address(LOANS_CONTRACT),
-            TRUSTED_FORWARDER
+            TRUSTED_FORWARDER,
+            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

@@ -41,6 +41,8 @@ import {JBBeforePayRecordedContext} from "@bananapus/core-v6/src/structs/JBBefor
 import {JBPayHookSpecification} from "@bananapus/core-v6/src/structs/JBPayHookSpecification.sol";
 import {JBTokenAmount} from "@bananapus/core-v6/src/structs/JBTokenAmount.sol";
 import {REVEmpty721Config} from "./helpers/REVEmpty721Config.sol";
+import {REVOwner} from "../src/REVOwner.sol";
+import {IREVDeployer} from "../src/interfaces/IREVDeployer.sol";
 
 /// @notice Tests for the split weight adjustment in REVDeployer.beforePayRecordedWith.
 contract TestSplitWeightAdjustment is TestBaseWorkflow {
@@ -50,6 +52,8 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
     // forge-lint: disable-next-line(mixed-case-variable)
     REVDeployer REV_DEPLOYER;
     // forge-lint: disable-next-line(mixed-case-variable)
+    REVOwner REV_OWNER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     JB721TiersHook EXAMPLE_HOOK;
     // forge-lint: disable-next-line(mixed-case-variable)
     IJB721TiersHookDeployer HOOK_DEPLOYER;
@@ -93,6 +97,14 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
             permit2: permit2(),
             trustedForwarder: TRUSTED_FORWARDER
         });
+        REV_OWNER = new REVOwner(
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
+            jbDirectory(),
+            FEE_PROJECT_ID,
+            SUCKER_REGISTRY,
+            address(LOANS_CONTRACT)
+        );
+
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
             jbController(),
             SUCKER_REGISTRY,
@@ -101,8 +113,11 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
             PUBLISHER,
             IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
             address(LOANS_CONTRACT),
-            TRUSTED_FORWARDER
+            TRUSTED_FORWARDER,
+            address(REV_OWNER)
         );
+
+        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
     }
@@ -199,7 +214,7 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
         });
 
         // 721 hook is deployed but has no tiers, buyback returns context.weight.
-        (uint256 weight, JBPayHookSpecification[] memory specs) = REV_DEPLOYER.beforePayRecordedWith(context);
+        (uint256 weight, JBPayHookSpecification[] memory specs) = REV_OWNER.beforePayRecordedWith(context);
 
         assertEq(weight, context.weight, "weight should pass through unchanged");
         assertEq(specs.length, 1, "should have 721 hook spec even with no tiers");
@@ -217,11 +232,11 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
         // tiered721HookOf is internal, so we use vm.store.
         // Slot for tiered721HookOf[revnetId]: keccak256(abi.encode(revnetId, slot))
         // Need to find the storage slot for tiered721HookOf mapping.
-        bytes32 slot = keccak256(abi.encode(revnetId, uint256(3))); // slot 9 for tiered721HookOf in REVDeployer
-        vm.store(address(REV_DEPLOYER), slot, bytes32(uint256(uint160(mock721))));
+        bytes32 slot = keccak256(abi.encode(revnetId, uint256(1))); // slot 1 for tiered721HookOf in REVOwner
+        vm.store(address(REV_OWNER), slot, bytes32(uint256(uint160(mock721))));
 
         // Verify the store worked.
-        assertEq(address(REV_DEPLOYER.tiered721HookOf(revnetId)), mock721, "721 hook stored");
+        assertEq(address(REV_OWNER.tiered721HookOf(revnetId)), mock721, "721 hook stored");
 
         // Mock 721 hook returning 0.3 ETH split on 1 ETH payment.
         JBPayHookSpecification[] memory hookSpecs = new JBPayHookSpecification[](1);
@@ -250,7 +265,7 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
             metadata: ""
         });
 
-        (uint256 weight,) = REV_DEPLOYER.beforePayRecordedWith(context);
+        (uint256 weight,) = REV_OWNER.beforePayRecordedWith(context);
 
         // Buyback returns context.weight (1000e18) since mock buyback passes through.
         // Weight adjusted for 0.3 ETH split on 1 ETH: 1000e18 * 0.7 = 700e18.
@@ -263,8 +278,8 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
 
         address mock721 = makeAddr("mock721_full");
         vm.etch(mock721, bytes("0x01"));
-        bytes32 slot = keccak256(abi.encode(revnetId, uint256(3)));
-        vm.store(address(REV_DEPLOYER), slot, bytes32(uint256(uint160(mock721))));
+        bytes32 slot = keccak256(abi.encode(revnetId, uint256(1))); // slot 1 for tiered721HookOf in REVOwner
+        vm.store(address(REV_OWNER), slot, bytes32(uint256(uint160(mock721))));
 
         // Mock 721 hook returning full 1 ETH split.
         JBPayHookSpecification[] memory hookSpecs = new JBPayHookSpecification[](1);
@@ -293,7 +308,7 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
             metadata: ""
         });
 
-        (uint256 weight,) = REV_DEPLOYER.beforePayRecordedWith(context);
+        (uint256 weight,) = REV_OWNER.beforePayRecordedWith(context);
 
         assertEq(weight, 0, "full split = zero weight");
     }
@@ -308,6 +323,13 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
 
         // Deploy a new REVDeployer with the AMM buyback mock.
         MockBuybackDataHook ammBuyback = new MockBuybackDataHook();
+        REVOwner ammOwner = new REVOwner(
+            IJBBuybackHookRegistry(address(ammBuyback)),
+            jbDirectory(),
+            FEE_PROJECT_ID,
+            SUCKER_REGISTRY,
+            address(LOANS_CONTRACT)
+        );
         REVDeployer ammDeployer = new REVDeployer{salt: "REVDeployer_AMM"}(
             jbController(),
             SUCKER_REGISTRY,
@@ -316,8 +338,10 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
             PUBLISHER,
             IJBBuybackHookRegistry(address(ammBuyback)),
             address(LOANS_CONTRACT),
-            TRUSTED_FORWARDER
+            TRUSTED_FORWARDER,
+            address(ammOwner)
         );
+        ammOwner.initialize(IREVDeployer(address(ammDeployer)));
 
         vm.prank(multisig());
         jbProjects().approve(address(ammDeployer), FEE_PROJECT_ID);
@@ -348,8 +372,8 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
         // Mock a 721 hook for this project.
         address mock721 = makeAddr("mock721_amm");
         vm.etch(mock721, bytes("0x01"));
-        bytes32 slot = keccak256(abi.encode(revnetId, uint256(3)));
-        vm.store(address(ammDeployer), slot, bytes32(uint256(uint160(mock721))));
+        bytes32 slot = keccak256(abi.encode(revnetId, uint256(1))); // slot 1 for tiered721HookOf in REVOwner
+        vm.store(address(ammOwner), slot, bytes32(uint256(uint160(mock721))));
 
         // Mock 721 hook returning 0.4 ETH split on 1 ETH payment.
         JBPayHookSpecification[] memory hookSpecs = new JBPayHookSpecification[](1);
@@ -378,7 +402,7 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
             metadata: ""
         });
 
-        (uint256 weight, JBPayHookSpecification[] memory specs) = ammDeployer.beforePayRecordedWith(context);
+        (uint256 weight, JBPayHookSpecification[] memory specs) = ammOwner.beforePayRecordedWith(context);
 
         // AMM buyback returns context.weight (passes through the reduced weight from context).
         // The buyback mock receives a reduced context with 0.6 ETH and returns that weight.
@@ -398,8 +422,8 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
 
         address mock721 = makeAddr("mock721_mint");
         vm.etch(mock721, bytes("0x01"));
-        bytes32 slot = keccak256(abi.encode(revnetId, uint256(3)));
-        vm.store(address(REV_DEPLOYER), slot, bytes32(uint256(uint160(mock721))));
+        bytes32 slot = keccak256(abi.encode(revnetId, uint256(1))); // slot 1 for tiered721HookOf in REVOwner
+        vm.store(address(REV_OWNER), slot, bytes32(uint256(uint160(mock721))));
 
         // Mock 721 hook returning 0.2 ETH split.
         JBPayHookSpecification[] memory hookSpecs = new JBPayHookSpecification[](1);
@@ -428,7 +452,7 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
             metadata: ""
         });
 
-        (uint256 weight, JBPayHookSpecification[] memory specs) = REV_DEPLOYER.beforePayRecordedWith(context);
+        (uint256 weight, JBPayHookSpecification[] memory specs) = REV_OWNER.beforePayRecordedWith(context);
 
         // Buyback mint path: returns context.weight (1000e18 from reduced context = 0.8 ETH context).
         // Actually MockBuybackDataHookMintPath returns context.weight with empty specs.
@@ -447,8 +471,8 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
 
         address mock721 = makeAddr("mock721_specs");
         vm.etch(mock721, bytes("0x01"));
-        bytes32 slot = keccak256(abi.encode(revnetId, uint256(3)));
-        vm.store(address(REV_DEPLOYER), slot, bytes32(uint256(uint160(mock721))));
+        bytes32 slot = keccak256(abi.encode(revnetId, uint256(1))); // slot 1 for tiered721HookOf in REVOwner
+        vm.store(address(REV_OWNER), slot, bytes32(uint256(uint160(mock721))));
 
         // Mock 721 hook returning split amount with metadata.
         bytes memory splitMeta = abi.encode(uint256(42));
@@ -478,7 +502,7 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
             metadata: ""
         });
 
-        (, JBPayHookSpecification[] memory specs) = REV_DEPLOYER.beforePayRecordedWith(context);
+        (, JBPayHookSpecification[] memory specs) = REV_OWNER.beforePayRecordedWith(context);
 
         // Should have 721 hook spec (buyback empty).
         assertEq(specs.length, 1, "should have 1 spec (721 hook, buyback empty)");

package/test/TestSplitWeightE2E.t.sol

@@ -46,6 +46,8 @@ import {REVBaseline721HookConfig} from "../src/structs/REVBaseline721HookConfig.
 import {REV721TiersHookFlags} from "../src/structs/REV721TiersHookFlags.sol";
 import {REVCroptopAllowedPost} from "../src/structs/REVCroptopAllowedPost.sol";
 import {REVEmpty721Config} from "./helpers/REVEmpty721Config.sol";
+import {REVOwner} from "../src/REVOwner.sol";
+import {IREVDeployer} from "../src/interfaces/IREVDeployer.sol";
 
 /// @notice E2E tests verifying that the split weight adjustment in REVDeployer produces correct token counts
 /// when payments flow through the full terminal → store → dataHook → mint pipeline.
@@ -59,6 +61,8 @@ contract TestSplitWeightE2E is TestBaseWorkflow {
     // forge-lint: disable-next-line(mixed-case-variable)
     REVDeployer REV_DEPLOYER;
     // forge-lint: disable-next-line(mixed-case-variable)
+    REVOwner REV_OWNER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     JB721TiersHook EXAMPLE_HOOK;
     // forge-lint: disable-next-line(mixed-case-variable)
     IJB721TiersHookDeployer HOOK_DEPLOYER;
@@ -113,6 +117,14 @@ contract TestSplitWeightE2E is TestBaseWorkflow {
             trustedForwarder: TRUSTED_FORWARDER
         });
 
+        REV_OWNER = new REVOwner(
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK_MINT)),
+            jbDirectory(),
+            FEE_PROJECT_ID,
+            SUCKER_REGISTRY,
+            address(LOANS_CONTRACT)
+        );
+
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
             jbController(),
             SUCKER_REGISTRY,
@@ -121,9 +133,12 @@ contract TestSplitWeightE2E is TestBaseWorkflow {
             PUBLISHER,
             IJBBuybackHookRegistry(address(MOCK_BUYBACK_MINT)),
             address(LOANS_CONTRACT),
-            TRUSTED_FORWARDER
+            TRUSTED_FORWARDER,
+            address(REV_OWNER)
         );
 
+        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
+
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
 
@@ -405,6 +420,13 @@ contract TestSplitWeightE2E is TestBaseWorkflow {
         vm.prank(multisig());
         jbProjects().approve(address(0), FEE_PROJECT_ID); // Clear old approval.
 
+        REVOwner ammOwner = new REVOwner(
+            IJBBuybackHookRegistry(address(ammBuyback)),
+            jbDirectory(),
+            FEE_PROJECT_ID,
+            SUCKER_REGISTRY,
+            address(LOANS_CONTRACT)
+        );
         REVDeployer ammDeployer = new REVDeployer{salt: "REVDeployer_AMM_E2E"}(
             jbController(),
             SUCKER_REGISTRY,
@@ -413,8 +435,10 @@ contract TestSplitWeightE2E is TestBaseWorkflow {
             PUBLISHER,
             IJBBuybackHookRegistry(address(ammBuyback)),
             address(LOANS_CONTRACT),
-            TRUSTED_FORWARDER
+            TRUSTED_FORWARDER,
+            address(ammOwner)
         );
+        ammOwner.initialize(IREVDeployer(address(ammDeployer)));
 
         vm.prank(multisig());
         jbProjects().approve(address(ammDeployer), FEE_PROJECT_ID);

package/test/TestSplitWeightFork.t.sol

@@ -63,6 +63,8 @@ import {TickMath} from "@uniswap/v4-core/src/libraries/TickMath.sol";
 import {StateLibrary} from "@uniswap/v4-core/src/libraries/StateLibrary.sol";
 
 import {IERC20} from "@openzeppelin/contracts/interfaces/IERC20.sol";
+import {REVOwner} from "../src/REVOwner.sol";
+import {IREVDeployer} from "../src/interfaces/IREVDeployer.sol";
 
 /// @notice Helper that adds liquidity to and swaps on a V4 pool via the unlock/callback pattern.
 contract LiquidityHelper is IUnlockCallback {
@@ -234,6 +236,8 @@ contract TestSplitWeightFork is TestBaseWorkflow {
     // forge-lint: disable-next-line(mixed-case-variable)
     REVDeployer REV_DEPLOYER;
     // forge-lint: disable-next-line(mixed-case-variable)
+    REVOwner REV_OWNER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     JBBuybackHook BUYBACK_HOOK;
     // forge-lint: disable-next-line(mixed-case-variable)
     JBBuybackHookRegistry BUYBACK_REGISTRY;
@@ -325,6 +329,14 @@ contract TestSplitWeightFork is TestBaseWorkflow {
             trustedForwarder: TRUSTED_FORWARDER
         });
 
+        REV_OWNER = new REVOwner(
+            IJBBuybackHookRegistry(address(BUYBACK_REGISTRY)),
+            jbDirectory(),
+            FEE_PROJECT_ID,
+            SUCKER_REGISTRY,
+            address(LOANS_CONTRACT)
+        );
+
         REV_DEPLOYER = new REVDeployer{salt: "REVDeployer_Fork"}(
             jbController(),
             SUCKER_REGISTRY,
@@ -333,9 +345,12 @@ contract TestSplitWeightFork is TestBaseWorkflow {
             PUBLISHER,
             IJBBuybackHookRegistry(address(BUYBACK_REGISTRY)),
             address(LOANS_CONTRACT),
-            TRUSTED_FORWARDER
+            TRUSTED_FORWARDER,
+            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

@@ -34,6 +34,8 @@ import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStor
 import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
 import {REVEmpty721Config} from "./helpers/REVEmpty721Config.sol";
+import {REVOwner} from "../src/REVOwner.sol";
+import {IREVDeployer} from "../src/interfaces/IREVDeployer.sol";
 
 /// @notice Documents and verifies that stage transitions change the borrowable amount for the same collateral.
 /// This is by design: loan value tracks the current bonding curve parameters (cashOutTaxRate),
@@ -45,6 +47,8 @@ contract TestStageTransitionBorrowable is TestBaseWorkflow {
     // forge-lint: disable-next-line(mixed-case-variable)
     REVDeployer REV_DEPLOYER;
     // forge-lint: disable-next-line(mixed-case-variable)
+    REVOwner REV_OWNER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     JB721TiersHook EXAMPLE_HOOK;
     // forge-lint: disable-next-line(mixed-case-variable)
     IJB721TiersHookDeployer HOOK_DEPLOYER;
@@ -148,6 +152,14 @@ contract TestStageTransitionBorrowable is TestBaseWorkflow {
             permit2: permit2(),
             trustedForwarder: TRUSTED_FORWARDER
         });
+        REV_OWNER = new REVOwner(
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
+            jbDirectory(),
+            FEE_PROJECT_ID,
+            SUCKER_REGISTRY,
+            address(LOANS_CONTRACT)
+        );
+
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
             jbController(),
             SUCKER_REGISTRY,
@@ -156,8 +168,11 @@ contract TestStageTransitionBorrowable is TestBaseWorkflow {
             PUBLISHER,
             IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
             address(LOANS_CONTRACT),
-            TRUSTED_FORWARDER
+            TRUSTED_FORWARDER,
+            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

@@ -36,6 +36,8 @@ import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStor
 import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
 import {REVEmpty721Config} from "./helpers/REVEmpty721Config.sol";
+import {REVOwner} from "../src/REVOwner.sol";
+import {IREVDeployer} from "../src/interfaces/IREVDeployer.sol";
 
 /// @notice Tests for default operator permissions including SET_ROUTER_TERMINAL.
 /// Verifies that all default split operator permissions are granted correctly.
@@ -46,6 +48,8 @@ contract TestSwapTerminalPermission is TestBaseWorkflow {
     // forge-lint: disable-next-line(mixed-case-variable)
     REVDeployer REV_DEPLOYER;
     // forge-lint: disable-next-line(mixed-case-variable)
+    REVOwner REV_OWNER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     JB721TiersHook EXAMPLE_HOOK;
     // forge-lint: disable-next-line(mixed-case-variable)
     IJB721TiersHookDeployer HOOK_DEPLOYER;
@@ -89,6 +93,14 @@ contract TestSwapTerminalPermission is TestBaseWorkflow {
             permit2: permit2(),
             trustedForwarder: TRUSTED_FORWARDER
         });
+        REV_OWNER = new REVOwner(
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
+            jbDirectory(),
+            FEE_PROJECT_ID,
+            SUCKER_REGISTRY,
+            address(LOANS_CONTRACT)
+        );
+
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
             jbController(),
             SUCKER_REGISTRY,
@@ -97,8 +109,11 @@ contract TestSwapTerminalPermission is TestBaseWorkflow {
             PUBLISHER,
             IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
             address(LOANS_CONTRACT),
-            TRUSTED_FORWARDER
+            TRUSTED_FORWARDER,
+            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

@@ -40,6 +40,8 @@ import {JB721TiersHook} from "@bananapus/721-hook-v6/src/JB721TiersHook.sol";
 import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStore.sol";
 import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
+import {REVOwner} from "../src/REVOwner.sol";
+import {IREVDeployer} from "../src/interfaces/IREVDeployer.sol";
 
 /// @title TestUint112Overflow
 /// @notice Tests for uint112 truncation fix in REVLoans._adjust()
@@ -52,6 +54,8 @@ contract TestUint112Overflow is TestBaseWorkflow {
     // forge-lint: disable-next-line(mixed-case-variable)
     REVDeployer REV_DEPLOYER;
     // forge-lint: disable-next-line(mixed-case-variable)
+    REVOwner REV_OWNER;
+    // forge-lint: disable-next-line(mixed-case-variable)
     JB721TiersHook EXAMPLE_HOOK;
     // forge-lint: disable-next-line(mixed-case-variable)
     IJB721TiersHookDeployer HOOK_DEPLOYER;
@@ -109,6 +113,14 @@ contract TestUint112Overflow is TestBaseWorkflow {
             trustedForwarder: TRUSTED_FORWARDER
         });
 
+        REV_OWNER = new REVOwner(
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
+            jbDirectory(),
+            FEE_PROJECT_ID,
+            SUCKER_REGISTRY,
+            address(LOANS_CONTRACT)
+        );
+
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
             jbController(),
             SUCKER_REGISTRY,
@@ -117,9 +129,12 @@ contract TestUint112Overflow is TestBaseWorkflow {
             PUBLISHER,
             IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
             address(LOANS_CONTRACT),
-            TRUSTED_FORWARDER
+            TRUSTED_FORWARDER,
+            address(REV_OWNER)
         );
 
+        REV_OWNER.initialize(IREVDeployer(address(REV_DEPLOYER)));
+
         // Deploy fee project
         vm.prank(multisig());
         jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);