@bananapus/core-v6 0.0.31 → 0.0.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/core-v6",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/JBController.sol

@@ -522,23 +522,28 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
         // Get a reference to the project's ruleset.
         JBRuleset memory ruleset = _currentRulesetOf(projectId);
 
+        // Cache common values used in both permission checks.
+        address sender = _msgSender();
+        bool senderIsTerminal = _isTerminalOf(projectId, sender);
+
         // Minting is restricted to: the project's owner, addresses with permission to `MINT_TOKENS`, the project's
         // terminals, and the project's data hook.
         _requirePermissionAllowingOverrideFrom({
             account: PROJECTS.ownerOf(projectId),
             projectId: projectId,
             permissionId: JBPermissionIds.MINT_TOKENS,
-            alsoGrantAccessIf: _isTerminalOf(projectId, _msgSender()) || _msgSender() == ruleset.dataHook()
-                || _hasDataHookMintPermissionFor(projectId, ruleset, _msgSender())
+            alsoGrantAccessIf: senderIsTerminal || sender == ruleset.dataHook()
+                || _hasDataHookMintPermissionFor(projectId, ruleset, sender)
         });
 
         // If the message sender is not the project's terminal or data hook, the ruleset must have `allowOwnerMinting`
         // set to `true`.
         if (
-            ruleset.id != 0 && !ruleset.allowOwnerMinting() && !_isTerminalOf(projectId, _msgSender())
-                && _msgSender() != address(ruleset.dataHook())
-                && !_hasDataHookMintPermissionFor(projectId, ruleset, _msgSender())
-        ) revert JBController_MintNotAllowedAndNotTerminalOrHook(_msgSender());
+            ruleset.id != 0 && !ruleset.allowOwnerMinting() && !senderIsTerminal && sender != ruleset.dataHook()
+                && !_hasDataHookMintPermissionFor(projectId, ruleset, sender)
+        ) {
+            revert JBController_MintNotAllowedAndNotTerminalOrHook(sender);
+        }
 
         // Determine the reserved percent to use.
         reservedPercent = useReservedPercent ? ruleset.reservedPercent() : 0;
@@ -559,7 +564,7 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
             beneficiaryTokenCount: beneficiaryTokenCount,
             memo: memo,
             reservedPercent: reservedPercent,
-            caller: _msgSender()
+            caller: sender
         });
 
         // Add any reserved tokens to the pending reserved token balance.
@@ -748,12 +753,15 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
         rulesets = new JBRulesetWithMetadata[](numberOfRulesets);
 
         // Populate the array with rulesets AND their metadata.
-        for (uint256 i; i < numberOfRulesets; i++) {
+        for (uint256 i; i < numberOfRulesets;) {
             // Set the ruleset being iterated on.
             JBRuleset memory baseRuleset = baseRulesets[i];
 
             // Set the returned value.
             rulesets[i] = JBRulesetWithMetadata({ruleset: baseRuleset, metadata: baseRuleset.expandMetadata()});
+            unchecked {
+                ++i;
+            }
         }
     }
 
@@ -896,7 +904,7 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
         // Initialize an array of terminals to populate.
         IJBTerminal[] memory terminals = new IJBTerminal[](terminalConfigurations.length);
 
