@bananapus/core-v6 0.0.41 → 0.0.43

package/src/JBMultiTerminal.sol

@@ -64,7 +64,7 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
     //*********************************************************************//
 
     error JBMultiTerminal_FeeTerminalNotFound(address token);
-    error JBMultiTerminal_MintNotAllowed();
+    error JBMultiTerminal_MintNotAllowed(uint256 projectId, uint256 splitProjectId, address terminal);
     error JBMultiTerminal_NoMsgValueAllowed(uint256 value);
     error JBMultiTerminal_OverflowAlert(uint256 value, uint256 limit);
     error JBMultiTerminal_PermitAllowanceNotEnough(uint256 amount, uint256 allowance);
@@ -88,9 +88,6 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
     // ------------------------ internal constants ----------------------- //
     //*********************************************************************//
 
-    /// @notice Denominator for forward-calculating this terminal's fee from a pre-fee amount.
-    uint256 internal constant _FEE_AMOUNT_FROM_DENOMINATOR = JBConstants.MAX_FEE / FEE;
-
     /// @notice Project ID #1 receives fees. It should be the first project launched during the deployment process.
     uint256 internal constant _FEE_BENEFICIARY_PROJECT_ID = 1;
 
@@ -216,7 +213,6 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
 
         // Emit an event for each accounting context.
         for (uint256 i; i < accountingContexts.length;) {
-            // slither-disable-next-line reentrancy-events
             emit SetAccountingContext({projectId: projectId, context: accountingContexts[i], caller: _msgSender()});
             unchecked {
                 ++i;
@@ -251,15 +247,15 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
         _addToBalanceOf({
             projectId: projectId,
             token: token,
-            amount: _acceptFundsFor(projectId, token, amount, metadata),
+            amount: _acceptFundsFor({projectId: projectId, token: token, amount: amount, metadata: metadata}),
             shouldReturnHeldFees: shouldReturnHeldFees,
             memo: memo,
             metadata: metadata
         });
     }
 
-    /// @notice Burns project tokens to reclaim a share of the project's surplus (determined by the bonding curve) or
-    /// to trigger custom logic through the ruleset's data hook and cash out hook.
+    /// @notice Cash out project tokens. The project's current ruleset determines the reclaimed surplus and any data
+    /// hook or cash out hook behavior.
     /// @dev Only the token holder or an operator with `CASH_OUT_TOKENS` permission from that holder can call this.
     /// @param holder The account cashing out tokens.
     /// @param projectId The ID of the project the project tokens belong to.
@@ -333,7 +329,7 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
         if (split.hook != IJBSplitHook(address(0))) {
             // Make sure that the address supports the split hook interface.
             if (!split.hook.supportsInterface(type(IJBSplitHook).interfaceId)) {
-                revert JBMultiTerminal_SplitHookInvalid(split.hook);
+                revert JBMultiTerminal_SplitHookInvalid({hook: split.hook});
             }
 
             // This payout is eligible for a fee since the funds are leaving this contract and the split hook isn't a
@@ -373,7 +369,7 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
 
             // The project must have a terminal to send funds to.
             if (terminal == IJBTerminal(address(0))) {
-                revert JBMultiTerminal_RecipientProjectTerminalNotFound(split.projectId, token);
+                revert JBMultiTerminal_RecipientProjectTerminalNotFound({projectId: split.projectId, token: token});
             }
 
             // Fees apply to fund egress, not intra-terminal accounting. When both projects share this terminal,
@@ -412,7 +408,9 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
                 // Cross-project pay splits on the same terminal are allowed (different project receives the funds).
                 // The try-catch in the split group lib catches this revert and restores the balance.
                 if (terminal == this && split.projectId == projectId) {
-                    revert JBMultiTerminal_MintNotAllowed();
+                    revert JBMultiTerminal_MintNotAllowed({
+                        projectId: projectId, splitProjectId: split.projectId, terminal: address(terminal)
+                    });
                 }
 
                 // Keep a reference to the beneficiary of the payment.
@@ -432,7 +430,6 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
                 // destination project's data hook forwarded part of the payment to pay hooks, the store
                 // only recorded a partial balance increase. Without this cap, _feeFreeSurplusOf can exceed
                 // STORE.balanceOf, causing users to be overcharged fees on zero-tax cashouts.
-                // slither-disable-next-line reentrancy-eth
                 _capFeeFreeSurplus({projectId: split.projectId, token: token});
             }
         } else {
@@ -476,7 +473,7 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
         require(msg.sender == address(this));
 
         if (address(feeTerminal) == address(0)) {
-            revert JBMultiTerminal_FeeTerminalNotFound(token);
+            revert JBMultiTerminal_FeeTerminalNotFound({token: token});
         }
 
         // Send the projectId in the metadata.
@@ -540,7 +537,6 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
         // sends fees to the fee project terminal. The migrated project's balance on this terminal is zero, but held
         // fees are backed by the terminal's own token balance (not the project's recorded balance).
         // Record the migration in the store.
-        // slither-disable-next-line reentrancy-events
         balance = STORE.recordTerminalMigration({projectId: projectId, token: token});
 
         emit MigrateTerminal({projectId: projectId, token: token, to: to, amount: balance, caller: _msgSender()});
@@ -569,8 +565,8 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
         }
     }
 
