@rev-net/core-v6 0.0.14 → 0.0.16

package/src/REVDeployer.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 import {IJB721TiersHook} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHook.sol";
 import {IJB721TiersHookDeployer} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHookDeployer.sol";
@@ -41,7 +41,7 @@ import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
-import {mulDiv} from "@prb/math/src/Common.sol";
+import {mulDiv, sqrt} from "@prb/math/src/Common.sol";
 
 import {IREVDeployer} from "./interfaces/IREVDeployer.sol";
 import {REVAutoIssuance} from "./structs/REVAutoIssuance.sol";
@@ -235,6 +235,10 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
     /// @notice Determine how a cash out from a revnet should be processed.
     /// @dev This function is part of `IJBRulesetDataHook`, and gets called before the revnet processes a cash out.
     /// @dev If a sucker is cashing out, no taxes or fees are imposed.
+    /// @dev REVDeployer is intentionally not registered as a feeless address. The protocol fee (2.5%) applies on top
+    /// of the rev fee — this is by design. The fee hook spec amount sent to `afterCashOutRecordedWith` will have the
+    /// protocol fee deducted by the terminal before reaching this contract, so the rev fee is computed on the
+    /// post-protocol-fee amount.
     /// @param context Standard Juicebox cash out context. See `JBBeforeCashOutRecordedContext`.
     /// @return cashOutTaxRate The cash out tax rate, which influences the amount of terminal tokens which get cashed
     /// out.
@@ -271,18 +275,19 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
         IJBTerminal feeTerminal = DIRECTORY.primaryTerminalOf({projectId: FEE_REVNET_ID, token: context.surplus.token});
 
         // If there's no cash out tax (100% cash out tax rate), if there's no fee terminal, or if the beneficiary is
-        // feeless (e.g. the router terminal routing value between projects), do not charge a fee.
+        // feeless (e.g. the router terminal routing value between projects), proxy directly to the buyback hook.
         if (context.cashOutTaxRate == 0 || address(feeTerminal) == address(0) || context.beneficiaryIsFeeless) {
-            return (context.cashOutTaxRate, context.cashOutCount, context.totalSupply, hookSpecifications);
+            // slither-disable-next-line unused-return
+            return BUYBACK_HOOK.beforeCashOutRecordedWith(context);
         }
 
-        // Get a reference to the number of tokens being used to pay the fee (out of the total being cashed out).
+        // Split the cashed-out tokens into a fee portion and a non-fee portion.
         // Micro cash outs (< 40 wei at 2.5% fee) round feeCashOutCount to zero, bypassing the fee.
         // Economically insignificant: the gas cost of the transaction far exceeds the bypassed fee. No fix needed.
         uint256 feeCashOutCount = mulDiv({x: context.cashOutCount, y: FEE, denominator: JBConstants.MAX_FEE});
         uint256 nonFeeCashOutCount = context.cashOutCount - feeCashOutCount;
 
-        // Keep a reference to the amount claimable with non-fee tokens.
+        // Calculate how much surplus the non-fee tokens can reclaim via the bonding curve.
         uint256 postFeeReclaimedAmount = JBCashOuts.cashOutFrom({
             surplus: context.surplus.value,
             cashOutCount: nonFeeCashOutCount,
@@ -290,7 +295,7 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
             cashOutTaxRate: context.cashOutTaxRate
         });
 
-        // Keep a reference to the fee amount after the reclaimed amount is subtracted.
+        // Calculate how much the fee tokens reclaim from the remaining surplus after the non-fee reclaim.
         uint256 feeAmount = JBCashOuts.cashOutFrom({
             surplus: context.surplus.value - postFeeReclaimedAmount,
             cashOutCount: feeCashOutCount,
@@ -298,15 +303,39 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
             cashOutTaxRate: context.cashOutTaxRate
         });
 