-        for (uint256 i; i < terminalConfigurations.length; i++) {
+        for (uint256 i; i < terminalConfigurations.length;) {
             // Set the terminal configuration being iterated on.
             JBTerminalConfig memory terminalConfig = terminalConfigurations[i];
 
@@ -909,6 +917,9 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
 
             // Add the terminal.
             terminals[i] = terminalConfig.terminal;
+            unchecked {
+                ++i;
+            }
         }
 
         // Set the terminals in the directory.
@@ -928,7 +939,7 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
         internal
         returns (uint256 rulesetId)
     {
-        for (uint256 i; i < rulesetConfigurations.length; i++) {
+        for (uint256 i; i < rulesetConfigurations.length;) {
             // Get a reference to the ruleset config being iterated on.
             JBRulesetConfig memory rulesetConfig = rulesetConfigurations[i];
 
@@ -974,6 +985,9 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
             if (i == rulesetConfigurations.length - 1) {
                 rulesetId = ruleset.id;
             }
+            unchecked {
+                ++i;
+            }
         }
     }
 
@@ -1004,8 +1018,11 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
         // Keep a reference to the number of splits being iterated on.
         uint256 numberOfSplits = splits.length;
 
+        // Cache _msgSender() before the loop.
+        address messageSender = _msgSender();
+
         // Send the tokens to the splits.
-        for (uint256 i; i < numberOfSplits; i++) {
+        for (uint256 i; i < numberOfSplits;) {
             // Get a reference to the split being iterated on.
             JBSplit memory split = splits[i];
 
@@ -1048,7 +1065,7 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
                 } else {
                     // Pay the project using the split's beneficiary if one was provided. Otherwise, use the message
                     // sender.
-                    address beneficiary = split.beneficiary != address(0) ? split.beneficiary : _msgSender();
+                    address beneficiary = split.beneficiary != address(0) ? split.beneficiary : messageSender;
 
                     if (split.projectId != 0) {
                         // Get a reference to the receiving project's primary payment terminal for the token.
@@ -1086,7 +1103,7 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
                                     split: split,
                                     tokenCount: splitTokenCount,
                                     reason: reason,
-                                    caller: _msgSender()
+                                    caller: messageSender
                                 });
 
                                 // If it fails, transfer the tokens from this contract to the beneficiary.
@@ -1115,8 +1132,11 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
                 groupId: groupId,
                 split: split,
                 tokenCount: splitTokenCount,
-                caller: _msgSender()
+                caller: messageSender
             });
+            unchecked {
+                ++i;
+            }
         }
     }
 

package/src/JBDirectory.sol