-    /// @notice Pay a project with tokens. The project's current ruleset determines how many project tokens the
-    /// beneficiary will receive.
+    /// @notice Pay a project. The project's current ruleset determines how many project tokens the beneficiary receives
+    /// and any data hook or pay hook behavior.
     /// @param projectId The ID of the project to pay.
     /// @param amount The amount of tokens to send, as a fixed point number with the same number of
     /// decimals as the token's accounting context. If this terminal's token is native, this is ignored and `msg.value`
@@ -672,7 +668,6 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
             _nextHeldFeeIndexOf[projectId][token] = currentIndex + 1;
 
             // Process the fee.
-            // slither-disable-next-line reentrancy-no-eth
             _processFee({
                 projectId: projectId,
                 token: token,
@@ -1022,7 +1017,7 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
 
             // Make sure the permit allowance is enough for this payment. If not we revert early.
             if (amount > allowance.amount) {
-                revert JBMultiTerminal_PermitAllowanceNotEnough(amount, allowance.amount);
+                revert JBMultiTerminal_PermitAllowanceNotEnough({amount: amount, allowance: allowance.amount});
             }
 
             // Keep a reference to the permit rules.
@@ -1037,8 +1032,7 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
             // Set the allowance to `spend` tokens for the user.
             try PERMIT2.permit({owner: _msgSender(), permitSingle: permitSingle, signature: allowance.signature}) {}
             catch (bytes memory reason) {
-                // slither-disable-next-line reentrancy-events
-                emit Permit2AllowanceFailed(token, _msgSender(), reason);
+                emit Permit2AllowanceFailed({token: token, owner: _msgSender(), reason: reason});
             }
         }
 
@@ -1121,7 +1115,6 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
 
         // Cap fee-free surplus at the remaining balance.
         if (feeFreeSurplus > remainingBalance) {
-            // slither-disable-next-line reentrancy-no-eth,reentrancy-eth,reentrancy-benign
             _feeFreeSurplusOf[projectId][token] = remainingBalance;
         }
     }