-        // Assemble a cash out hook specification to invoke `afterCashOutRecordedWith(…)` with, to process the fee.
-        hookSpecifications = new JBCashOutHookSpecification[](1);
-        hookSpecifications[0] = JBCashOutHookSpecification({
-            hook: IJBCashOutHook(address(this)), amount: feeAmount, metadata: abi.encode(feeTerminal)
+        // Build a context for the buyback hook using only the non-fee token count.
+        JBBeforeCashOutRecordedContext memory buybackHookContext = context;
+        buybackHookContext.cashOutCount = nonFeeCashOutCount;
+
+        // Let the buyback hook adjust the cash out parameters and optionally return a hook specification.
+        JBCashOutHookSpecification[] memory buybackHookSpecifications;
+        (cashOutTaxRate, cashOutCount, totalSupply, buybackHookSpecifications) =
+            BUYBACK_HOOK.beforeCashOutRecordedWith(buybackHookContext);
+
+        // If the fee rounds down to zero, return the buyback hook's response directly — no fee to process.
+        if (feeAmount == 0) return (cashOutTaxRate, cashOutCount, totalSupply, buybackHookSpecifications);
+
+        // Build a hook spec that routes the fee amount to this contract's `afterCashOutRecordedWith` for processing.
+        JBCashOutHookSpecification memory feeSpec = JBCashOutHookSpecification({
+            hook: IJBCashOutHook(address(this)), noop: false, amount: feeAmount, metadata: abi.encode(feeTerminal)
         });
 
-        // Return the cash out rate and the number of revnet tokens to cash out, minus the tokens being used to pay the
-        // fee.
-        return (context.cashOutTaxRate, nonFeeCashOutCount, context.totalSupply, hookSpecifications);
+        // Compose the final hook specifications: buyback spec (if any) + fee spec.
+        // NOTE: Only buybackHookSpecifications[0] is used. If the buyback hook returns multiple
+        // specs, the additional ones are silently dropped. This is intentional — the buyback hook is
+        // expected to return at most one spec for the cash-out buyback swap.
+        if (buybackHookSpecifications.length > 0) {
+            // The buyback hook returned a spec — include it before the fee spec.
+            hookSpecifications = new JBCashOutHookSpecification[](2);
+            hookSpecifications[0] = buybackHookSpecifications[0];
+            hookSpecifications[1] = feeSpec;
+        } else {
+            // No buyback spec — only the fee spec.
+            hookSpecifications = new JBCashOutHookSpecification[](1);
+            hookSpecifications[0] = feeSpec;
+        }
+
+        return (cashOutTaxRate, cashOutCount, totalSupply, hookSpecifications);
     }
 
     /// @notice Before a revnet processes an incoming payment, determine the weight and pay hooks to use.
@@ -565,14 +594,33 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
         }
     }
 
-    /// @notice Try to initialize a Uniswap V4 buyback pool for a terminal token at a generic 1:1 price.
+    /// @notice Try to initialize a Uniswap V4 buyback pool for a terminal token at its fair issuance price.
     /// @dev Called after the ERC-20 token is deployed so the pool can be initialized in the PoolManager.
+    /// Computes `sqrtPriceX96` from `initialIssuance` so the pool starts at the same price as the bonding curve.
     /// Silently catches failures (e.g., if the pool is already initialized).
     /// @param revnetId The ID of the revnet.
     /// @param terminalToken The terminal token to initialize a buyback pool for.
