@rev-net/core-v6 0.0.37 → 0.0.40

package/test/fork/TestLoanReallocateFork.t.sol

@@ -1,113 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-// forge-lint: disable-next-line(unaliased-plain-import)
-import "./ForkTestBase.sol";
-
-/// @notice Fork tests for REVLoans.reallocateCollateralFromLoan() with real Uniswap V4 buyback hook.
-///
-/// Covers: basic reallocation and source mismatch revert.
-///
-/// Run with: FOUNDRY_PROFILE=fork forge test --match-contract TestLoanReallocateFork -vvv
-contract TestLoanReallocateFork is ForkTestBase {
-    uint256 revnetId;
-
-    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, 10 ether);
-    }
-
-    /// @notice Reallocate collateral to a new loan: original reduced, new loan created.
-    function test_fork_reallocate_basic() public {
-        uint256 borrowerTokens = jbTokens().totalBalanceOf(BORROWER, revnetId);
-        (uint256 loanId, REVLoan memory loan) =
-            _createLoan(revnetId, BORROWER, borrowerTokens, LOANS_CONTRACT.MIN_PREPAID_FEE_PERCENT());
-
-        // Add more surplus after the loan so the remaining collateral supports the existing borrow amount.
-        // Without extra surplus, any collateral removal would make borrowable < loan.amount (bonding curve).
-        address extraPayer = makeAddr("extraPayer");
-        vm.deal(extraPayer, 20 ether);
-        _payRevnet(revnetId, extraPayer, 20 ether);
-
-        uint256 transferAmount = loan.collateral / 20;
-        uint256 totalCollateralBefore = LOANS_CONTRACT.totalCollateralOf(revnetId);
-
-        REVLoanSource memory source = _nativeLoanSource();
-
-        // Grant burn permission again for the new loan's collateral.
-        _grantBurnPermission(BORROWER, revnetId);
-
-        // Cache before prank to avoid consuming the prank with a static call.
-        uint256 minFeePercent = LOANS_CONTRACT.MIN_PREPAID_FEE_PERCENT();
-
-        vm.prank(BORROWER);
-        (uint256 reallocatedLoanId, uint256 newLoanId, REVLoan memory reallocatedLoan, REVLoan memory newLoan) = LOANS_CONTRACT.reallocateCollateralFromLoan({
-            loanId: loanId,
-            collateralCountToTransfer: transferAmount,
-            source: source,
-            minBorrowAmount: 0,
-            collateralCountToAdd: 0,
-            beneficiary: payable(BORROWER),
-            prepaidFeePercent: minFeePercent
-        });
-
-        // Original loan reduced.
-        assertEq(
-            reallocatedLoan.collateral,
-            loan.collateral - transferAmount,
-            "reallocated loan should have reduced collateral"
-        );
-
-        // New loan has the transferred collateral.
-        assertEq(newLoan.collateral, transferAmount, "new loan should have transferred collateral");
-
-        // Original loan burned, reallocated loan created.
-        vm.expectRevert();
-        _loanOwnerOf(loanId);
-
-        assertEq(_loanOwnerOf(reallocatedLoanId), BORROWER, "reallocated loan owned by borrower");
-        assertEq(_loanOwnerOf(newLoanId), BORROWER, "new loan owned by borrower");
-
-        // Total collateral should remain approximately the same (moved, not destroyed).
-        // It increases by halfCollateral because the new loan's borrowFrom also adds collateral.
-        // But reallocateCollateralFromLoan transfers collateral from the existing loan (not burning new tokens),
-        // so totalCollateralOf should stay the same (the half was already in the system).
-        assertEq(
-            LOANS_CONTRACT.totalCollateralOf(revnetId), totalCollateralBefore, "total collateral should be unchanged"
-        );
-    }
-
-    /// @notice Reallocate with a different source terminal should revert.
-    function test_fork_reallocate_sourceMismatchReverts() public {
-        uint256 borrowerTokens = jbTokens().totalBalanceOf(BORROWER, revnetId);
-        (uint256 loanId, REVLoan memory loan) =
-            _createLoan(revnetId, BORROWER, borrowerTokens, LOANS_CONTRACT.MIN_PREPAID_FEE_PERCENT());
-
-        // Create a source with a different terminal address.
-        REVLoanSource memory badSource =
-            REVLoanSource({token: JBConstants.NATIVE_TOKEN, terminal: IJBPayoutTerminal(address(0xdead))});
-
-        // Cache before prank to avoid consuming the prank with a static call.
-        uint256 minFeePercent = LOANS_CONTRACT.MIN_PREPAID_FEE_PERCENT();
-
-        vm.prank(BORROWER);
-        vm.expectRevert();
-        LOANS_CONTRACT.reallocateCollateralFromLoan({
-            loanId: loanId,
-            collateralCountToTransfer: loan.collateral / 2,
-            source: badSource,
-            minBorrowAmount: 0,
-            collateralCountToAdd: 0,
-            beneficiary: payable(BORROWER),
-            prepaidFeePercent: minFeePercent
-        });
-    }
-}

