@bananapus/core-v6 0.0.30 → 0.0.32

package/src/JBController.sol

@@ -158,6 +158,7 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
         RULESETS = rulesets;
         SPLITS = splits;
         TOKENS = tokens;
+        // slither-disable-next-line missing-zero-check
         OMNICHAIN_RULESET_OPERATOR = omnichainRulesetOperator;
     }
 
@@ -521,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;
@@ -558,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.
@@ -747,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;
+            }
         }
     }
 
@@ -820,8 +829,8 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
         override
         returns (uint256 beneficiaryTokenCount, uint256 reservedTokenCount)
     {
-        // Revert if there are no tokens to split.
-        if (tokenCount == 0) revert JBController_ZeroTokensToMint();
+        // A zero preview amount means there are no tokens to split.
+        if (tokenCount == 0) return (0, 0);
 
         // Keep a reference to the current ruleset.
         JBRuleset memory ruleset = _currentRulesetOf(projectId);
@@ -895,11 +904,12 @@ 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];
 
             // Add the accounting contexts for the specified tokens.
+            // slither-disable-next-line calls-loop
             terminalConfig.terminal
                 .addAccountingContextsFor({
                     projectId: projectId, accountingContexts: terminalConfig.accountingContextsToAccept
@@ -907,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.
@@ -926,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];
 
@@ -945,6 +958,7 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
             }
 
             // Queue its ruleset.
+            // slither-disable-next-line calls-loop
             JBRuleset memory ruleset = RULESETS.queueFor({
                 projectId: projectId,
                 duration: rulesetConfig.duration,
@@ -956,11 +970,13 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
             });
 
             // Set its split groups.
+            // slither-disable-next-line calls-loop
             SPLITS.setSplitGroupsOf({
                 projectId: projectId, rulesetId: ruleset.id, splitGroups: rulesetConfig.splitGroups
             });
 
             // Set its fund access limits.
+            // slither-disable-next-line calls-loop
             FUND_ACCESS_LIMITS.setFundAccessLimitsFor({
                 projectId: projectId, rulesetId: ruleset.id, fundAccessLimitGroups: rulesetConfig.fundAccessLimitGroups
             });
@@ -969,6 +985,9 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
             if (i == rulesetConfigurations.length - 1) {
                 rulesetId = ruleset.id;
             }
+            unchecked {
+                ++i;
+            }
         }
     }
 
@@ -999,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];
 
@@ -1023,7 +1045,7 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
                         projectId: projectId, tokenCount: splitTokenCount, recipient: address(split.hook), token: token
                     });
 
-                    // slither-disable-next-line reentrancy-events
+                    // slither-disable-next-line calls-loop,reentrancy-events
                     try split.hook
                         .processSplitWith(
                             JBSplitHookContext({
@@ -1043,10 +1065,11 @@ 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.
+                        // slither-disable-next-line calls-loop
                         IJBTerminal terminal = token == IJBToken(address(0))
                             ? IJBTerminal(address(0))
                             : DIRECTORY.primaryTerminalOf({projectId: split.projectId, token: address(token)});
@@ -1065,6 +1088,7 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
                             bytes memory metadata = bytes(abi.encodePacked(projectId));
 
                             // Try to fulfill the payment.
+                            // slither-disable-next-line calls-loop
                             try this.executePayReservedTokenToTerminal({
                                 projectId: split.projectId,
                                 terminal: terminal,
@@ -1079,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.
@@ -1088,6 +1112,7 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
                         }
                     } else if (beneficiary == address(0xdead)) {
                         // If the split has no project ID, and the beneficiary is 0xdead, burn.
+                        // slither-disable-next-line calls-loop
                         TOKENS.burnFrom({holder: address(this), projectId: projectId, count: splitTokenCount});
                     } else {
                         // If the split has no project Id, send to beneficiary.
@@ -1107,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

@@ -139,6 +139,7 @@ contract JBDirectory is JBPermissioned, Ownable, IJBDirectory {
         // 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.
@@ -209,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);
         }
 
@@ -234,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;
                 }
             }
         }
@@ -266,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];
 
@@ -282,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.
@@ -304,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;
+            }
         }
     }
 }