-    function _tryInitializeBuybackPoolFor(uint256 revnetId, address terminalToken) internal {
-        // Try to initialize the pool at a generic 1:1 sqrtPriceX96 and configure the buyback hook.
-        // The buyback hook constructs the PoolKey internally from the project token, terminal token, and pool params.
+    /// @param initialIssuance The initial issuance rate (project tokens per terminal token, 18 decimals).
+    function _tryInitializeBuybackPoolFor(uint256 revnetId, address terminalToken, uint112 initialIssuance) internal {
+        uint160 sqrtPriceX96;
+
+        if (initialIssuance == 0) {
+            sqrtPriceX96 = uint160(1 << 96);
+        } else {
+            address normalizedTerminalToken = terminalToken == JBConstants.NATIVE_TOKEN ? address(0) : terminalToken;
+            address projectToken = address(CONTROLLER.TOKENS().tokenOf(revnetId));
+
+            if (projectToken == address(0) || projectToken == normalizedTerminalToken) {
+                sqrtPriceX96 = uint160(1 << 96);
+            } else if (normalizedTerminalToken < projectToken) {
+                // token0 = terminal, token1 = project → price = issuance / 1e18
+                sqrtPriceX96 = uint160(sqrt(mulDiv(uint256(initialIssuance), 1 << 192, 1e18)));
+            } else {
+                // token0 = project, token1 = terminal → price = 1e18 / issuance
+                sqrtPriceX96 = uint160(sqrt(mulDiv(1e18, 1 << 192, uint256(initialIssuance))));
+            }
+        }
+
         // slither-disable-next-line calls-loop
         try BUYBACK_HOOK.initializePoolFor({
             projectId: revnetId,
@@ -580,7 +628,7 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
             tickSpacing: DEFAULT_BUYBACK_TICK_SPACING,
             twapWindow: DEFAULT_BUYBACK_TWAP_WINDOW,
             terminalToken: terminalToken,
-            sqrtPriceX96: uint160(1 << 96)
+            sqrtPriceX96: sqrtPriceX96
         }) {}
             catch {} // Pool may already be initialized — that's OK.
     }
@@ -838,8 +886,10 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
 
     /// @notice Change a revnet's split operator.
     /// @dev Only a revnet's current split operator can set a new split operator.
+    /// @dev Passing `address(0)` as `newSplitOperator` relinquishes operator powers permanently — the permissions
+    /// are granted to the zero address (which cannot execute transactions), effectively burning them.
     /// @param revnetId The ID of the revnet to set the split operator of.
-    /// @param newSplitOperator The new split operator's address.
+    /// @param newSplitOperator The new split operator's address. Use `address(0)` to relinquish operator powers.
     function setSplitOperatorOf(uint256 revnetId, address newSplitOperator) external override {
         // Enforce permissions.
         _checkIfIsSplitOperatorOf({revnetId: revnetId, operator: _msgSender()});
@@ -1067,7 +1117,9 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IJBRulesetDataHook, IJBCas
             for (uint256 j; j < terminalConfiguration.accountingContextsToAccept.length; j++) {
                 // slither-disable-next-line calls-loop
                 _tryInitializeBuybackPoolFor({
-                    revnetId: revnetId, terminalToken: terminalConfiguration.accountingContextsToAccept[j].token
+                    revnetId: revnetId,
+                    terminalToken: terminalConfiguration.accountingContextsToAccept[j].token,
+                    initialIssuance: configuration.stageConfigurations[0].initialIssuance
                 });
             }
         }

package/src/REVLoans.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 import {ERC2771Context} from "@openzeppelin/contracts/metatx/ERC2771Context.sol";
@@ -339,11 +339,7 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
 
         // Get the surplus of all the revnet's terminals in terms of the native currency.
         uint256 totalSurplus = JBSurplus.currentSurplusOf({
-            projectId: revnetId,
-            terminals: terminals,
-            accountingContexts: new JBAccountingContext[](0),
-            decimals: decimals,
-            currency: currency
+            projectId: revnetId, terminals: terminals, tokens: new address[](0), decimals: decimals, currency: currency
         });
 
         // Get the total amount the revnet currently has loaned out, in terms of the native currency with 18
@@ -442,6 +438,9 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
     }
 
     /// @notice Generate a ID for a loan given a revnet ID and a loan number within that revnet.
+    /// @dev The multiplication and addition can theoretically overflow a uint256 if revnetId or loanNumber are
+    /// astronomically large. In practice this is infeasible — it would require 2^256 loans or project IDs, far
+    /// beyond any realistic usage. No overflow check is needed.
     /// @param revnetId The ID of the revnet to generate a loan ID for.
     /// @param loanNumber The loan number of the loan within the revnet.
     /// @return The token ID of the 721.
@@ -581,6 +580,9 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
             );
         }
 
+        // Prevent the loan number from exceeding the ID namespace for this revnet.
+        if (totalLoansBorrowedFor[revnetId] >= _ONE_TRILLION) revert REVLoans_LoanIdOverflow();
+
         // Get a reference to the loan ID.
         loanId = _generateLoanId({revnetId: revnetId, loanNumber: ++totalLoansBorrowedFor[revnetId]});
 
