@rev-net/core-v6 0.0.29 → 0.0.30

package/test/fork/ForkTestBase.sol

@@ -328,7 +328,6 @@ abstract contract ForkTestBase is TestBaseWorkflow {
 
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -340,7 +339,8 @@ abstract contract ForkTestBase is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: "REVDeployer_Fork"}(
@@ -707,7 +707,8 @@ abstract contract ForkTestBase is TestBaseWorkflow {
             minBorrowAmount: 0,
             collateralCount: collateral,
             beneficiary: payable(borrower),
-            prepaidFeePercent: prepaidFeePercent
+            prepaidFeePercent: prepaidFeePercent,
+            holder: borrower
         });
     }
 }

package/test/fork/TestLoanBorrowFork.t.sol

@@ -97,7 +97,8 @@ contract TestLoanBorrowFork is ForkTestBase {
             minBorrowAmount: 0,
             collateralCount: borrowerTokens,
             beneficiary: payable(BORROWER),
-            prepaidFeePercent: prepaidFeePercent
+            prepaidFeePercent: prepaidFeePercent,
+            holder: BORROWER
         });
 
         uint256 borrowerReceived = BORROWER.balance - borrowerEthBefore;

package/test/fork/TestLoanERC20Fork.t.sol

@@ -184,7 +184,8 @@ contract TestLoanERC20Fork is ForkTestBase {
             minBorrowAmount: 0,
             collateralCount: collateral,
             beneficiary: payable(borrower),
-            prepaidFeePercent: prepaidFeePercent
+            prepaidFeePercent: prepaidFeePercent,
+            holder: borrower
         });
     }
 
@@ -263,7 +264,8 @@ contract TestLoanERC20Fork is ForkTestBase {
             minBorrowAmount: 0,
             collateralCount: borrowerTokens,
             beneficiary: payable(BORROWER),
-            prepaidFeePercent: prepaidFeePercent
+            prepaidFeePercent: prepaidFeePercent,
+            holder: BORROWER
         });
 
         uint256 borrowerUsdcReceived = IERC20(USDC).balanceOf(BORROWER) - borrowerUsdcBefore;

package/test/fork/TestLoanTransferFork.t.sol

@@ -3,6 +3,8 @@ pragma solidity 0.8.28;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "./ForkTestBase.sol";
+import {JBPermissioned} from "@bananapus/core-v6/src/abstract/JBPermissioned.sol";
+import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
 
 /// @notice Fork tests for transferring loan NFTs and repaying from the new owner.
 ///
@@ -79,9 +81,17 @@ contract TestLoanTransferFork is ForkTestBase {
 
         JBSingleAllowance memory allowance;
 
-        // Original borrower tries to repay — should revert with REVLoans_Unauthorized.
+        // Original borrower tries to repay — should revert with JBPermissioned_Unauthorized.
         vm.prank(BORROWER);
-        vm.expectRevert(abi.encodeWithSelector(REVLoans.REVLoans_Unauthorized.selector, BORROWER, newOwner));
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                JBPermissioned.JBPermissioned_Unauthorized.selector,
+                newOwner,
+                BORROWER,
+                revnetId,
+                JBPermissionIds.REPAY_LOAN
+            )
+        );
         LOANS_CONTRACT.repayLoan{value: loan.amount * 2}({
             loanId: loanId,
             maxRepayBorrowAmount: loan.amount * 2,

package/test/helpers/MaliciousContracts.sol

@@ -162,7 +162,7 @@ contract SurplusInflator is ERC165, IJBPayoutTerminal {
             shouldInflate = false;
             // Try to borrow at the inflated surplus
             REVLoanSource memory source = REVLoanSource({token: JBConstants.NATIVE_TOKEN, terminal: realTerminal});
-            try loans.borrowFrom(revnetId, source, 0, 1e18, payable(address(this)), 25) {} catch {}
+            try loans.borrowFrom(revnetId, source, 0, 1e18, payable(address(this)), 25, address(this)) {} catch {}
         }
         return 0;
     }

package/test/regression/TestBurnPermissionRequired.t.sol

@@ -102,7 +102,6 @@ contract TestBurnPermissionRequired 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(),
@@ -113,7 +112,8 @@ contract TestBurnPermissionRequired 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 TestBurnPermissionRequired is TestBaseWorkflow {
                 JBPermissionIds.BURN_TOKENS // permissionId
             )
         );
-        LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(user), 25);
+        LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(user), 25, user);
     }
 
     /// @notice borrowFrom should succeed when the caller has granted BURN_TOKENS permission.
@@ -274,7 +274,7 @@ contract TestBurnPermissionRequired is TestBaseWorkflow {
         REVLoanSource memory source = REVLoanSource({token: JBConstants.NATIVE_TOKEN, terminal: jbMultiTerminal()});
         vm.prank(user);
         (uint256 loanId, REVLoan memory loan) =
-            LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(user), 25);
+            LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(user), 25, user);
 
         assertTrue(loanId > 0, "Loan ID should be non-zero");
         assertTrue(loan.createdAt > 0, "Loan should be created");

