@rev-net/core-v6 0.0.21 → 0.0.22

package/USER_JOURNEYS.md

@@ -321,8 +321,9 @@ This is a standard Juicebox payment, but REVOwner intervenes as the data hook.
 **What happens:**
 
 1. **Authorization:** `_ownerOf(loanId) == _msgSender()`
-2. **Source match:** New loan source must match existing loan source (prevents cross-source value extraction)
-3. **`_reallocateCollateralFromLoan`:**
+2. **Expiry check:** If the loan has expired (`block.timestamp - createdAt > LOAN_LIQUIDATION_DURATION`), reverts with `REVLoans_LoanExpired`. Expired loans can only be liquidated, not reallocated.
+3. **Source match:** New loan source must match existing loan source (prevents cross-source value extraction)
+4. **`_reallocateCollateralFromLoan`:**
    - Burns original loan NFT
    - Validates `collateralCountToTransfer <= loan.collateral`
    - Computes `newCollateralCount = loan.collateral - collateralCountToTransfer`
@@ -332,8 +333,8 @@ This is a standard Juicebox payment, but REVOwner intervenes as the data hook.
    - Calls `_adjust` to reduce collateral (returns excess tokens to caller via `_returnCollateralFrom`)
    - Mints replacement loan NFT to caller
    - Deletes original loan data