package/test/fork/TestLoanRepayFork.t.sol

@@ -1,188 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-// forge-lint: disable-next-line(unaliased-plain-import)
-import "./ForkTestBase.sol";
-
-/// @notice Fork tests for REVLoans.repayLoan() with real Uniswap V4 buyback hook.
-///
-/// Covers: full repay, partial repay, source fee after prepaid, no-fee within prepaid, expired revert.
-///
-/// Run with: FOUNDRY_PROFILE=fork forge test --match-contract TestLoanRepayFork -vvv
-contract TestLoanRepayFork is ForkTestBase {
-    uint256 revnetId;
-    uint256 loanId;
-    REVLoan loan;
-    uint256 borrowerTokens;
-    uint256 feeTokensFromLoan; // Tokens minted to borrower from source fee payment back to revnet.
-
-    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());
-
-        // Record fee tokens minted to borrower from source fee payment back to revnet.
-        feeTokensFromLoan = jbTokens().totalBalanceOf(BORROWER, revnetId);
-    }
-
-    /// @notice Full repay: return all collateral, burn loan NFT.
-    function test_fork_repay_full() public {
-        uint256 totalCollateralBefore = LOANS_CONTRACT.totalCollateralOf(revnetId);
-        uint256 totalBorrowedBefore =
-            LOANS_CONTRACT.totalBorrowedFrom(revnetId, jbMultiTerminal(), JBConstants.NATIVE_TOKEN);
-
-        // Fund borrower to repay (they need more ETH than they got from the loan due to fees).
-        vm.deal(BORROWER, 100 ether);
-
-        JBSingleAllowance memory allowance;
-
-        vm.prank(BORROWER);
-        LOANS_CONTRACT.repayLoan{value: loan.amount * 2}({
-            loanId: loanId,
-            maxRepayBorrowAmount: loan.amount * 2,
-            collateralCountToReturn: loan.collateral,
-            beneficiary: payable(BORROWER),
-            allowance: allowance
-        });
-
-        // Collateral re-minted to borrower (plus fee tokens from loan creation).
-        assertEq(
-            jbTokens().totalBalanceOf(BORROWER, revnetId),
-            borrowerTokens + feeTokensFromLoan,
-            "collateral should be returned to borrower"
-        );
-
-        // Loan NFT burned.
-        vm.expectRevert();
-        _loanOwnerOf(loanId);
-
-        // Tracking decreased.
-        assertEq(
-            LOANS_CONTRACT.totalCollateralOf(revnetId),
-            totalCollateralBefore - loan.collateral,
-            "totalCollateralOf should decrease"
-        );
-        assertLt(
-            LOANS_CONTRACT.totalBorrowedFrom(revnetId, jbMultiTerminal(), JBConstants.NATIVE_TOKEN),
-            totalBorrowedBefore,
-            "totalBorrowedFrom should decrease"
-        );
-    }
-
-    /// @notice Partial repay: return half the collateral, old loan burned, new loan minted.
-    function test_fork_repay_partial() public {
-        uint256 halfCollateral = loan.collateral / 2;
-
-        vm.deal(BORROWER, 100 ether);
-
-        JBSingleAllowance memory allowance;
-
-        vm.prank(BORROWER);
-        (uint256 newLoanId, REVLoan memory newLoan) = LOANS_CONTRACT.repayLoan{value: loan.amount * 2}({
-            loanId: loanId,
-            maxRepayBorrowAmount: loan.amount * 2,
-            collateralCountToReturn: halfCollateral,
-            beneficiary: payable(BORROWER),
-            allowance: allowance
-        });
-
-        // Some collateral re-minted (plus fee tokens from loan creation).
-        uint256 returnedTokens = jbTokens().totalBalanceOf(BORROWER, revnetId);
-        assertEq(returnedTokens, halfCollateral + feeTokensFromLoan, "half collateral should be returned");
-
-        // Old loan burned.
-        vm.expectRevert();
-        _loanOwnerOf(loanId);
-
-        // New loan created 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 amount should be less");
-
-        // New loan NFT owned by borrower.
-        assertEq(_loanOwnerOf(newLoanId), BORROWER, "new loan NFT should be owned by borrower");
-    }
-
-    /// @notice After prepaid duration, source fee is charged on repayment.
-    function test_fork_repay_withSourceFee() public {
-        // Warp well past the prepaid duration to accrue a meaningful source fee.
-        vm.warp(block.timestamp + loan.prepaidDuration + 365 days);
-
-        vm.deal(BORROWER, 100 ether);
-
-        // Record ETH spent for repayment.
-        uint256 borrowerEthBefore = BORROWER.balance;
-
-        JBSingleAllowance memory allowance;
-
-        vm.prank(BORROWER);
-        LOANS_CONTRACT.repayLoan{value: loan.amount * 3}({
-            loanId: loanId,
-            maxRepayBorrowAmount: loan.amount * 3,
-            collateralCountToReturn: loan.collateral,
-            beneficiary: payable(BORROWER),
-            allowance: allowance
-        });
-
-        uint256 ethSpent = borrowerEthBefore - BORROWER.balance;
-
-        // Total cost should be more than the loan principal (due to source fee).
-        assertGt(ethSpent, loan.amount, "repay cost should exceed loan amount due to source fee");
-    }
-
-    /// @notice Repay immediately (within prepaid duration) -> no source fee.
-    function test_fork_repay_withinPrepaidNofee() public {
-        // Don't warp — we're within prepaid duration.
-        vm.deal(BORROWER, 100 ether);
-
-        uint256 borrowerEthBefore = BORROWER.balance;
-
-        JBSingleAllowance memory allowance;
-
-        vm.prank(BORROWER);
-        LOANS_CONTRACT.repayLoan{value: loan.amount * 2}({
-            loanId: loanId,
-            maxRepayBorrowAmount: loan.amount * 2,
-            collateralCountToReturn: loan.collateral,
-            beneficiary: payable(BORROWER),
-            allowance: allowance
-        });
-
-        uint256 ethSpent = borrowerEthBefore - BORROWER.balance;
-
-        // Within prepaid period, cost should be exactly the loan amount (no additional source fee).
-        assertEq(ethSpent, loan.amount, "repay within prepaid should cost exactly loan amount");
-    }
-
-    /// @notice Repay after 10 years should revert (loan expired).
-    function test_fork_repay_expiredReverts() public {
-        // Warp past the 10-year liquidation duration (strict > check, so need +1).
-        vm.warp(block.timestamp + LOANS_CONTRACT.LOAN_LIQUIDATION_DURATION() + 1);
-
-        vm.deal(BORROWER, 100 ether);
-
-        JBSingleAllowance memory allowance;
-
-        vm.prank(BORROWER);
-        vm.expectRevert();
-        LOANS_CONTRACT.repayLoan{value: loan.amount * 3}({
-            loanId: loanId,
-            maxRepayBorrowAmount: loan.amount * 3,
-            collateralCountToReturn: loan.collateral,
-            beneficiary: payable(BORROWER),
-            allowance: allowance
-        });
-    }
-}

package/test/fork/TestLoanTransferFork.t.sol

@@ -1,143 +0,0 @@
-// SPDX-License-Identifier: MIT
-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.
-///
-/// 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 JBPermissioned_Unauthorized.
-        vm.prank(BORROWER);
-        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,
-            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");
-    }
-}