package/test/regression/TestCashOutBuybackFeeLeak.t.sol

@@ -77,7 +77,6 @@ contract TestCashOutBuybackFeeLeak is TestBaseWorkflow {
         mockBuyback = new MockBuybackCashOutRecorder();
         loans = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: feeProjectId,
             owner: address(this),
             permit2: permit2(),
@@ -89,7 +88,8 @@ contract TestCashOutBuybackFeeLeak is TestBaseWorkflow {
             jbDirectory(),
             feeProjectId,
             IJBSuckerRegistry(address(suckerRegistry)),
-            address(loans)
+            address(loans),
+            address(0)
         );
 
         revDeployer = new REVDeployer{salt: REV_DEPLOYER_SALT}(

package/test/regression/TestCrossRevnetLiquidation.t.sol

@@ -100,7 +100,6 @@ contract TestCrossRevnetLiquidation 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 TestCrossRevnetLiquidation 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/regression/TestCumulativeLoanCounter.t.sol

@@ -104,7 +104,6 @@ contract TestCumulativeLoanCounter is TestBaseWorkflow {
             );
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -115,7 +114,8 @@ contract TestCumulativeLoanCounter is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
@@ -242,7 +242,7 @@ contract TestCumulativeLoanCounter 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);
     }
 
     /// @notice Verifies totalLoansBorrowedFor never decrements after loan repayment.

package/test/regression/TestLiquidateGapHandling.t.sol

@@ -106,7 +106,6 @@ contract TestLiquidateGapHandling 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(),
@@ -117,7 +116,8 @@ contract TestLiquidateGapHandling is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
@@ -246,7 +246,7 @@ contract TestLiquidateGapHandling 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);
     }
 
     /// @notice Liquidation should continue past deleted loan gaps.

package/test/regression/TestZeroPriceFeed.t.sol

@@ -114,7 +114,6 @@ contract TestZeroPriceFeed is TestBaseWorkflow {
 
         LOANS_CONTRACT = new REVLoans({
             controller: jbController(),
-            projects: jbProjects(),
             revId: FEE_PROJECT_ID,
             owner: address(this),
             permit2: permit2(),
@@ -126,7 +125,8 @@ contract TestZeroPriceFeed is TestBaseWorkflow {
             jbDirectory(),
             FEE_PROJECT_ID,
             SUCKER_REGISTRY,
-            address(LOANS_CONTRACT)
+            address(LOANS_CONTRACT),
+            address(0)
         );
 
         REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
@@ -300,7 +300,7 @@ contract TestZeroPriceFeed is TestBaseWorkflow {
         _mockBurnPermission();
         REVLoanSource memory ethSource = REVLoanSource({token: JBConstants.NATIVE_TOKEN, terminal: jbMultiTerminal()});
         vm.prank(USER);
-        LOANS_CONTRACT.borrowFrom(REVNET_ID, ethSource, 0, ethCollateral, payable(USER), 25);
+        LOANS_CONTRACT.borrowFrom(REVNET_ID, ethSource, 0, ethCollateral, payable(USER), 25, USER);
 
         // Step 3: Fund the terminal with TOKEN and borrow from TOKEN source.
         uint256 tokenFunding = 1_000_000e6;
@@ -312,7 +312,7 @@ contract TestZeroPriceFeed is TestBaseWorkflow {
         _mockBurnPermission();
         REVLoanSource memory tokenSource = REVLoanSource({token: address(TOKEN), terminal: jbMultiTerminal()});
         vm.prank(USER);
-        LOANS_CONTRACT.borrowFrom(REVNET_ID, tokenSource, 0, tokenCollateral, payable(USER), 25);
+        LOANS_CONTRACT.borrowFrom(REVNET_ID, tokenSource, 0, tokenCollateral, payable(USER), 25, USER);
 
         // Verify both sources have nonzero totalBorrowedFrom.
         uint256 borrowedFromEth =
@@ -384,7 +384,7 @@ contract TestZeroPriceFeed is TestBaseWorkflow {
         _mockBurnPermission();
         REVLoanSource memory ethSource = REVLoanSource({token: JBConstants.NATIVE_TOKEN, terminal: jbMultiTerminal()});
         vm.prank(USER);
-        LOANS_CONTRACT.borrowFrom(REVNET_ID, ethSource, 0, revnetTokens / 2, payable(USER), 25);
+        LOANS_CONTRACT.borrowFrom(REVNET_ID, ethSource, 0, revnetTokens / 2, payable(USER), 25, USER);
 
         // Step 3: Get borrowable amount.
         vm.prank(USER);