@bananapus/core-v6 0.0.42 → 0.0.44

package/src/JBDirectory.sol

@@ -121,7 +121,7 @@ contract JBDirectory is JBPermissioned, Ownable, IJBDirectory {
 
         // If setting the controller is not allowed, revert.
         if (!allowSetController) {
-            revert JBDirectory_SetControllerNotAllowed(projectId);
+            revert JBDirectory_SetControllerNotAllowed({projectId: projectId});
         }
 
         // Prepare the new controller to receive the project.
@@ -140,10 +140,8 @@ contract JBDirectory is JBPermissioned, Ownable, IJBDirectory {
         }
 
         // Set the new controller after migration completes.
-        // slither-disable-next-line reentrancy-no-eth
         controllerOf[projectId] = controller;
 
-        // slither-disable-next-line reentrancy-events
         emit SetController({projectId: projectId, controller: controller, caller: msg.sender});
 
         // Notify the new controller that migration is complete and it is now the active controller.
@@ -185,7 +183,7 @@ contract JBDirectory is JBPermissioned, Ownable, IJBDirectory {
 
         // If the terminal doesn't accept the token, revert.
         if (terminal.accountingContextForTokenOf({projectId: projectId, token: token}).token == address(0)) {
-            revert JBDirectory_TokenNotAccepted(projectId, token, terminal);
+            revert JBDirectory_TokenNotAccepted({projectId: projectId, token: token, terminal: terminal});
         }
 
         // If the terminal is not already in the project's terminal list, require ADD_TERMINALS permission.
@@ -229,7 +227,7 @@ contract JBDirectory is JBPermissioned, Ownable, IJBDirectory {
 
         // If the caller is not the project's controller, the project's ruleset must allow setting terminals.
         if (msg.sender != address(controller) && !allowSetTerminals) {
-            revert JBDirectory_SetTerminalsNotAllowed(projectId);
+            revert JBDirectory_SetTerminalsNotAllowed({projectId: projectId});
         }
 
         // Set the stored terminals for the project.
@@ -286,7 +284,6 @@ contract JBDirectory is JBPermissioned, Ownable, IJBDirectory {
             IJBTerminal terminal = terminals[i];
 
             // If the terminal accepts the specified token, return it.
-            // slither-disable-next-line calls-loop
             if (terminal.accountingContextForTokenOf({projectId: projectId, token: token}).token != address(0)) {
                 return terminal;
             }
@@ -355,7 +352,7 @@ contract JBDirectory is JBPermissioned, Ownable, IJBDirectory {
 
         // The project's ruleset must allow setting terminals.
         if (!allowSetTerminals) {
-            revert JBDirectory_SetTerminalsNotAllowed(projectId);
+            revert JBDirectory_SetTerminalsNotAllowed({projectId: projectId});
         }
 
         // Add the new terminal.

package/src/JBERC20.sol

@@ -25,8 +25,8 @@ contract JBERC20 is ERC20Votes, ERC20Permit, JBPermissioned, IERC1271, IJBToken
     // --------------------------- custom errors ------------------------- //
     //*********************************************************************//
 
-    error JBERC20_AlreadyInitialized();
-    error JBERC20_Unauthorized();
+    error JBERC20_AlreadyInitialized(uint256 currentNameLength, uint256 newNameLength);
+    error JBERC20_Unauthorized(address caller, address tokens);
 
     //*********************************************************************//
     // --------------- public immutable stored properties ---------------- //
@@ -48,11 +48,9 @@ contract JBERC20 is ERC20Votes, ERC20Permit, JBPermissioned, IERC1271, IJBToken
     //*********************************************************************//
 
     /// @notice The token's name.
-    // slither-disable-next-line shadowing-state
     string private _name;
 
     /// @notice The token's symbol.
-    // slither-disable-next-line shadowing-state
     string private _symbol;
 
     //*********************************************************************//
@@ -82,7 +80,7 @@ contract JBERC20 is ERC20Votes, ERC20Permit, JBPermissioned, IERC1271, IJBToken
     /// @notice Only the JBTokens contract can call this function.
     // forge-lint: disable-next-line(unwrapped-modifier-logic)
     modifier onlyTokens() {
-        if (msg.sender != address(TOKENS)) revert JBERC20_Unauthorized();
+        if (msg.sender != address(TOKENS)) revert JBERC20_Unauthorized({caller: msg.sender, tokens: address(TOKENS)});
         _;
     }
 
@@ -132,7 +130,6 @@ contract JBERC20 is ERC20Votes, ERC20Permit, JBPermissioned, IERC1271, IJBToken
     /// @return magicValue `0x1626ba7e` if the signature is valid, `0xffffffff` otherwise.
     function isValidSignature(bytes32 hash, bytes memory signature) external view override returns (bytes4 magicValue) {
         // Recover the signer from the signature. Return invalid if recovery fails.
-        // slither-disable-next-line unused-return
         (address signer, ECDSA.RecoverError error,) = ECDSA.tryRecover(hash, signature);
         if (error != ECDSA.RecoverError.NoError) return 0xffffffff;
 
@@ -201,7 +198,11 @@ contract JBERC20 is ERC20Votes, ERC20Permit, JBPermissioned, IERC1271, IJBToken
     /// @param tokens The JBTokens contract that manages this token.
     function initialize(string memory name_, string memory symbol_, address tokens) public override {
         // Prevent re-initialization by reverting if a name is already set or if the provided name is empty.
-        if (bytes(_name).length != 0 || bytes(name_).length == 0) revert JBERC20_AlreadyInitialized();
+        if (bytes(_name).length != 0 || bytes(name_).length == 0) {
+            revert JBERC20_AlreadyInitialized({
+                currentNameLength: bytes(_name).length, newNameLength: bytes(name_).length
+            });
+        }
 
         _name = name_;
         _symbol = symbol_;

package/src/JBFeelessAddresses.sol

@@ -7,19 +7,17 @@ import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import {IJBFeelessAddresses} from "./interfaces/IJBFeelessAddresses.sol";
 
 /// @notice A registry of addresses exempt from the protocol's 2.5% fee. Feeless addresses don't incur fees on
-/// payouts they receive, surplus allowance they use, or cash outs where they are the beneficiary. Managed by the
-/// contract owner (typically the protocol multisig).
+/// payouts they receive, surplus allowance they use, or cash outs where they are the beneficiary.
+/// @dev All feeless status is managed by the contract owner (typically the protocol multisig).
+/// @dev `projectId = 0` is the wildcard — an address feeless for project 0 is feeless for ALL projects.
 contract JBFeelessAddresses is Ownable, IJBFeelessAddresses, IERC165 {
     //*********************************************************************//
-    // --------------------- public stored properties -------------------- //
+    // -------------------- internal stored properties ------------------- //
     //*********************************************************************//
 
-    /// @notice Check if the specified address is feeless.
-    /// @dev Feeless addresses can receive payouts without incurring a fee.
-    /// @dev Feeless addresses can use the surplus allowance without incurring a fee.
-    /// @dev Feeless addresses can be the beneficiary of cash outs without incurring a fee.
-    /// @custom:param addr The address to check.
-    mapping(address addr => bool) public override isFeeless;
+    /// @notice Raw feeless status per project per address.
+    /// @dev `projectId = 0` stores the global (all-project) feeless status.
+    mapping(uint256 projectId => mapping(address addr => bool)) internal _isFeelessFor;
 
     //*********************************************************************//
     // -------------------------- constructor ---------------------------- //
@@ -32,21 +30,42 @@ contract JBFeelessAddresses is Ownable, IJBFeelessAddresses, IERC165 {
     // ---------------------- external transactions ---------------------- //
     //*********************************************************************//
 
-    /// @notice Add or remove an address from the fee-exempt list. Feeless addresses don't pay the 2.5% protocol fee
-    /// on payouts received, surplus allowance used, or cash outs where they're the beneficiary.
+    /// @notice Add or remove an address from the global (all-project) fee-exempt list.
+    /// @dev Equivalent to `setFeelessAddressFor(0, addr, flag)`.
     /// @dev Can only be called by this contract's owner (typically the protocol multisig).
     /// @param addr The address to set as feeless or not feeless.
     /// @param flag Whether the address should be feeless (`true`) or not feeless (`false`).
     function setFeelessAddress(address addr, bool flag) external virtual override onlyOwner {
-        isFeeless[addr] = flag;
+        _isFeelessFor[0][addr] = flag;
 
-        emit SetFeelessAddress({addr: addr, isFeeless: flag, caller: _msgSender()});
+        emit SetFeelessAddress({projectId: 0, addr: addr, isFeeless: flag, caller: _msgSender()});
+    }
+
+    /// @notice Add or remove an address from a project's fee-exempt list.
+    /// @dev Can only be called by this contract's owner (typically the protocol multisig).
+    /// @dev Use `projectId = 0` to set the global (all-project) feeless status.
+    /// @param projectId The ID of the project. 0 means all projects.
+    /// @param addr The address to set as feeless or not feeless for the project.
+    /// @param flag Whether the address should be feeless for the project (`true`) or not (`false`).
+    function setFeelessAddressFor(uint256 projectId, address addr, bool flag) external virtual override onlyOwner {
+        _isFeelessFor[projectId][addr] = flag;
+
+        emit SetFeelessAddress({projectId: projectId, addr: addr, isFeeless: flag, caller: _msgSender()});
     }
 
     //*********************************************************************//
     // -------------------------- public views --------------------------- //
     //*********************************************************************//
 
+    /// @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.
+    /// @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 override returns (bool) {
+        return _isFeelessFor[0][addr] || _isFeelessFor[projectId][addr];
+    }
+
     /// @notice Indicates whether this contract adheres to the specified interface.
     /// @dev See {IERC165-supportsInterface}.
     /// @param interfaceId The ID of the interface to check for adherence to.

package/src/JBFundAccessLimits.sol

@@ -18,8 +18,12 @@ contract JBFundAccessLimits is JBControlled, IJBFundAccessLimits {
     // --------------------------- custom errors ------------------------- //
     //*********************************************************************//
 
-    error JBFundAccessLimits_InvalidPayoutLimitCurrencyOrdering();
-    error JBFundAccessLimits_InvalidSurplusAllowanceCurrencyOrdering();
+    error JBFundAccessLimits_InvalidPayoutLimitCurrencyOrdering(
+        uint256 projectId, uint256 rulesetId, uint256 groupIndex, uint256 limitIndex
+    );
+    error JBFundAccessLimits_InvalidSurplusAllowanceCurrencyOrdering(
+        uint256 projectId, uint256 rulesetId, uint256 groupIndex, uint256 allowanceIndex
+    );
 
     //*********************************************************************//
     // --------------------- internal stored properties ------------------ //
@@ -102,7 +106,9 @@ contract JBFundAccessLimits is JBControlled, IJBFundAccessLimits {
                 // Make sure the payout limits are passed in strictly increasing order (sorted by currency) to prevent
                 // duplicates.
                 if (j != 0 && payoutLimit.currency <= fundAccessLimitGroup.payoutLimits[j - 1].currency) {
-                    revert JBFundAccessLimits_InvalidPayoutLimitCurrencyOrdering();
+                    revert JBFundAccessLimits_InvalidPayoutLimitCurrencyOrdering({
+                        projectId: projectId, rulesetId: rulesetId, groupIndex: i, limitIndex: j
+                    });
                 }
 
                 // Set the payout limit if there is one.
@@ -127,7 +133,9 @@ contract JBFundAccessLimits is JBControlled, IJBFundAccessLimits {
                 // Make sure the surplus allowances are passed in strictly increasing order (sorted by currency) to
                 // prevent duplicates.
                 if (j != 0 && surplusAllowance.currency <= fundAccessLimitGroup.surplusAllowances[j - 1].currency) {
-                    revert JBFundAccessLimits_InvalidSurplusAllowanceCurrencyOrdering();
+                    revert JBFundAccessLimits_InvalidSurplusAllowanceCurrencyOrdering({
+                        projectId: projectId, rulesetId: rulesetId, groupIndex: i, allowanceIndex: j
+                    });
                 }
 
                 // Set the surplus allowance if there is one.

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);
@@ -213,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;
@@ -248,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.
@@ -330,12 +329,12 @@ 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
             // feeless address.
-            if (!_isFeeless(address(split.hook))) {
+            if (!_isFeeless({addr: address(split.hook), projectId: projectId})) {
                 unchecked {
                     netPayoutAmount -= _feeAmountFrom(amount);
                 }
@@ -370,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,
@@ -378,7 +377,7 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
             // the fee model taxes value leaving the protocol ecosystem, not internal rebalancing.
             // This payout is eligible for a fee if the funds are leaving this contract and the receiving terminal isn't
             // a feeless address.
-            if (terminal != this && !_isFeeless(address(terminal))) {
+            if (terminal != this && !_isFeeless({addr: address(terminal), projectId: projectId})) {
                 unchecked {
                     netPayoutAmount -= _feeAmountFrom(amount);
                 }
@@ -409,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.
@@ -429,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 {
@@ -440,7 +440,7 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
 
             // This payout is eligible for a fee since the funds are leaving this contract and the recipient isn't a
             // feeless address.
-            if (!_isFeeless(recipient)) {
+            if (!_isFeeless({addr: recipient, projectId: projectId})) {
                 unchecked {
                     netPayoutAmount -= _feeAmountFrom(amount);
                 }
@@ -473,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.
@@ -537,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()});
@@ -547,7 +546,7 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
             // Migration to a non-feeless terminal incurs the standard 2.5% fee, same as any other fund egress.
             // This also settles any fee-free surplus liability that would otherwise be lost on the new terminal.
             uint256 feeAmount;
-            if (!_isFeeless(address(to)) && projectId != _FEE_BENEFICIARY_PROJECT_ID) {
+            if (!_isFeeless({addr: address(to), projectId: projectId}) && projectId != _FEE_BENEFICIARY_PROJECT_ID) {
                 feeAmount = _takeFeeFrom({
                     projectId: projectId,
                     token: token,
@@ -566,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`
@@ -669,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,
@@ -906,16 +904,16 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
             JBCashOutHookSpecification[] memory hookSpecifications
         )
     {
-        (ruleset, reclaimAmount, cashOutTaxRate, hookSpecifications) =
-            STORE.previewCashOutFrom({
-                terminal: address(this),
-                holder: holder,
-                projectId: projectId,
-                cashOutCount: cashOutCount,
-                tokenToReclaim: tokenToReclaim,
-                beneficiaryIsFeeless: _isFeeless(beneficiary),
-                metadata: metadata
-            });
+        bool feeless = _isFeeless({addr: beneficiary, projectId: projectId});
+        (ruleset, reclaimAmount, cashOutTaxRate, hookSpecifications) = STORE.previewCashOutFrom({
+            terminal: address(this),
+            holder: holder,
+            projectId: projectId,
+            cashOutCount: cashOutCount,
+            tokenToReclaim: tokenToReclaim,
+            beneficiaryIsFeeless: feeless,
+            metadata: metadata
+        });
     }
 
     /// @notice Simulates a payment without modifying state — use this to preview how many project tokens a payer
@@ -1019,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.
@@ -1034,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});
             }
         }
 
@@ -1118,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;
         }
     }
@@ -1159,7 +1155,7 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
         uint256 cashOutTaxRate;
 
         // Cache whether the beneficiary is feeless.
-        bool beneficiaryIsFeeless = _isFeeless(beneficiary);
+        bool beneficiaryIsFeeless = _isFeeless({addr: beneficiary, projectId: projectId});
 
         {
             // Cache the controller to avoid a redundant external call (also used inside STORE.recordCashOutFor).
@@ -1199,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;
                         }
@@ -1242,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.
@@ -1344,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,
@@ -1382,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.
@@ -1441,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];
@@ -1455,8 +1445,9 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
             }
 
             // Get the fee for the specified amount.
-            uint256 specificationAmountFee =
-                _isFeeless(address(specification.hook)) ? 0 : _feeAmountFrom(specification.amount);
+            uint256 specificationAmountFee = _isFeeless({addr: address(specification.hook), projectId: projectId})
+                ? 0
+                : _feeAmountFrom(specification.amount);
 
             // Add the specification's amount to the amount eligible for fees.
             if (specificationAmountFee != 0) {
@@ -1477,13 +1468,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.
@@ -1538,7 +1527,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];
@@ -1564,13 +1552,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.
@@ -1618,7 +1604,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
         });
@@ -1630,7 +1615,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,
@@ -1686,7 +1670,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
         }) {
@@ -1723,7 +1706,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});
     }
 
@@ -1760,7 +1742,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 {
@@ -1862,7 +1843,8 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
         // Send any leftover funds to the project owner and update the fee tracking accordingly.
         if (leftoverPayoutAmount != 0) {
             // Keep a reference to the fee for the leftover payout amount.
-            uint256 fee = _isFeeless(projectOwner) ? 0 : _feeAmountFrom(leftoverPayoutAmount);
+            uint256 fee =
+                _isFeeless({addr: projectOwner, projectId: projectId}) ? 0 : _feeAmountFrom(leftoverPayoutAmount);
 
             uint256 netLeftoverPayoutAmount;
             unchecked {
@@ -1878,7 +1860,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,
@@ -1896,7 +1877,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.
@@ -2042,14 +2022,12 @@ 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)
+            - (_isFeeless({addr: owner, projectId: projectId}) || _isFeeless({addr: beneficiary, projectId: projectId})
                     ? 0
                     : _takeFeeFrom({
                         projectId: projectId,
@@ -2092,7 +2070,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);
     }
@@ -2138,9 +2115,10 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
 
     /// @notice Returns a flag indicating if interacting with an address should not incur fees.
     /// @param addr The address to check.
-    /// @return A flag indicating if the address should not incur fees.
-    function _isFeeless(address addr) internal view returns (bool) {
-        return FEELESS_ADDRESSES.isFeeless(addr);
+    /// @param projectId The ID of the project to check the per-project feeless status for.
+    /// @return A flag indicating if the address should not incur fees (globally or for the project).
+    function _isFeeless(address addr, uint256 projectId) internal view returns (bool) {
+        return FEELESS_ADDRESSES.isFeelessFor({addr: addr, projectId: projectId});
     }
 
     /// @notice The calldata. Preferred to use over `msg.data`.

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();