@rev-net/core-v6 0.0.6 → 0.0.7

package/docs/src/src/structs/REVLoan.sol/struct.REVLoan.md

@@ -1,5 +1,5 @@
 # REVLoan
-[Git Source](https://github.com/rev-net/revnet-core-v5/blob/364afaae78a8f60af2b98252dc96af1c2e4760d3/src/structs/REVLoan.sol)
+[Git Source](https://github.com/rev-net/revnet-core-v6/blob/94c003a3a16de2bd012d63cccedd6bd38d21f6e7/src/structs/REVLoan.sol)
 
 **Notes:**
 - member: borrowedAmount The amount that is being borrowed.
@@ -17,12 +17,12 @@
 
 ```solidity
 struct REVLoan {
-    uint112 amount;
-    uint112 collateral;
-    uint48 createdAt;
-    uint16 prepaidFeePercent;
-    uint32 prepaidDuration;
-    REVLoanSource source;
+uint112 amount;
+uint112 collateral;
+uint48 createdAt;
+uint16 prepaidFeePercent;
+uint32 prepaidDuration;
+REVLoanSource source;
 }
 ```
 

package/docs/src/src/structs/REVLoanSource.sol/struct.REVLoanSource.md

@@ -1,5 +1,5 @@
 # REVLoanSource
-[Git Source](https://github.com/rev-net/revnet-core-v5/blob/364afaae78a8f60af2b98252dc96af1c2e4760d3/src/structs/REVLoanSource.sol)
+[Git Source](https://github.com/rev-net/revnet-core-v6/blob/94c003a3a16de2bd012d63cccedd6bd38d21f6e7/src/structs/REVLoanSource.sol)
 
 **Notes:**
 - member: token The token that is being loaned.
@@ -9,8 +9,8 @@
 
 ```solidity
 struct REVLoanSource {
-    address token;
-    IJBPayoutTerminal terminal;
+address token;
+IJBPayoutTerminal terminal;
 }
 ```
 

package/docs/src/src/structs/REVStageConfig.sol/struct.REVStageConfig.md

@@ -1,5 +1,5 @@
 # REVStageConfig
-[Git Source](https://github.com/rev-net/revnet-core-v5/blob/364afaae78a8f60af2b98252dc96af1c2e4760d3/src/structs/REVStageConfig.sol)
+[Git Source](https://github.com/rev-net/revnet-core-v6/blob/94c003a3a16de2bd012d63cccedd6bd38d21f6e7/src/structs/REVStageConfig.sol)
 
 **Notes:**
 - member: startsAtOrAfter The timestamp to start a stage at the given rate at or after.
@@ -30,15 +30,15 @@ out.
 
 ```solidity
 struct REVStageConfig {
-    uint48 startsAtOrAfter;
-    REVAutoIssuance[] autoIssuances;
-    uint16 splitPercent;
-    JBSplit[] splits;
-    uint112 initialIssuance;
-    uint32 issuanceCutFrequency;
-    uint32 issuanceCutPercent;
-    uint16 cashOutTaxRate;
-    uint16 extraMetadata;
+uint48 startsAtOrAfter;
+REVAutoIssuance[] autoIssuances;
+uint16 splitPercent;
+JBSplit[] splits;
+uint112 initialIssuance;
+uint32 issuanceCutFrequency;
+uint32 issuanceCutPercent;
+uint16 cashOutTaxRate;
+uint16 extraMetadata;
 }
 ```
 

package/docs/src/src/structs/REVSuckerDeploymentConfig.sol/struct.REVSuckerDeploymentConfig.md

@@ -1,5 +1,5 @@
 # REVSuckerDeploymentConfig
-[Git Source](https://github.com/rev-net/revnet-core-v5/blob/364afaae78a8f60af2b98252dc96af1c2e4760d3/src/structs/REVSuckerDeploymentConfig.sol)
+[Git Source](https://github.com/rev-net/revnet-core-v6/blob/94c003a3a16de2bd012d63cccedd6bd38d21f6e7/src/structs/REVSuckerDeploymentConfig.sol)
 
 **Notes:**
 - member: deployerConfigurations The information for how to suck tokens to other chains.
@@ -9,8 +9,8 @@
 
 ```solidity
 struct REVSuckerDeploymentConfig {
-    JBSuckerDeployerConfig[] deployerConfigurations;
-    bytes32 salt;
+JBSuckerDeployerConfig[] deployerConfigurations;
+bytes32 salt;
 }
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rev-net/core-v6",
-    "version": "0.0.6",
+    "version": "0.0.7",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -17,11 +17,11 @@
         "artifacts": "source ./.env && npx sphinx artifacts --org-id 'ea165b21-7cdc-4d7b-be59-ecdd4c26bee4' --project-name 'revnet-core-v6'"
     },
     "dependencies": {
-        "@bananapus/721-hook-v6": "^0.0.7",
-        "@bananapus/buyback-hook-v6": "^0.0.4",
-        "@bananapus/core-v6": "^0.0.5",
-        "@bananapus/permission-ids-v6": "^0.0.3",
-        "@bananapus/suckers-v6": "^0.0.4",
+        "@bananapus/721-hook-v6": "^0.0.9",
+        "@bananapus/buyback-hook-v6": "^0.0.7",
+        "@bananapus/core-v6": "^0.0.9",
+        "@bananapus/permission-ids-v6": "^0.0.4",
+        "@bananapus/suckers-v6": "^0.0.6",
         "@bananapus/router-terminal-v6": "^0.0.6",
         "@croptop/core-v6": "^0.0.6",
         "@openzeppelin/contracts": "^5.2.0"

package/slither-ci.config.json

@@ -5,6 +5,6 @@
   "exclude_medium": false,
   "exclude_high": false,
   "disable_color": false,
-  "filter_paths": "(mocks/|test/|node_modules/)",
+  "filter_paths": "(mocks/|test/|node_modules/|lib/)",
   "legacy_ast": false
 }

package/src/REVLoans.sol

@@ -134,9 +134,12 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
         public
         override isLoanSourceOf;
 
-    /// @notice The amount of loans that have been created.
-    /// @custom:param revnetId The ID of the revnet to get the number of loans from.
-    mapping(uint256 revnetId => uint256) public override numberOfLoansFor;
+    /// @notice The cumulative number of loans ever created for a revnet, used as a loan ID sequence counter.
+    /// @dev This counter only increments (on borrow, repay-with-new-loan, and reallocation) and never decrements.
+    /// It does NOT represent the number of currently active loans. Repaid and liquidated loans leave permanent gaps
+    /// in the ID sequence. Integrators should not use this to count active loans.
+    /// @custom:param revnetId The ID of the revnet to get the cumulative loan count from.
+    mapping(uint256 revnetId => uint256) public override totalLoansBorrowedFor;
 
     /// @notice The contract resolving each project ID to its ERC721 URI.
     IJBTokenUriResolver public override tokenUriResolver;
@@ -158,6 +161,10 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
     //*********************************************************************//
 
     /// @notice The sources of each revnet's loan.
+    /// @dev This array grows monotonically -- entries are appended when a new (terminal, token) pair is first used for
+    /// borrowing, but are never removed. The `isLoanSourceOf` mapping tracks whether a source has been registered.
+    /// Since the number of distinct (terminal, token) pairs per revnet is practically bounded (typically < 10),
+    /// the gas cost of iterating this array in `loanSourcesOf` remains manageable.
     /// @custom:member revnetId The ID of the revnet issuing the loan.
     mapping(uint256 revnetId => REVLoanSource[]) internal _loanSourcesOf;
 
@@ -231,6 +238,8 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
     }
 
     /// @notice The sources of each revnet's loan.
+    /// @dev This array only grows -- sources are never removed. The number of distinct sources is practically bounded
+    /// by the number of unique (terminal, token) pairs used for borrowing, which is typically small.
     /// @custom:member revnetId The ID of the revnet issuing the loan.
     function loanSourcesOf(uint256 revnetId) external view override returns (REVLoanSource[] memory) {
         return _loanSourcesOf[revnetId];
@@ -557,7 +566,7 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
         }
 
         // Get a reference to the loan ID.
-        loanId = _generateLoanId({revnetId: revnetId, loanNumber: ++numberOfLoansFor[revnetId]});
+        loanId = _generateLoanId({revnetId: revnetId, loanNumber: ++totalLoansBorrowedFor[revnetId]});
 
         // Get a reference to the loan being created.
         REVLoan storage loan = _loanOf[loanId];
@@ -627,9 +636,9 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
             // Get a reference to the loan being iterated on.
             REVLoan memory loan = _loanOf[loanId];
 
-            // If the loan doesn't exist, there's nothing left to liquidate.
+            // If the loan doesn't exist (repaid or already liquidated), skip past this gap and continue.
             // slither-disable-next-line incorrect-equality
-            if (loan.createdAt == 0) break;
+            if (loan.createdAt == 0) continue;
 
             // Keep a reference to the loan's owner.
             address owner = _ownerOf(loanId);
@@ -775,7 +784,7 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
 
         // Revert if this repayment would do nothing — no borrow amount repaid and no collateral returned.
         // Without this check, a zero-amount repayment would burn the old loan NFT and mint a new one,
-        // incrementing numberOfLoansFor without limit.
+        // incrementing totalLoansBorrowedFor without limit.
         if (repayBorrowAmount == 0 && collateralCountToReturn == 0) revert REVLoans_NothingToRepay();
 
         // Keep a reference to the fee that'll be taken.
@@ -862,6 +871,8 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
         internal
     {
         // Register the source if this is the first time its being used for this revnet.
+        // Note: Sources are only appended, never removed. This is acceptable because the number of distinct
+        // (terminal, token) pairs per revnet is practically bounded.
         if (!isLoanSourceOf[revnetId][loan.source.terminal][loan.source.token]) {
             isLoanSourceOf[revnetId][loan.source.terminal][loan.source.token] = true;
             _loanSourcesOf[revnetId].push(REVLoanSource({token: loan.source.token, terminal: loan.source.terminal}));
@@ -1139,7 +1150,7 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
         } else {
             // Make a new loan with the remaining amount and collateral.
             // Get a reference to the replacement loan ID.
-            uint256 paidOffLoanId = _generateLoanId({revnetId: revnetId, loanNumber: ++numberOfLoansFor[revnetId]});
+            uint256 paidOffLoanId = _generateLoanId({revnetId: revnetId, loanNumber: ++totalLoansBorrowedFor[revnetId]});
 
             // Get a reference to the loan being paid off.
             REVLoan storage paidOffLoan = _loanOf[paidOffLoanId];
@@ -1220,7 +1231,7 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
         }
 
         // Get a reference to the replacement loan ID.
-        reallocatedLoanId = _generateLoanId({revnetId: revnetId, loanNumber: ++numberOfLoansFor[revnetId]});
+        reallocatedLoanId = _generateLoanId({revnetId: revnetId, loanNumber: ++totalLoansBorrowedFor[revnetId]});
 
         // Get a reference to the loan being created.
         reallocatedLoan = _loanOf[reallocatedLoanId];

package/src/interfaces/IREVDeployer.sol

@@ -47,8 +47,6 @@ interface IREVDeployer {
         uint256 indexed revnetId, uint256 indexed stageId, address indexed beneficiary, uint256 count, address caller
     );
 
-    event SetAdditionalOperator(uint256 revnetId, address additionalOperator, uint256[] permissionIds, address caller);
-
     event BurnHeldTokens(uint256 indexed revnetId, uint256 count, address caller);
 
     /// @notice The number of seconds until a revnet's participants can cash out after deploying to a new network.

package/src/interfaces/IREVLoans.sol

@@ -129,14 +129,20 @@ interface IREVLoans {
     function loanOf(uint256 loanId) external view returns (REVLoan memory);
 
     /// @notice The sources of each revnet's loans.
+    /// @dev This array only grows -- sources are appended when a new (terminal, token) pair is first used for
+    /// borrowing, but are never removed. Gas cost scales linearly with the number of distinct sources, though this is
+    /// practically bounded to a small number of unique (terminal, token) pairs.
     /// @param revnetId The ID of the revnet to get the loan sources for.
     /// @return The array of loan sources.
     function loanSourcesOf(uint256 revnetId) external view returns (REVLoanSource[] memory);
 
-    /// @notice The number of loans that have been created for a revnet.
-    /// @param revnetId The ID of the revnet to get the loan count for.
-    /// @return The number of loans.
-    function numberOfLoansFor(uint256 revnetId) external view returns (uint256);
+    /// @notice The cumulative number of loans ever created for a revnet, used as a loan ID sequence counter.
+    /// @dev This counter only increments and never decrements. It does NOT represent the count of currently active
+    /// loans -- repaid and liquidated loans leave permanent gaps in the sequence. Do not use this value to determine
+    /// how many loans are currently outstanding.
+    /// @param revnetId The ID of the revnet to get the cumulative loan count for.
+    /// @return The cumulative number of loans ever created.
+    function totalLoansBorrowedFor(uint256 revnetId) external view returns (uint256);
 
     /// @notice The revnet ID for the loan with the provided loan ID.
     /// @param loanId The loan ID to get the revnet ID of.

package/test/TestPR27_CEIPattern.t.sol

@@ -335,8 +335,8 @@ contract TestPR27_CEIPattern is TestBaseWorkflow, JBTest {
         REVLoanSource memory source = REVLoanSource({token: JBConstants.NATIVE_TOKEN, terminal: jbMultiTerminal()});
 
         // Pre-compute the loanId so the attacker can read it during reentrancy.
-        // loanId = revnetId * 1_000_000_000_000 + (numberOfLoansFor + 1)
-        uint256 expectedLoanId = REVNET_ID * 1_000_000_000_000 + (LOANS_CONTRACT.numberOfLoansFor(REVNET_ID) + 1);
+        // loanId = revnetId * 1_000_000_000_000 + (totalLoansBorrowedFor + 1)
+        uint256 expectedLoanId = REVNET_ID * 1_000_000_000_000 + (LOANS_CONTRACT.totalLoansBorrowedFor(REVNET_ID) + 1);
         attacker.setTarget(expectedLoanId);
 
         // Borrow with attacker as beneficiary — attacker's receive() will fire when ETH arrives.

package/test/TestPR32_MixedFixes.t.sol

@@ -516,7 +516,7 @@ contract TestPR32_MixedFixes is TestBaseWorkflow, JBTest {
         assertTrue(tokenBorrowed > 0, "TOKEN borrow should be tracked");
 
         // The total number of loans should be 2.
-        assertEq(LOANS_CONTRACT.numberOfLoansFor(MIXED_REVNET_ID), 2, "Should have 2 loans");
+        assertEq(LOANS_CONTRACT.totalLoansBorrowedFor(MIXED_REVNET_ID), 2, "Should have 2 loans");
 
         // Query borrowable in 18-decimal ETH context. This exercises _totalBorrowedFrom's
         // cross-decimal normalization: TOKEN borrows (6 dec) must be normalized to 18 dec before

package/test/regression/TestI20_CumulativeLoanCounter.t.sol

@@ -0,0 +1,303 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.26;
+
+import "forge-std/Test.sol";
+import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
+import /* {*} from "@bananapus/721-hook-v6/src/JB721TiersHookDeployer.sol";
+import /* {*} from */ "./../../src/REVDeployer.sol";
+import "@croptop/core-v6/src/CTPublisher.sol";
+import {MockBuybackDataHook} from "./../mock/MockBuybackDataHook.sol";
+import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
+import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
+import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
+import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
+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";
+
+/// @notice Regression test for I-20: totalLoansBorrowedFor is a cumulative counter, not an active loan count.
+/// @dev The rename from numberOfLoansFor to totalLoansBorrowedFor clarifies that the counter only increments
+/// and never decrements. Repaying or liquidating a loan does NOT reduce the counter. This test verifies that
+/// the counter remains at its high-water mark after loans are fully repaid and after loans are liquidated.
+contract TestI20_CumulativeLoanCounter is TestBaseWorkflow, JBTest {
+    bytes32 REV_DEPLOYER_SALT = "REVDeployer";
+
+    REVDeployer REV_DEPLOYER;
+    JB721TiersHook EXAMPLE_HOOK;
+    IJB721TiersHookDeployer HOOK_DEPLOYER;
+    IJB721TiersHookStore HOOK_STORE;
+    IJBAddressRegistry ADDRESS_REGISTRY;
+    REVLoans LOANS_CONTRACT;
+    IJBSuckerRegistry SUCKER_REGISTRY;
+    CTPublisher PUBLISHER;
+    MockBuybackDataHook MOCK_BUYBACK;
+
+    uint256 FEE_PROJECT_ID;
+    uint256 REVNET_ID;
+
+    address USER1 = makeAddr("user1");
+    address USER2 = makeAddr("user2");
+    address USER3 = makeAddr("user3");
+
+    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(), jbRulesets(), HOOK_STORE, 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();
+        MockPriceFeed priceFeed = new MockPriceFeed(1e18, 18);
+        vm.prank(multisig());
+        jbPrices()
+            .addPriceFeedFor(
+                0, uint32(uint160(JBConstants.NATIVE_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,
+            IJBRulesetDataHook(address(MOCK_BUYBACK)),
+            address(LOANS_CONTRACT),
+            TRUSTED_FORWARDER
+        );
+        vm.prank(multisig());
+        jbProjects().approve(address(REV_DEPLOYER), FEE_PROJECT_ID);
+        _deployFeeProject();
+        _deployRevnet();
+        vm.deal(USER1, 100e18);
+        vm.deal(USER2, 100e18);
+        vm.deal(USER3, 100e18);
+    }
+
+    function _deployFeeProject() internal {
+        JBAccountingContext[] memory acc = new JBAccountingContext[](1);
+        acc[0] = JBAccountingContext({
+            token: JBConstants.NATIVE_TOKEN, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_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({
+            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")
+            })
+        });
+    }
+
+    function _deployRevnet() internal {
+        JBAccountingContext[] memory acc = new JBAccountingContext[](1);
+        acc[0] = JBAccountingContext({
+            token: JBConstants.NATIVE_TOKEN, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_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({
+            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")
+            })
+        });
+    }
+
+    function _setupLoan(address user, uint256 ethAmount) internal returns (uint256 loanId, uint256 tokenCount) {
+        vm.prank(user);
+        tokenCount =
+            jbMultiTerminal().pay{value: ethAmount}(REVNET_ID, JBConstants.NATIVE_TOKEN, ethAmount, user, 0, "", "");
+        uint256 borrowAmount =
+            LOANS_CONTRACT.borrowableAmountFrom(REVNET_ID, tokenCount, 18, uint32(uint160(JBConstants.NATIVE_TOKEN)));
+        require(borrowAmount > 0, "Borrow amount should be > 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), 25);
+    }
+
+    /// @notice Verifies totalLoansBorrowedFor never decrements after loan repayment.
+    /// @dev Creates 3 loans, fully repays 2, then verifies the counter stays at 3 (not 1).
+    /// This confirms the I-20 rename correctly reflects cumulative semantics.
+    function test_I20_counterNeverDecrementsAfterRepayment() public {
+        // Counter starts at 0
+        assertEq(LOANS_CONTRACT.totalLoansBorrowedFor(REVNET_ID), 0, "Counter should start at 0");
+
+        // Create 3 loans
+        (uint256 loanId1,) = _setupLoan(USER1, 3e18);
+        (uint256 loanId2,) = _setupLoan(USER2, 3e18);
+        (uint256 loanId3,) = _setupLoan(USER3, 3e18);
+
+        // Counter should be 3
+        assertEq(LOANS_CONTRACT.totalLoansBorrowedFor(REVNET_ID), 3, "Counter should be 3 after 3 loans");
+
+        // Fully repay loan 1
+        REVLoan memory loan1 = LOANS_CONTRACT.loanOf(loanId1);
+        JBSingleAllowance memory allowance;
+        vm.prank(USER1);
+        LOANS_CONTRACT.repayLoan{value: loan1.amount}(
+            loanId1, loan1.amount, loan1.collateral, payable(USER1), allowance
+        );
+
+        // Counter should still be 3 (NOT 2) -- repayment does not decrement
+        assertEq(
+            LOANS_CONTRACT.totalLoansBorrowedFor(REVNET_ID),
+            3,
+            "Counter should remain 3 after repaying loan 1 -- cumulative, never decrements"
+        );
+
+        // Fully repay loan 2
+        REVLoan memory loan2 = LOANS_CONTRACT.loanOf(loanId2);
+        vm.prank(USER2);
+        LOANS_CONTRACT.repayLoan{value: loan2.amount}(
+            loanId2, loan2.amount, loan2.collateral, payable(USER2), allowance
+        );
+
+        // Counter should still be 3 (NOT 1)
+        assertEq(
+            LOANS_CONTRACT.totalLoansBorrowedFor(REVNET_ID),
+            3,
+            "Counter should remain 3 after repaying loan 2 -- cumulative, never decrements"
+        );
+
+        // Verify the loans are actually deleted (createdAt == 0)
+        assertEq(LOANS_CONTRACT.loanOf(loanId1).createdAt, 0, "Loan 1 should be deleted");
+        assertEq(LOANS_CONTRACT.loanOf(loanId2).createdAt, 0, "Loan 2 should be deleted");
+        assertTrue(LOANS_CONTRACT.loanOf(loanId3).createdAt > 0, "Loan 3 should still exist");
+    }
+
+    /// @notice Verifies totalLoansBorrowedFor never decrements after loan liquidation.
+    /// @dev Creates 2 loans, liquidates both, then verifies the counter stays at 2.
+    function test_I20_counterNeverDecrementsAfterLiquidation() public {
+        // Create 2 loans
+        (uint256 loanId1,) = _setupLoan(USER1, 5e18);
+        (uint256 loanId2,) = _setupLoan(USER2, 5e18);
+
+        assertEq(LOANS_CONTRACT.totalLoansBorrowedFor(REVNET_ID), 2, "Counter should be 2 after 2 loans");
+
+        // Warp past liquidation duration
+        vm.warp(block.timestamp + LOANS_CONTRACT.LOAN_LIQUIDATION_DURATION() + 1);
+
+        // Liquidate both loans
+        LOANS_CONTRACT.liquidateExpiredLoansFrom(REVNET_ID, 1, 2);
+
+        // Both loans should be deleted
+        assertEq(LOANS_CONTRACT.loanOf(loanId1).createdAt, 0, "Loan 1 should be liquidated");
+        assertEq(LOANS_CONTRACT.loanOf(loanId2).createdAt, 0, "Loan 2 should be liquidated");
+
+        // Counter should still be 2 -- liquidation does not decrement
+        assertEq(
+            LOANS_CONTRACT.totalLoansBorrowedFor(REVNET_ID),
+            2,
+            "Counter should remain 2 after liquidating both loans -- cumulative, never decrements"
+        );
+    }
+
+    /// @notice Verifies that partial repayment (which creates a new loan) increments the counter.
+    /// @dev When partially repaying, the old loan is burned and a new loan is minted for the remainder.
+    /// This should increment the counter by 1 since a new loan ID is generated.
+    function test_I20_partialRepaymentIncrementsCounter() public {
+        // Create 1 loan
+        (uint256 loanId1,) = _setupLoan(USER1, 5e18);
+        assertEq(LOANS_CONTRACT.totalLoansBorrowedFor(REVNET_ID), 1, "Counter should be 1 after 1 loan");
+
+        // Partially repay (repay half the borrow amount, return no collateral)
+        REVLoan memory loan1 = LOANS_CONTRACT.loanOf(loanId1);
+        uint256 halfAmount = loan1.amount / 2;
+        JBSingleAllowance memory allowance;
+        vm.prank(USER1);
+        LOANS_CONTRACT.repayLoan{value: halfAmount}(loanId1, halfAmount, 0, payable(USER1), allowance);
+
+        // Counter should be 2: original loan (burned) + replacement loan (new ID)
+        assertEq(
+            LOANS_CONTRACT.totalLoansBorrowedFor(REVNET_ID),
+            2,
+            "Counter should be 2 after partial repayment creates a replacement loan"
+        );
+
+        // Original loan should be deleted
+        assertEq(LOANS_CONTRACT.loanOf(loanId1).createdAt, 0, "Original loan should be deleted after partial repay");
+    }
+}