@@ -1202,7 +1195,6 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
                     uint256 feeFreeSurplus = _feeFreeSurplusOf[projectId][tokenToReclaim];
                     if (feeFreeSurplus != 0) {
                         uint256 feeableAmount = reclaimAmount < feeFreeSurplus ? reclaimAmount : feeFreeSurplus;
-                        // slither-disable-next-line reentrancy-no-eth,reentrancy-eth,reentrancy-benign
                         unchecked {
                             _feeFreeSurplusOf[projectId][tokenToReclaim] = feeFreeSurplus - feeableAmount;
                         }
@@ -1245,7 +1237,6 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
         // balance during a prior inbound payout), overcharging fees on round-trip prevention.
         // Placed after hook fulfillment so any further balance reductions from cashout hooks are
         // also accounted for.
-        // slither-disable-next-line reentrancy-eth
         _capFeeFreeSurplus({projectId: projectId, token: tokenToReclaim});
 
         // Take the fee from all outbound reclaimings.
@@ -1347,12 +1338,10 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
         } else {
             // Trigger any inherited pre-transfer logic.
             // Keep a reference to the amount that'll be paid as a `msg.value`.
-            // slither-disable-next-line reentrancy-events
             uint256 payValue = _beforeTransferTo({to: address(terminal), token: token, amount: amount});
 
             // Send the fee.
             // If this terminal's token is ETH, send it in msg.value.
-            // slither-disable-next-line unused-return
             terminal.pay{value: payValue}({
                 projectId: projectId,
                 token: token,
@@ -1385,7 +1374,6 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
     {
         // Trigger any inherited pre-transfer logic.
         // Keep a reference to the amount that'll be paid as a `msg.value`.
-        // slither-disable-next-line reentrancy-events
         uint256 payValue = _beforeTransferTo({to: address(terminal), token: token, amount: amount});
 
         // Add to balance on the recipient terminal.
@@ -1444,7 +1432,6 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
             cashOutMetadata: metadata
         });
 
-        // slither-disable-next-line calls-loop
         for (uint256 i; i < specifications.length;) {
             // Set the specification being iterated on.
             JBCashOutHookSpecification memory specification = specifications[i];
@@ -1480,13 +1467,11 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
 
             // Trigger any inherited pre-transfer logic.
             // Keep a reference to the amount that'll be paid as a `msg.value`.
-            // slither-disable-next-line reentrancy-events
             uint256 payValue = _beforeTransferTo({
                 to: address(specification.hook), token: beneficiaryReclaimAmount.token, amount: specification.amount
             });
 
             // Fulfill the specification.
-            // slither-disable-next-line reentrancy-events,calls-loop
             specification.hook.afterCashOutRecordedWith{value: payValue}(context);
 
             // Revoke the temporary pull allowance now that the hook call has finished.
@@ -1541,7 +1526,6 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
         });
 
         // Fulfill each specification through their pay hooks.
-        // slither-disable-next-line calls-loop
         for (uint256 i; i < specifications.length;) {
             // Set the specification being iterated on.
             JBPayHookSpecification memory specification = specifications[i];
@@ -1567,13 +1551,11 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
 
             // Trigger any inherited pre-transfer logic.
             // Keep a reference to the amount that'll be paid as a `msg.value`.
-            // slither-disable-next-line reentrancy-events
             uint256 payValue = _beforeTransferTo({
                 to: address(specification.hook), token: tokenAmount.token, amount: specification.amount
             });
 
             // Fulfill the specification.
-            // slither-disable-next-line reentrancy-events,calls-loop
             specification.hook.afterPayRecordedWith{value: payValue}(context);
 
             // Revoke the temporary pull allowance now that the hook call has finished.
@@ -1621,7 +1603,6 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
         // Keep a reference to the ruleset the payment is being made during.
         // Keep a reference to the pay hook specifications.
         // Keep a reference to the token count that'll be minted as a result of the payment.
-        // slither-disable-next-line reentrancy-events
         (JBRuleset memory ruleset, uint256 tokenCount, JBPayHookSpecification[] memory hookSpecifications) = STORE.recordPaymentFrom({
             payer: payer, amount: tokenAmount, projectId: projectId, beneficiary: beneficiary, metadata: metadata
         });
@@ -1633,7 +1614,6 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
         if (tokenCount != 0) {
             // Set the token count to be the number of tokens minted for the beneficiary instead of the total
             // amount.
-            // slither-disable-next-line reentrancy-events
             newlyIssuedTokenCount = _controllerOf(projectId)
                 .mintTokensOf({
                 projectId: projectId,
@@ -1689,7 +1669,6 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
     )
         internal
     {
-        // slither-disable-next-line reentrancy-events,calls-loop
         try this.executeProcessFee({
             projectId: projectId, token: token, amount: amount, beneficiary: beneficiary, feeTerminal: feeTerminal
         }) {
@@ -1726,7 +1705,6 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
     /// this
     /// terminal.
     function _recordAddedBalanceFor(uint256 projectId, address token, uint256 amount) internal {
-        // slither-disable-next-line calls-loop
         STORE.recordAddedBalanceFor({projectId: projectId, token: token, amount: amount});
     }
 
@@ -1763,7 +1741,6 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
             // Save the fee being iterated on.
             JBFee memory heldFee = _heldFeesOf[projectId][token][startIndex + i];
 
-            // slither-disable-next-line incorrect-equality
             if (leftoverAmount == 0) {
                 break;
             } else {
@@ -1782,9 +1759,7 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
                     // Move the start index forward to the held fee after the current one.
                     newStartIndex = startIndex + i + 1;
                 } else {
-                    // Use the floor variant here. The minimum 1-unit fee applies when a fee is created, not while
-                    // splitting an already-held fee entry across repayments.
-                    feeAmount = JBFees.feeAmountResultingInFloorForFee25(leftoverAmount);
+                    feeAmount = JBFees.feeAmountResultingIn({amountAfterFee: leftoverAmount, feePercent: FEE});
 
                     // Get fee from `leftoverAmount`.
                     unchecked {
@@ -1883,7 +1858,6 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
                     leftoverPayoutAmount = netLeftoverPayoutAmount;
                 }
             } catch (bytes memory reason) {
-                // slither-disable-next-line reentrancy-events
                 emit PayoutTransferReverted({
                     projectId: projectId,
                     addr: projectOwner,
@@ -1901,7 +1875,6 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
 
         // Cap fee-free surplus at remaining balance. Non-fee-free funds leave first.
         // Placed after all payouts settle so the cap reflects post-payout state.
-        // slither-disable-next-line reentrancy-no-eth,reentrancy-eth,reentrancy-benign
         _capFeeFreeSurplus({projectId: projectId, token: token});
 
         // Take the fee.
@@ -2047,12 +2020,10 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
             STORE.recordUsedAllowanceOf({projectId: projectId, token: token, amount: amount, currency: currency});
 
         // Cap fee-free surplus at remaining balance. Non-fee-free funds leave first.
-        // slither-disable-next-line reentrancy-no-eth,reentrancy-eth,reentrancy-benign
         _capFeeFreeSurplus({projectId: projectId, token: token});
 
         // Take a fee from the `amountPaidOut`, if needed.
         // The net amount is the final amount withdrawn after the fee has been taken.
-        // slither-disable-next-line reentrancy-events
         netAmountPaidOut = amountPaidOut
             - (_isFeeless(owner) || _isFeeless(beneficiary)
                     ? 0
@@ -2097,7 +2068,6 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
         if (token == JBConstants.NATIVE_TOKEN) return;
 
         // Revert if the callee returned without consuming the full forwarded ERC-20 amount.
-        // slither-disable-next-line calls-loop
         uint256 allowance = IERC20(token).allowance({owner: address(this), spender: to});
         if (allowance != 0) revert JBMultiTerminal_TemporaryAllowanceNotConsumed(token, to, allowance);
     }
@@ -2202,12 +2172,9 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
     //*********************************************************************//
 
     /// @notice The terminal fee charged from a pre-fee `amount`.
-    /// @dev Returns at least 1 for nonzero feeable amounts so dust payouts cannot bypass protocol fees.
     /// @param amount The amount before the fee is applied.
-    /// @return feeAmount The fee amount.
-    function _feeAmountFrom(uint256 amount) private pure returns (uint256 feeAmount) {
-        feeAmount = amount / _FEE_AMOUNT_FROM_DENOMINATOR;
-
-        return feeAmount == 0 && amount != 0 ? 1 : feeAmount;
+    /// @return The fee amount.
+    function _feeAmountFrom(uint256 amount) private pure returns (uint256) {
+        return JBFees.feeAmountFrom({amountBeforeFee: amount, feePercent: FEE});
     }
 }

package/src/JBPermissions.sol

@@ -17,8 +17,7 @@ contract JBPermissions is ERC2771Context, IJBPermissions {
     // --------------------------- custom errors ------------------------- //
     //*********************************************************************//
 
-    error JBPermissions_CantSetRootPermissionForWildcardProject();
-    error JBPermissions_NoZeroPermission();
+    error JBPermissions_NoZeroPermission(address account, address operator, uint256 projectId);
     error JBPermissions_PermissionIdOutOfBounds(uint256 permissionId);
     error JBPermissions_Unauthorized(address account, address operator, uint256 projectId, uint256 permissionId);
 
@@ -69,7 +68,11 @@ contract JBPermissions is ERC2771Context, IJBPermissions {
         uint256 packed = _packedPermissions(permissionsData.permissionIds);
 
         // Make sure the 0 permission is not set.
-        if (_includesPermission({permissions: packed, permissionId: 0})) revert JBPermissions_NoZeroPermission();
+        if (_includesPermission({permissions: packed, permissionId: 0})) {
+            revert JBPermissions_NoZeroPermission({
+                account: account, operator: permissionsData.operator, projectId: permissionsData.projectId
+            });
+        }
 
         // Cache the sender.
         address msgSender = _msgSender();

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;