@@ -991,6 +993,10 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
                 _beforeTransferTo({to: address(feeTerminal), token: loan.source.token, amount: revFeeAmount});
 
             // Pay the fee. Send the REV to the beneficiary. If fee payment fails, give the amount back to the borrower.
+            // NOTE: When terminal.pay() reverts (e.g. due to a misconfigured terminal or paused payments),
+            // the REV fee is refunded to the borrower, resulting in an effectively interest-free loan for the
+            // REV fee portion. This is acceptable — it requires a broken/misconfigured fee terminal and the
+            // borrower still pays the source fee and protocol fee.
             // slither-disable-next-line arbitrary-send-eth,unused-return
             try feeTerminal.pay{value: payValue}({
                 projectId: REV_ID,
@@ -1026,6 +1032,11 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
 
     /// @notice Allows the owner of a loan to pay it back, add more, or receive returned collateral no longer necessary
     /// to support the loan.
+    /// @dev CEI ordering note: `totalCollateralOf` is not incremented until `_addCollateralTo` executes,
+    /// which happens after the external calls in `_addTo` (useAllowanceOf, fee payment, transfer). A reentrant
+    /// `borrowFrom` during those calls would see a lower `totalCollateralOf`, potentially passing collateral
+    /// checks that should fail. Practically infeasible — requires an adversarial pay hook on the revnet's own
+    /// terminal that calls back into `borrowFrom`, which is not a realistic deployment configuration.
     /// @param loan The loan being adjusted.
     /// @param revnetId The ID of the revnet the loan is being adjusted in.
     /// @param newBorrowAmount The new amount of the loan, denominated in the token of the source's accounting
@@ -1096,6 +1107,10 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
             });
 
             // Pay the fee. If it fails, reclaim the allowance and give the amount back to the borrower.
