@bananapus/core-v6 0.0.42 → 0.0.44

package/src/JBPrices.sol

@@ -26,9 +26,9 @@ contract JBPrices is JBControlled, JBPermissioned, ERC2771Context, Ownable, IJBP
     //*********************************************************************//
 
     error JBPrices_PriceFeedAlreadyExists(IJBPriceFeed feed);
-    error JBPrices_PriceFeedNotFound();
-    error JBPrices_ZeroPricingCurrency();
-    error JBPrices_ZeroUnitCurrency();
+    error JBPrices_PriceFeedNotFound(uint256 projectId, uint256 pricingCurrency, uint256 unitCurrency);
+    error JBPrices_ZeroPricingCurrency(uint256 projectId, uint256 pricingCurrency);
+    error JBPrices_ZeroUnitCurrency(uint256 projectId, uint256 unitCurrency);
 
     //*********************************************************************//
     // ------------------------- public constants ------------------------ //
@@ -111,20 +111,23 @@ contract JBPrices is JBControlled, JBPermissioned, ERC2771Context, Ownable, IJBP
         projectId == DEFAULT_PROJECT_ID ? _checkOwner() : _onlyControllerOf(projectId);
 
         // Make sure the pricing currency isn't 0.
-        if (pricingCurrency == 0) revert JBPrices_ZeroPricingCurrency();
+        if (pricingCurrency == 0) {
+            revert JBPrices_ZeroPricingCurrency({projectId: projectId, pricingCurrency: pricingCurrency});
+        }
 
         // Make sure the unit currency isn't 0.
-        if (unitCurrency == 0) revert JBPrices_ZeroUnitCurrency();
+        if (unitCurrency == 0) revert JBPrices_ZeroUnitCurrency({projectId: projectId, unitCurrency: unitCurrency});
 
         // Make sure there isn't already a default price feed for the pair or its inverse.
         if (
             priceFeedFor[DEFAULT_PROJECT_ID][pricingCurrency][unitCurrency] != IJBPriceFeed(address(0))
                 || priceFeedFor[DEFAULT_PROJECT_ID][unitCurrency][pricingCurrency] != IJBPriceFeed(address(0))
         ) {
-            revert JBPrices_PriceFeedAlreadyExists(priceFeedFor[DEFAULT_PROJECT_ID][pricingCurrency][unitCurrency]
-                    != IJBPriceFeed(address(0))
+            revert JBPrices_PriceFeedAlreadyExists({
+                feed: priceFeedFor[DEFAULT_PROJECT_ID][pricingCurrency][unitCurrency] != IJBPriceFeed(address(0))
                     ? priceFeedFor[DEFAULT_PROJECT_ID][pricingCurrency][unitCurrency]
-                    : priceFeedFor[DEFAULT_PROJECT_ID][unitCurrency][pricingCurrency]);
+                    : priceFeedFor[DEFAULT_PROJECT_ID][unitCurrency][pricingCurrency]
+            });
         }
 
         // Make sure this project doesn't already have a price feed for the pair or its inverse.
@@ -132,10 +135,11 @@ contract JBPrices is JBControlled, JBPermissioned, ERC2771Context, Ownable, IJBP
             priceFeedFor[projectId][pricingCurrency][unitCurrency] != IJBPriceFeed(address(0))
                 || priceFeedFor[projectId][unitCurrency][pricingCurrency] != IJBPriceFeed(address(0))
         ) {
-            revert JBPrices_PriceFeedAlreadyExists(priceFeedFor[projectId][pricingCurrency][unitCurrency]
-                    != IJBPriceFeed(address(0))
+            revert JBPrices_PriceFeedAlreadyExists({
+                feed: priceFeedFor[projectId][pricingCurrency][unitCurrency] != IJBPriceFeed(address(0))
                     ? priceFeedFor[projectId][pricingCurrency][unitCurrency]
-                    : priceFeedFor[projectId][unitCurrency][pricingCurrency]);
+                    : priceFeedFor[projectId][unitCurrency][pricingCurrency]
+            });
         }
 
         // Price feed immutability is by design to prevent admin-key attacks on price oracles.
@@ -212,7 +216,9 @@ contract JBPrices is JBControlled, JBPermissioned, ERC2771Context, Ownable, IJBP
         }
 
         // No price feed available, revert.
