@rev-net/core-v6 0.0.29 → 0.0.30

package/src/interfaces/IREVHiddenTokens.sol

@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import {IJBController} from "@bananapus/core-v6/src/interfaces/IJBController.sol";
+
+/// @notice Manages hiding (burning) and revealing (re-minting) revnet tokens to exclude them from totalSupply.
+interface IREVHiddenTokens {
+    /// @notice Emitted when tokens are hidden (burned and tracked for later reveal).
+    /// @param revnetId The ID of the revnet whose tokens are hidden.
+    /// @param tokenCount The number of tokens hidden.
+    /// @param holder The address whose tokens are hidden.
+    /// @param caller The address that hid the tokens.
+    event HideTokens(uint256 indexed revnetId, uint256 tokenCount, address holder, address caller);
+
+    /// @notice Emitted when previously hidden tokens are revealed (re-minted).
+    /// @param revnetId The ID of the revnet whose tokens are revealed.
+    /// @param tokenCount The number of tokens revealed.
+    /// @param beneficiary The address receiving the revealed tokens.
+    /// @param holder The address whose hidden balance is decremented.
+    /// @param caller The address that revealed the tokens.
+    event RevealTokens(
+        uint256 indexed revnetId, uint256 tokenCount, address beneficiary, address holder, address caller
+    );
+
+    /// @notice The controller that manages revnets using this contract.
+    /// @return The controller contract.
+    function CONTROLLER() external view returns (IJBController);
+
+    /// @notice The number of tokens a holder has hidden for a given revnet.
+    /// @param holder The address of the token holder.
+    /// @param revnetId The ID of the revnet.
+    /// @return The number of hidden tokens.
+    function hiddenBalanceOf(address holder, uint256 revnetId) external view returns (uint256);
+
+    /// @notice The total number of hidden tokens for a revnet.
+    /// @param revnetId The ID of the revnet.
+    /// @return The total hidden token count.
+    function totalHiddenOf(uint256 revnetId) external view returns (uint256);
+
+    /// @notice Hide tokens by burning them and tracking them for later reveal.
+    /// @dev The holder must have granted BURN_TOKENS permission to this contract.
+    /// @param revnetId The ID of the revnet whose tokens to hide.
+    /// @param tokenCount The number of tokens to hide.
+    /// @param holder The address whose tokens to hide.
+    function hideTokensOf(uint256 revnetId, uint256 tokenCount, address holder) external;
+
+    /// @notice Reveal previously hidden tokens by re-minting them.
+    /// @param revnetId The ID of the revnet whose tokens to reveal.
+    /// @param tokenCount The number of tokens to reveal.
+    /// @param beneficiary The address that will receive the revealed tokens.
+    /// @param holder The address whose hidden balance to decrement.
+    function revealTokensOf(uint256 revnetId, uint256 tokenCount, address beneficiary, address holder) external;
+}

package/src/interfaces/IREVLoans.sol

@@ -5,7 +5,6 @@ import {IJBController} from "@bananapus/core-v6/src/interfaces/IJBController.sol
 import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 import {IJBPayoutTerminal} from "@bananapus/core-v6/src/interfaces/IJBPayoutTerminal.sol";
 import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
-import {IJBProjects} from "@bananapus/core-v6/src/interfaces/IJBProjects.sol";
 import {IJBTokenUriResolver} from "@bananapus/core-v6/src/interfaces/IJBTokenUriResolver.sol";
 import {JBSingleAllowance} from "@bananapus/core-v6/src/structs/JBSingleAllowance.sol";
 import {IPermit2} from "@uniswap/permit2/src/interfaces/IPermit2.sol";
