@rev-net/core-v6 0.0.29 → 0.0.30

package/test/TestMixedFixes.t.sol

@@ -98,7 +98,6 @@ contract TestMixedFixes is TestBaseWorkflow {
             .addPriceFeedFor(0, uint32(uint160(address(TOKEN))), uint32(uint160(JBConstants.NATIVE_TOKEN)), priceFeed);
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -109,7 +108,8 @@ contract TestMixedFixes is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
@@ -245,7 +245,7 @@ contract TestMixedFixes is TestBaseWorkflow {
         );
         REVLoanSource memory source = REVLoanSource({token: JBConstants.NATIVE_TOKEN, terminal: jbMultiTerminal()});
         vm.prank(user);
-        (loanId,) = LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(user), prepaidFee);
+        (loanId,) = LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(user), prepaidFee, user);
     }
 
     /// @notice At exactly LOAN_LIQUIDATION_DURATION, determineSourceFeeAmount should revert with LoanExpired (>=
@@ -431,7 +431,7 @@ contract TestMixedFixes is TestBaseWorkflow {
         REVLoanSource memory ethSource = REVLoanSource({token: JBConstants.NATIVE_TOKEN, terminal: jbMultiTerminal()});
         vm.prank(USER);
         (uint256 loanId, REVLoan memory loan) =
-            LOANS_CONTRACT.borrowFrom(MIXED_REVNET_ID, ethSource, 0, tokenCount, payable(USER), 25);
+            LOANS_CONTRACT.borrowFrom(MIXED_REVNET_ID, ethSource, 0, tokenCount, payable(USER), 25, USER);
 
         // Verify loan created and TOKEN source has zero borrowed.
         assertTrue(loanId != 0, "ETH loan should be created");
@@ -481,7 +481,7 @@ contract TestMixedFixes is TestBaseWorkflow {
         REVLoanSource memory tokenSource = REVLoanSource({token: address(TOKEN), terminal: jbMultiTerminal()});
         vm.prank(USER);
         (uint256 loanId, REVLoan memory loan) =
-            LOANS_CONTRACT.borrowFrom(MIXED_REVNET_ID, tokenSource, 0, smallCollateral, payable(USER), 25);
+            LOANS_CONTRACT.borrowFrom(MIXED_REVNET_ID, tokenSource, 0, smallCollateral, payable(USER), 25, USER);
 
         assertTrue(loanId != 0, "TOKEN loan should be created");
         assertTrue(loan.amount > 0, "Loan amount should be nonzero");
@@ -537,7 +537,7 @@ contract TestMixedFixes is TestBaseWorkflow {
         REVLoanSource memory tokenSource = REVLoanSource({token: address(TOKEN), terminal: jbMultiTerminal()});
         vm.prank(USER);
         (uint256 tokenLoanId,) =
-            LOANS_CONTRACT.borrowFrom(MIXED_REVNET_ID, tokenSource, 0, smallCollateral, payable(USER), 25);
+            LOANS_CONTRACT.borrowFrom(MIXED_REVNET_ID, tokenSource, 0, smallCollateral, payable(USER), 25, USER);
         assertTrue(tokenLoanId != 0, "TOKEN loan should be created");
 
         // STEP 3: Pay ETH to create ETH surplus.
@@ -558,7 +558,7 @@ contract TestMixedFixes is TestBaseWorkflow {
         REVLoanSource memory ethSource = REVLoanSource({token: JBConstants.NATIVE_TOKEN, terminal: jbMultiTerminal()});
         vm.prank(USER);
         (uint256 ethLoanId,) =
-            LOANS_CONTRACT.borrowFrom(MIXED_REVNET_ID, ethSource, 0, ethCollateral, payable(USER), 25);
+            LOANS_CONTRACT.borrowFrom(MIXED_REVNET_ID, ethSource, 0, ethCollateral, payable(USER), 25, USER);
         assertTrue(ethLoanId != 0, "ETH loan should be created");
 
         // Both sources should have tracked borrows.

package/test/TestPermit2Signatures.t.sol

@@ -258,7 +258,6 @@ contract TestPermit2Signatures is TestBaseWorkflow {
 
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -270,7 +269,8 @@ contract TestPermit2Signatures is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
@@ -398,7 +398,7 @@ contract TestPermit2Signatures is TestBaseWorkflow {
         REVLoanSource memory source = REVLoanSource({token: address(TOKEN), terminal: jbMultiTerminal()});
 
         vm.prank(user);
-        (loanId,) = LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(user), prepaidFee);
+        (loanId,) = LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(user), prepaidFee, user);
     }
 
     // =========================================================================

package/test/TestReallocationSandwich.t.sol

@@ -153,7 +153,6 @@ contract TestReallocationSandwich is TestBaseWorkflow {
         MOCK_BUYBACK = new MockBuybackDataHook();
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -164,7 +163,8 @@ contract TestReallocationSandwich is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
@@ -286,7 +286,8 @@ contract TestReallocationSandwich is TestBaseWorkflow {
             minBorrowAmount: 0,
             collateralCount: borrowerTokens,
             beneficiary: payable(BORROWER),
-            prepaidFeePercent: prepaidFeePercent
+            prepaidFeePercent: prepaidFeePercent,
+            holder: BORROWER
         });
 
         uint256 stage1BorrowedAmount = stage1Loan.amount;

package/test/TestRevnetRegressions.t.sol

@@ -48,13 +48,12 @@ import {IREVDeployer} from "../src/interfaces/IREVDeployer.sol";
 contract REVLoansHarness is REVLoans {
     constructor(
         IJBController controller,
-        IJBProjects projects,
         uint256 revId,
         address owner,
         IPermit2 permit2,
         address trustedForwarder
     )
-        REVLoans(controller, projects, revId, owner, permit2, trustedForwarder)
+        REVLoans(controller, revId, owner, permit2, trustedForwarder)
     {}
 
     /// @notice Expose _totalBorrowedFrom for testing.
@@ -141,7 +140,6 @@ contract TestRevnetRegressions is TestBaseWorkflow {
 
         LOANS_CONTRACT = new REVLoansHarness({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -153,7 +151,8 @@ contract TestRevnetRegressions is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(

package/test/TestSplitWeightAdjustment.t.sol

@@ -91,7 +91,6 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
         MOCK_BUYBACK = new MockBuybackDataHookMintPath();
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -102,7 +101,8 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
@@ -329,7 +329,8 @@ contract TestSplitWeightAdjustment is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
         REVDeployer ammDeployer = new REVDeployer{salt: "REVDeployer_AMM"}(
             jbController(),

package/test/TestSplitWeightE2E.t.sol

@@ -111,7 +111,6 @@ contract TestSplitWeightE2E is TestBaseWorkflow {
 
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -123,7 +122,8 @@ contract TestSplitWeightE2E is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
@@ -429,7 +429,8 @@ contract TestSplitWeightE2E is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
         REVDeployer ammDeployer = new REVDeployer{salt: "REVDeployer_AMM_E2E"}(
             jbController(),

package/test/TestSplitWeightFork.t.sol

@@ -323,7 +323,6 @@ contract TestSplitWeightFork is TestBaseWorkflow {
 
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -335,7 +334,8 @@ contract TestSplitWeightFork is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: "REVDeployer_Fork"}(

package/test/TestStageTransitionBorrowable.t.sol

@@ -146,7 +146,6 @@ contract TestStageTransitionBorrowable is TestBaseWorkflow {
         MOCK_BUYBACK = new MockBuybackDataHook();
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -157,7 +156,8 @@ contract TestStageTransitionBorrowable is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(

package/test/TestSwapTerminalPermission.t.sol

@@ -87,7 +87,6 @@ contract TestSwapTerminalPermission is TestBaseWorkflow {
         MOCK_BUYBACK = new MockBuybackDataHook();
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -98,7 +97,8 @@ contract TestSwapTerminalPermission is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(

package/test/TestUint112Overflow.t.sol

@@ -106,7 +106,6 @@ contract TestUint112Overflow is TestBaseWorkflow {
 
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -118,7 +117,8 @@ contract TestUint112Overflow is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
@@ -265,7 +265,7 @@ contract TestUint112Overflow is TestBaseWorkflow {
 
         REVLoanSource memory source = REVLoanSource({token: JBConstants.NATIVE_TOKEN, terminal: jbMultiTerminal()});
         vm.prank(user);
-        (loanId,) = LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(user), prepaidFee);
+        (loanId,) = LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(user), prepaidFee, user);
     }
 
     /// @notice Verify loan creation with a reasonable borrow amount succeeds.

package/test/TestZeroAmountLoanGuard.t.sol

@@ -100,7 +100,6 @@ contract TestZeroAmountLoanGuard is TestBaseWorkflow {
             .addPriceFeedFor(0, uint32(uint160(address(TOKEN))), uint32(uint160(JBConstants.NATIVE_TOKEN)), priceFeed);
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -111,7 +110,8 @@ contract TestZeroAmountLoanGuard is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
@@ -247,7 +247,7 @@ contract TestZeroAmountLoanGuard is TestBaseWorkflow {
         );
         REVLoanSource memory source = REVLoanSource({token: JBConstants.NATIVE_TOKEN, terminal: jbMultiTerminal()});
         vm.prank(user);
-        (loanId,) = LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(user), prepaidFee);
+        (loanId,) = LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(user), prepaidFee, user);
     }
 
     // -----------------------------------------------------------------------

package/test/TestZeroRepayment.t.sol

@@ -100,7 +100,6 @@ contract TestZeroRepayment is TestBaseWorkflow {
             .addPriceFeedFor(0, uint32(uint160(address(TOKEN))), uint32(uint160(JBConstants.NATIVE_TOKEN)), priceFeed);
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -111,7 +110,8 @@ contract TestZeroRepayment is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
@@ -247,7 +247,7 @@ contract TestZeroRepayment is TestBaseWorkflow {
         );
         REVLoanSource memory source = REVLoanSource({token: JBConstants.NATIVE_TOKEN, terminal: jbMultiTerminal()});
         vm.prank(user);
-        (loanId,) = LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(user), prepaidFee);
+        (loanId,) = LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(user), prepaidFee, user);
     }
 
     /// @notice Repaying with zero borrow amount and zero collateral return should revert.

package/test/audit/LoanIdOverflowGuard.t.sol

@@ -155,7 +155,6 @@ contract LoanIdOverflowGuard is TestBaseWorkflow {
         // Deploy the REVLoans contract.
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -168,7 +167,8 @@ contract LoanIdOverflowGuard is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
@@ -349,7 +349,7 @@ contract LoanIdOverflowGuard is TestBaseWorkflow {
 
         // Borrow with minimum fee percent (25 = 2.5%).
         vm.prank(user);
-        (loanId,) = LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(user), 25);
+        (loanId,) = LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(user), 25, user);
     }
 
     /// @dev Computes the storage slot for totalLoansBorrowedFor[revnetId].
@@ -401,7 +401,7 @@ contract LoanIdOverflowGuard is TestBaseWorkflow {
 
         // Attempt to borrow -- should revert because the counter is at the limit.
         vm.prank(USER);
-        LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokens, payable(USER), 25);
+        LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokens, payable(USER), 25, USER);
     }
 
     // ---------------------------------------------------------------

package/test/audit/NemesisOperatorDelegation.t.sol

@@ -0,0 +1,278 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.28;
+
+import "forge-std/Test.sol";
+import "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
+import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
+import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
+import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
+import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
+import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
+import "@croptop/core-v6/src/CTPublisher.sol";
+import "@bananapus/suckers-v6/src/JBSuckerRegistry.sol";
+import "@bananapus/721-hook-v6/src/JB721TiersHook.sol";
+import "@bananapus/721-hook-v6/src/JB721TiersHookDeployer.sol";
+import "@bananapus/721-hook-v6/src/JB721TiersHookStore.sol";
+import "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
+import "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
+import "@bananapus/buyback-hook-v6/src/interfaces/IJBBuybackHookRegistry.sol";
+import "@bananapus/core-v6/src/libraries/JBConstants.sol";
+import "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
+import "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
+import "@bananapus/core-v6/src/structs/JBPermissionsData.sol";
+import "@bananapus/core-v6/src/structs/JBTerminalConfig.sol";
+import "@bananapus/core-v6/src/structs/JBSplit.sol";
+import "@bananapus/suckers-v6/src/structs/JBSuckerDeployerConfig.sol";
+
+import {MockBuybackDataHook} from "../mock/MockBuybackDataHook.sol";
+import {REVEmpty721Config} from "../helpers/REVEmpty721Config.sol";
+import {REVDeployer} from "../../src/REVDeployer.sol";
+import {REVHiddenTokens} from "../../src/REVHiddenTokens.sol";
+import {REVLoans} from "../../src/REVLoans.sol";
+import {REVOwner} from "../../src/REVOwner.sol";
+import {IREVLoans} from "../../src/interfaces/IREVLoans.sol";
+import {IREVHiddenTokens} from "../../src/interfaces/IREVHiddenTokens.sol";
+import {REVConfig} from "../../src/structs/REVConfig.sol";
+import {REVDescription} from "../../src/structs/REVDescription.sol";
+import {REVLoanSource} from "../../src/structs/REVLoanSource.sol";
+import {REVStageConfig} from "../../src/structs/REVStageConfig.sol";
+import {REVAutoIssuance} from "../../src/structs/REVAutoIssuance.sol";
+import {REVSuckerDeploymentConfig} from "../../src/structs/REVSuckerDeploymentConfig.sol";
+import {IREVDeployer} from "../../src/interfaces/IREVDeployer.sol";
+
+contract NemesisOperatorDelegationTest is TestBaseWorkflow {
+    bytes32 internal constant REV_DEPLOYER_SALT = "REVDeployer";
+    bytes32 internal constant ERC20_SALT = "REV_TOKEN";
+
+    address internal constant TRUSTED_FORWARDER = 0xB2b5841DBeF766d4b521221732F9B618fCf34A87;
+
+    address internal USER = makeAddr("user");
+    address internal OPERATOR = makeAddr("operator");
+
+    REVDeployer internal REV_DEPLOYER;
+    REVOwner internal REV_OWNER;
+    REVHiddenTokens internal HIDDEN_TOKENS;
+    REVLoans internal LOANS;
+    JB721TiersHook internal EXAMPLE_HOOK;
+    IJB721TiersHookDeployer internal HOOK_DEPLOYER;
+    IJB721TiersHookStore internal HOOK_STORE;
+    IJBAddressRegistry internal ADDRESS_REGISTRY;
+    IJBSuckerRegistry internal SUCKER_REGISTRY;
+    CTPublisher internal PUBLISHER;
+    MockBuybackDataHook internal MOCK_BUYBACK;
+
+    uint256 internal FEE_PROJECT_ID;
+    uint256 internal REVNET_ID;
+
+    function setUp() public override {
+        super.setUp();
+
+        FEE_PROJECT_ID = jbProjects().createFor(multisig());
+        SUCKER_REGISTRY = new JBSuckerRegistry(jbDirectory(), jbPermissions(), multisig(), address(0));
+        HOOK_STORE = new JB721TiersHookStore();
+        EXAMPLE_HOOK = new JB721TiersHook(
+            jbDirectory(), jbPermissions(), jbPrices(), jbRulesets(), HOOK_STORE, jbSplits(), multisig()
+        );
+        ADDRESS_REGISTRY = new JBAddressRegistry();
+        HOOK_DEPLOYER = new JB721TiersHookDeployer(EXAMPLE_HOOK, HOOK_STORE, ADDRESS_REGISTRY, multisig());
+        PUBLISHER = new CTPublisher(jbDirectory(), jbPermissions(), FEE_PROJECT_ID, multisig());
+        MOCK_BUYBACK = new MockBuybackDataHook();
+
+        LOANS = new REVLoans({
+            controller: jbController(),
+            revId: FEE_PROJECT_ID,
+            owner: address(this),
+            permit2: permit2(),
+            trustedForwarder: TRUSTED_FORWARDER
+        });
+        HIDDEN_TOKENS = new REVHiddenTokens(jbController(), TRUSTED_FORWARDER);
+        REV_OWNER = new REVOwner(
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
+            jbDirectory(),
+            FEE_PROJECT_ID,
+            SUCKER_REGISTRY,
+            address(LOANS),
+            address(HIDDEN_TOKENS)
+        );
+        REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
+            jbController(),
+            SUCKER_REGISTRY,
+            FEE_PROJECT_ID,
+            HOOK_DEPLOYER,
+            PUBLISHER,
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
+            address(LOANS),
+            TRUSTED_FORWARDER,
+            address(REV_OWNER)
+        );
+
+        REV_OWNER.setDeployer(IREVDeployer(REV_DEPLOYER));
+
+        vm.prank(multisig());
+        jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
+
+        _deployFeeProject();
+        REVNET_ID = _deployRevnet();
+
+        vm.deal(USER, 100e18);
+    }
+
+    function test_openLoanOperatorCanRedirectBorrowedFunds() public {
+        uint256 userTokens = _payUserIntoRevnet(10e18);
+        _grantPermission(USER, REVNET_ID, address(LOANS), JBPermissionIds.BURN_TOKENS);
+        _grantPermission(USER, REVNET_ID, OPERATOR, JBPermissionIds.OPEN_LOAN);
+
+        REVLoanSource memory source = REVLoanSource({token: JBConstants.NATIVE_TOKEN, terminal: jbMultiTerminal()});
+        uint256 operatorBalanceBefore = OPERATOR.balance;
+
+        vm.prank(OPERATOR);
+        (uint256 loanId,) = LOANS.borrowFrom(REVNET_ID, source, 0, userTokens / 2, payable(OPERATOR), 25, USER);
+
+        assertEq(LOANS.ownerOf(loanId), USER, "loan NFT stays with the holder");
+        assertGt(OPERATOR.balance, operatorBalanceBefore, "operator receives the borrowed funds");
+        assertLt(
+            jbController().TOKENS().totalBalanceOf(USER, REVNET_ID),
+            userTokens,
+            "holder lost collateral even though proceeds were redirected"
+        );
+    }
+
+    function test_revealTokensOperatorCanRedirectHiddenTokens() public {
+        uint256 userTokens = _payUserIntoRevnet(10e18);
+        uint256 hiddenCount = userTokens / 2;
+
+        _grantPermission(USER, REVNET_ID, address(HIDDEN_TOKENS), JBPermissionIds.BURN_TOKENS);
+        _grantPermission(USER, REVNET_ID, OPERATOR, JBPermissionIds.REVEAL_TOKENS);
+
+        vm.prank(USER);
+        HIDDEN_TOKENS.hideTokensOf(REVNET_ID, hiddenCount, USER);
+
+        vm.prank(OPERATOR);
+        HIDDEN_TOKENS.revealTokensOf(REVNET_ID, hiddenCount, OPERATOR, USER);
+
+        assertEq(HIDDEN_TOKENS.hiddenBalanceOf(USER, REVNET_ID), 0, "holder hidden balance was consumed");
+        assertEq(
+            jbController().TOKENS().totalBalanceOf(OPERATOR, REVNET_ID),
+            hiddenCount,
+            "operator receives the holder's revealed tokens"
+        );
+        assertEq(
+            jbController().TOKENS().totalBalanceOf(USER, REVNET_ID),
+            userTokens - hiddenCount,
+            "holder does not get the revealed tokens back"
+        );
+    }
+
+    function _grantPermission(address account, uint256 revnetId, address operator, uint8 permissionId) internal {
+        uint8[] memory permissionIds = new uint8[](1);
+        permissionIds[0] = permissionId;
+
+        vm.prank(account);
+        jbPermissions()
+            .setPermissionsFor(
+                account,
+                JBPermissionsData({operator: operator, projectId: uint56(revnetId), permissionIds: permissionIds})
+            );
+    }
+
+    function _payUserIntoRevnet(uint256 amount) internal returns (uint256 tokenCount) {
+        vm.prank(USER);
+        tokenCount = jbMultiTerminal().pay{value: amount}({
+            projectId: REVNET_ID,
+            token: JBConstants.NATIVE_TOKEN,
+            amount: amount,
+            beneficiary: USER,
+            minReturnedTokens: 0,
+            memo: "",
+            metadata: ""
+        });
+        assertGt(tokenCount, 0, "payment should mint revnet tokens");
+    }
+
+    function _deployFeeProject() internal {
+        JBAccountingContext[] memory acc = new JBAccountingContext[](1);
+        acc[0] = JBAccountingContext({
+            token: JBConstants.NATIVE_TOKEN, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
+        });
+
+        JBTerminalConfig[] memory tc = new JBTerminalConfig[](1);
+        tc[0] = JBTerminalConfig({terminal: jbMultiTerminal(), accountingContextsToAccept: acc});
+
+        REVStageConfig[] memory stages = new REVStageConfig[](1);
+        stages[0] = REVStageConfig({
+            startsAtOrAfter: uint40(block.timestamp),
+            autoIssuances: new REVAutoIssuance[](0),
+            splitPercent: 0,
+            splits: new JBSplit[](0),
+            initialIssuance: uint112(1000e18),
+            issuanceCutFrequency: 0,
+            issuanceCutPercent: 0,
+            cashOutTaxRate: 0,
+            extraMetadata: 0
+        });
+
+        REVConfig memory feeConfig = REVConfig({
+            description: REVDescription("Fee Revnet", "FEE", "", ERC20_SALT),
+            baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
+            splitOperator: multisig(),
+            stageConfigurations: stages
+        });
+
+        vm.prank(multisig());
+        REV_DEPLOYER.deployFor({
+            revnetId: FEE_PROJECT_ID,
+            configuration: feeConfig,
+            terminalConfigurations: tc,
+            suckerDeploymentConfiguration: REVSuckerDeploymentConfig({
+                deployerConfigurations: new JBSuckerDeployerConfig[](0), salt: keccak256("FEE")
+            }),
+            tiered721HookConfiguration: REVEmpty721Config.empty721Config(uint32(uint160(JBConstants.NATIVE_TOKEN))),
+            allowedPosts: REVEmpty721Config.emptyAllowedPosts()
+        });
+    }
+
+    function _deployRevnet() internal returns (uint256 revnetId) {
+        JBAccountingContext[] memory acc = new JBAccountingContext[](1);
+        acc[0] = JBAccountingContext({
+            token: JBConstants.NATIVE_TOKEN, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
+        });
+
+        JBTerminalConfig[] memory tc = new JBTerminalConfig[](1);
+        tc[0] = JBTerminalConfig({terminal: jbMultiTerminal(), accountingContextsToAccept: acc});
+
+        REVStageConfig[] memory stages = new REVStageConfig[](1);
+        JBSplit[] memory splits = new JBSplit[](1);
+        splits[0].beneficiary = payable(multisig());
+        splits[0].percent = 10_000;
+
+        stages[0] = REVStageConfig({
+            startsAtOrAfter: uint40(block.timestamp),
+            autoIssuances: new REVAutoIssuance[](0),
+            splitPercent: 2000,
+            splits: splits,
+            initialIssuance: uint112(1000e18),
+            issuanceCutFrequency: 90 days,
+            issuanceCutPercent: JBConstants.MAX_WEIGHT_CUT_PERCENT / 2,
+            cashOutTaxRate: 6000,
+            extraMetadata: 0
+        });
+
+        REVConfig memory config = REVConfig({
+            description: REVDescription("Revnet", "REV", "", bytes32("REV_TOKEN_2")),
+            baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
+            splitOperator: multisig(),
+            stageConfigurations: stages
+        });
+
+        (revnetId,) = REV_DEPLOYER.deployFor({
+            revnetId: 0,
+            configuration: config,
+            terminalConfigurations: tc,
+            suckerDeploymentConfiguration: REVSuckerDeploymentConfig({
+                deployerConfigurations: new JBSuckerDeployerConfig[](0), salt: keccak256("REV")
+            }),
+            tiered721HookConfiguration: REVEmpty721Config.empty721Config(uint32(uint160(JBConstants.NATIVE_TOKEN))),
+            allowedPosts: REVEmpty721Config.emptyAllowedPosts()
+        });
+    }
+}