@@ -210,23 +210,23 @@ contract JBDirectory is JBPermissioned, Ownable, IJBDirectory {
     /// @param projectId The ID of the project whose terminals are being set.
     /// @param terminals An array of terminal addresses to set for the project.
     function setTerminalsOf(uint256 projectId, IJBTerminal[] calldata terminals) external override {
+        // Cache the controller to avoid redundant storage reads.
+        IERC165 controller = controllerOf[projectId];
+
         // Enforce permissions.
         _requirePermissionAllowingOverrideFrom({
             account: PROJECTS.ownerOf(projectId),
             projectId: projectId,
             permissionId: JBPermissionIds.SET_TERMINALS,
-            alsoGrantAccessIf: msg.sender == address(controllerOf[projectId])
+            alsoGrantAccessIf: msg.sender == address(controller)
         });
 
-        // Keep a reference to the project's controller.
-        IERC165 controller = controllerOf[projectId];
-
         // Get a reference to the flag indicating whether the project is allowed to set its terminals.
         bool allowSetTerminals = !controller.supportsInterface(type(IJBDirectoryAccessControl).interfaceId)
             || IJBDirectoryAccessControl(address(controller)).setTerminalsAllowed(projectId);
 
         // If the caller is not the project's controller, the project's ruleset must allow setting terminals.
-        if (msg.sender != address(controllerOf[projectId]) && !allowSetTerminals) {
+        if (msg.sender != address(controller) && !allowSetTerminals) {
             revert JBDirectory_SetTerminalsNotAllowed(projectId);
         }
 
@@ -235,9 +235,15 @@ contract JBDirectory is JBPermissioned, Ownable, IJBDirectory {
 
         // If there are any duplicates, revert.
         if (terminals.length > 1) {
-            for (uint256 i; i < terminals.length; i++) {
-                for (uint256 j = i + 1; j < terminals.length; j++) {
+            for (uint256 i; i < terminals.length;) {
+                for (uint256 j = i + 1; j < terminals.length;) {
                     if (terminals[i] == terminals[j]) revert JBDirectory_DuplicateTerminals(terminals[i]);
+                    unchecked {
+                        ++j;
+                    }
+                }
+                unchecked {
+                    ++i;
                 }
             }
         }
@@ -267,14 +273,14 @@ contract JBDirectory is JBPermissioned, Ownable, IJBDirectory {
             return primaryTerminal;
         }
 
-        // Keep a reference to the project's terminals.
-        IJBTerminal[] memory terminals = _terminalsOf[projectId];
+        // Keep a storage reference to the project's terminals to avoid copying the array to memory.
+        IJBTerminal[] storage terminals = _terminalsOf[projectId];
 
         // Keep a reference to the number of terminals the project has.
         uint256 numberOfTerminals = terminals.length;
 
         // Return the first terminal which accepts the specified token.
-        for (uint256 i; i < numberOfTerminals; i++) {
+        for (uint256 i; i < numberOfTerminals;) {
             // Keep a reference to the terminal being iterated on.
             IJBTerminal terminal = terminals[i];
 
@@ -283,6 +289,9 @@ contract JBDirectory is JBPermissioned, Ownable, IJBDirectory {
             if (terminal.accountingContextForTokenOf({projectId: projectId, token: token}).token != address(0)) {
                 return terminal;
             }
+            unchecked {
+                ++i;
+            }
         }
 
         // Not found.
@@ -305,15 +314,18 @@ contract JBDirectory is JBPermissioned, Ownable, IJBDirectory {
     /// @param terminal The terminal to check for.
     /// @return A flag indicating whether the project uses the terminal.
     function isTerminalOf(uint256 projectId, IJBTerminal terminal) public view override returns (bool) {
-        // Keep a reference to the project's terminals.
-        IJBTerminal[] memory terminals = _terminalsOf[projectId];
+        // Keep a storage reference to the project's terminals to avoid copying the array to memory.
+        IJBTerminal[] storage terminals = _terminalsOf[projectId];
 
         // Keep a reference to the number of terminals the project has.
         uint256 numberOfTerminals = terminals.length;
 
         // Loop through and return true if the terminal is found.
-        for (uint256 i; i < numberOfTerminals; i++) {
+        for (uint256 i; i < numberOfTerminals;) {
             if (terminals[i] == terminal) return true;
+            unchecked {
+                ++i;
+            }
         }
 
         // Otherwise, return false.

package/src/JBFundAccessLimits.sol

@@ -82,7 +82,7 @@ contract JBFundAccessLimits is JBControlled, IJBFundAccessLimits {
         uint256 numberOfFundAccessLimitGroups = fundAccessLimitGroups.length;
 
         // Set payout limits if there are any.
-        for (uint256 i; i < numberOfFundAccessLimitGroups; i++) {
+        for (uint256 i; i < numberOfFundAccessLimitGroups;) {
             // Set the limits being iterated on.
             JBFundAccessLimitGroup calldata fundAccessLimitGroup = fundAccessLimitGroups[i];
 
@@ -90,7 +90,7 @@ contract JBFundAccessLimits is JBControlled, IJBFundAccessLimits {
             uint256 numberOfPayoutLimits = fundAccessLimitGroup.payoutLimits.length;
 
             // Iterate through each payout limit to validate and store them.
-            for (uint256 j; j < numberOfPayoutLimits; j++) {
+            for (uint256 j; j < numberOfPayoutLimits;) {
                 // Set the payout limit being iterated on.
                 JBCurrencyAmount calldata payoutLimit = fundAccessLimitGroup.payoutLimits[j];
 
@@ -106,13 +106,16 @@ contract JBFundAccessLimits is JBControlled, IJBFundAccessLimits {
                         uint256(payoutLimit.amount) | (uint256(payoutLimit.currency) << 224)
                     );
                 }
+                unchecked {
+                    ++j;
+                }
             }
 
             // Keep a reference to the number of surplus allowances.
             uint256 numberOfSurplusAllowances = fundAccessLimitGroup.surplusAllowances.length;
 
             // Iterate through each surplus allowance to validate and store them.
-            for (uint256 j; j < numberOfSurplusAllowances; j++) {
+            for (uint256 j; j < numberOfSurplusAllowances;) {
                 // Set the surplus allowance being iterated on.
                 JBCurrencyAmount calldata surplusAllowance = fundAccessLimitGroup.surplusAllowances[j];
 
@@ -128,6 +131,9 @@ contract JBFundAccessLimits is JBControlled, IJBFundAccessLimits {
                         uint256(surplusAllowance.amount) | (uint256(surplusAllowance.currency) << 224)
                     );
                 }
+                unchecked {
+                    ++j;
+                }
             }
 
             emit SetFundAccessLimits({
@@ -136,6 +142,9 @@ contract JBFundAccessLimits is JBControlled, IJBFundAccessLimits {
                 fundAccessLimitGroup: fundAccessLimitGroup,
                 caller: msg.sender
             });
+            unchecked {
+                ++i;
+            }
         }
     }
 
@@ -171,7 +180,7 @@ contract JBFundAccessLimits is JBControlled, IJBFundAccessLimits {
         uint256 numberOfData = data.length;
 
         // Iterate through the stored packed values and return the value of the matching currency.
-        for (uint256 i; i < numberOfData; i++) {
+        for (uint256 i; i < numberOfData;) {
             // Set the data being iterated on.
             uint256 packedPayoutLimitData = data[i];
 
@@ -180,6 +189,9 @@ contract JBFundAccessLimits is JBControlled, IJBFundAccessLimits {
                 // forge-lint: disable-next-line(unsafe-typecast)
                 return uint256(uint224(packedPayoutLimitData));
             }
+            unchecked {
+                ++i;
+            }
         }
     }
 
@@ -213,7 +225,7 @@ contract JBFundAccessLimits is JBControlled, IJBFundAccessLimits {
         payoutLimits = new JBCurrencyAmount[](numberOfData);
 
         // Iterate through the packed values and format the returned value.
-        for (uint256 i; i < numberOfData; i++) {
+        for (uint256 i; i < numberOfData;) {
             // Set the data being iterated on.
             uint256 packedPayoutLimitData = packedPayoutLimitsData[i];
 
@@ -225,6 +237,9 @@ contract JBFundAccessLimits is JBControlled, IJBFundAccessLimits {
                 // forge-lint: disable-next-line(unsafe-typecast)
                 amount: uint224(packedPayoutLimitData)
             });
+            unchecked {
+                ++i;
+            }
         }
     }
 
@@ -257,7 +272,7 @@ contract JBFundAccessLimits is JBControlled, IJBFundAccessLimits {
         uint256 numberOfData = packedSurplusAllowancesData.length;
 
         // Iterate through the stored packed values and format the returned value.
-        for (uint256 i; i < numberOfData; i++) {
+        for (uint256 i; i < numberOfData;) {
             // Set the data being iterated on.
             uint256 packedSurplusAllowanceData = packedSurplusAllowancesData[i];
 
@@ -266,6 +281,9 @@ contract JBFundAccessLimits is JBControlled, IJBFundAccessLimits {
                 // forge-lint: disable-next-line(unsafe-typecast)
                 return uint256(uint224(packedSurplusAllowanceData));
             }
+            unchecked {
+                ++i;
+            }
         }
     }
 
@@ -301,7 +319,7 @@ contract JBFundAccessLimits is JBControlled, IJBFundAccessLimits {
         surplusAllowances = new JBCurrencyAmount[](numberOfData);
 
         // Iterate through the stored packed values and format the returned value.
-        for (uint256 i; i < numberOfData; i++) {
+        for (uint256 i; i < numberOfData;) {
             // Set the data being iterated on.
             uint256 packedSurplusAllowanceData = packedSurplusAllowancesData[i];
 
@@ -313,6 +331,9 @@ contract JBFundAccessLimits is JBControlled, IJBFundAccessLimits {
                 // forge-lint: disable-next-line(unsafe-typecast)
                 amount: uint224(packedSurplusAllowanceData)
             });
+            unchecked {
+                ++i;
+            }
         }
     }
 }

package/src/JBMultiTerminal.sol

@@ -207,9 +207,12 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
         STORE.recordAccountingContextOf({projectId: projectId, contexts: accountingContexts});
 
         // Emit an event for each accounting context.
-        for (uint256 i; i < accountingContexts.length; i++) {
+        for (uint256 i; i < accountingContexts.length;) {
             // slither-disable-next-line reentrancy-events
             emit SetAccountingContext({projectId: projectId, context: accountingContexts[i], caller: _msgSender()});
+            unchecked {
+                ++i;
+            }
         }
     }
 
@@ -582,11 +585,15 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
         // Get a reference to the beneficiary's balance before the payment.
         uint256 beneficiaryBalanceBefore = TOKENS.totalBalanceOf({holder: beneficiary, projectId: projectId});
 
+        // Accept the funds.
+        uint256 acceptedAmount =
+            _acceptFundsFor({projectId: projectId, token: token, amount: amount, metadata: metadata});
+
         // Pay the project.
         _pay({
             projectId: projectId,
             token: token,
-            amount: _acceptFundsFor(projectId, token, amount, metadata),
+            amount: acceptedAmount,
             payer: _msgSender(),
             beneficiary: beneficiary,
             memo: memo,
@@ -627,7 +634,7 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
 
         // Process each fee. Re-read the index and array length from storage each iteration to account for reentrant
         // calls that may have already advanced the index or cleaned up the array.
-        for (uint256 i; i < count; i++) {
+        for (uint256 i; i < count;) {
             // Read the current index from storage (not a cached value) to prevent reentrancy from
             // causing double-processing.
             uint256 currentIndex = _nextHeldFeeIndexOf[projectId][token];
@@ -662,6 +669,9 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
                 feeTerminal: feeTerminal,
                 wasHeld: true
             });
+            unchecked {
+                ++i;
+            }
         }
 
         // If all held fees have been processed, reset the array and index entirely to bound storage growth.
@@ -850,8 +860,11 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
         heldFees = new JBFee[](count);
 
         // Copy the fees into the array.
-        for (uint256 i; i < count; i++) {
+        for (uint256 i; i < count;) {
             heldFees[i] = _heldFeesOf[projectId][token][startIndex + i];
+            unchecked {
+                ++i;
+            }
         }
     }
 
@@ -1134,13 +1147,16 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
         // Keep a reference to the cash out tax rate being used.
         uint256 cashOutTaxRate;
 
+        // Cache whether the beneficiary is feeless.
+        bool beneficiaryIsFeeless = _isFeeless(beneficiary);
+
         // Record the cash out.
         (ruleset, reclaimAmount, cashOutTaxRate, hookSpecifications) = STORE.recordCashOutFor({
             holder: holder,
             projectId: projectId,
             cashOutCount: cashOutCount,
             tokenToReclaim: tokenToReclaim,
-            beneficiaryIsFeeless: _isFeeless(beneficiary),
+            beneficiaryIsFeeless: beneficiaryIsFeeless,
             metadata: metadata
         });
 
@@ -1156,7 +1172,7 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
         // Send the reclaimed funds to the beneficiary.
         if (reclaimAmount != 0) {
             // Determine if a fee should be taken. Fees are not taken if the beneficiary is feeless.
-            if (!_isFeeless(beneficiary)) {
+            if (!beneficiaryIsFeeless) {
                 if (cashOutTaxRate != 0) {
                     // Non-zero tax: fees apply to the full reclaim amount.
                     amountEligibleForFees += reclaimAmount;
@@ -1404,12 +1420,17 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
         });
 
         // slither-disable-next-line calls-loop
-        for (uint256 i; i < specifications.length; i++) {
+        for (uint256 i; i < specifications.length;) {
             // Set the specification being iterated on.
             JBCashOutHookSpecification memory specification = specifications[i];
 
             // A noop specification is informational only and doesn't trigger the hook.
-            if (specification.noop) continue;
+            if (specification.noop) {
+                unchecked {
+                    ++i;
+                }
+                continue;
+            }
 
             // Get the fee for the specified amount.
             uint256 specificationAmountFee = _isFeeless(address(specification.hook))
@@ -1454,6 +1475,9 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
                 fee: specificationAmountFee,
                 caller: _msgSender()
             });
+            unchecked {
+                ++i;
+            }
         }
     }
 
@@ -1494,12 +1518,17 @@ 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; i++) {
+        for (uint256 i; i < specifications.length;) {
             // Set the specification being iterated on.
             JBPayHookSpecification memory specification = specifications[i];
 
             // A noop specification is informational only and doesn't trigger the hook.
-            if (specification.noop) continue;
+            if (specification.noop) {
+                unchecked {
+                    ++i;
+                }
+                continue;
+            }
 
             // Pass the correct token `forwardedAmount` to the hook.
             context.forwardedAmount = JBTokenAmount({
@@ -1532,6 +1561,9 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
                 specificationAmount: specification.amount,
                 caller: _msgSender()
             });
+            unchecked {
+                ++i;
+            }
         }
     }
 
@@ -1674,6 +1706,8 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
     }
 
     /// @notice Returns held fees to the project who paid them based on the specified amount.
+    /// @dev Fee rounding during partial replenishment can zero out dust-level fee entries (< 40 wei at 2.5% fee).
+    /// This is accepted behavior — dust fees are economically insignificant.
     /// @param projectId The project held fees are being returned to.
     /// @param token The token that the held fees are in.
     /// @param amount The amount to base the calculation on, as a fixed point number with the same number of decimals
@@ -1700,7 +1734,7 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
         uint256 newStartIndex = startIndex;
 
         // Process each fee.
-        for (uint256 i; i < count; i++) {
+        for (uint256 i; i < count;) {
             // Save the fee being iterated on.
             JBFee memory heldFee = _heldFeesOf[projectId][token][startIndex + i];
 
@@ -1734,6 +1768,9 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
                     leftoverAmount = 0;
                 }
             }
+            unchecked {
+                ++i;
+            }
         }
 
         // Update the next held fee index.
@@ -1766,6 +1803,9 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
         internal
         returns (uint256 amountPaidOut)
     {
+        // Cache the message sender.
+        address sender = _msgSender();
+
         // Keep a reference to the ruleset.
         JBRuleset memory ruleset;
 
@@ -1799,7 +1839,7 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
             token: token,
             rulesetId: ruleset.id,
             amount: amountPaidOut,
-            caller: _msgSender()
+            caller: sender
         });
 
         // Send any leftover funds to the project owner and update the fee tracking accordingly.
@@ -1826,7 +1866,7 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
                     amount: leftoverPayoutAmount - fee,
                     fee: fee,
                     reason: reason,
-                    caller: _msgSender()
+                    caller: sender
                 });
 
                 // Add balance back to the project.
@@ -1852,7 +1892,7 @@ contract JBMultiTerminal is JBPermissioned, ERC2771Context, IJBMultiTerminal {
             amountPaidOut: amountPaidOut,
             fee: feeTaken,
             netLeftoverPayoutAmount: leftoverPayoutAmount,
-            caller: _msgSender()
+            caller: sender
         });
     }
 

package/src/JBPermissions.sol

@@ -160,7 +160,7 @@ contract JBPermissions is ERC2771Context, IJBPermissions {
 
         // Returns true for empty permission arrays by design (vacuous truth). An empty set of
         // required permissions is trivially satisfied. Callers should validate non-empty permission arrays if needed.
-        for (uint256 i; i < permissionIds.length; i++) {
+        for (uint256 i; i < permissionIds.length;) {
             // Set the permission being iterated on.
             uint256 permissionId = permissionIds[i];
 
@@ -176,6 +176,9 @@ contract JBPermissions is ERC2771Context, IJBPermissions {
             ) {
                 return false;
             }
+            unchecked {
+                ++i;
+            }
         }
         return true;
     }
@@ -210,29 +213,23 @@ contract JBPermissions is ERC2771Context, IJBPermissions {
         // Indexes above 255 don't exist
         if (permissionId > 255) revert JBPermissions_PermissionIdOutOfBounds(permissionId);
 
+        // Cache both permission slots upfront to avoid redundant storage reads.
+        uint256 projectPermissions = permissionsOf[operator][account][projectId];
+        uint256 wildcardPermissions =
+            includeWildcardProjectId ? permissionsOf[operator][account][WILDCARD_PROJECT_ID] : 0;
+
         // If the ROOT permission is set and should be included, return true.
         if (
             includeRoot
-                && (_includesPermission({
-                        permissions: permissionsOf[operator][account][projectId], permissionId: JBPermissionIds.ROOT
-                    })
-                    || (includeWildcardProjectId
-                        && _includesPermission({
-                            permissions: permissionsOf[operator][account][WILDCARD_PROJECT_ID],
-                            permissionId: JBPermissionIds.ROOT
-                        })))
+                && (_includesPermission({permissions: projectPermissions, permissionId: JBPermissionIds.ROOT})
+                    || _includesPermission({permissions: wildcardPermissions, permissionId: JBPermissionIds.ROOT}))
         ) {
             return true;
         }
 
         // Otherwise return the t/f flag of the specified id.
-        return _includesPermission({
-                permissions: permissionsOf[operator][account][projectId], permissionId: permissionId
-            })
-            || (includeWildcardProjectId
-                && _includesPermission({
-                    permissions: permissionsOf[operator][account][WILDCARD_PROJECT_ID], permissionId: permissionId
-                }));
+        return _includesPermission({permissions: projectPermissions, permissionId: permissionId})
+            || _includesPermission({permissions: wildcardPermissions, permissionId: permissionId});
     }
 
     //*********************************************************************//
@@ -251,13 +248,16 @@ contract JBPermissions is ERC2771Context, IJBPermissions {
     /// @param permissionIds The IDs of the permissions to pack.
     /// @return packed The packed value.
     function _packedPermissions(uint8[] calldata permissionIds) internal pure returns (uint256 packed) {
-        for (uint256 i; i < permissionIds.length; i++) {
+        for (uint256 i; i < permissionIds.length;) {
             // Set the permission being iterated on.
             uint256 permissionId = permissionIds[i];
 
             // Turn on the bit at the ID.
             // forge-lint: disable-next-line(incorrect-shift)
             packed |= 1 << permissionId;
+            unchecked {
+                ++i;
+            }
         }
     }
 }