@@ -164,10 +163,6 @@ interface IREVLoans {
     /// @return The prices contract.
     function PRICES() external view returns (IJBPrices);
 
-    /// @notice The contract that mints ERC-721s representing project ownership.
-    /// @return The projects contract.
-    function PROJECTS() external view returns (IJBProjects);
-
     /// @notice The ID of the REV revnet that receives protocol fees from loans.
     /// @return The REV revnet ID.
     function REV_ID() external view returns (uint256);
@@ -219,6 +214,7 @@ interface IREVLoans {
     /// @param collateralCount The amount of tokens to use as collateral for the loan.
     /// @param beneficiary The address that will receive the borrowed funds and fee payment tokens.
     /// @param prepaidFeePercent The fee percent to charge upfront, in terms of `JBConstants.MAX_FEE`.
+    /// @param holder The address whose tokens are used as collateral and who receives the loan NFT.
     /// @return loanId The ID of the loan created from borrowing.
     /// @return The loan created from borrowing.
     function borrowFrom(
@@ -227,7 +223,8 @@ interface IREVLoans {
         uint256 minBorrowAmount,
         uint256 collateralCount,
         address payable beneficiary,
-        uint256 prepaidFeePercent
+        uint256 prepaidFeePercent,
+        address holder
     )
         external
         returns (uint256 loanId, REVLoan memory);

package/test/REV.integrations.t.sol

@@ -226,7 +226,8 @@ contract REVnet_Integrations is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            makeAddr("loans")
+            makeAddr("loans"),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(

package/test/REVAutoIssuanceFuzz.t.sol

@@ -89,7 +89,8 @@ contract REVAutoIssuanceFuzz_Local is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            makeAddr("loans")
+            makeAddr("loans"),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(

package/test/REVDeployerRegressions.t.sol

@@ -92,7 +92,6 @@ contract REVDeployerRegressions is TestBaseWorkflow {
 
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -104,7 +103,8 @@ contract REVDeployerRegressions 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/REVInvincibility.t.sol

@@ -244,7 +244,6 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
 
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -256,7 +255,8 @@ contract REVInvincibility_PropertyTests 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,7 @@ contract REVInvincibility_PropertyTests 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);
     }
 
     // =====================================================================
@@ -788,7 +788,7 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
 
         if (borrowableA > 0) {
             vm.prank(userA);
-            LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokensA, payable(userA), 25);
+            LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokensA, payable(userA), 25, userA);
         }
 
         // UserB's tokens should still have proportional cash-out value
@@ -1028,7 +1028,6 @@ contract REVInvincibility_Invariants is StdInvariant, TestBaseWorkflow {
 
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -1040,7 +1039,8 @@ contract REVInvincibility_Invariants is StdInvariant, 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/REVInvincibilityHandler.sol

@@ -145,7 +145,7 @@ contract REVInvincibilityHandler is JBTest {
 
         REVLoanSource memory source = REVLoanSource({token: JBConstants.NATIVE_TOKEN, terminal: TERMINAL});
         (, REVLoan memory loan) =
-            LOANS.borrowFrom(REVNET_ID, source, borrowable, receivedTokens, payable(USER), prepaidFee);
+            LOANS.borrowFrom(REVNET_ID, source, borrowable, receivedTokens, payable(USER), prepaidFee, USER);
 
         COLLATERAL_SUM += receivedTokens;
         BORROWED_SUM += loan.amount;

package/test/REVLifecycle.t.sol

@@ -100,7 +100,6 @@ contract REVLifecycle_Local is TestBaseWorkflow {
 
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -112,7 +111,8 @@ contract REVLifecycle_Local 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/REVLoans.invariants.t.sol

@@ -117,7 +117,7 @@ contract REVLoansCallHandler is JBTest {
 
         REVLoanSource memory sauce = REVLoanSource({token: JBConstants.NATIVE_TOKEN, terminal: TERMINAL});
         (, REVLoan memory lastLoan) =
-            LOANS.borrowFrom(REVNET_ID, sauce, borrowable, receivedTokens, payable(USER), prepaidFee);
+            LOANS.borrowFrom(REVNET_ID, sauce, borrowable, receivedTokens, payable(USER), prepaidFee, USER);
 
         COLLATERAL_SUM += receivedTokens;
         BORROWED_SUM += lastLoan.amount;
@@ -542,7 +542,6 @@ contract InvariantREVLoansTests is StdInvariant, TestBaseWorkflow {
 
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -554,7 +553,8 @@ contract InvariantREVLoansTests is StdInvariant, 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/REVLoansAttacks.t.sol

@@ -98,7 +98,8 @@ contract ReentrantTerminal is ERC165, IJBPayoutTerminal {
                 0, // minBorrowAmount
                 reenterCollateral,
                 payable(address(this)),
-                25 // MIN_PREPAID_FEE_PERCENT
+                25, // MIN_PREPAID_FEE_PERCENT
+                address(this)
             ) {}
                 catch {
                 // Expected to revert if reentrancy guard exists
@@ -383,7 +384,6 @@ contract REVLoansAttacks is TestBaseWorkflow {
 
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -395,7 +395,8 @@ contract REVLoansAttacks is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
@@ -474,7 +475,7 @@ contract REVLoansAttacks 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);
     }
 
     // =========================================================================
@@ -646,7 +647,7 @@ contract REVLoansAttacks is TestBaseWorkflow {
         vm.assume(borrowable > 0);
 
         vm.prank(userA);
-        LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokensA, payable(userA), 25);
+        LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokensA, payable(userA), 25, userA);
 
         // After borrowing, tokensA are burned as collateral
         // But the surplus is adjusted by adding totalBorrowed
@@ -771,7 +772,7 @@ contract REVLoansAttacks is TestBaseWorkflow {
 
         // Borrow with max prepaid fee (so no additional fee on immediate repay)
         vm.prank(USER);
-        (uint256 loanId,) = LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokens, payable(USER), 500);
+        (uint256 loanId,) = LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokens, payable(USER), 500, USER);
 
         REVLoan memory loan = LOANS_CONTRACT.loanOf(loanId);
 

package/test/REVLoansFeeRecovery.t.sol

@@ -349,7 +349,6 @@ contract REVLoansFeeRecovery is TestBaseWorkflow {
 
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -361,7 +360,8 @@ contract REVLoansFeeRecovery is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
@@ -450,7 +450,7 @@ contract REVLoansFeeRecovery is TestBaseWorkflow {
         borrowerBalanceBefore = user.balance;
 
         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);
 
         borrowerBalanceAfter = user.balance;
     }
@@ -492,7 +492,7 @@ contract REVLoansFeeRecovery is TestBaseWorkflow {
         // Normal borrow.
         uint256 balBefore = USER.balance;
         vm.prank(USER);
-        LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(USER), 25);
+        LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(USER), 25, USER);
         uint256 normalReceived = USER.balance - balBefore;
 
         // Revert to snapshot — identical state.
@@ -504,7 +504,7 @@ contract REVLoansFeeRecovery is TestBaseWorkflow {
 
         balBefore = USER.balance;
         vm.prank(USER);
-        LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(USER), 25);
+        LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(USER), 25, USER);
         uint256 failReceived = USER.balance - balBefore;
 
         // The borrower with a failed fee terminal should receive MORE than the normal borrower,
@@ -537,7 +537,7 @@ contract REVLoansFeeRecovery is TestBaseWorkflow {
         // Normal borrow.
         uint256 balBefore = USER.balance;
         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);
         uint256 normalReceived = USER.balance - balBefore;
 
         // Get the actual borrow amount from the loan to compute expected REV fee.
@@ -555,7 +555,7 @@ contract REVLoansFeeRecovery is TestBaseWorkflow {
 
         balBefore = USER.balance;
         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);
         uint256 failReceived = USER.balance - balBefore;
 
         // The difference should be the REV fee amount.
@@ -594,7 +594,7 @@ contract REVLoansFeeRecovery is TestBaseWorkflow {
         assertEq(allowanceBefore, 0, "No pre-existing allowance");
 
         vm.prank(USER);
-        LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(USER), 25);
+        LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(USER), 25, USER);
 
         // After the borrow, the allowance to the reverting terminal should still be 0
         // (the catch block decreased it).
@@ -630,7 +630,7 @@ contract REVLoansFeeRecovery is TestBaseWorkflow {
         // Normal borrow.
         uint256 tokenBalBefore = TOKEN.balanceOf(USER);
         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);
         uint256 normalReceived = TOKEN.balanceOf(USER) - tokenBalBefore;
 
         // Revert to snapshot.
@@ -642,7 +642,7 @@ contract REVLoansFeeRecovery is TestBaseWorkflow {
 
         tokenBalBefore = TOKEN.balanceOf(USER);
         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);
         uint256 failReceived = TOKEN.balanceOf(USER) - tokenBalBefore;
 
         // Failed-fee borrower should receive more tokens.
@@ -699,7 +699,7 @@ contract REVLoansFeeRecovery is TestBaseWorkflow {
             REVLoanSource memory source = REVLoanSource({token: JBConstants.NATIVE_TOKEN, terminal: jbMultiTerminal()});
 
             vm.prank(borrower);
-            LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokens, payable(borrower), 25);
+            LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokens, payable(borrower), 25, borrower);
         }
 
         // After 3 borrows with fee failures, no ETH should be stuck.
