@bananapus/core-v6 0.0.42 → 0.0.44

package/src/JBTokens.sol

@@ -19,8 +19,8 @@ contract JBTokens is JBControlled, IJBTokens {
     // --------------------------- custom errors ------------------------- //
     //*********************************************************************//
 
-    error JBTokens_EmptyName();
-    error JBTokens_EmptySymbol();
+    error JBTokens_EmptyName(uint256 projectId);
+    error JBTokens_EmptySymbol(uint256 projectId);
     error JBTokens_EmptyToken(uint256 projectId);
     error JBTokens_InsufficientCredits(uint256 count, uint256 creditBalance);
     error JBTokens_InsufficientTokensToBurn(uint256 count, uint256 tokenBalance);
@@ -28,7 +28,7 @@ contract JBTokens is JBControlled, IJBTokens {
     error JBTokens_ProjectAlreadyHasToken(IJBToken token);
     error JBTokens_TokenAlreadyBeingUsed(uint256 projectId);
     error JBTokens_TokenCantBeAdded(uint256 projectId);
-    error JBTokens_TokenNotFound();
+    error JBTokens_TokenNotFound(uint256 projectId);
     error JBTokens_TokensMustHave18Decimals(uint256 decimals);
 
     //*********************************************************************//
@@ -49,7 +49,6 @@ contract JBTokens is JBControlled, IJBTokens {
 
     /// @notice The project ID that a given ERC-20 token is associated with.
     /// @custom:param token The address of the token associated with the project.
-    // slither-disable-next-line unused-return
     mapping(IJBToken token => uint256) public override projectIdOf;
 
     /// @notice Each project's attached token contract.
@@ -92,7 +91,7 @@ contract JBTokens is JBControlled, IJBTokens {
 
         // There must be enough tokens to burn across the holder's combined token and credit balance.
         if (count > tokenBalance + creditBalance) {
-            revert JBTokens_InsufficientTokensToBurn(count, tokenBalance + creditBalance);
+            revert JBTokens_InsufficientTokensToBurn({count: count, tokenBalance: tokenBalance + creditBalance});
         }
 
         // The amount of tokens to burn.
@@ -153,7 +152,7 @@ contract JBTokens is JBControlled, IJBTokens {
         IJBToken token = tokenOf[projectId];
 
         // The project must have a token contract attached.
-        if (token == IJBToken(address(0))) revert JBTokens_TokenNotFound();
+        if (token == IJBToken(address(0))) revert JBTokens_TokenNotFound({projectId: projectId});
 
         // Get a reference to the amount of credits the holder has.
         uint256 creditBalance = creditBalanceOf[holder][projectId];
@@ -204,10 +203,10 @@ contract JBTokens is JBControlled, IJBTokens {
         returns (IJBToken token)
     {
         // There must be a name.
-        if (bytes(name).length == 0) revert JBTokens_EmptyName();
+        if (bytes(name).length == 0) revert JBTokens_EmptyName({projectId: projectId});
 
         // There must be a symbol.
-        if (bytes(symbol).length == 0) revert JBTokens_EmptySymbol();
+        if (bytes(symbol).length == 0) revert JBTokens_EmptySymbol({projectId: projectId});
 
         // The project shouldn't already have a token.
         if (tokenOf[projectId] != IJBToken(address(0))) revert JBTokens_ProjectAlreadyHasToken(tokenOf[projectId]);
@@ -263,12 +262,11 @@ contract JBTokens is JBControlled, IJBTokens {
 
         // The total supply after minting can't exceed the maximum value storable in a uint208.
         if (supply + count > type(uint208).max) {
-            revert JBTokens_OverflowAlert(supply + count, type(uint208).max);
+            revert JBTokens_OverflowAlert({value: supply + count, limit: type(uint208).max});
         }
 
         if (tokensWereClaimed) {
             // If tokens should be claimed, mint tokens into the holder's wallet.
-            // slither-disable-next-line reentrancy-events
             token.mint({account: holder, amount: count});
         } else {
             // Otherwise, add the tokens to their credits and the credit supply.
@@ -333,13 +331,13 @@ contract JBTokens is JBControlled, IJBTokens {
         IJBToken token = tokenOf[projectId];
 
         // The project must have a token contract attached.
-        if (token == IJBToken(address(0))) revert JBTokens_TokenNotFound();
+        if (token == IJBToken(address(0))) revert JBTokens_TokenNotFound({projectId: projectId});
 
         // There must be a name.
-        if (bytes(name).length == 0) revert JBTokens_EmptyName();
+        if (bytes(name).length == 0) revert JBTokens_EmptyName({projectId: projectId});
 
         // There must be a symbol.
-        if (bytes(symbol).length == 0) revert JBTokens_EmptySymbol();
+        if (bytes(symbol).length == 0) revert JBTokens_EmptySymbol({projectId: projectId});
 
         emit SetTokenMetadata({projectId: projectId, name: name, symbol: symbol, caller: msg.sender});
 

package/src/abstract/JBControlled.sol

@@ -48,10 +48,9 @@ abstract contract JBControlled is IJBControlled {
     /// @notice Only allows the controller of the specified project to proceed.
     function _onlyControllerOf(uint256 projectId) internal view {
         // Cache the controller address to avoid a redundant external call on revert.
-        // slither-disable-next-line calls-loop
         address controller = address(DIRECTORY.controllerOf(projectId));
         if (controller != msg.sender) {
-            revert JBControlled_ControllerUnauthorized(controller);
+            revert JBControlled_ControllerUnauthorized({controller: controller});
         }
     }
 }

package/src/interfaces/IJBController.sol

@@ -81,12 +81,6 @@ interface IJBController is IERC165, IJBProjectUriRegistry, IJBDirectoryAccessCon
         address caller
     );
 
-    /// @notice A project was prepared for migration from another controller.
-    /// @param projectId The ID of the project to prepare for migration.
-    /// @param from The controller to migrate from.
-    /// @param caller The address that called the prep migration function.
-    event PrepMigration(uint256 indexed projectId, address from, address caller);
-
     /// @notice Rulesets were queued for a project.
     /// @param rulesetId The ID of the first queued ruleset.
     /// @param projectId The ID of the project.

package/src/interfaces/IJBFeelessAddresses.sol

@@ -1,21 +1,31 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-/// @notice Tracks addresses that are exempt from fees.
+/// @notice Tracks addresses that are exempt from fees, both globally and on a per-project basis.
+/// @dev `projectId = 0` is the wildcard — an address feeless for project 0 is feeless for ALL projects.
 interface IJBFeelessAddresses {
-    /// @notice An address's feeless status was set.
+    /// @notice An address's feeless status was set for a project (or globally if projectId is 0).
+    /// @param projectId The project the feeless status applies to. 0 means all projects.
     /// @param addr The address whose feeless status was set.
     /// @param isFeeless Whether the address is feeless.
     /// @param caller The address that set the feeless status.
-    event SetFeelessAddress(address indexed addr, bool indexed isFeeless, address caller);
+    event SetFeelessAddress(uint256 indexed projectId, address indexed addr, bool indexed isFeeless, address caller);
 
-    /// @notice Returns whether the specified address is feeless.
+    /// @notice Returns whether the specified address is feeless for a specific project, considering both the wildcard
+    /// (projectId 0) and project-specific feeless status.
     /// @param addr The address to check.
-    /// @return A flag indicating whether the address is feeless.
-    function isFeeless(address addr) external view returns (bool);
+    /// @param projectId The ID of the project to check.
+    /// @return A flag indicating whether the address is feeless (globally or for the project).
+    function isFeelessFor(address addr, uint256 projectId) external view returns (bool);
 
-    /// @notice Sets whether an address is feeless.
+    /// @notice Sets whether an address is feeless globally (for all projects).
     /// @param addr The address to set the feeless status of.
     /// @param flag A flag indicating whether the address should be feeless.
     function setFeelessAddress(address addr, bool flag) external;
+
+    /// @notice Sets whether an address is feeless for a specific project.
+    /// @param projectId The ID of the project. 0 means all projects (same as `setFeelessAddress`).
+    /// @param addr The address to set the feeless status of.
+    /// @param flag A flag indicating whether the address should be feeless for the project.
+    function setFeelessAddressFor(uint256 projectId, address addr, bool flag) external;
 }

package/src/libraries/JBCashOuts.sol

@@ -13,7 +13,7 @@ import {JBConstants} from "./JBConstants.sol";
 /// reclaim amount.
 library JBCashOuts {
     /// @notice Thrown when the desired output cannot be achieved (e.g., cash out tax rate is 100%).
-    error JBCashOuts_DesiredOutputNotAchievable();
+    error JBCashOuts_DesiredOutputNotAchievable(uint256 desiredOutput, uint256 cashOutTaxRate, uint256 maxTaxRate);
 
     /// @notice Returns the amount of surplus terminal tokens which can be reclaimed based on the total surplus, the
     /// number of tokens to cash out, the total token supply, and the ruleset's cash out tax rate.
@@ -81,7 +81,11 @@ library JBCashOuts {
 
         // If the cash out tax rate is at maximum, no output is achievable.
         if (cashOutTaxRate == JBConstants.MAX_CASH_OUT_TAX_RATE) {
-            revert JBCashOuts_DesiredOutputNotAchievable();
+            revert JBCashOuts_DesiredOutputNotAchievable({
+                desiredOutput: desiredOutput,
+                cashOutTaxRate: cashOutTaxRate,
+                maxTaxRate: JBConstants.MAX_CASH_OUT_TAX_RATE
+            });
         }
 
         // If the desired output meets or exceeds the surplus, the entire supply must be cashed out.

package/src/libraries/JBCurrencyIds.sol

@@ -4,6 +4,9 @@ pragma solidity 0.8.28;
 /// @notice Well-known currency IDs used as the `baseCurrency` in ruleset metadata. These are distinct from accounting
 /// context currencies (which use `uint32(uint160(tokenAddress))`). Only used for price feed lookups in `JBPrices`.
 library JBCurrencyIds {
+    /// @notice The currency ID used for ETH-denominated price feeds.
     uint32 public constant ETH = 1;
+
+    /// @notice The currency ID used for USD-denominated price feeds.
     uint32 public constant USD = 2;
 }

package/src/libraries/JBMetadataResolver.sol

@@ -25,10 +25,10 @@ pragma solidity 0.8.28;
  *            +-----------------------+
  */
 library JBMetadataResolver {
-    error JBMetadataResolver_DataNotPadded();
-    error JBMetadataResolver_LengthMismatch();
-    error JBMetadataResolver_MetadataTooLong();
-    error JBMetadataResolver_MetadataTooShort();
+    error JBMetadataResolver_DataNotPadded(uint256 dataLength);
+    error JBMetadataResolver_LengthMismatch(uint256 idsLength, uint256 datasLength);
+    error JBMetadataResolver_MetadataTooLong(uint256 offset, uint256 maxOffset);
+    error JBMetadataResolver_MetadataTooShort(uint256 metadataLength, uint256 minMetadataLength);
 
     // The various sizes used in bytes.
     uint256 constant ID_SIZE = 4;
@@ -61,7 +61,7 @@ library JBMetadataResolver {
         returns (bytes memory newMetadata)
     {
         // Validate data padding upfront so that the fast path below cannot bypass the check.
-        if (dataToAdd.length < 32) revert JBMetadataResolver_DataNotPadded();
+        if (dataToAdd.length < 32) revert JBMetadataResolver_DataNotPadded({dataLength: dataToAdd.length});
 
         // Empty original metadata and maybe something in the first 32 bytes: create new metadata
         if (originalMetadata.length <= RESERVED_SIZE) {
@@ -70,7 +70,11 @@ library JBMetadataResolver {
         }
 
         // There is something in the table offset, but not a valid entry - avoid overwriting
-        if (originalMetadata.length < RESERVED_SIZE + ID_SIZE + 1) revert JBMetadataResolver_MetadataTooShort();
+        if (originalMetadata.length < RESERVED_SIZE + ID_SIZE + 1) {
+            revert JBMetadataResolver_MetadataTooShort({
+                metadataLength: originalMetadata.length, minMetadataLength: RESERVED_SIZE + ID_SIZE + 1
+            });
+        }
 
         // Get the first data offset - upcast to avoid overflow (same for other offset)...
         uint256 firstOffset = uint8(originalMetadata[RESERVED_SIZE + ID_SIZE]);
@@ -104,7 +108,9 @@ library JBMetadataResolver {
                     // Increment every offset by 1 (as the table now takes one more word)
                     for (uint256 j = RESERVED_SIZE + ID_SIZE; j < lastOffsetIndex + 1; j += TOTAL_ID_SIZE) {
                         uint256 incremented = uint256(uint8(originalMetadata[j])) + 1;
-                        if (incremented > 255) revert JBMetadataResolver_MetadataTooLong();
+                        if (incremented > 255) {
+                            revert JBMetadataResolver_MetadataTooLong({offset: incremented, maxOffset: 255});
+                        }
                         // forge-lint: disable-next-line(unsafe-typecast)
                         newMetadata[j] = bytes1(uint8(incremented));
                     }
@@ -121,7 +127,7 @@ library JBMetadataResolver {
         // taken by the last data
         // Compute in uint256 first — casting directly to uint8 silently wraps offsets > 255.
         uint256 newOffset = lastOffset + numberOfWordslastData;
-        if (newOffset > 255) revert JBMetadataResolver_MetadataTooLong();
+        if (newOffset > 255) revert JBMetadataResolver_MetadataTooLong({offset: newOffset, maxOffset: 255});
         // forge-lint: disable-next-line(unsafe-typecast)
         newMetadata = abi.encodePacked(newMetadata, idToAdd, bytes1(uint8(newOffset)));
 
@@ -167,7 +173,9 @@ library JBMetadataResolver {
     /// @param datas The list of corresponding datas
     /// @return metadata The resulting metadata
     function createMetadata(bytes4[] memory ids, bytes[] memory datas) internal pure returns (bytes memory metadata) {
-        if (ids.length != datas.length) revert JBMetadataResolver_LengthMismatch();
+        if (ids.length != datas.length) {
+            revert JBMetadataResolver_LengthMismatch({idsLength: ids.length, datasLength: datas.length});
+        }
 
         // Return empty bytes for empty input arrays to avoid underflow in offset calculation below.
         if (ids.length == 0) return bytes("");
@@ -191,7 +199,7 @@ library JBMetadataResolver {
             bytes memory data = datas[i];
 
             if (data.length < 32 || data.length % JBMetadataResolver.WORD_SIZE != 0) {
-                revert JBMetadataResolver_DataNotPadded();
+                revert JBMetadataResolver_DataNotPadded({dataLength: data.length});
             }
 
             // forge-lint: disable-next-line(unsafe-typecast)
@@ -199,7 +207,7 @@ library JBMetadataResolver {
             offset += data.length / JBMetadataResolver.WORD_SIZE;
 
             // Overflowing a bytes1?
-            if (offset > 255) revert JBMetadataResolver_MetadataTooLong();
+            if (offset > 255) revert JBMetadataResolver_MetadataTooLong({offset: offset, maxOffset: 255});
         }
 
         // Pad the table to a multiple of 32B
@@ -277,7 +285,7 @@ library JBMetadataResolver {
     /// @param purpose A string describing the purpose associated with the id
     /// @return id The resulting ID.
     function getId(string memory purpose) internal view returns (bytes4) {
-        return getId(purpose, address(this));
+        return getId({purpose: purpose, target: address(this)});
     }
 
     /// @notice Returns an unique id following a suggested format (`xor(address(this), purpose name)` where purpose name

package/src/libraries/JBPayoutSplitGroupLib.sol

@@ -12,6 +12,13 @@ import {JBConstants} from "./JBConstants.sol";
 /// @dev Kept local to this file because `executePayout(...)` is an implementation detail, not a shared public
 /// interface.
 interface IJBPayoutSplitGroupExecutor {
+    /// @notice Executes one payout split from the terminal that is using this library.
+    /// @param split The split to pay.
+    /// @param projectId The ID of the project paying the split.
+    /// @param token The token being paid out.
+    /// @param amount The amount assigned to the split.
+    /// @param originalMessageSender The account that started the payout flow.
+    /// @return netPayoutAmount The amount that was actually paid after fees or hook behavior.
     function executePayout(
         JBSplit calldata split,
         uint256 projectId,
@@ -30,6 +37,7 @@ interface IJBPayoutSplitGroupExecutor {
 /// are emitted from the terminal's address.
 library JBPayoutSplitGroupLib {
     event PayoutReverted(uint256 indexed projectId, JBSplit split, uint256 amount, bytes reason, address caller);
+
     event SendPayoutToSplit(
         uint256 indexed projectId,
         uint256 indexed rulesetId,
@@ -80,7 +88,6 @@ library JBPayoutSplitGroupLib {
             uint256 payoutAmount = mulDiv(leftoverAmount, split.percent, leftoverPercentage);
 
             // The final payout amount after taking out any fees.
-            // slither-disable-next-line calls-loop
             uint256 netPayoutAmount = _sendPayoutToSplit({
                 store: store, split: split, projectId: projectId, token: token, amount: payoutAmount, caller: caller
             });
@@ -140,7 +147,6 @@ library JBPayoutSplitGroupLib {
         // split from DoS-ing the entire payout. Failed splits' amounts are returned to the project balance via
         // `recordAddedBalanceFor`. Payout limit consumption is correct because the project authorized the
         // distribution.
-        // slither-disable-next-line reentrancy-events,calls-loop
         try IJBPayoutSplitGroupExecutor(address(this))
             .executePayout({
             split: split, projectId: projectId, token: token, amount: amount, originalMessageSender: caller
@@ -154,7 +160,6 @@ library JBPayoutSplitGroupLib {
             });
 
             // Add balance back to the project.
-            // slither-disable-next-line calls-loop
             store.recordAddedBalanceFor({projectId: projectId, token: token, amount: amount});
 
             // Since the payout failed the netPayoutAmount is zero.

package/src/libraries/JBRulesetMetadataResolver.sol

@@ -67,7 +67,7 @@ library JBRulesetMetadataResolver {
         return ((ruleset.metadata >> 78) & 1) == 1;
     }
 
-    function useTotalSurplusForCashOuts(JBRuleset memory ruleset) internal pure returns (bool) {
+    function scopeCashOutsToLocalBalances(JBRuleset memory ruleset) internal pure returns (bool) {
         return ((ruleset.metadata >> 79) & 1) == 1;
     }
 
@@ -123,8 +123,8 @@ library JBRulesetMetadataResolver {
         if (rulesetMetadata.ownerMustSendPayouts) packed |= 1 << 77;
         // hold fees in bit 78.
         if (rulesetMetadata.holdFees) packed |= 1 << 78;
-        // useTotalSurplusForCashOuts in bit 79.
-        if (rulesetMetadata.useTotalSurplusForCashOuts) packed |= 1 << 79;
+        // scopeCashOutsToLocalBalances in bit 79.
+        if (rulesetMetadata.scopeCashOutsToLocalBalances) packed |= 1 << 79;
         // use pay data source in bit 80.
         if (rulesetMetadata.useDataHookForPay) packed |= 1 << 80;
         // use cash out data source in bit 81.
@@ -154,7 +154,7 @@ library JBRulesetMetadataResolver {
             allowAddPriceFeed: allowAddPriceFeed(ruleset),
             ownerMustSendPayouts: ownerMustSendPayouts(ruleset),
             holdFees: holdFees(ruleset),
-            useTotalSurplusForCashOuts: useTotalSurplusForCashOuts(ruleset),
+            scopeCashOutsToLocalBalances: scopeCashOutsToLocalBalances(ruleset),
             useDataHookForPay: useDataHookForPay(ruleset),
             useDataHookForCashOut: useDataHookForCashOut(ruleset),
             dataHook: dataHook(ruleset),

package/src/libraries/JBSplitGroupIds.sol

@@ -4,5 +4,6 @@ pragma solidity 0.8.28;
 /// @notice Well-known split group IDs. The reserved tokens group (ID 1) defines how a project's reserved tokens are
 /// distributed. Payout split groups use the token address cast to `uint256(uint160(token))` as their group ID.
 library JBSplitGroupIds {
+    /// @notice The split group ID used for reserved token distributions.
     uint256 public constant RESERVED_TOKENS = 1;
 }

package/src/periphery/JBDeadline1Day.sol

@@ -3,6 +3,7 @@ pragma solidity 0.8.28;
 
 import {JBDeadline} from "../JBDeadline.sol";
 
+/// @notice A reusable deadline implementation with a fixed one-day duration.
 contract JBDeadline1Day is JBDeadline {
     constructor() JBDeadline(1 days) {}
 }

package/src/periphery/JBDeadline3Days.sol

@@ -3,6 +3,7 @@ pragma solidity 0.8.28;
 
 import {JBDeadline} from "../JBDeadline.sol";
 
+/// @notice A reusable deadline implementation with a fixed three-day duration.
 contract JBDeadline3Days is JBDeadline {
     constructor() JBDeadline(3 days) {}
 }

package/src/periphery/JBDeadline3Hours.sol

@@ -3,6 +3,7 @@ pragma solidity 0.8.28;
 
 import {JBDeadline} from "../JBDeadline.sol";
 
+/// @notice A reusable deadline implementation with a fixed three-hour duration.
 contract JBDeadline3Hours is JBDeadline {
     constructor() JBDeadline(3 hours) {}
 }

package/src/periphery/JBDeadline7Days.sol

@@ -3,6 +3,7 @@ pragma solidity 0.8.28;
 
 import {JBDeadline} from "../JBDeadline.sol";
 
+/// @notice A reusable deadline implementation with a fixed seven-day duration.
 contract JBDeadline7Days is JBDeadline {
     constructor() JBDeadline(7 days) {}
 }

package/src/structs/JBBeforeCashOutRecordedContext.sol

@@ -14,7 +14,8 @@ import {JBTokenAmount} from "./JBTokenAmount.sol";
 /// @custom:member surplus The surplus amount used for the calculation, as a fixed point number with 18 decimals.
 /// Includes the token of the surplus, the surplus value, the number of decimals
 /// included, and the currency of the surplus.
-/// @custom:member useTotalSurplus If true, use surplus across all of a project's terminals when calculating cash outs.
+/// @custom:member scopeCashOutsToLocalBalances If true, omnichain hooks should use only local chain balances for cash
+/// outs (skip cross-chain aggregation).
 /// @custom:member cashOutTaxRate The cash out tax rate of the ruleset the cash out is made during, out of
 /// `JBConstants.MAX_CASH_OUT_TAX_RATE`.
 /// @custom:member beneficiaryIsFeeless Whether the cash out's beneficiary is a feeless address. Useful for data hooks
@@ -29,7 +30,7 @@ struct JBBeforeCashOutRecordedContext {
     uint256 cashOutCount;
     uint256 totalSupply;
     JBTokenAmount surplus;
-    bool useTotalSurplus;
+    bool scopeCashOutsToLocalBalances;
     uint256 cashOutTaxRate;
     bool beneficiaryIsFeeless;
     bytes metadata;

package/src/structs/JBRulesetMetadata.sol

@@ -21,8 +21,8 @@ pragma solidity ^0.8.0;
 /// @custom:member allowAddPriceFeed If `true`, the project can register new price feeds in `JBPrices`.
 /// @custom:member ownerMustSendPayouts If `true`, only the project owner can trigger payout distribution.
 /// @custom:member holdFees If `true`, fees are accumulated but not processed until a future ruleset (or manually).
-/// @custom:member useTotalSurplusForCashOuts If `true`, cash-out calculations use surplus across all terminals (not
-/// just the one to cash out from).
+/// @custom:member scopeCashOutsToLocalBalances If `true`, omnichain cash-out calculations use only the local chain's
+/// balances (not cross-chain aggregates).
 /// @custom:member useDataHookForPay If `true`, the data hook is called before recording payments.
 /// @custom:member useDataHookForCashOut If `true`, the data hook is called before recording cash outs.
 /// @custom:member dataHook Contract called before pay/cash-out to potentially override token counts or add hooks.
@@ -42,7 +42,7 @@ struct JBRulesetMetadata {
     bool allowAddPriceFeed;
     bool ownerMustSendPayouts;
     bool holdFees;
-    bool useTotalSurplusForCashOuts;
+    bool scopeCashOutsToLocalBalances;
     bool useDataHookForPay;
     bool useDataHookForCashOut;
     address dataHook;

package/test/helpers/JBTest.sol

@@ -43,7 +43,7 @@ contract JBTest is Test {
             allowAddAccountingContext: true,
             allowAddPriceFeed: true,
             holdFees: false,
-            useTotalSurplusForCashOuts: true,
+            scopeCashOutsToLocalBalances: true,
             useDataHookForPay: false,
             useDataHookForCashOut: false,
             dataHook: address(0),
@@ -81,7 +81,7 @@ contract JBTest is Test {
             allowAddAccountingContext: true,
             allowAddPriceFeed: false,
             holdFees: false,
-            useTotalSurplusForCashOuts: false,
+            scopeCashOutsToLocalBalances: false,
             useDataHookForPay: false,
             useDataHookForCashOut: false,
             dataHook: address(0),
@@ -105,7 +105,7 @@ contract JBTest is Test {
             allowAddAccountingContext: false,
             allowAddPriceFeed: false,
             holdFees: true,
-            useTotalSurplusForCashOuts: true,
+            scopeCashOutsToLocalBalances: true,
             useDataHookForPay: false,
             useDataHookForCashOut: false,
             dataHook: address(0),