-        revert JBPrices_PriceFeedNotFound();
+        revert JBPrices_PriceFeedNotFound({
+            projectId: projectId, pricingCurrency: pricingCurrency, unitCurrency: unitCurrency
+        });
     }
 
     //*********************************************************************//

package/src/JBRulesets.sol

@@ -123,7 +123,7 @@ contract JBRulesets is JBControlled, IJBRulesets {
 
         // Weight cut percent must be less than or equal to 100%.
         if (weightCutPercent > JBConstants.MAX_WEIGHT_CUT_PERCENT) {
-            revert JBRulesets_InvalidWeightCutPercent(weightCutPercent);
+            revert JBRulesets_InvalidWeightCutPercent({percent: weightCutPercent});
         }
 
         // Weight must fit into a uint112.
@@ -137,7 +137,7 @@ contract JBRulesets is JBControlled, IJBRulesets {
         // Make sure the min start date fits in a uint48, and that the start date of the following ruleset will also fit
         // within the max.
         if (mustStartAtOrAfter + duration > type(uint48).max) {
-            revert JBRulesets_InvalidRulesetEndTime(mustStartAtOrAfter + duration, type(uint48).max);
+            revert JBRulesets_InvalidRulesetEndTime({timestamp: mustStartAtOrAfter + duration, limit: type(uint48).max});
         }
 
         // Approval hook should be a valid contract, supporting the correct interface
@@ -152,7 +152,7 @@ contract JBRulesets is JBControlled, IJBRulesets {
                 // with the
                 // wrong interface
             } catch {
-                revert JBRulesets_InvalidRulesetApprovalHook(approvalHook); // No ERC165 support
+                revert JBRulesets_InvalidRulesetApprovalHook({hook: approvalHook}); // No ERC165 support
             }
         }
 
@@ -217,7 +217,6 @@ contract JBRulesets is JBControlled, IJBRulesets {
             _getStructFor({projectId: projectId, rulesetId: rulesetId, withMetadata: false});
 
         // Nothing to cache if the target ruleset doesn't have a duration or a weight cut percent.
-        // slither-disable-next-line incorrect-equality
         if (targetRuleset.duration == 0 || targetRuleset.weightCutPercent == 0) return;
 
         // Get a reference to the current cache.
@@ -356,7 +355,6 @@ contract JBRulesets is JBControlled, IJBRulesets {
     /// @return ruleset The project's current ruleset.
     function currentOf(uint256 projectId) external view override returns (JBRuleset memory ruleset) {
         // If the project does not have a ruleset, return an empty struct.
-        // slither-disable-next-line incorrect-equality
         if (latestRulesetIdOf[projectId] == 0) {
             return _getStructFor({projectId: 0, rulesetId: 0, withMetadata: false});
         }
@@ -375,7 +373,6 @@ contract JBRulesets is JBControlled, IJBRulesets {
 
             // Check to see if this ruleset's approval hook is approved if it exists.
             // If so, return it.
-            // slither-disable-next-line incorrect-equality
             if (approvalStatus == JBApprovalStatus.Approved || approvalStatus == JBApprovalStatus.Empty) {
                 return ruleset;
             }
@@ -413,7 +410,6 @@ contract JBRulesets is JBControlled, IJBRulesets {
         }
 
         // If the base has no duration, it's still the current one.
-        // slither-disable-next-line incorrect-equality
         if (ruleset.duration == 0) return ruleset;
 
         // Return a simulation of the current ruleset.
@@ -466,7 +462,6 @@ contract JBRulesets is JBControlled, IJBRulesets {
     /// @return ruleset The struct for the project's upcoming ruleset.
     function upcomingOf(uint256 projectId) external view override returns (JBRuleset memory ruleset) {
         // If the project does not have a latest ruleset, return an empty struct.
-        // slither-disable-next-line incorrect-equality
         if (latestRulesetIdOf[projectId] == 0) {
             return _getStructFor({projectId: 0, rulesetId: 0, withMetadata: false});
         }
@@ -487,7 +482,6 @@ contract JBRulesets is JBControlled, IJBRulesets {
 
             // If the approval hook is empty, expects approval, or has approved the ruleset, return it.
             if (
-                // slither-disable-next-line incorrect-equality
                 approvalStatus == JBApprovalStatus.Approved || approvalStatus == JBApprovalStatus.ApprovalExpected
                     || approvalStatus == JBApprovalStatus.Empty
             ) return ruleset;
@@ -510,7 +504,6 @@ contract JBRulesets is JBControlled, IJBRulesets {
         }
 
         // There's no queued if the current has a duration of 0.
-        // slither-disable-next-line incorrect-equality
         if (ruleset.duration == 0) return _getStructFor({projectId: 0, rulesetId: 0, withMetadata: false});
 
         // Get a reference to the approval status.
@@ -518,7 +511,6 @@ contract JBRulesets is JBControlled, IJBRulesets {
 
         // Check to see if this ruleset's approval hook hasn't failed.
         // If so, return a ruleset based on it.
-        // slither-disable-next-line incorrect-equality
         if (approvalStatus == JBApprovalStatus.Approved || approvalStatus == JBApprovalStatus.Empty) {
             return _simulateCycledRulesetBasedOn({projectId: projectId, baseRuleset: ruleset, allowMidRuleset: false});
         }
@@ -528,7 +520,6 @@ contract JBRulesets is JBControlled, IJBRulesets {
         ruleset = _getStructFor({projectId: projectId, rulesetId: ruleset.basedOnId, withMetadata: true});
 
         // There's no queued if the base, which must still be the current, has a duration of 0.
-        // slither-disable-next-line incorrect-equality
         if (ruleset.duration == 0) return _getStructFor({projectId: 0, rulesetId: 0, withMetadata: false});
 
         // Return a simulated cycled ruleset.
@@ -557,7 +548,6 @@ contract JBRulesets is JBControlled, IJBRulesets {
         returns (uint256)
     {
         // A subsequent ruleset to one with a duration of 0 should be the next number.
-        // slither-disable-next-line incorrect-equality
         if (baseRulesetDuration == 0) {
             return baseRulesetCycleNumber + 1;
         }
@@ -585,7 +575,6 @@ contract JBRulesets is JBControlled, IJBRulesets {
         returns (uint256 start)
     {
         // A subsequent ruleset to one with a duration of 0 should start as soon as possible.
-        // slither-disable-next-line incorrect-equality
         if (baseRulesetDuration == 0) return mustStartAtOrAfter;
 
         // The time when the ruleset immediately after the specified ruleset starts.
@@ -598,7 +587,6 @@ contract JBRulesets is JBControlled, IJBRulesets {
 
         // The amount of seconds since the `mustStartAtOrAfter` time which results in a start time that might satisfy
         // the specified limits.
-        // slither-disable-next-line weak-prng
         uint256 timeFromImmediateStartMultiple = (mustStartAtOrAfter - nextImmediateStart) % baseRulesetDuration;
 
         // A reference to the first possible start timestamp.
@@ -634,7 +622,6 @@ contract JBRulesets is JBControlled, IJBRulesets {
         returns (uint256 weight)
     {
         // A subsequent ruleset to one with a duration of 0 should have the next possible weight.
-        // slither-disable-next-line incorrect-equality
         if (baseRulesetDuration == 0) {
             return mulDiv(
                 baseRulesetWeight,
@@ -647,7 +634,6 @@ contract JBRulesets is JBControlled, IJBRulesets {
         weight = baseRulesetWeight;
 
         // If the weight cut percent is 0, the weight doesn't change.
-        // slither-disable-next-line incorrect-equality
         if (baseRulesetWeightCutPercent == 0) return weight;
 
         // The difference between the start of the base ruleset and the proposed start.
@@ -678,7 +664,7 @@ contract JBRulesets is JBControlled, IJBRulesets {
         // If too many iterations remain after cache lookup, require the cache to be populated first.
         // This prevents gas exhaustion for short-duration rulesets with large cycle counts.
         if (weightCutMultiple > _WEIGHT_CUT_MULTIPLE_CACHE_LOOKUP_THRESHOLD) {
-            revert JBRulesets_WeightCacheRequired(projectId);
+            revert JBRulesets_WeightCacheRequired({projectId: projectId});
         }
 
         // Cache the cut factor and max percent to avoid recomputing each iteration.
@@ -719,7 +705,6 @@ contract JBRulesets is JBControlled, IJBRulesets {
         uint256 latestId = latestRulesetIdOf[projectId];
 
         // If the project doesn't have a ruleset yet, initialize one.
-        // slither-disable-next-line incorrect-equality
         if (latestId == 0) {
             // Use an empty ruleset as the base.
             return _initializeRulesetFor({
@@ -807,7 +792,6 @@ contract JBRulesets is JBControlled, IJBRulesets {
         internal
     {
         // If there is no base, initialize a first ruleset.
-        // slither-disable-next-line incorrect-equality
         if (baseRuleset.cycleNumber == 0) {
             // Set fresh intrinsic properties.
             _packAndStoreIntrinsicPropertiesOf({
@@ -910,7 +894,6 @@ contract JBRulesets is JBControlled, IJBRulesets {
     /// @return The approval status of the project.
     function _approvalStatusOf(uint256 projectId, JBRuleset memory ruleset) internal view returns (JBApprovalStatus) {
         // If there is no ruleset ID to check the approval hook of, the approval hook is empty.
-        // slither-disable-next-line incorrect-equality
         if (ruleset.basedOnId == 0) return JBApprovalStatus.Empty;
 
         // Read only the packed user properties to extract the approval hook address,
@@ -928,7 +911,6 @@ contract JBRulesets is JBControlled, IJBRulesets {
         // Wrap in try/catch to prevent a reverting approval hook from permanently freezing the project.
         // Note: A malicious hook that consumes all gas (e.g. infinite loop) could still DoS via gas exhaustion.
         // This is accepted risk since the project owner chose their own approval hook.
-        // slither-disable-next-line calls-loop
         try approvalHook.approvalStatusOf({projectId: projectId, ruleset: ruleset}) returns (JBApprovalStatus status) {
             return status;
         } catch {
@@ -988,7 +970,6 @@ contract JBRulesets is JBControlled, IJBRulesets {
         returns (JBRuleset memory ruleset)
     {
         // Return an empty ruleset if the specified `rulesetId` is 0.
-        // slither-disable-next-line incorrect-equality
         if (rulesetId == 0) return ruleset;
 
         // forge-lint: disable-next-line(unsafe-typecast)
@@ -1104,12 +1085,10 @@ contract JBRulesets is JBControlled, IJBRulesets {
         JBRuleset memory ruleset = _getStructFor({projectId: projectId, rulesetId: rulesetId, withMetadata: false});
 
         // There is no upcoming ruleset if the latest ruleset has already started.
-        // slither-disable-next-line incorrect-equality
         // forge-lint: disable-next-line(block-timestamp)
         if (block.timestamp >= ruleset.start) return 0;
 
         // If this is the first ruleset, it is queued.
-        // slither-disable-next-line incorrect-equality
         if (ruleset.cycleNumber == 1) return rulesetId;
 
         // Get a reference to the ID of the ruleset the latest ruleset was based on.

package/src/JBSplits.sol

@@ -20,8 +20,8 @@ contract JBSplits is JBControlled, IJBSplits {
     //*********************************************************************//
 
     error JBSplits_PreviousLockedSplitsNotIncluded(uint256 projectId, uint256 rulesetId);
-    error JBSplits_TotalPercentExceeds100();
-    error JBSplits_ZeroSplitPercent();
+    error JBSplits_TotalPercentExceeds100(uint256 projectId, uint256 rulesetId, uint256 groupId, uint256 percentTotal);
+    error JBSplits_ZeroSplitPercent(uint256 projectId, uint256 rulesetId, uint256 groupId, uint256 splitIndex);
 
     //*********************************************************************//
     // ------------------------- public constants ------------------------ //
@@ -180,7 +180,7 @@ contract JBSplits is JBControlled, IJBSplits {
                 block.timestamp < currentSplits[i].lockedUntil
                     && !_includesLockedSplits({splits: splits, lockedSplit: currentSplits[i]})
             ) {
-                revert JBSplits_PreviousLockedSplitsNotIncluded(projectId, rulesetId);
+                revert JBSplits_PreviousLockedSplitsNotIncluded({projectId: projectId, rulesetId: rulesetId});
             }
             unchecked {
                 ++i;
@@ -198,13 +198,21 @@ contract JBSplits is JBControlled, IJBSplits {
             JBSplit memory split = splits[i];
 
             // The percent should be greater than 0.
-            if (split.percent == 0) revert JBSplits_ZeroSplitPercent();
+            if (split.percent == 0) {
+                revert JBSplits_ZeroSplitPercent({
+                    projectId: projectId, rulesetId: rulesetId, groupId: groupId, splitIndex: i
+                });
+            }
 
             // Add to the `percent` total.
             percentTotal += split.percent;
 
             // Ensure the total does not exceed 100%.
-            if (percentTotal > JBConstants.SPLITS_TOTAL_PERCENT) revert JBSplits_TotalPercentExceeds100();
+            if (percentTotal > JBConstants.SPLITS_TOTAL_PERCENT) {
+                revert JBSplits_TotalPercentExceeds100({
+                    projectId: projectId, rulesetId: rulesetId, groupId: groupId, percentTotal: percentTotal
+                });
+            }
 
             uint256 packedSplitParts1;
 

package/src/JBTerminalStore.sol

@@ -40,8 +40,10 @@ contract JBTerminalStore is IJBTerminalStore {
     //*********************************************************************//
 
     error JBTerminalStore_AccountingContextAlreadySet(address token);
-    error JBTerminalStore_AccountingContextDecimalsMismatch();
-    error JBTerminalStore_AddingAccountingContextNotAllowed();
+    error JBTerminalStore_AccountingContextDecimalsMismatch(
+        address token, uint256 providedDecimals, uint256 expectedDecimals
+    );
+    error JBTerminalStore_AddingAccountingContextNotAllowed(uint256 projectId, uint256 rulesetId, address terminal);
     error JBTerminalStore_InadequateControllerAllowance(uint256 amount, uint256 allowance);
     error JBTerminalStore_InadequateControllerPayoutLimit(uint256 amount, uint256 limit);
     error JBTerminalStore_InadequateTerminalStoreBalance(uint256 amount, uint256 balance);
@@ -49,10 +51,10 @@ contract JBTerminalStore is IJBTerminalStore {
     error JBTerminalStore_InvalidAmountToForwardHook(uint256 amount, uint256 paidAmount);
     error JBTerminalStore_NoopHookSpecHasAmount(uint256 amount);
     error JBTerminalStore_RulesetNotFound(uint256 projectId);
-    error JBTerminalStore_RulesetPaymentPaused();
-    error JBTerminalStore_TerminalMigrationNotAllowed();
+    error JBTerminalStore_RulesetPaymentPaused(uint256 projectId, uint256 rulesetId);
+    error JBTerminalStore_TerminalMigrationNotAllowed(uint256 projectId, uint256 rulesetId);
     error JBTerminalStore_Uint224Overflow(uint256 value);
-    error JBTerminalStore_ZeroAccountingContextCurrency();
+    error JBTerminalStore_ZeroAccountingContextCurrency(address token);
 
     //*********************************************************************//
     // -------------------------- internal constants --------------------- //
@@ -176,7 +178,9 @@ contract JBTerminalStore is IJBTerminalStore {
 
         // Make sure that if there's a ruleset, it allows adding accounting contexts.
         if (ruleset.id != 0 && !ruleset.allowAddAccountingContext()) {
-            revert JBTerminalStore_AddingAccountingContextNotAllowed();
+            revert JBTerminalStore_AddingAccountingContextNotAllowed({
+                projectId: projectId, rulesetId: ruleset.id, terminal: msg.sender
+            });
         }
 
         // Record each accounting context.
@@ -185,20 +189,22 @@ contract JBTerminalStore is IJBTerminalStore {
 
             // Make sure the token accounting context isn't already set.
             if (_accountingContextForTokenOf[msg.sender][projectId][context.token].token != address(0)) {
-                revert JBTerminalStore_AccountingContextAlreadySet(context.token);
+                revert JBTerminalStore_AccountingContextAlreadySet({token: context.token});
             }
 
             // Keep track of a flag indicating if we know the provided decimals are incorrect.
             bool knownInvalidDecimals;
+            uint256 expectedDecimals;
 
             // Check if the token is the native token and has the correct decimals.
             if (context.token == JBConstants.NATIVE_TOKEN && context.decimals != 18) {
                 knownInvalidDecimals = true;
+                expectedDecimals = 18;
             } else if (context.token != JBConstants.NATIVE_TOKEN && context.token.code.length > 0) {
-                // slither-disable-next-line calls-loop
                 try IERC20Metadata(context.token).decimals() returns (uint8 decimals) {
                     if (context.decimals != decimals) {
                         knownInvalidDecimals = true;
+                        expectedDecimals = decimals;
                     }
                 } catch {
                     // The token didn't support `decimals`.
@@ -210,11 +216,13 @@ contract JBTerminalStore is IJBTerminalStore {
 
             // Make sure the decimals are correct.
             if (knownInvalidDecimals) {
-                revert JBTerminalStore_AccountingContextDecimalsMismatch();
+                revert JBTerminalStore_AccountingContextDecimalsMismatch({
+                    token: context.token, providedDecimals: context.decimals, expectedDecimals: expectedDecimals
+                });
             }
 
             // Make sure the currency is non-zero.
-            if (context.currency == 0) revert JBTerminalStore_ZeroAccountingContextCurrency();
+            if (context.currency == 0) revert JBTerminalStore_ZeroAccountingContextCurrency({token: context.token});
 
             // Store the accounting context.
             _accountingContextForTokenOf[msg.sender][projectId][context.token] = context;
@@ -303,7 +311,7 @@ contract JBTerminalStore is IJBTerminalStore {
 
         // The amount being reclaimed must be within the project's balance.
         if (balanceDiff > currentBalance) {
-            revert JBTerminalStore_InadequateTerminalStoreBalance(balanceDiff, currentBalance);
+            revert JBTerminalStore_InadequateTerminalStoreBalance({amount: balanceDiff, balance: currentBalance});
         }
 
         // Remove the reclaimed funds from the project's balance.
@@ -404,7 +412,7 @@ contract JBTerminalStore is IJBTerminalStore {
 
         // The amount being paid out must be available.
         if (amountPaidOut > currentBalance) {
-            revert JBTerminalStore_InadequateTerminalStoreBalance(amountPaidOut, currentBalance);
+            revert JBTerminalStore_InadequateTerminalStoreBalance({amount: amountPaidOut, balance: currentBalance});
         }
 
         // The new total amount which has been paid out during this ruleset.
@@ -420,7 +428,7 @@ contract JBTerminalStore is IJBTerminalStore {
 
         // Make sure the new used amount is within the payout limit.
         if (newUsedPayoutLimitOf > payoutLimit || payoutLimit == 0) {
-            revert JBTerminalStore_InadequateControllerPayoutLimit(newUsedPayoutLimitOf, payoutLimit);
+            revert JBTerminalStore_InadequateControllerPayoutLimit({amount: newUsedPayoutLimitOf, limit: payoutLimit});
         }
 
         // Removed the paid out funds from the project's token balance.
@@ -444,7 +452,7 @@ contract JBTerminalStore is IJBTerminalStore {
 
         // Terminal migration must be allowed.
         if (!ruleset.allowTerminalMigration()) {
-            revert JBTerminalStore_TerminalMigrationNotAllowed();
+            revert JBTerminalStore_TerminalMigrationNotAllowed({projectId: projectId, rulesetId: ruleset.id});
         }
 
         // Return the current balance, which is the amount being migrated.
@@ -525,7 +533,9 @@ contract JBTerminalStore is IJBTerminalStore {
 
         // Make sure the new used amount is within the allowance.
         if (newUsedSurplusAllowanceOf > surplusAllowance || surplusAllowance == 0) {
-            revert JBTerminalStore_InadequateControllerAllowance(newUsedSurplusAllowanceOf, surplusAllowance);
+            revert JBTerminalStore_InadequateControllerAllowance({
+                amount: newUsedSurplusAllowanceOf, allowance: surplusAllowance
+            });
         }
 
         // Cache the balance slot to avoid redundant storage reads.
@@ -837,57 +847,6 @@ contract JBTerminalStore is IJBTerminalStore {
     // -------------------------- internal views ------------------------- //
     //*********************************************************************//
 
-    /// @notice Computes the surplus relevant for a cash out (total or local, depending on ruleset flag).
-    /// @dev When `useTotalSurplusForCashOuts` is enabled, surplus is aggregated from ALL registered terminals without
-    /// validation. Projects MUST only register trusted terminals — an untrusted terminal can over-report surplus and
-    /// cause the executing terminal to overpay cash-outs.
-    /// @param terminal The terminal recording the cash out.
-    /// @param projectId The ID of the project to cash out from.
-    /// @param tokenToReclaim The token to reclaim.
-    /// @param ruleset The ruleset during the cash out.
-    /// @return The surplus amount in the token's native decimals and currency.
-    function _cashOutSurplusOf(
-        address terminal,
-        uint256 projectId,
-        address tokenToReclaim,
-        JBRuleset memory ruleset
-    )
-        internal
-        view
-        returns (uint256)
-    {
-        // Look up the accounting context (decimals, currency) for the token being reclaimed at this terminal.
-        JBAccountingContext memory accountingContext = _accountingContextForTokenOf[terminal][projectId][tokenToReclaim];
-
-        // If the ruleset uses total surplus, aggregate across ALL terminals and ALL tokens.
-        if (ruleset.useTotalSurplusForCashOuts()) {
-            return JBSurplus.currentSurplusOf({
-                projectId: projectId,
-                // Get every terminal the project has registered.
-                terminals: DIRECTORY.terminalsOf(projectId),
-                // Empty tokens array = include all tokens at each terminal.
-                tokens: new address[](0),
-                // Express the result in the reclaimed token's decimals and currency.
-                decimals: accountingContext.decimals,
-                currency: accountingContext.currency
-            });
-        }
-
-        // Otherwise, only account for the specific token's surplus at this terminal.
-        JBAccountingContext[] memory singleContext = new JBAccountingContext[](1);
-        singleContext[0] = accountingContext;
-
-        // Compute surplus from only this terminal using only the reclaimed token's balance.
-        return _surplusFrom({
-            terminal: terminal,
-            projectId: projectId,
-            accountingContexts: singleContext,
-            ruleset: ruleset,
-            targetDecimals: accountingContext.decimals,
-            targetCurrency: accountingContext.currency
-        });
-    }
-
     /// @notice Calls the data hook, validates noop specifications, and computes the bonding curve reclaim amount.
     /// @dev Extracted from `_computeCashOutFrom` to keep it under the EVM stack depth limit (16 slots).
     /// @param ruleset The current ruleset (used to resolve the data hook address).
@@ -915,7 +874,7 @@ contract JBTerminalStore is IJBTerminalStore {
         // Noop specifications are informational only, so they can't also request forwarded funds.
         for (uint256 i; i < hookSpecifications.length;) {
             if (hookSpecifications[i].noop && hookSpecifications[i].amount != 0) {
-                revert JBTerminalStore_NoopHookSpecHasAmount(hookSpecifications[i].amount);
+                revert JBTerminalStore_NoopHookSpecHasAmount({amount: hookSpecifications[i].amount});
             }
             unchecked {
                 ++i;
@@ -969,21 +928,25 @@ contract JBTerminalStore is IJBTerminalStore {
         // Get a reference to the project's current ruleset.
         ruleset = RULESETS.currentOf(projectId);
 
-        // Get the project's current surplus for the token being reclaimed.
-        uint256 surplus = _cashOutSurplusOf({
-            terminal: terminal, projectId: projectId, tokenToReclaim: tokenToReclaim, ruleset: ruleset
-        });
-
         // Get the accounting context for the token being reclaimed.
         JBAccountingContext memory accountingContext = _accountingContextForTokenOf[terminal][projectId][tokenToReclaim];
 
+        // Get the project's current surplus across ALL terminals and ALL tokens.
+        uint256 surplus = JBSurplus.currentSurplusOf({
+            projectId: projectId,
+            terminals: DIRECTORY.terminalsOf(projectId),
+            tokens: new address[](0),
+            decimals: accountingContext.decimals,
+            currency: accountingContext.currency
+        });
+
         // Get the total number of outstanding project tokens.
         uint256 effectiveTotalSupply =
             IJBController(address(DIRECTORY.controllerOf(projectId))).totalTokenSupplyWithReservedTokensOf(projectId);
 
         // Can't cash out more tokens than are in the supply.
         if (cashOutCount > effectiveTotalSupply) {
-            revert JBTerminalStore_InsufficientTokens(cashOutCount, effectiveTotalSupply);
+            revert JBTerminalStore_InsufficientTokens({count: cashOutCount, totalSupply: effectiveTotalSupply});
         }
 
         // SECURITY NOTE: The data hook has absolute control over cash-out pricing.
@@ -991,7 +954,7 @@ contract JBTerminalStore is IJBTerminalStore {
         // completely overriding the terminal's bonding curve math. For example, setting
         // effectiveTotalSupply = surplus makes reclaimAmount = effectiveCashOutCount, bypassing the curve.
         // The terminal still burns the caller-supplied cashOutCount after pricing completes.
-        // Project owners MUST audit their data hooks with the same rigor as the terminal.
+        // Project owners must review their data hooks with the same rigor as the terminal.
 
         // If the ruleset has a data hook which is enabled for cash outs, use it to derive a claim amount and memo.
         if (ruleset.useDataHookForCashOut() && ruleset.dataHook() != address(0)) {
@@ -1009,7 +972,7 @@ contract JBTerminalStore is IJBTerminalStore {
                 decimals: accountingContext.decimals,
                 currency: accountingContext.currency
             });
-            context.useTotalSurplus = ruleset.useTotalSurplusForCashOuts();
+            context.scopeCashOutsToLocalBalances = ruleset.scopeCashOutsToLocalBalances();
             context.cashOutTaxRate = ruleset.cashOutTaxRate();
             context.beneficiaryIsFeeless = beneficiaryIsFeeless;
             context.metadata = metadata;
@@ -1067,7 +1030,9 @@ contract JBTerminalStore is IJBTerminalStore {
         if (ruleset.cycleNumber == 0) revert JBTerminalStore_RulesetNotFound(projectId);
 
         // The ruleset must not have payments paused.
-        if (ruleset.pausePay()) revert JBTerminalStore_RulesetPaymentPaused();
+        if (ruleset.pausePay()) {
+            revert JBTerminalStore_RulesetPaymentPaused({projectId: projectId, rulesetId: ruleset.id});
+        }
 
         // The weight according to which new tokens are to be minted, as a fixed point number with 18 decimals.
         uint256 weight;
@@ -1075,7 +1040,7 @@ contract JBTerminalStore is IJBTerminalStore {
         // SECURITY NOTE: The data hook has absolute control over payment token minting.
         // It can return an arbitrary weight (overriding the ruleset's weight) and hook specifications
         // that divert payment funds to external hooks before they reach the project's balance.
-        // Project owners MUST audit their data hooks with the same rigor as the terminal.
+        // Project owners must review their data hooks with the same rigor as the terminal.
 
         // If the ruleset has a data hook enabled for payments, use it to derive a weight and memo.
         if (ruleset.useDataHookForPay() && ruleset.dataHook() != address(0)) {
@@ -1105,7 +1070,7 @@ contract JBTerminalStore is IJBTerminalStore {
         // Ensure that the specifications have valid amounts.
         for (uint256 i; i < hookSpecifications.length;) {
             if (hookSpecifications[i].noop && hookSpecifications[i].amount != 0) {
-                revert JBTerminalStore_NoopHookSpecHasAmount(hookSpecifications[i].amount);
+                revert JBTerminalStore_NoopHookSpecHasAmount({amount: hookSpecifications[i].amount});
             }
 
             uint256 specifiedAmount = hookSpecifications[i].amount;
@@ -1113,7 +1078,9 @@ contract JBTerminalStore is IJBTerminalStore {
             // Can't send more to hook than was paid.
             if (specifiedAmount != 0) {
                 if (specifiedAmount > balanceDiff) {
-                    revert JBTerminalStore_InvalidAmountToForwardHook(specifiedAmount, balanceDiff);
+                    revert JBTerminalStore_InvalidAmountToForwardHook({
+                        amount: specifiedAmount, paidAmount: balanceDiff
+                    });
                 }
 
                 // Decrement the total amount being added to the local balance.
@@ -1319,7 +1286,6 @@ contract JBTerminalStore is IJBTerminalStore {
             });
 
         // Add up all the balances.
-        // slither-disable-next-line calls-loop
         surplus = (surplus == 0 || accountingContext.currency == targetCurrency)
             ? surplus
             : mulDiv({
@@ -1335,7 +1301,6 @@ contract JBTerminalStore is IJBTerminalStore {
             });
 
         // Get a reference to the payout limit during the ruleset for the token.
-        // slither-disable-next-line calls-loop
         JBCurrencyAmount[] memory payoutLimits = IJBController(address(DIRECTORY.controllerOf(projectId)))
             .FUND_ACCESS_LIMITS()
             .payoutLimitsOf({
@@ -1375,7 +1340,6 @@ contract JBTerminalStore is IJBTerminalStore {
 
             // Convert the `payoutLimit`'s amount to be in terms of the provided currency.
             if (payoutLimit.amount != 0 && payoutLimit.currency != targetCurrency) {
-                // slither-disable-next-line calls-loop
                 uint256 converted = mulDiv({
                     x: payoutLimit.amount,
                     y: 10 ** _MAX_FIXED_POINT_FIDELITY, // Use `_MAX_FIXED_POINT_FIDELITY` to keep as much of the