@@ -737,7 +737,7 @@ contract REVLoansFeeRecovery is TestBaseWorkflow {
 
         uint256 balanceBefore = borrower.balance;
         vm.prank(borrower);
-        LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokens, payable(borrower), 25);
+        LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokens, payable(borrower), 25, borrower);
         uint256 received = borrower.balance - balanceBefore;
 
         // The borrower should always receive something.

package/test/REVLoansFindings.t.sol

@@ -207,7 +207,6 @@ contract REVLoansFindings is TestBaseWorkflow {
 
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -219,7 +218,8 @@ contract REVLoansFindings is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
@@ -372,7 +372,7 @@ contract REVLoansFindings is TestBaseWorkflow {
         REVLoanSource memory source = REVLoanSource({token: JBConstants.NATIVE_TOKEN, terminal: jbMultiTerminal()});
 
         vm.prank(USER);
-        (loanId, loan) = LOANS_CONTRACT.borrowFrom(REVNET_ID, source, loanable, tokens, payable(USER), 25);
+        (loanId, loan) = LOANS_CONTRACT.borrowFrom(REVNET_ID, source, loanable, tokens, payable(USER), 25, USER);
     }
 
     //*********************************************************************//
@@ -411,7 +411,7 @@ contract REVLoansFindings is TestBaseWorkflow {
         );
 
         vm.prank(USER);
-        LOANS_CONTRACT.borrowFrom(REVNET_ID, fakeSource, loanable, tokens, payable(USER), 25);
+        LOANS_CONTRACT.borrowFrom(REVNET_ID, fakeSource, loanable, tokens, payable(USER), 25, USER);
     }
 
     //*********************************************************************//