-4. **`borrowFrom`:** Opens a new loan with `collateralCountToTransfer + collateralCountToAdd` as collateral
-   - The `collateralCountToTransfer` tokens were just re-minted to the caller in step 3
+5. **`borrowFrom`:** Opens a new loan with `collateralCountToTransfer + collateralCountToAdd` as collateral
+   - The `collateralCountToTransfer` tokens were just re-minted to the caller in step 4
    - The `collateralCountToAdd` tokens come from the caller's existing balance
    - Both are burned as collateral for the new loan
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rev-net/core-v6",
-    "version": "0.0.21",
+    "version": "0.0.22",
     "license": "MIT",
     "repository": {
         "type": "git",

package/script/Deploy.s.sol

@@ -398,7 +398,8 @@ contract DeployScript is Script, Sphinx {
                     _singletonsExist = true;
 
                     // Also predict and verify the owner.
-                    (_existingOwnerAddr,) = _isDeployed({
+                    bool _ownerDeployed;
+                    (_existingOwnerAddr, _ownerDeployed) = _isDeployed({
                         salt: REVOWNER_SALT,
                         creationCode: type(REVOwner).creationCode,
                         arguments: abi.encode(
@@ -411,7 +412,8 @@ contract DeployScript is Script, Sphinx {
                     });
 
                     // Also predict and verify the deployer.
-                    (_existingDeployerAddr,) = _isDeployed({
+                    bool _deployerDeployed;
+                    (_existingDeployerAddr, _deployerDeployed) = _isDeployed({
                         salt: DEPLOYER_SALT,
                         creationCode: type(REVDeployer).creationCode,
                         arguments: abi.encode(
@@ -426,6 +428,9 @@ contract DeployScript is Script, Sphinx {
                             _existingOwnerAddr
                         )
                     });
+
+                    // If either singleton is missing, we cannot reuse the set.
+                    if (!_ownerDeployed || !_deployerDeployed) _singletonsExist = false;
                     // Stop searching — we found the deployed singletons.
                     break;
                 }
@@ -434,8 +439,21 @@ contract DeployScript is Script, Sphinx {
 
         // Only create a new fee project if no singletons were found.
         if (!_singletonsExist) {
-            // forge-lint: disable-next-line(mixed-case-variable)
-            FEE_PROJECT_ID = core.projects.createFor(safeAddress());
+            // Check if safeAddress() already owns a blank project (from a previous interrupted run).
+            bool _foundExisting;
+            for (uint256 i = _nextProjectId - 1; i >= 1; i--) {
+                if (core.projects.ownerOf(i) == safeAddress()) {
+                    if (address(core.controller.DIRECTORY().controllerOf(i)) == address(0)) {
+                        FEE_PROJECT_ID = i;
+                        _foundExisting = true;
+                        break;
+                    }
+                }
+            }
+            if (!_foundExisting) {
+                // forge-lint: disable-next-line(mixed-case-variable)
+                FEE_PROJECT_ID = core.projects.createFor(safeAddress());
+            }
         }
 
         // Deploy REVLoans first — it only depends on the controller.
@@ -491,9 +509,11 @@ contract DeployScript is Script, Sphinx {
                 owner: address(revOwner)
             });
 
-        // Only configure the fee project if singletons were freshly deployed. Re-running `deployFor` on an
-        // already-configured project would fail because the project is no longer blank.
-        if (!_singletonsExist) {
+        // Only configure the fee project if it doesn't already have a controller.
+        // This handles both fresh deploys and restarts where singletons exist but the fee project
+        // was not yet configured.
+        bool _feeProjectConfigured = address(core.controller.DIRECTORY().controllerOf(FEE_PROJECT_ID)) != address(0);
+        if (!_feeProjectConfigured) {
             // Approve the basic deployer to configure the project.
             core.projects.approve({to: address(_basicDeployer), tokenId: FEE_PROJECT_ID});
 

package/src/REVLoans.sol

@@ -759,6 +759,11 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
         // Make sure only the loan's owner can manage it.
         if (_ownerOf(loanId) != _msgSender()) revert REVLoans_Unauthorized(_msgSender(), _ownerOf(loanId));
 
+        // Make sure the loan hasn't expired.
+        if (block.timestamp - _loanOf[loanId].createdAt > LOAN_LIQUIDATION_DURATION) {
+            revert REVLoans_LoanExpired(block.timestamp - _loanOf[loanId].createdAt, LOAN_LIQUIDATION_DURATION);
+        }
+
         // Make sure the new loan's source matches the existing loan's source to prevent cross-source value extraction.
         {
             REVLoanSource storage existingSource = _loanOf[loanId].source;
@@ -831,6 +836,11 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
                 loan: loan, revnetId: revnetId, collateralCount: loan.collateral - collateralCountToReturn
             });
 
+            // If the remaining collateral yields zero borrow amount, treat as full repay.
+            if (newBorrowAmount == 0) {
+                collateralCountToReturn = loan.collateral;
+            }
+
             // Make sure the new borrow amount is less than the loan's amount.
             if (newBorrowAmount > loan.amount) {
                 revert REVLoans_NewBorrowAmountGreaterThanLoanAmount(newBorrowAmount, loan.amount);
@@ -1362,7 +1372,10 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
             paidOffLoan.prepaidDuration = loan.prepaidDuration;
             paidOffLoan.source = loan.source;
 
-            // Borrow in.
+            // Mint the replacement loan FIRST so it exists before _adjust writes data.
+            _mint({to: _msgSender(), tokenId: paidOffLoanId});
+
+            // Then adjust the loan data.
             _adjust({
                 loan: paidOffLoan,
                 revnetId: revnetId,
@@ -1372,9 +1385,6 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
                 beneficiary: beneficiary
             });
 
-            // Mint the replacement loan.
-            _mint({to: _msgSender(), tokenId: paidOffLoanId});
-
             emit RepayLoan({
                 loanId: loanId,
                 revnetId: revnetId,

package/test/TestZeroAmountLoanGuard.t.sol

@@ -0,0 +1,365 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.28;
+
+// 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";
+import {REVEmpty721Config} from "./helpers/REVEmpty721Config.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 {IREVLoans} from "./../src/interfaces/IREVLoans.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 {REVOwner} from "../src/REVOwner.sol";
+import {IREVDeployer} from "../src/interfaces/IREVDeployer.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
+
+/// @notice Tests for PR #105: zero-amount loan guard and mint-before-adjust ordering.
+contract TestZeroAmountLoanGuard 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)
+    REVOwner REV_OWNER;
+    // forge-lint: disable-next-line(mixed-case-variable)
+    JB721TiersHook EXAMPLE_HOOK;
+    // forge-lint: disable-next-line(mixed-case-variable)
+    IJB721TiersHookDeployer HOOK_DEPLOYER;
+    // 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)
+    IREVLoans 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;
+
+    // forge-lint: disable-next-line(mixed-case-variable)
+    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_OWNER = new REVOwner(
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
+            jbDirectory(),
+            FEE_PROJECT_ID,
+            SUCKER_REGISTRY,
+            address(LOANS_CONTRACT)
+        );
+
+        REV_DEPLOYER = new REVDeployer{salt: REV_DEPLOYER_SALT}(
+            jbController(),
+            SUCKER_REGISTRY,
+            FEE_PROJECT_ID,
+            HOOK_DEPLOYER,
+            PUBLISHER,
+            IJBBuybackHookRegistry(address(MOCK_BUYBACK)),
+            address(LOANS_CONTRACT),
+            TRUSTED_FORWARDER,
+            address(REV_OWNER)
+        );
+
+        vm.prank(multisig());
+        jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
+        _deployFeeProject();
+        _deployRevnet();
+        vm.deal(USER, 1000e18);
+    }
+
+    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
+        });
+        REVLoanSource[] memory ls = new REVLoanSource[](1);
+        ls[0] = REVLoanSource({token: JBConstants.NATIVE_TOKEN, terminal: jbMultiTerminal()});
+        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()
+        });
+    }
+
+    function _setupLoan(
+        address user,
+        uint256 ethAmount,
+        uint256 prepaidFee
+    )
+        internal
+        returns (uint256 loanId, uint256 tokenCount, uint256 borrowAmount)
+    {
+        vm.prank(user);
+        tokenCount =
+            jbMultiTerminal().pay{value: ethAmount}(REVNET_ID, JBConstants.NATIVE_TOKEN, ethAmount, user, 0, "", "");
+        borrowAmount =
+            LOANS_CONTRACT.borrowableAmountFrom(REVNET_ID, tokenCount, 18, uint32(uint160(JBConstants.NATIVE_TOKEN)));
+        if (borrowAmount == 0) return (0, tokenCount, 0);
+        mockExpect(
+            address(jbPermissions()),
+            abi.encodeCall(IJBPermissions.hasPermission, (address(LOANS_CONTRACT), user, REVNET_ID, 11, true, true)),
+            abi.encode(true)
+        );
+        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);
+    }
+
+    // -----------------------------------------------------------------------
+    // 1. Zero-amount loan guard: partial repay that rounds to zero triggers full repay
+    // -----------------------------------------------------------------------
+
+    /// @notice When a partial repay would create a zero-amount loan (newBorrowAmount rounds to 0),
+    /// the guard should automatically return ALL collateral (full repay path).
+    /// Without the guard, a zero-amount loan with leftover collateral would be unrepayable.
+    function test_zeroAmountGuard_partialRepayBecomesFullRepay() public {
+        // Setup: borrow against 10 ETH
+        (uint256 loanId,,) = _setupLoan(USER, 10e18, 25);
+        require(loanId != 0, "Loan setup failed");
+
+        REVLoan memory loan = LOANS_CONTRACT.loanOf(loanId);
+        uint256 originalCollateral = loan.collateral;
+
+        // Drain most surplus so remaining collateral yields ~0 borrow amount.
+        // Cash out most of the surplus from other participants to reduce it drastically.
+        // Instead, we'll return nearly all collateral, leaving just 1 token.
+        // With very low remaining collateral and bonding curve rounding, newBorrowAmount = 0.
+        uint256 collateralToReturn = originalCollateral - 1; // Return all but 1 token
+
+        JBSingleAllowance memory allowance;
+
+        vm.prank(USER);
+        (uint256 paidOffLoanId, REVLoan memory paidOffLoan) = LOANS_CONTRACT.repayLoan{value: loan.amount}(
+            loanId,
+            loan.amount, // generous max repay
+            collateralToReturn,
+            payable(USER),
+            allowance
+        );
+
+        // Check: if newBorrowAmount was 0, the guard should have triggered full repayment.
+        // This means paidOffLoanId == loanId (original ID returned for full repays)
+        // AND paidOffLoan.collateral == 0 AND paidOffLoan.amount == 0.
+        if (paidOffLoanId == loanId) {
+            // Full repay path was taken — guard worked
+            assertEq(paidOffLoan.collateral, 0, "Full repay should have zero collateral");
+            assertEq(paidOffLoan.amount, 0, "Full repay should have zero amount");
+        } else {
+            // Partial repay path — newBorrowAmount was nonzero (rounding didn't hit zero)
+            // This is also valid, just means the guard wasn't needed in this case.
+            assertTrue(paidOffLoan.amount > 0, "Partial repay should have nonzero amount");
+            assertTrue(paidOffLoan.collateral > 0, "Partial repay should have nonzero collateral");
+        }
+    }
+
+    // -----------------------------------------------------------------------
+    // 2. Mint-before-adjust: replacement loan NFT exists before external calls
+    // -----------------------------------------------------------------------
+
+    /// @notice A partial repay (not returning all collateral) should produce a valid new loan NFT
+    /// with correct ownership established before any external calls from _adjust.
+    function test_mintBeforeAdjust_partialRepayCreatesValidLoan() public {
+        // Setup: borrow against 10 ETH
+        (uint256 loanId,,) = _setupLoan(USER, 10e18, 25);
+        require(loanId != 0, "Loan setup failed");
+
+        REVLoan memory loan = LOANS_CONTRACT.loanOf(loanId);
+        uint256 collateralToReturn = loan.collateral / 2;
+
+        JBSingleAllowance memory allowance;
+
+        vm.prank(USER);
+        (uint256 paidOffLoanId, REVLoan memory paidOffLoan) = LOANS_CONTRACT.repayLoan{value: loan.amount}(
+            loanId, loan.amount, collateralToReturn, payable(USER), allowance
+        );
+
+        // Partial repay should create a new loan (different ID)
+        assertTrue(paidOffLoanId != loanId, "Partial repay should create new loan ID");
+
+        // New loan should be owned by the caller
+        assertEq(
+            IERC721(address(LOANS_CONTRACT)).ownerOf(paidOffLoanId), USER, "New loan NFT should be owned by caller"
+        );
+
+        // New loan should have reduced collateral and amount
+        assertTrue(paidOffLoan.collateral < loan.collateral, "New loan should have less collateral");
+        assertTrue(paidOffLoan.amount < loan.amount, "New loan should have less borrow amount");
+        assertTrue(paidOffLoan.collateral > 0, "New loan should have nonzero collateral");
+        assertTrue(paidOffLoan.amount > 0, "New loan should have nonzero borrow amount");
+
+        // Original loan NFT should be burned
+        vm.expectRevert();
+        IERC721(address(LOANS_CONTRACT)).ownerOf(loanId);
+    }
+
+    // -----------------------------------------------------------------------
+    // 3. Full repay still works correctly (returns original loanId)
+    // -----------------------------------------------------------------------
+
+    /// @notice Full repayment (returning all collateral) should return the original loanId
+    /// and zero out the loan. This path doesn't create a new NFT.
+    function test_fullRepay_returnsOriginalLoanId() public {
+        (uint256 loanId,,) = _setupLoan(USER, 10e18, 25);
+        require(loanId != 0, "Loan setup failed");
+
+        REVLoan memory loan = LOANS_CONTRACT.loanOf(loanId);
+
+        JBSingleAllowance memory allowance;
+
+        vm.prank(USER);
+        (uint256 paidOffLoanId, REVLoan memory paidOffLoan) = LOANS_CONTRACT.repayLoan{value: loan.amount}(
+            loanId,
+            loan.amount,
+            loan.collateral, // return ALL collateral
+            payable(USER),
+            allowance
+        );
+
+        assertEq(paidOffLoanId, loanId, "Full repay should return original loan ID");
+        assertEq(paidOffLoan.amount, 0, "Full repay should zero out amount");
+        assertEq(paidOffLoan.collateral, 0, "Full repay should zero out collateral");
+    }
+}