@rev-net/core-v6 0.0.11 → 0.0.13

package/test/fork/TestCashOutFork.t.sol

@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "./ForkTestBase.sol";
-import {JBCashOuts} from "@bananapus/core-v6/src/libraries/JBCashOuts.sol";
+import {REVEmpty721Config} from "../helpers/REVEmpty721Config.sol";
 
 /// @notice Fork tests for revnet cash-out scenarios with real Uniswap V4 buyback hook.
 ///
@@ -203,8 +204,13 @@ contract TestCashOutFork is ForkTestBase {
         (REVConfig memory cfg, JBTerminalConfig[] memory tc, REVSuckerDeploymentConfig memory sdc) =
             _buildMinimalConfig(5000);
         cfg.stageConfigurations[0].startsAtOrAfter = uint40(block.timestamp - 1);
-        uint256 delayRevnet = REV_DEPLOYER.deployFor({
-            revnetId: 0, configuration: cfg, terminalConfigurations: tc, suckerDeploymentConfiguration: sdc
+        (uint256 delayRevnet,) = REV_DEPLOYER.deployFor({
+            revnetId: 0,
+            configuration: cfg,
+            terminalConfigurations: tc,
+            suckerDeploymentConfiguration: sdc,
+            tiered721HookConfiguration: REVEmpty721Config.empty721Config(uint32(uint160(JBConstants.NATIVE_TOKEN))),
+            allowedPosts: REVEmpty721Config.emptyAllowedPosts()
         });
         _setupPool(delayRevnet, 10_000 ether);
         _payRevnet(delayRevnet, PAYER, 1 ether);

package/test/fork/TestLoanBorrowFork.t.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "./ForkTestBase.sol";
 import {JBFees} from "@bananapus/core-v6/src/libraries/JBFees.sol";
 

package/test/fork/TestLoanCrossRulesetFork.t.sol

@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "./ForkTestBase.sol";
-import {JBFees} from "@bananapus/core-v6/src/libraries/JBFees.sol";
+import {REVEmpty721Config} from "../helpers/REVEmpty721Config.sol";
 
 /// @notice Fork tests for loan lifecycle spanning multiple revnet stages (rulesets).
 ///
@@ -52,6 +53,7 @@ contract TestLoanCrossRulesetFork is ForkTestBase {
 
         // Stage 2: low tax — starts after STAGE_DURATION.
         stages[1] = REVStageConfig({
+            // forge-lint: disable-next-line(unsafe-typecast)
             startsAtOrAfter: uint40(block.timestamp + STAGE_DURATION),
             autoIssuances: new REVAutoIssuance[](0),
             splitPercent: 0,
@@ -64,6 +66,7 @@ contract TestLoanCrossRulesetFork is ForkTestBase {
         });
 
         cfg = REVConfig({
+            // forge-lint: disable-next-line(named-struct-fields)
             description: REVDescription("CrossStage", "XSTG", "ipfs://xstage", "XSTG_SALT"),
             baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
             splitOperator: multisig(),
@@ -85,8 +88,13 @@ contract TestLoanCrossRulesetFork is ForkTestBase {
         (REVConfig memory cfg, JBTerminalConfig[] memory tc, REVSuckerDeploymentConfig memory sdc) =
             _buildTwoStageConfig(7000, 2000);
 
-        revnetId = REV_DEPLOYER.deployFor({
-            revnetId: 0, configuration: cfg, terminalConfigurations: tc, suckerDeploymentConfiguration: sdc
+        (revnetId,) = REV_DEPLOYER.deployFor({
+            revnetId: 0,
+            configuration: cfg,
+            terminalConfigurations: tc,
+            suckerDeploymentConfiguration: sdc,
+            tiered721HookConfiguration: REVEmpty721Config.empty721Config(uint32(uint160(JBConstants.NATIVE_TOKEN))),
+            allowedPosts: REVEmpty721Config.emptyAllowedPosts()
         });
 
         // Set up pool at 1:1 (mint path wins).

package/test/fork/TestLoanLiquidationFork.t.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "./ForkTestBase.sol";
 
 /// @notice Fork tests for REVLoans.liquidateExpiredLoansFrom() with real Uniswap V4 buyback hook.

package/test/fork/TestLoanReallocateFork.t.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "./ForkTestBase.sol";
 
 /// @notice Fork tests for REVLoans.reallocateCollateralFromLoan() with real Uniswap V4 buyback hook.

package/test/fork/TestLoanRepayFork.t.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "./ForkTestBase.sol";
 
 /// @notice Fork tests for REVLoans.repayLoan() with real Uniswap V4 buyback hook.

package/test/fork/TestLoanTransferFork.t.sol

@@ -0,0 +1,133 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.26;
+
+// forge-lint: disable-next-line(unaliased-plain-import)
+import "./ForkTestBase.sol";
+
+/// @notice Fork tests for transferring loan NFTs and repaying from the new owner.
+///
+/// Covers: transfer + repay by new owner, original owner rejection after transfer, transfer + partial repay.
+///
+/// Run with: FOUNDRY_PROFILE=fork forge test --match-contract TestLoanTransferFork -vvv
+contract TestLoanTransferFork is ForkTestBase {
+    uint256 revnetId;
+    uint256 loanId;
+    REVLoan loan;
+    uint256 borrowerTokens;
+
+    address newOwner = makeAddr("newOwner");
+
+    function setUp() public override {
+        super.setUp();
+
+        // Deploy fee project + revnet.
+        _deployFeeProject(5000);
+        revnetId = _deployRevnet(5000);
+        _setupPool(revnetId, 10_000 ether);
+
+        // Pay to create surplus.
+        _payRevnet(revnetId, PAYER, 10 ether);
+        _payRevnet(revnetId, BORROWER, 5 ether);
+
+        borrowerTokens = jbTokens().totalBalanceOf(BORROWER, revnetId);
+
+        // Create a loan with min prepaid fee.
+        (loanId, loan) = _createLoan(revnetId, BORROWER, borrowerTokens, LOANS_CONTRACT.MIN_PREPAID_FEE_PERCENT());
+    }
+
+    /// @notice Transfer loan NFT to a new owner, who then fully repays the loan.
+    function test_fork_transferLoan_newOwnerCanRepay() public {
+        // Transfer the loan NFT from BORROWER to newOwner.
+        vm.prank(BORROWER);
+        REVLoans(payable(address(LOANS_CONTRACT))).safeTransferFrom(BORROWER, newOwner, loanId);
+
+        // Verify newOwner is the loan NFT owner.
+        assertEq(_loanOwnerOf(loanId), newOwner, "newOwner should own the loan NFT after transfer");
+
+        // Fund newOwner with ETH for repayment.
+        vm.deal(newOwner, 100 ether);
+
+        JBSingleAllowance memory allowance;
+
+        // newOwner repays the loan in full.
+        vm.prank(newOwner);
+        LOANS_CONTRACT.repayLoan{value: loan.amount * 2}({
+            loanId: loanId,
+            maxRepayBorrowAmount: loan.amount * 2,
+            collateralCountToReturn: loan.collateral,
+            beneficiary: payable(newOwner),
+            allowance: allowance
+        });
+
+        // Loan NFT should be burned after full repay.
+        vm.expectRevert();
+        _loanOwnerOf(loanId);
+
+        // Collateral tokens should be minted to newOwner (the beneficiary).
+        uint256 newOwnerTokens = jbTokens().totalBalanceOf(newOwner, revnetId);
+        assertEq(newOwnerTokens, borrowerTokens, "collateral should be returned to newOwner");
+    }
+
+    /// @notice After transferring the loan NFT, the original borrower cannot repay.
+    function test_fork_transferLoan_originalBorrowerCannotRepay() public {
+        // Transfer the loan NFT from BORROWER to newOwner.
+        vm.prank(BORROWER);
+        REVLoans(payable(address(LOANS_CONTRACT))).safeTransferFrom(BORROWER, newOwner, loanId);
+
+        // Fund BORROWER with ETH for the attempted repayment.
+        vm.deal(BORROWER, 100 ether);
+
+        JBSingleAllowance memory allowance;
+
+        // Original borrower tries to repay — should revert with REVLoans_Unauthorized.
+        vm.prank(BORROWER);
+        vm.expectRevert(abi.encodeWithSelector(REVLoans.REVLoans_Unauthorized.selector, BORROWER, newOwner));
+        LOANS_CONTRACT.repayLoan{value: loan.amount * 2}({
+            loanId: loanId,
+            maxRepayBorrowAmount: loan.amount * 2,
+            collateralCountToReturn: loan.collateral,
+            beneficiary: payable(BORROWER),
+            allowance: allowance
+        });
+    }
+
+    /// @notice Transfer loan NFT, new owner does a partial repay — old loan burned, new loan minted to new owner.
+    function test_fork_transferLoan_newOwnerPartialRepay() public {
+        // Transfer the loan NFT from BORROWER to newOwner.
+        vm.prank(BORROWER);
+        REVLoans(payable(address(LOANS_CONTRACT))).safeTransferFrom(BORROWER, newOwner, loanId);
+
+        // Fund newOwner with ETH for repayment.
+        vm.deal(newOwner, 100 ether);
+
+        uint256 halfCollateral = loan.collateral / 2;
+
+        JBSingleAllowance memory allowance;
+
+        // newOwner partially repays the loan (return half the collateral).
+        vm.prank(newOwner);
+        (uint256 newLoanId, REVLoan memory newLoan) = LOANS_CONTRACT.repayLoan{value: loan.amount * 2}({
+            loanId: loanId,
+            maxRepayBorrowAmount: loan.amount * 2,
+            collateralCountToReturn: halfCollateral,
+            beneficiary: payable(newOwner),
+            allowance: allowance
+        });
+
+        // Original loan NFT should be burned.
+        vm.expectRevert();
+        _loanOwnerOf(loanId);
+
+        // New loan should exist with reduced collateral.
+        assertGt(newLoanId, 0, "new loan should be created");
+        assertEq(newLoan.collateral, loan.collateral - halfCollateral, "new loan collateral should be reduced");
+        assertLt(newLoan.amount, loan.amount, "new loan borrow amount should be less");
+
+        // New loan NFT should be owned by newOwner.
+        assertEq(_loanOwnerOf(newLoanId), newOwner, "new loan NFT should be owned by newOwner");
+
+        // Half collateral should be returned to newOwner.
+        uint256 newOwnerTokens = jbTokens().totalBalanceOf(newOwner, revnetId);
+        assertEq(newOwnerTokens, halfCollateral, "half collateral should be returned to newOwner");
+    }
+}

package/test/fork/TestSplitWeightFork.t.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
+// forge-lint: disable-next-line(unaliased-plain-import)
 import "./ForkTestBase.sol";
 
 /// @notice Fork tests verifying that revnet 721 tier splits + real Uniswap V4 buyback hook produce correct token
@@ -50,6 +51,7 @@ contract TestSplitWeightFork is ForkTestBase {
         vm.stopPrank();
 
         // Add full-range liquidity at tick 0 (1:1 price).
+        // forge-lint: disable-next-line(unsafe-typecast)
         int256 liquidityDelta = int256(ethLiq / 4);
         vm.prank(address(liqHelper));
         liqHelper.addLiquidity{value: ethLiq}(key, TICK_LOWER, TICK_UPPER, liquidityDelta);
@@ -66,6 +68,7 @@ contract TestSplitWeightFork is ForkTestBase {
         uint160 sqrtPriceLimit = TickMath.getSqrtPriceAtTick(76_000);
 
         vm.prank(address(liqHelper));
+        // forge-lint: disable-next-line(unsafe-typecast)
         liqHelper.swap(key, zeroForOne, -int256(swapAmount), sqrtPriceLimit);
 
         // Read the post-swap tick for the oracle mock.

package/test/helpers/REVEmpty721Config.sol

@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";
+// forge-lint: disable-next-line(unused-import)
+import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
+import {JB721InitTiersConfig} from "@bananapus/721-hook-v6/src/structs/JB721InitTiersConfig.sol";
+import {JB721TierConfig} from "@bananapus/721-hook-v6/src/structs/JB721TierConfig.sol";
+import {REVBaseline721HookConfig} from "../../src/structs/REVBaseline721HookConfig.sol";
+import {REVDeploy721TiersHookConfig} from "../../src/structs/REVDeploy721TiersHookConfig.sol";
+import {REV721TiersHookFlags} from "../../src/structs/REV721TiersHookFlags.sol";
+import {REVCroptopAllowedPost} from "../../src/structs/REVCroptopAllowedPost.sol";
+
+/// @notice Helpers for constructing empty 721 hook configs in tests.
+library REVEmpty721Config {
+    function empty721Config(uint32 baseCurrency) internal pure returns (REVDeploy721TiersHookConfig memory) {
+        return REVDeploy721TiersHookConfig({
+            baseline721HookConfiguration: REVBaseline721HookConfig({
+                name: "",
+                symbol: "",
+                baseUri: "",
+                tokenUriResolver: IJB721TokenUriResolver(address(0)),
+                contractUri: "",
+                tiersConfig: JB721InitTiersConfig({
+                    tiers: new JB721TierConfig[](0), currency: baseCurrency, decimals: 18
+                }),
+                reserveBeneficiary: address(0),
+                flags: REV721TiersHookFlags({
+                    noNewTiersWithReserves: false,
+                    noNewTiersWithVotes: false,
+                    noNewTiersWithOwnerMinting: false,
+                    preventOverspending: false
+                })
+            }),
+            salt: bytes32(0),
+            preventSplitOperatorAdjustingTiers: false,
+            preventSplitOperatorUpdatingMetadata: false,
+            preventSplitOperatorMinting: false,
+            preventSplitOperatorIncreasingDiscountPercent: false
+        });
+    }
+
+    function emptyAllowedPosts() internal pure returns (REVCroptopAllowedPost[] memory) {
+        return new REVCroptopAllowedPost[](0);
+    }
+}

package/test/mock/MockBuybackDataHook.sol

@@ -3,6 +3,7 @@ pragma solidity 0.8.26;
 
 import {IJBRulesetDataHook} from "@bananapus/core-v6/src/interfaces/IJBRulesetDataHook.sol";
 import {IJBPayHook} from "@bananapus/core-v6/src/interfaces/IJBPayHook.sol";
+// forge-lint: disable-next-line(unused-import)
 import {IJBBuybackHook} from "@bananapus/buyback-hook-v6/src/interfaces/IJBBuybackHook.sol";
 import {JBBeforePayRecordedContext} from "@bananapus/core-v6/src/structs/JBBeforePayRecordedContext.sol";
 import {JBBeforeCashOutRecordedContext} from "@bananapus/core-v6/src/structs/JBBeforeCashOutRecordedContext.sol";

package/test/regression/TestBurnPermissionRequired.t.sol

@@ -0,0 +1,267 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.26;
+
+// forge-lint: disable-next-line(unaliased-plain-import)
+import "forge-std/Test.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
+import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
+import /* {*} from */ "./../../src/REVDeployer.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
+import "@croptop/core-v6/src/CTPublisher.sol";
+import {MockBuybackDataHook} from "./../mock/MockBuybackDataHook.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
+import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
+import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
+import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
+import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
+// forge-lint: disable-next-line(unaliased-plain-import)
+import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
+import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
+import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
+import {JBSingleAllowance} from "@bananapus/core-v6/src/structs/JBSingleAllowance.sol";
+import {MockPriceFeed} from "@bananapus/core-v6/test/mock/MockPriceFeed.sol";
+import {MockERC20} from "@bananapus/core-v6/test/mock/MockERC20.sol";
+import {REVLoans} from "../../src/REVLoans.sol";
+import {REVLoan} from "../../src/structs/REVLoan.sol";
+import {REVStageConfig, REVAutoIssuance} from "../../src/structs/REVStageConfig.sol";
+import {REVLoanSource} from "../../src/structs/REVLoanSource.sol";
+import {REVDescription} from "../../src/structs/REVDescription.sol";
+import {JBSuckerDeployerConfig} from "@bananapus/suckers-v6/src/structs/JBSuckerDeployerConfig.sol";
+import {JBSuckerRegistry} from "@bananapus/suckers-v6/src/JBSuckerRegistry.sol";
+import {JB721TiersHookDeployer} from "@bananapus/721-hook-v6/src/JB721TiersHookDeployer.sol";
+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 {REVEmpty721Config} from "../helpers/REVEmpty721Config.sol";
+import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
+import {JBPermissioned} from "@bananapus/core-v6/src/abstract/JBPermissioned.sol";
+
+/// @notice Validates that borrowFrom() reverts with a clear error when the caller hasn't granted BURN_TOKENS
+/// permission to the REVLoans contract.
+/// @dev Without this upfront check, the transaction would revert deep in JBController.burnTokensOf with a
+/// less informative JBPermissioned_Unauthorized error.
+contract TestBurnPermissionRequired is TestBaseWorkflow {
+    // forge-lint: disable-next-line(mixed-case-variable)
+    bytes32 REV_DEPLOYER_SALT = "REVDeployer";
+
+    // forge-lint: disable-next-line(mixed-case-variable)
+    REVDeployer REV_DEPLOYER;
+    // forge-lint: disable-next-line(mixed-case-variable)
+    JB721TiersHook EXAMPLE_HOOK;
+    // forge-lint: disable-next-line(mixed-case-variable)
+    IJB721TiersHookDeployer HOOK_DEPLOYER;
+    // forge-lint: disable-next-line(mixed-case-variable)
+    IJB721TiersHookStore HOOK_STORE;
+    // forge-lint: disable-next-line(mixed-case-variable)
+    IJBAddressRegistry ADDRESS_REGISTRY;
+    // forge-lint: disable-next-line(mixed-case-variable)
+    REVLoans LOANS_CONTRACT;
+    // forge-lint: disable-next-line(mixed-case-variable)
+    MockERC20 TOKEN;
+    // forge-lint: disable-next-line(mixed-case-variable)
+    IJBSuckerRegistry SUCKER_REGISTRY;
+    // forge-lint: disable-next-line(mixed-case-variable)
+    CTPublisher PUBLISHER;
+    // forge-lint: disable-next-line(mixed-case-variable)
+    MockBuybackDataHook MOCK_BUYBACK;
+
+    // forge-lint: disable-next-line(mixed-case-variable)
+    uint256 FEE_PROJECT_ID;
+    // forge-lint: disable-next-line(mixed-case-variable)
+    uint256 REVNET_ID;
+
+    address user = makeAddr("user");
+
+    address private constant TRUSTED_FORWARDER = 0xB2b5841DBeF766d4b521221732F9B618fCf34A87;
+
+    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();
+        TOKEN = new MockERC20("1/2 ETH", "1/2");
+        MockPriceFeed priceFeed = new MockPriceFeed(1e21, 6);
+        vm.prank(multisig());
+        jbPrices()
+            .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(),
+            trustedForwarder: TRUSTED_FORWARDER
+        });
+        REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
+            jbController(),
+            SUCKER_REGISTRY,
+            FEE_PROJECT_ID,
+            HOOK_DEPLOYER,
+            PUBLISHER,
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
+            address(LOANS_CONTRACT),
+            TRUSTED_FORWARDER
+        );
+        vm.prank(multisig());
+        jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
+        _deployFeeProject();
+        _deployRevnet();
+        vm.deal(user, 100e18);
+    }
+
+    function _deployFeeProject() internal {
+        JBAccountingContext[] memory acc = new JBAccountingContext[](2);
+        acc[0] = JBAccountingContext({
+            token: JBConstants.NATIVE_TOKEN, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
+        });
+        acc[1] = JBAccountingContext({token: address(TOKEN), decimals: 6, currency: uint32(uint160(address(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;
+        REVAutoIssuance[] memory ai = new REVAutoIssuance[](1);
+        ai[0] = REVAutoIssuance({chainId: uint32(block.chainid), count: uint104(70_000e18), beneficiary: multisig()});
+        stages[0] = REVStageConfig({
+            startsAtOrAfter: uint40(block.timestamp),
+            autoIssuances: ai,
+            splitPercent: 2000,
+            splits: splits,
+            initialIssuance: uint112(1000e18),
+            issuanceCutFrequency: 90 days,
+            issuanceCutPercent: JBConstants.MAX_WEIGHT_CUT_PERCENT / 2,
+            cashOutTaxRate: 6000,
+            extraMetadata: 0
+        });
+        REVConfig memory cfg = REVConfig({
+            // forge-lint: disable-next-line(named-struct-fields)
+            description: REVDescription("Revnet", "$REV", "ipfs://test", "REV_TOKEN"),
+            baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
+            splitOperator: multisig(),
+            stageConfigurations: stages
+        });
+        vm.prank(multisig());
+        REV_DEPLOYER.deployFor({
+            revnetId: FEE_PROJECT_ID,
+            configuration: cfg,
+            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 {
+        JBAccountingContext[] memory acc = new JBAccountingContext[](2);
+        acc[0] = JBAccountingContext({
+            token: JBConstants.NATIVE_TOKEN, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
+        });
+        acc[1] = JBAccountingContext({token: address(TOKEN), decimals: 6, currency: uint32(uint160(address(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;
+        REVAutoIssuance[] memory ai = new REVAutoIssuance[](1);
+        ai[0] = REVAutoIssuance({chainId: uint32(block.chainid), count: uint104(70_000e18), beneficiary: multisig()});
+        stages[0] = REVStageConfig({
+            startsAtOrAfter: uint40(block.timestamp),
+            autoIssuances: ai,
+            splitPercent: 2000,
+            splits: splits,
+            initialIssuance: uint112(1000e18),
+            issuanceCutFrequency: 90 days,
+            issuanceCutPercent: JBConstants.MAX_WEIGHT_CUT_PERCENT / 2,
+            cashOutTaxRate: 6000,
+            extraMetadata: 0
+        });
+        REVConfig memory cfg = REVConfig({
+            // forge-lint: disable-next-line(named-struct-fields)
+            description: REVDescription("NANA", "$NANA", "ipfs://test2", "NANA_TOKEN"),
+            baseCurrency: uint32(uint160(JBConstants.NATIVE_TOKEN)),
+            splitOperator: multisig(),
+            stageConfigurations: stages
+        });
+        (REVNET_ID,) = REV_DEPLOYER.deployFor({
+            revnetId: 0,
+            configuration: cfg,
+            terminalConfigurations: tc,
+            suckerDeploymentConfiguration: REVSuckerDeploymentConfig({
+                deployerConfigurations: new JBSuckerDeployerConfig[](0), salt: keccak256("NANA")
+            }),
+            tiered721HookConfiguration: REVEmpty721Config.empty721Config(uint32(uint160(JBConstants.NATIVE_TOKEN))),
+            allowedPosts: REVEmpty721Config.emptyAllowedPosts()
+        });
+    }
+
+    /// @notice borrowFrom should revert when the caller hasn't granted BURN_TOKENS permission.
+    /// @dev The controller enforces this with JBPermissioned_Unauthorized when burnTokensOf is called.
+    function test_borrowFrom_revertsWithoutBurnPermission() public {
+        // Pay into the revnet to get tokens.
+        vm.prank(user);
+        uint256 tokenCount =
+            jbMultiTerminal().pay{value: 5e18}(REVNET_ID, JBConstants.NATIVE_TOKEN, 5e18, user, 0, "", "");
+        require(tokenCount > 0, "Should have received tokens");
+
+        // Attempt to borrow WITHOUT granting BURN_TOKENS permission → should revert.
+        REVLoanSource memory source = REVLoanSource({token: JBConstants.NATIVE_TOKEN, terminal: jbMultiTerminal()});
+        vm.prank(user);
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                JBPermissioned.JBPermissioned_Unauthorized.selector,
+                user, // account (the token holder)
+                address(LOANS_CONTRACT), // sender (the contract trying to burn)
+                REVNET_ID, // projectId
+                JBPermissionIds.BURN_TOKENS // permissionId
+            )
+        );
+        LOANS_CONTRACT.borrowFrom(REVNET_ID, source, 0, tokenCount, payable(user), 25);
+    }
+
+    /// @notice borrowFrom should succeed when the caller has granted BURN_TOKENS permission.
+    function test_borrowFrom_succeedsWithBurnPermission() public {
+        // Pay into the revnet to get tokens.
+        vm.prank(user);
+        uint256 tokenCount =
+            jbMultiTerminal().pay{value: 5e18}(REVNET_ID, JBConstants.NATIVE_TOKEN, 5e18, user, 0, "", "");
+        require(tokenCount > 0, "Should have received tokens");
+
+        // Grant BURN_TOKENS permission to the loans contract via the real permissions system.
+        uint8[] memory permissionIds = new uint8[](1);
+        permissionIds[0] = JBPermissionIds.BURN_TOKENS;
+        vm.prank(user);
+        jbPermissions()
+            .setPermissionsFor({
+                account: user,
+                permissionsData: JBPermissionsData({
+                    operator: address(LOANS_CONTRACT), projectId: uint64(REVNET_ID), permissionIds: permissionIds
+                })
+            });
+
+        // Borrow should now succeed.
+        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);
+
+        assertTrue(loanId > 0, "Loan ID should be non-zero");
+        assertTrue(loan.createdAt > 0, "Loan should be created");
+        assertTrue(loan.amount > 0, "Loan amount should be non-zero");
+    }
+}