package/test/REVLoansRegressions.t.sol

@@ -202,7 +202,6 @@ contract REVLoansRegressions is TestBaseWorkflow {
 
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -214,7 +213,8 @@ contract REVLoansRegressions is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
@@ -335,7 +335,7 @@ contract REVLoansRegressions is TestBaseWorkflow {
         );
 
         vm.prank(USER);
-        LOANS_CONTRACT.borrowFrom(REVNET_ID, fakeSource, borrowable, tokens, payable(USER), 500);
+        LOANS_CONTRACT.borrowFrom(REVNET_ID, fakeSource, borrowable, tokens, payable(USER), 500, USER);
     }
 
     /// @notice Verify that the configured loan source (real terminal) is properly registered.

package/test/REVLoansSourceFeeRecovery.t.sol

@@ -229,7 +229,6 @@ contract REVLoansSourceFeeRecovery is TestBaseWorkflow {
 
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -241,7 +240,8 @@ contract REVLoansSourceFeeRecovery is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
@@ -310,7 +310,7 @@ contract REVLoansSourceFeeRecovery 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), 25);
+        (loanId,) = LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(user), 25, user);
     }
 
     // =========================================================================
@@ -495,7 +495,7 @@ contract REVLoansSourceFeeRecovery is TestBaseWorkflow {
 
         uint256 balBefore = USER.balance;
         vm.prank(USER);
-        LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(USER), 25);
+        LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(USER), 25, USER);
 
         uint256 received = USER.balance - balBefore;
         assertGt(received, 0, "Borrower should receive ETH even when source fee terminal fails");