@bananapus/suckers-v6 0.0.22 → 0.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/suckers-v6",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/JBCeloSucker.sol

@@ -76,8 +76,8 @@ contract JBCeloSucker is JBOptimismSucker {
     /// and adds native ETH to the project's balance.
     /// @param token The terminal token to add to the project's balance.
     /// @param amount The amount of terminal tokens to add to the project's balance.
-    /// @param projectId The cached project ID to avoid redundant storage reads.
-    function _addToBalance(address token, uint256 amount, uint256 projectId) internal override {
+    /// @param cachedProjectId The cached project ID to avoid redundant storage reads.
+    function _addToBalance(address token, uint256 amount, uint256 cachedProjectId) internal override {
         if (token == address(WRAPPED_NATIVE)) {
             // Check addable amount against WETH balance before unwrapping.
             uint256 addableAmount = amountToAddToBalanceOf(token);
@@ -91,16 +91,17 @@ contract JBCeloSucker is JBOptimismSucker {
 
             // Get the project's primary terminal for native token.
             // slither-disable-next-line calls-loop
-            IJBTerminal terminal = DIRECTORY.primaryTerminalOf({projectId: projectId, token: JBConstants.NATIVE_TOKEN});
+            IJBTerminal terminal =
+                DIRECTORY.primaryTerminalOf({projectId: cachedProjectId, token: JBConstants.NATIVE_TOKEN});
 
             if (address(terminal) == address(0)) {
-                revert JBSucker_NoTerminalForToken(projectId, JBConstants.NATIVE_TOKEN);
+                revert JBSucker_NoTerminalForToken(cachedProjectId, JBConstants.NATIVE_TOKEN);
             }
 
             // Add native ETH to the project's balance.
             // slither-disable-next-line arbitrary-send-eth,calls-loop
             terminal.addToBalanceOf{value: amount}({
-                projectId: projectId,
+                projectId: cachedProjectId,
                 token: JBConstants.NATIVE_TOKEN,
                 amount: amount,
                 shouldReturnHeldFees: false,
@@ -108,7 +109,7 @@ contract JBCeloSucker is JBOptimismSucker {
                 metadata: ""
             });
         } else {
-            super._addToBalance({token: token, amount: amount, projectId: projectId});
+            super._addToBalance({token: token, amount: amount, cachedProjectId: cachedProjectId});
         }
     }
 

package/src/JBSucker.sol

@@ -789,8 +789,8 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
     /// @notice Adds funds to the projects balance.
     /// @param token The terminal token to add to the project's balance.
     /// @param amount The amount of terminal tokens to add to the project's balance.
-    /// @param projectId The cached project ID to avoid redundant storage reads.
-    function _addToBalance(address token, uint256 amount, uint256 projectId) internal virtual {
+    /// @param cachedProjectId The cached project ID to avoid redundant storage reads.
+    function _addToBalance(address token, uint256 amount, uint256 cachedProjectId) internal virtual {
         // Make sure that the current `amountToAddToBalance` is greater than or equal to the amount being added.
         uint256 addableAmount = amountToAddToBalanceOf(token);
         if (amount > addableAmount) {
@@ -799,10 +799,10 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
 
         // Get the project's primary terminal for the token.
         // slither-disable-next-line calls-loop
-        IJBTerminal terminal = DIRECTORY.primaryTerminalOf({projectId: projectId, token: token});
+        IJBTerminal terminal = DIRECTORY.primaryTerminalOf({projectId: cachedProjectId, token: token});
 
         // slither-disable-next-line incorrect-equality
-        if (address(terminal) == address(0)) revert JBSucker_NoTerminalForToken(projectId, token);
+        if (address(terminal) == address(0)) revert JBSucker_NoTerminalForToken(cachedProjectId, token);
 
         // Perform the `addToBalance`.
         if (token != JBConstants.NATIVE_TOKEN) {
@@ -813,7 +813,12 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
 
             // slither-disable-next-line calls-loop
             terminal.addToBalanceOf({
-                projectId: projectId, token: token, amount: amount, shouldReturnHeldFees: false, memo: "", metadata: ""
+                projectId: cachedProjectId,
+                token: token,
+                amount: amount,
+                shouldReturnHeldFees: false,
+                memo: "",
+                metadata: ""
             });
 
             // Sanity check: make sure we transfer the full amount.
@@ -823,7 +828,12 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
             // If the token is the native token, use `msg.value`.
             // slither-disable-next-line arbitrary-send-eth,calls-loop
             terminal.addToBalanceOf{value: amount}({
-                projectId: projectId, token: token, amount: amount, shouldReturnHeldFees: false, memo: "", metadata: ""
+                projectId: cachedProjectId,
+                token: token,
+                amount: amount,
+                shouldReturnHeldFees: false,
+                memo: "",
+                metadata: ""
             });
         }
     }
@@ -845,7 +855,7 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
 
         // Add the cashed out funds to the project's balance.
         if (terminalTokenAmount != 0) {
-            _addToBalance({token: terminalToken, amount: terminalTokenAmount, projectId: cachedProjectId});
+            _addToBalance({token: terminalToken, amount: terminalTokenAmount, cachedProjectId: cachedProjectId});
         }
 
         // Cast the bytes32 beneficiary to an EVM address for the local mint.