+            // NOTE: When terminal.pay() reverts (e.g. due to a misconfigured terminal or paused payments),
+            // the source fee is refunded to the borrower, resulting in an effectively interest-free loan for the
+            // source fee portion. This is acceptable — it requires a broken/misconfigured source terminal and
+            // the borrower still pays the REV fee and protocol fee.
             // slither-disable-next-line unused-return,arbitrary-send-eth
             try loan.source.terminal.pay{value: payValue}({
                 projectId: revnetId,
@@ -1167,6 +1182,9 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
             revert REVLoans_ReallocatingMoreCollateralThanBorrowedAmountAllows(borrowAmount, loan.amount);
         }
 
+        // Prevent the loan number from exceeding the ID namespace for this revnet.
+        if (totalLoansBorrowedFor[revnetId] >= _ONE_TRILLION) revert REVLoans_LoanIdOverflow();
+
         // Get a reference to the replacement loan ID.
         reallocatedLoanId = _generateLoanId({revnetId: revnetId, loanNumber: ++totalLoansBorrowedFor[revnetId]});
 
@@ -1296,6 +1314,9 @@ contract REVLoans is ERC721, ERC2771Context, Ownable, IREVLoans {
             return (loanId, paidOffSnapshot);
         } else {
             // Make a new loan with the remaining amount and collateral.
+            // Prevent the loan number from exceeding the ID namespace for this revnet.
+            if (totalLoansBorrowedFor[revnetId] >= _ONE_TRILLION) revert REVLoans_LoanIdOverflow();
+
             // Get a reference to the replacement loan ID.
             uint256 paidOffLoanId = _generateLoanId({revnetId: revnetId, loanNumber: ++totalLoansBorrowedFor[revnetId]});
 

package/test/REV.integrations.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/REVAutoIssuanceFuzz.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/REVDeployerRegressions.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";
@@ -138,7 +138,8 @@ contract REVDeployerRegressions is TestBaseWorkflow {
         assertEq(correctIndex, 0, "buyback hook should use index 0 when no tiered hook");
 
         // Write to the correct index (no revert)
-        specs[correctIndex] = JBPayHookSpecification({hook: IJBPayHook(address(0xbeef)), amount: 1 ether, metadata: ""});
+        specs[correctIndex] =
+            JBPayHookSpecification({hook: IJBPayHook(address(0xbeef)), noop: false, amount: 1 ether, metadata: ""});
     }
 
     /// @notice Verify both hooks present works fine (no OOB).
@@ -150,8 +151,10 @@ contract REVDeployerRegressions is TestBaseWorkflow {
         assertEq(arraySize, 2, "array should be size 2");
 
         JBPayHookSpecification[] memory specs = new JBPayHookSpecification[](arraySize);
-        specs[0] = JBPayHookSpecification({hook: IJBPayHook(address(0xdead)), amount: 1 ether, metadata: ""});
-        specs[1] = JBPayHookSpecification({hook: IJBPayHook(address(0xbeef)), amount: 2 ether, metadata: ""});
+        specs[0] =
+            JBPayHookSpecification({hook: IJBPayHook(address(0xdead)), noop: false, amount: 1 ether, metadata: ""});
+        specs[1] =
+            JBPayHookSpecification({hook: IJBPayHook(address(0xbeef)), noop: false, amount: 2 ether, metadata: ""});
     }
 
     //*********************************************************************//

package/test/REVInvincibility.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";
@@ -368,7 +368,8 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
 
         // Verify safe write
         JBPayHookSpecification[] memory specs = new JBPayHookSpecification[](arraySize);
-        specs[correctIndex] = JBPayHookSpecification({hook: IJBPayHook(address(0xbeef)), amount: 1 ether, metadata: ""});
+        specs[correctIndex] =
+            JBPayHookSpecification({hook: IJBPayHook(address(0xbeef)), noop: false, amount: 1 ether, metadata: ""});
     }
 
     /// @notice Reentrancy — _adjust calls terminal.pay() BEFORE writing loan state.
@@ -909,12 +910,8 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
         // Record fee project balance before cash-out
         uint256 feeBalanceBefore;
         {
-            JBAccountingContext[] memory feeCtx = new JBAccountingContext[](1);
-            feeCtx[0] = JBAccountingContext({
-                token: JBConstants.NATIVE_TOKEN, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-            });
             feeBalanceBefore = jbMultiTerminal()
-                .currentSurplusOf(FEE_PROJECT_ID, feeCtx, 18, uint32(uint160(JBConstants.NATIVE_TOKEN)));
+                .currentSurplusOf(FEE_PROJECT_ID, new address[](0), 18, uint32(uint160(JBConstants.NATIVE_TOKEN)));
         }
 
         // Cash out
@@ -935,12 +932,8 @@ contract REVInvincibility_PropertyTests is TestBaseWorkflow {
             // because both the terminal fee AND the revnet fee route to it
             uint256 feeBalanceAfter;
             {
-                JBAccountingContext[] memory feeCtx = new JBAccountingContext[](1);
-                feeCtx[0] = JBAccountingContext({
-                    token: JBConstants.NATIVE_TOKEN, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-                });
                 feeBalanceAfter = jbMultiTerminal()
-                    .currentSurplusOf(FEE_PROJECT_ID, feeCtx, 18, uint32(uint160(JBConstants.NATIVE_TOKEN)));
+                    .currentSurplusOf(FEE_PROJECT_ID, new address[](0), 18, uint32(uint160(JBConstants.NATIVE_TOKEN)));
             }
 
             // Fee project should have received fees from the cash-out
@@ -1206,13 +1199,8 @@ contract REVInvincibility_Invariants is StdInvariant, TestBaseWorkflow {
     function invariant_REV_1_surplusCoversLoans() public {
         uint256 totalBorrowed = LOANS_CONTRACT.totalBorrowedFrom(REVNET_ID, jbMultiTerminal(), JBConstants.NATIVE_TOKEN);
 
-        JBAccountingContext[] memory ctxArray = new JBAccountingContext[](1);
-        ctxArray[0] = JBAccountingContext({
-            token: JBConstants.NATIVE_TOKEN, decimals: 18, currency: uint32(uint160(JBConstants.NATIVE_TOKEN))
-        });
-
-        uint256 storeBalance =
-            jbMultiTerminal().currentSurplusOf(REVNET_ID, ctxArray, 18, uint32(uint160(JBConstants.NATIVE_TOKEN)));
+        uint256 storeBalance = jbMultiTerminal()
+            .currentSurplusOf(REVNET_ID, new address[](0), 18, uint32(uint160(JBConstants.NATIVE_TOKEN)));
 
         // Note: storeBalance is surplus (after payout limits), but the terminal holds at least this much
         // The total borrowed should not exceed what the terminal can cover

package/test/REVInvincibilityHandler.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/REVLifecycle.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/REVLoans.invariants.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";

package/test/REVLoansAttacks.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";
@@ -42,6 +42,8 @@ import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressReg
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
 import {REVEmpty721Config} from "./helpers/REVEmpty721Config.sol";
 import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
+import {JBRuleset} from "@bananapus/core-v6/src/structs/JBRuleset.sol";
+import {JBPayHookSpecification} from "@bananapus/core-v6/src/structs/JBPayHookSpecification.sol";
 
 /// @notice A malicious terminal that re-enters REVLoans during fee payment in _adjust().
 /// @dev Reentrancy during pay() callback in _adjust.
@@ -128,17 +130,7 @@ contract ReentrantTerminal is ERC165, IJBPayoutTerminal {
         override
     {}
 
-    function currentSurplusOf(
-        uint256,
-        JBAccountingContext[] memory,
-        uint256,
-        uint256
-    )
-        external
-        pure
-        override
-        returns (uint256)
-    {
+    function currentSurplusOf(uint256, address[] calldata, uint256, uint256) external pure override returns (uint256) {
         return 0;
     }
 
@@ -168,6 +160,22 @@ contract ReentrantTerminal is ERC165, IJBPayoutTerminal {
         return 0;
     }
 
+    function previewPayFor(
+        uint256,
+        address,
+        uint256,
+        address,
+        bytes calldata
+    )
+        external
+        pure
+        override
+        returns (JBRuleset memory, uint256, uint256, JBPayHookSpecification[] memory)
+    {
+        JBRuleset memory ruleset;
+        return (ruleset, 0, 0, new JBPayHookSpecification[](0));
+    }
+
     function supportsInterface(bytes4 interfaceId) public view override(ERC165, IERC165) returns (bool) {
         return interfaceId == type(IJBTerminal).interfaceId || interfaceId == type(IJBPayoutTerminal).interfaceId
             || super.supportsInterface(interfaceId);

package/test/REVLoansFeeRecovery.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";
@@ -42,6 +42,8 @@ import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStor
 import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
 import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
+import {JBRuleset} from "@bananapus/core-v6/src/structs/JBRuleset.sol";
+import {JBPayHookSpecification} from "@bananapus/core-v6/src/structs/JBPayHookSpecification.sol";
 import {REVEmpty721Config} from "./helpers/REVEmpty721Config.sol";
 
 /// @notice A terminal mock that always reverts on pay(), used to simulate fee payment failure.
@@ -87,17 +89,7 @@ contract RevertingFeeTerminal is ERC165, IJBPayoutTerminal {
         override
     {}
 
-    function currentSurplusOf(
-        uint256,
-        JBAccountingContext[] memory,
-        uint256,
-        uint256
-    )
-        external
-        pure
-        override
-        returns (uint256)
-    {
+    function currentSurplusOf(uint256, address[] calldata, uint256, uint256) external pure override returns (uint256) {
         return 0;
     }
 
@@ -127,6 +119,22 @@ contract RevertingFeeTerminal is ERC165, IJBPayoutTerminal {
         return 0;
     }
 
+    function previewPayFor(
+        uint256,
+        address,
+        uint256,
+        address,
+        bytes calldata
+    )
+        external
+        pure
+        override
+        returns (JBRuleset memory, uint256, uint256, JBPayHookSpecification[] memory)
+    {
+        JBRuleset memory ruleset;
+        return (ruleset, 0, 0, new JBPayHookSpecification[](0));
+    }
+
     function supportsInterface(bytes4 interfaceId) public view override(ERC165, IERC165) returns (bool) {
         return interfaceId == type(IJBTerminal).interfaceId || interfaceId == type(IJBPayoutTerminal).interfaceId
             || super.supportsInterface(interfaceId);

package/test/REVLoansFindings.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";
@@ -42,6 +42,8 @@ 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 {JBRuleset} from "@bananapus/core-v6/src/structs/JBRuleset.sol";
+import {JBPayHookSpecification} from "@bananapus/core-v6/src/structs/JBPayHookSpecification.sol";
 import {REVEmpty721Config} from "./helpers/REVEmpty721Config.sol";
 
 /// @notice A fake terminal that returns garbage accounting contexts.
@@ -91,17 +93,7 @@ contract GarbageTerminal is ERC165, IJBPayoutTerminal {
         override
     {}
 
-    function currentSurplusOf(
-        uint256,
-        JBAccountingContext[] memory,
-        uint256,
-        uint256
-    )
-        external
-        pure
-        override
-        returns (uint256)
-    {
+    function currentSurplusOf(uint256, address[] calldata, uint256, uint256) external pure override returns (uint256) {
         return 0;
     }
 
@@ -130,6 +122,22 @@ contract GarbageTerminal is ERC165, IJBPayoutTerminal {
         return 0;
     }
 
+    function previewPayFor(
+        uint256,
+        address,
+        uint256,
+        address,
+        bytes calldata
+    )
+        external
+        pure
+        override
+        returns (JBRuleset memory, uint256, uint256, JBPayHookSpecification[] memory)
+    {
+        JBRuleset memory ruleset;
+        return (ruleset, 0, 0, new JBPayHookSpecification[](0));
+    }
+
     function supportsInterface(bytes4 interfaceId) public view override(ERC165, IERC165) returns (bool) {
         return interfaceId == type(IJBTerminal).interfaceId || interfaceId == type(IJBPayoutTerminal).interfaceId
             || super.supportsInterface(interfaceId);

package/test/REVLoansRegressions.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";
@@ -38,6 +38,8 @@ import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStor
 import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
 import {IJBAddressRegistry} from "@bananapus/address-registry-v6/src/interfaces/IJBAddressRegistry.sol";
 import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
+import {JBRuleset} from "@bananapus/core-v6/src/structs/JBRuleset.sol";
+import {JBPayHookSpecification} from "@bananapus/core-v6/src/structs/JBPayHookSpecification.sol";
 import {REVEmpty721Config} from "./helpers/REVEmpty721Config.sol";
 
 /// @notice A fake terminal that tracks whether useAllowanceOf was called.
@@ -92,17 +94,7 @@ contract FakeTerminal is ERC165, IJBPayoutTerminal {
         override
     {}
 
-    function currentSurplusOf(
-        uint256,
-        JBAccountingContext[] memory,
-        uint256,
-        uint256
-    )
-        external
-        pure
-        override
-        returns (uint256)
-    {
+    function currentSurplusOf(uint256, address[] calldata, uint256, uint256) external pure override returns (uint256) {
         return 0;
     }
 
@@ -131,6 +123,22 @@ contract FakeTerminal is ERC165, IJBPayoutTerminal {
         return 0;
     }
 
+    function previewPayFor(
+        uint256,
+        address,
+        uint256,
+        address,
+        bytes calldata
+    )
+        external
+        pure
+        override
+        returns (JBRuleset memory, uint256, uint256, JBPayHookSpecification[] memory)
+    {
+        JBRuleset memory ruleset;
+        return (ruleset, 0, 0, new JBPayHookSpecification[](0));
+    }
+
     function supportsInterface(bytes4 interfaceId) public view override(ERC165, IERC165) returns (bool) {
         return interfaceId == type(IJBTerminal).interfaceId || interfaceId == type(IJBPayoutTerminal).interfaceId
             || super.supportsInterface(interfaceId);

package/test/REVLoansSourceFeeRecovery.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.26;
+pragma solidity ^0.8.26;
 
 // forge-lint: disable-next-line(unaliased-plain-import)
 import "forge-std/Test.sol";