@bananapus/suckers-v6 0.0.36 → 0.0.37

package/src/JBSucker.sol

@@ -67,9 +67,9 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
 
     error JBSucker_AmountExceedsUint128(uint256 amount);
     error JBSucker_BelowMinGas(uint256 minGas, uint256 minGasLimit);
-    error JBSucker_Deprecated();
+    error JBSucker_Deprecated(JBSuckerState state);
     error JBSucker_DeprecationTimestampTooSoon(uint256 givenTime, uint256 minimumTime);
-    error JBSucker_ExpectedMsgValue();
+    error JBSucker_ExpectedMsgValue(uint256 msgValue);
     error JBSucker_IndexOutOfRange(uint256 index);
     error JBSucker_InsufficientBalance(uint256 amount, uint256 balance);
     error JBSucker_InsufficientMsgValue(uint256 received, uint256 expected);
@@ -79,16 +79,16 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
     error JBSucker_LeafAlreadyExecuted(address token, uint256 index);
     error JBSucker_NoTerminalForToken(uint256 projectId, address token);
     error JBSucker_NotPeer(bytes32 caller);
-    error JBSucker_NothingToSend();
+    error JBSucker_NothingToSend(address token, uint256 outboxBalance, uint256 treeCount, uint256 numberOfClaimsSent);
     error JBSucker_NoRetainedToRemoteFee(address account);
     error JBSucker_NoRetainedTransportPaymentRefund(address account);
-    error JBSucker_RefundFailed();
+    error JBSucker_RefundFailed(address beneficiary, uint256 amount);
     error JBSucker_TokenAlreadyMapped(address localToken, bytes32 mappedTo);
     error JBSucker_TokenHasInvalidEmergencyHatchState(address token);
     error JBSucker_TokenNotMapped(address token);
     error JBSucker_UnexpectedMsgValue(uint256 value);
-    error JBSucker_ZeroBeneficiary();
-    error JBSucker_ZeroERC20Token();
+    error JBSucker_ZeroBeneficiary(bytes32 beneficiary);
+    error JBSucker_ZeroERC20Token(uint256 projectId);
 
     //*********************************************************************//
     // ------------------------- public constants ------------------------ //
@@ -318,7 +318,6 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
     /// @param tokens The terminal tokens to enable the emergency hatch for.
     function enableEmergencyHatchFor(address[] calldata tokens) external override {
         // The caller must be the project owner or have the `QUEUE_RULESETS` permission from them.
-        // slither-disable-next-line calls-loop
         uint256 _projectId = projectId();
 
         _requirePermissionFrom({
@@ -396,7 +395,7 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
         // Using _msgSender() would allow a trusted forwarder to spoof the bridge messenger address via the
         // ERC-2771 calldata suffix.
         if (!_isRemotePeer(msg.sender)) {
-            revert JBSucker_NotPeer(_toBytes32(msg.sender));
+            revert JBSucker_NotPeer({caller: _toBytes32(msg.sender)});
         }
 
         // Validate the message version to reject incompatible messages.
@@ -479,7 +478,6 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
 
         // Perform each token mapping.
         for (uint256 i; i < maps.length;) {
-            // slither-disable-next-line msg-value-loop
             _mapToken({map: maps[i], transportPaymentValue: numberToDisable > 0 ? msg.value / numberToDisable : 0});
             unchecked {
                 ++i;
@@ -489,15 +487,13 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
         // If no tokens were disabled, the full `msg.value` is unused — refund it.
         if (numberToDisable == 0) {
             if (msg.value > 0) {
-                (bool _ok,) = _msgSender().call{value: msg.value}("");
-                if (!_ok) revert JBSucker_RefundFailed();
+                _sendNativeTo({beneficiary: payable(_msgSender()), amount: msg.value});
             }
         } else {
             // Refund any remainder from integer division so dust wei isn't stuck in the contract.
             uint256 remainder = msg.value % numberToDisable;
             if (remainder > 0) {
                 // Best-effort refund — don't revert if caller can't accept ETH.
-                // slither-disable-next-line low-level-calls,unchecked-lowlevel
                 (bool _ok,) = _msgSender().call{value: remainder}("");
                 _ok; // Silence unused-variable warning; failure is intentionally ignored.
             }
@@ -534,32 +530,27 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
     {
         // Make sure the beneficiary is not the zero address, as this would revert when minting on the remote chain.
         if (beneficiary == bytes32(0)) {
-            revert JBSucker_ZeroBeneficiary();
+            revert JBSucker_ZeroBeneficiary({beneficiary: beneficiary});
         }
 
         // Get the project's token.
         IERC20 projectToken = IERC20(address(TOKENS.tokenOf(projectId())));
         if (address(projectToken) == address(0)) {
-            revert JBSucker_ZeroERC20Token();
+            revert JBSucker_ZeroERC20Token({projectId: projectId()});
         }
 
         // Make sure that the token is mapped to a remote token.
         if (!_remoteTokenFor[token].enabled) {
-            revert JBSucker_TokenNotMapped(token);
+            revert JBSucker_TokenNotMapped({token: token});
         }
 
         // Make sure that the sucker still allows sending new messaged.
-        JBSuckerState deprecationState = state();
-        if (deprecationState == JBSuckerState.DEPRECATED || deprecationState == JBSuckerState.SENDING_DISABLED) {
-            revert JBSucker_Deprecated();
-        }
+        _requireSendingEnabled();
 
         // Transfer the tokens to this contract.
-        // slither-disable-next-line reentrancy-events,reentrancy-benign
         projectToken.safeTransferFrom({from: _msgSender(), to: address(this), value: projectTokenCount});
 
         // Cash out the tokens.
-        // slither-disable-next-line reentrancy-events,reentrancy-benign
         uint256 terminalTokenAmount = _pullBackingAssets({
             projectToken: projectToken, count: projectTokenCount, token: token, minTokensReclaimed: minTokensReclaimed
         });
@@ -580,12 +571,8 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
     function setDeprecation(uint40 timestamp) external override {
         // As long as the sucker has not started letting users withdrawal, its deprecation time can be
         // extended/shortened.
-        JBSuckerState deprecationState = state();
-        if (deprecationState == JBSuckerState.DEPRECATED || deprecationState == JBSuckerState.SENDING_DISABLED) {
-            revert JBSucker_Deprecated();
-        }
+        _requireSendingEnabled();
 
-        // slither-disable-next-line calls-loop
         uint256 _projectId = projectId();
 
         // The caller must be the project owner or have the `SET_SUCKER_DEPRECATION` permission from them.
@@ -626,13 +613,18 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
 
         // Ensure that the token does not have an emergency hatch enabled.
         if (remoteToken.emergencyHatch) {
-            revert JBSucker_TokenHasInvalidEmergencyHatchState(token);
+            revert JBSucker_TokenHasInvalidEmergencyHatchState({token: token});
         }
 
         // Revert if nothing has changed since the last toRemote() call.
         JBOutboxTree storage outbox = _outboxOf[token];
         if (outbox.balance == 0 && outbox.tree.count == outbox.numberOfClaimsSent) {
-            revert JBSucker_NothingToSend();
+            revert JBSucker_NothingToSend({
+                token: token,
+                outboxBalance: outbox.balance,
+                treeCount: outbox.tree.count,
+                numberOfClaimsSent: outbox.numberOfClaimsSent
+            });
         }
 
         // Read the fee from the registry.
@@ -650,7 +642,6 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
         IJBTerminal feeTerminal = _primaryTerminalOf({forProjectId: FEE_PROJECT_ID, token: JBConstants.NATIVE_TOKEN});
         bool feePaid;
         if (address(feeTerminal) != address(0) && _toRemoteFee != 0) {
-            // slither-disable-next-line unused-return,reentrancy-events,reentrancy-benign,arbitrary-send-eth
             try feeTerminal.pay{value: _toRemoteFee}({
                 projectId: FEE_PROJECT_ID,
                 token: JBConstants.NATIVE_TOKEN,
@@ -827,7 +818,7 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
     /// @notice Claim retained failed-fee ETH.
     /// @param beneficiary The address that should receive the retained ETH.
     function claimRetainedToRemoteFee(address payable beneficiary) external override {
-        if (beneficiary == address(0)) revert JBSucker_ZeroBeneficiary();
+        if (beneficiary == address(0)) revert JBSucker_ZeroBeneficiary({beneficiary: bytes32(0)});
 
         address account = _msgSender();
         uint256 amount = retainedToRemoteFeeOf[account];
@@ -836,12 +827,9 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
         retainedToRemoteFeeOf[account] = 0;
         retainedToRemoteFeeBalance -= amount;
 
-        // slither-disable-next-line arbitrary-send-eth
-        (bool success,) = beneficiary.call{value: amount}("");
-        if (!success) revert JBSucker_RefundFailed();
+        _sendNativeTo({beneficiary: beneficiary, amount: amount});
 
         // State was cleared before sending ETH; the event is emitted after the transfer so failed sends do not log.
-        // slither-disable-next-line reentrancy-events
         emit RetainedToRemoteFeeClaimed({
             account: account, beneficiary: beneficiary, amount: amount, caller: _msgSender()
         });
@@ -850,7 +838,7 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
     /// @notice Claim retained failed transport-payment refund ETH.
     /// @param beneficiary The address that should receive the retained ETH.
     function claimRetainedTransportPaymentRefund(address payable beneficiary) external override {
-        if (beneficiary == address(0)) revert JBSucker_ZeroBeneficiary();
+        if (beneficiary == address(0)) revert JBSucker_ZeroBeneficiary({beneficiary: bytes32(0)});
 
         address account = _msgSender();
         uint256 amount = retainedTransportPaymentRefundOf[account];
@@ -859,12 +847,9 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
         retainedTransportPaymentRefundOf[account] = 0;
         retainedTransportPaymentRefundBalance -= amount;
 
-        // slither-disable-next-line arbitrary-send-eth
-        (bool success,) = beneficiary.call{value: amount}("");
-        if (!success) revert JBSucker_RefundFailed();
+        _sendNativeTo({beneficiary: beneficiary, amount: amount});
 
         // State was cleared before sending ETH; the event is emitted after the transfer so failed sends do not log.
-        // slither-disable-next-line reentrancy-events
         emit RetainedTransportPaymentRefundClaimed({
             account: account, beneficiary: beneficiary, amount: amount, caller: _msgSender()
         });
@@ -887,7 +872,6 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
     /// @param _projectId The ID of the project (on the local chain) that this sucker is associated with.
     /// @param remotePeer The remote peer address. Leave zero to use the default deterministic same-address peer.
     function _initialize(uint256 _projectId, bytes32 remotePeer) internal {
-        // slither-disable-next-line missing-zero-check
         _localProjectId = _projectId;
         _peer = remotePeer;
         deployer = _msgSender();
@@ -920,7 +904,6 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
         IJBTerminal terminal = _primaryTerminalOf({forProjectId: cachedProjectId, token: token});
 
         // Revert if no terminal is configured for this token.
-        // slither-disable-next-line incorrect-equality
         if (address(terminal) == address(0)) {
             revert JBSucker_NoTerminalForToken({projectId: cachedProjectId, token: token});
         }
@@ -928,14 +911,12 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
         // Perform the `addToBalance` for ERC-20 tokens.
         if (token != JBConstants.NATIVE_TOKEN) {
             // Record the balance before the transfer for the sanity check.
-            // slither-disable-next-line calls-loop
             uint256 balanceBefore = IERC20(token).balanceOf(address(this));
 
             // Approve the terminal to spend the ERC-20 tokens.
             SafeERC20.forceApprove({token: IERC20(token), spender: address(terminal), value: amount});
 
             // Add the tokens to the project's balance.
-            // slither-disable-next-line calls-loop
             terminal.addToBalanceOf({
                 projectId: cachedProjectId,
                 token: token,
@@ -946,11 +927,9 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
             });
 
             // Sanity check: make sure we transferred the full amount.
-            // slither-disable-next-line calls-loop,incorrect-equality
             assert(IERC20(token).balanceOf(address(this)) == balanceBefore - amount);
         } else {
             // If the token is the native token, send ETH with the call.
-            // slither-disable-next-line arbitrary-send-eth,calls-loop
             terminal.addToBalanceOf{value: amount}({
                 projectId: cachedProjectId,
                 token: token,
@@ -988,7 +967,6 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
         // before enabling suckers.
         //
         // Mint the project tokens for the beneficiary via the project's controller.
-        // slither-disable-next-line calls-loop,unused-return
         IJBController(address(DIRECTORY.controllerOf(cachedProjectId)))
             .mintTokensOf({
             projectId: cachedProjectId,
@@ -1062,7 +1040,7 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
 
         // Once the emergency hatch for a token is enabled it can't be disabled.
         if (currentMapping.emergencyHatch) {
-            revert JBSucker_TokenHasInvalidEmergencyHatchState(token);
+            revert JBSucker_TokenHasInvalidEmergencyHatchState({token: token});
         }
 
         // Validate the token mapping according to the rules of the sucker.
@@ -1072,7 +1050,6 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
         uint256 _projectId = projectId();
 
         // The registry can map during authorized deployment. Otherwise, require the project's mapping permission.
-        // slither-disable-next-line calls-loop
         _requirePermissionAllowingOverrideFrom({
             account: PROJECTS.ownerOf(_projectId),
             projectId: _projectId,
@@ -1171,7 +1148,6 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
         });
 
         // Sanity check to make sure we received the expected amount.
-        // slither-disable-next-line incorrect-equality
         assert(reclaimedAmount == _balanceOf({token: token, addr: address(this)}) - balanceBefore);
     }
 
@@ -1187,12 +1163,7 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
         if (remoteToken.addr == bytes32(0)) revert JBSucker_TokenNotMapped(token);
 
         // Make sure that the sucker still allows sending new messaged.
-        {
-            JBSuckerState deprecationState = state();
-            if (deprecationState == JBSuckerState.DEPRECATED || deprecationState == JBSuckerState.SENDING_DISABLED) {
-                revert JBSucker_Deprecated();
-            }
-        }
+        _requireSendingEnabled();
 
         // Drain the outbox: read balance/nonce/root, clear balance, advance nonce and numberOfClaimsSent.
         uint256 amount;
@@ -1241,6 +1212,14 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
         });
     }
 
+    /// @notice Send native tokens, reverting if the recipient rejects them.
+    /// @param beneficiary The recipient.
+    /// @param amount The amount to send.
+    function _sendNativeTo(address payable beneficiary, uint256 amount) internal {
+        (bool success,) = beneficiary.call{value: amount}("");
+        if (!success) revert JBSucker_RefundFailed({beneficiary: beneficiary, amount: amount});
+    }
+
     /// @notice Performs the logic to send a message to the peer over the AMB.
     /// @dev This is chain/sucker/bridge specific logic.
     /// @param transportPayment The amount of `msg.value` that is going to get paid for sending this message.
@@ -1386,7 +1365,7 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
             deprecationState != JBSuckerState.DEPRECATED && deprecationState != JBSuckerState.SENDING_DISABLED
                 && !_remoteTokenFor[terminalToken].emergencyHatch
         ) {
-            revert JBSucker_TokenHasInvalidEmergencyHatchState(terminalToken);
+            revert JBSucker_TokenHasInvalidEmergencyHatchState({token: terminalToken});
         }
 
         // Check that this claim is within the bounds of who can claim.
@@ -1440,7 +1419,6 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
             return addr.balance;
         }
 
-        // slither-disable-next-line calls-loop
         return IERC20(token).balanceOf(addr);
     }
 
@@ -1561,10 +1539,17 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
     /// @return The primary terminal.
     function _primaryTerminalOf(uint256 forProjectId, address token) internal view returns (IJBTerminal) {
         // Claim processing may call this through a bounded claim list; each lookup must use the live directory state.
-        // slither-disable-next-line calls-loop
         return DIRECTORY.primaryTerminalOf({projectId: forProjectId, token: token});
     }
 
+    /// @notice Revert if new outbound sends are disabled or deprecated.
+    function _requireSendingEnabled() internal view {
+        JBSuckerState deprecationState = state();
+        if (deprecationState == JBSuckerState.DEPRECATED || deprecationState == JBSuckerState.SENDING_DISABLED) {
+            revert JBSucker_Deprecated({state: deprecationState});
+        }
+    }
+
     /// @notice Convert a bytes32 remote address to a local EVM address.
     /// @param remote The bytes32 representation of the address.
     /// @return The EVM address (lower 20 bytes).
@@ -1587,7 +1572,7 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
         // If the token being mapped is the native token, the `remoteToken` must also be the native token.
         // The native token can also be mapped to the 0 address, which is used to disable native token bridging.
         if (isNative && map.remoteToken != _toBytes32(JBConstants.NATIVE_TOKEN) && map.remoteToken != bytes32(0)) {
-            revert JBSucker_InvalidNativeRemoteAddress(map.remoteToken);
+            revert JBSucker_InvalidNativeRemoteAddress({remoteToken: map.remoteToken});
         }
 
         // Enforce a reasonable minimum gas limit for bridging. A minimum which is too low could lead to the loss of
@@ -1641,7 +1626,14 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
             sourceTimestamp: sourceTimestamp
         });
 
-        // Send the root over the AMB (positional args — slither IR parser crashes on named args here).
-        _sendRootOverAMB(transportPayment, index, token, amount, remoteToken, message);
+        // Send the root over the AMB. This overloaded interface call is intentionally positional.
+        _sendRootOverAMB({
+            transportPayment: transportPayment,
+            index: index,
+            token: token,
+            amount: amount,
+            remoteToken: remoteToken,
+            message: message
+        });
     }
 }

package/src/JBSuckerRegistry.sol

@@ -127,7 +127,6 @@ contract JBSuckerRegistry is ERC2771Context, Ownable, JBPermissioned, IJBSuckerR
         // Count active suckers.
         uint256 activeCount;
         for (uint256 i; i < allSuckers.length;) {
-            // slither-disable-next-line unused-return
             (, uint256 val) = _suckersOf[projectId].tryGet(allSuckers[i]);
             if (val == _SUCKER_EXISTS) activeCount++;
             unchecked {
@@ -139,11 +138,9 @@ contract JBSuckerRegistry is ERC2771Context, Ownable, JBPermissioned, IJBSuckerR
         pairs = new JBSuckersPair[](activeCount);
         uint256 j;
         for (uint256 i; i < allSuckers.length;) {
-            // slither-disable-next-line unused-return
             (, uint256 val) = _suckersOf[projectId].tryGet(allSuckers[i]);
             if (val == _SUCKER_EXISTS) {
                 IJBSucker sucker = IJBSucker(allSuckers[i]);
-                // slither-disable-next-line calls-loop
                 pairs[j] =
                     JBSuckersPair({local: address(sucker), remote: sucker.peer(), remoteChainId: sucker.peerChainId()});
                 unchecked {
@@ -166,7 +163,6 @@ contract JBSuckerRegistry is ERC2771Context, Ownable, JBPermissioned, IJBSuckerR
         // Count active suckers.
         uint256 activeCount;
         for (uint256 i; i < allSuckers.length;) {
-            // slither-disable-next-line unused-return
             (, uint256 val) = _suckersOf[projectId].tryGet(allSuckers[i]);
             if (val == _SUCKER_EXISTS) activeCount++;
             unchecked {
@@ -178,7 +174,6 @@ contract JBSuckerRegistry is ERC2771Context, Ownable, JBPermissioned, IJBSuckerR
         suckers = new address[](activeCount);
         uint256 j;
         for (uint256 i; i < allSuckers.length;) {
-            // slither-disable-next-line unused-return
             (, uint256 val) = _suckersOf[projectId].tryGet(allSuckers[i]);
             if (val == _SUCKER_EXISTS) {
                 suckers[j] = allSuckers[i];
@@ -221,15 +216,12 @@ contract JBSuckerRegistry is ERC2771Context, Ownable, JBPermissioned, IJBSuckerR
         uint256 chainCount;
 
         for (uint256 i; i < len;) {
-            // slither-disable-next-line unused-return
             (, uint256 val) = _suckersOf[projectId].tryGet(allSuckers[i]);
             // Include both active and deprecated suckers in aggregate economic views.
             if (val == _SUCKER_EXISTS || val == _SUCKER_DEPRECATED) {
-                // slither-disable-next-line calls-loop
                 try IJBSucker(allSuckers[i]).peerChainBalanceOf(decimals, currency) returns (
                     JBDenominatedAmount memory amt
                 ) {
-                    // slither-disable-next-line calls-loop
                     uint256 chainId = IJBSucker(allSuckers[i]).peerChainId();
                     chainCount = _recordPeerValue({
                         chainIds: chainIds,
@@ -285,15 +277,12 @@ contract JBSuckerRegistry is ERC2771Context, Ownable, JBPermissioned, IJBSuckerR
         uint256 chainCount;
 
         for (uint256 i; i < len;) {
-            // slither-disable-next-line unused-return
             (, uint256 val) = _suckersOf[projectId].tryGet(allSuckers[i]);
             // Include both active and deprecated suckers in aggregate economic views.
             if (val == _SUCKER_EXISTS || val == _SUCKER_DEPRECATED) {
-                // slither-disable-next-line calls-loop
                 try IJBSucker(allSuckers[i]).peerChainSurplusOf(decimals, currency) returns (
                     JBDenominatedAmount memory amt
                 ) {
-                    // slither-disable-next-line calls-loop
                     uint256 chainId = IJBSucker(allSuckers[i]).peerChainId();
                     chainCount = _recordPeerValue({
                         chainIds: chainIds,
@@ -338,13 +327,10 @@ contract JBSuckerRegistry is ERC2771Context, Ownable, JBPermissioned, IJBSuckerR
         uint256 chainCount;
 
         for (uint256 i; i < len;) {
-            // slither-disable-next-line unused-return
             (, uint256 val) = _suckersOf[projectId].tryGet(allSuckers[i]);
             // Include both active and deprecated suckers in aggregate economic views.
             if (val == _SUCKER_EXISTS || val == _SUCKER_DEPRECATED) {
-                // slither-disable-next-line calls-loop
                 try IJBSucker(allSuckers[i]).peerChainTotalSupply() returns (uint256 supply) {
-                    // slither-disable-next-line calls-loop
                     uint256 chainId = IJBSucker(allSuckers[i]).peerChainId();
                     chainCount = _recordPeerValue({
                         chainIds: chainIds,
@@ -518,21 +504,18 @@ contract JBSuckerRegistry is ERC2771Context, Ownable, JBPermissioned, IJBSuckerR
 
             // Make sure the deployer is allowed.
             if (!suckerDeployerIsAllowed[address(configuration.deployer)]) {
-                revert JBSuckerRegistry_InvalidDeployer(configuration.deployer);
+                revert JBSuckerRegistry_InvalidDeployer({deployer: configuration.deployer});
             }
 
             // Create the sucker.
-            // slither-disable-next-line reentrancy-event,calls-loop
             IJBSucker sucker = configuration.deployer
             .createForSender({localProjectId: projectId, salt: salt, peer: configuration.peer});
             suckers[i] = address(sucker);
 
             // Store the sucker as being deployed for this project.
-            // slither-disable-next-line unused-return
             _suckersOf[projectId].set({key: address(sucker), value: _SUCKER_EXISTS});
 
             // Map the tokens for the sucker.
-            // slither-disable-next-line reentrancy-events,calls-loop
             sucker.mapTokens(configuration.mappings);
             emit SuckerDeployedFor({
                 projectId: projectId, sucker: address(sucker), configuration: configuration, caller: sender
@@ -552,17 +535,16 @@ contract JBSuckerRegistry is ERC2771Context, Ownable, JBPermissioned, IJBSuckerR
         // Sanity check, make sure that the sucker does actually belong to the project.
         (bool belongsToProject, uint256 val) = _suckersOf[projectId].tryGet(sucker);
         if (!belongsToProject || val != _SUCKER_EXISTS) {
-            revert JBSuckerRegistry_SuckerDoesNotBelongToProject(projectId, address(sucker));
+            revert JBSuckerRegistry_SuckerDoesNotBelongToProject({projectId: projectId, sucker: address(sucker)});
         }
 
         // Check if the sucker is deprecated.
         JBSuckerState state = IJBSucker(sucker).state();
         if (state != JBSuckerState.DEPRECATED) {
-            revert JBSuckerRegistry_SuckerIsNotDeprecated(address(sucker), state);
+            revert JBSuckerRegistry_SuckerIsNotDeprecated({sucker: address(sucker), suckerState: state});
         }
 
         // Mark the sucker as deprecated (retains mint permission, excluded from active listings).
-        // slither-disable-next-line unused-return
         _suckersOf[projectId].set(address(sucker), _SUCKER_DEPRECATED);
         emit SuckerDeprecated({projectId: projectId, sucker: address(sucker), caller: _msgSender()});
     }
@@ -574,7 +556,7 @@ contract JBSuckerRegistry is ERC2771Context, Ownable, JBPermissioned, IJBSuckerR
         if (fee > MAX_TO_REMOTE_FEE) revert JBSuckerRegistry_FeeExceedsMax(fee, MAX_TO_REMOTE_FEE);
         uint256 oldFee = toRemoteFee;
         toRemoteFee = fee;
-        emit ToRemoteFeeChanged(oldFee, fee, _msgSender());
+        emit ToRemoteFeeChanged({oldFee: oldFee, newFee: fee, caller: _msgSender()});
     }
 
     /// @notice Removes a sucker deployer from the allowlist.

package/src/JBSwapCCIPSucker.sol

@@ -88,10 +88,10 @@ contract JBSwapCCIPSucker is JBCCIPSucker, IUnlockCallback, IUniswapV3SwapCallba
 
     error JBSwapCCIPSucker_BatchNotReceived(uint64 nonce);
     error JBSwapCCIPSucker_CallerNotPoolManager(address caller);
-    error JBSwapCCIPSucker_InvalidBridgeToken();
-    error JBSwapCCIPSucker_NoPendingSwap();
-    error JBSwapCCIPSucker_OnlySelf();
-    error JBSwapCCIPSucker_SwapFailed();
+    error JBSwapCCIPSucker_InvalidBridgeToken(address bridgeToken, address wrappedNativeToken);
+    error JBSwapCCIPSucker_NoPendingSwap(address localToken, uint64 nonce, bool retrySwapLocked);
+    error JBSwapCCIPSucker_OnlySelf(address caller, address expected);
+    error JBSwapCCIPSucker_SwapFailed(address tokenIn, address tokenOut, uint256 amountIn);
     error JBSwapCCIPSucker_SwapPending(uint64 nonce);
 
     //*********************************************************************//
@@ -226,10 +226,16 @@ contract JBSwapCCIPSucker is JBCCIPSucker, IUnlockCallback, IUniswapV3SwapCallba
         UNIV4_HOOK = swapDeployer.univ4Hook();
         WRAPPED_NATIVE_TOKEN = IWrappedNativeToken(swapDeployer.weth());
 
-        if (address(BRIDGE_TOKEN) == address(0)) revert JBSwapCCIPSucker_InvalidBridgeToken();
+        if (address(BRIDGE_TOKEN) == address(0)) {
+            revert JBSwapCCIPSucker_InvalidBridgeToken({
+                bridgeToken: address(BRIDGE_TOKEN), wrappedNativeToken: address(WRAPPED_NATIVE_TOKEN)
+            });
+        }
         // BRIDGE_TOKEN must not be the wrapped native token — wrapping and CCIP ERC-20 bridging conflict.
         if (address(BRIDGE_TOKEN) == address(WRAPPED_NATIVE_TOKEN) && address(WRAPPED_NATIVE_TOKEN) != address(0)) {
-            revert JBSwapCCIPSucker_InvalidBridgeToken();
+            revert JBSwapCCIPSucker_InvalidBridgeToken({
+                bridgeToken: address(BRIDGE_TOKEN), wrappedNativeToken: address(WRAPPED_NATIVE_TOKEN)
+            });
         }
         // NOTE: V3_FACTORY and POOL_MANAGER can both be address(0) on chains where the local terminal token
         // IS the bridge token (e.g., USDC on Tempo). No swap is ever needed in that case. If a swap IS attempted
@@ -259,7 +265,7 @@ contract JBSwapCCIPSucker is JBCCIPSucker, IUnlockCallback, IUniswapV3SwapCallba
         address origin = abi.decode(any2EvmMessage.sender, (address));
 
         if (origin != _toAddress(peer()) || any2EvmMessage.sourceChainSelector != REMOTE_CHAIN_SELECTOR) {
-            revert JBSucker_NotPeer(_toBytes32(origin));
+            revert JBSucker_NotPeer({caller: _toBytes32(origin)});
         }
 
         // Decode the typed message: abi.encode(uint8 type, bytes payload).
@@ -286,7 +292,6 @@ contract JBSwapCCIPSucker is JBCCIPSucker, IUnlockCallback, IUniswapV3SwapCallba
                     // Wrapped in try-catch so a swap failure doesn't revert the entire CCIP message
                     // (which would leave tokens stuck in the OffRamp). On failure, bridge tokens are
                     // stored for later retry via `retrySwap` (written below, after nonce validation).
-                    // slither-disable-next-line reentrancy-benign,reentrancy-events
                     try this.executeSwapExternal({
                         tokenIn: tokenAmount.token, tokenOut: localToken, amount: tokenAmount.amount
                     }) returns (
@@ -367,7 +372,7 @@ contract JBSwapCCIPSucker is JBCCIPSucker, IUnlockCallback, IUniswapV3SwapCallba
                 }
             }
         } else {
-            revert JBCCIPSucker_UnknownMessageType(messageType);
+            revert JBCCIPSucker_UnknownMessageType({messageType: messageType});
         }
     }
 
@@ -403,7 +408,9 @@ contract JBSwapCCIPSucker is JBCCIPSucker, IUnlockCallback, IUniswapV3SwapCallba
         external
         returns (uint256 amountOut)
     {
-        if (msg.sender != address(this)) revert JBSwapCCIPSucker_OnlySelf();
+        if (msg.sender != address(this)) {
+            revert JBSwapCCIPSucker_OnlySelf({caller: msg.sender, expected: address(this)});
+        }
         return _executeSwap({tokenIn: tokenIn, tokenOut: tokenOut, amount: amount});
     }
 
@@ -419,18 +426,22 @@ contract JBSwapCCIPSucker is JBCCIPSucker, IUnlockCallback, IUniswapV3SwapCallba
         // Reentrancy guard: prevents re-entry into retrySwap AND prevents claims from executing
         // during the swap window (which would see the stale {leafTotal > 0, localTotal: 0} rate
         // and mint project tokens backed by zero terminal tokens).
-        if (_retrySwapLocked) revert JBSwapCCIPSucker_NoPendingSwap();
+        if (_retrySwapLocked) {
+            revert JBSwapCCIPSucker_NoPendingSwap({
+                localToken: localToken, nonce: nonce, retrySwapLocked: _retrySwapLocked
+            });
+        }
         _retrySwapLocked = true;
 
         PendingSwap memory pending = pendingSwapOf[localToken][nonce];
-        if (pending.bridgeAmount == 0) revert JBSwapCCIPSucker_NoPendingSwap();
+        if (pending.bridgeAmount == 0) {
+            revert JBSwapCCIPSucker_NoPendingSwap({
+                localToken: localToken, nonce: nonce, retrySwapLocked: _retrySwapLocked
+            });
+        }
 
-        // slither-disable-next-line reentrancy-no-eth,reentrancy-benign,reentrancy-events,reentrancy-eth
         uint256 localAmount =
-            _executeSwap({tokenIn: pending.bridgeToken, tokenOut: localToken, amount: pending.bridgeAmount});
-
-        // Revert on zero output — matches outbound guard at toRemote.
-        if (localAmount == 0) revert JBSwapCCIPSucker_SwapFailed();
+            _executeSwapOrRevert({tokenIn: pending.bridgeToken, tokenOut: localToken, amount: pending.bridgeAmount});
 
         // Update the conversion rate so claims can proceed, then clear the pending swap.
         _conversionRateOf[localToken][nonce] = ConversionRate({leafTotal: pending.leafTotal, localTotal: localAmount});
@@ -453,9 +464,7 @@ contract JBSwapCCIPSucker is JBCCIPSucker, IUnlockCallback, IUniswapV3SwapCallba
     function claim(JBClaim calldata claimData) public override {
         // Block claims during retrySwap to prevent zero-backed minting via reentrancy.
         if (_retrySwapLocked) revert JBSwapCCIPSucker_SwapPending(0);
-        // slither-disable-next-line events-maths
         _currentClaimLeafIndex = claimData.leaf.index + 1;
-        // slither-disable-next-line reentrancy-eth
         super.claim(claimData);
         // Clear stale transient context to prevent leaking into same-tx emergency exits.
         _currentClaimLeafIndex = 0;
@@ -485,7 +494,7 @@ contract JBSwapCCIPSucker is JBCCIPSucker, IUnlockCallback, IUniswapV3SwapCallba
                 // claims must wait. This check must come BEFORE the leafTotal gate so that
                 // failed swaps (where _conversionRateOf was never written) still block claims.
                 if (pendingSwapOf[token][nonce].bridgeAmount > 0) {
-                    revert JBSwapCCIPSucker_SwapPending(nonce);
+                    revert JBSwapCCIPSucker_SwapPending({nonce: nonce});
                 }
                 ConversionRate storage rate = _conversionRateOf[token][nonce];
                 if (rate.leafTotal > 0) {
@@ -537,9 +546,7 @@ contract JBSwapCCIPSucker is JBCCIPSucker, IUnlockCallback, IUniswapV3SwapCallba
                     // (where the caller spends their own funds), here the swap output sets the conversion
                     // rate for ALL claimers of the batch. Caller-controlled slippage would allow sandwich
                     // attacks that lock in bad rates for everyone.
-                    // slither-disable-next-line reentrancy-events,reentrancy-benign
-                    bridgeAmount = _executeSwap({tokenIn: token, tokenOut: bridgeTokenAddr, amount: amount});
-                    if (bridgeAmount == 0) revert JBSwapCCIPSucker_SwapFailed();
+                    bridgeAmount = _executeSwapOrRevert({tokenIn: token, tokenOut: bridgeTokenAddr, amount: amount});
                 }
 
                 tokenAmounts = new Client.EVMTokenAmount[](1);
@@ -607,6 +614,25 @@ contract JBSwapCCIPSucker is JBCCIPSucker, IUnlockCallback, IUniswapV3SwapCallba
         });
     }
 
+    /// @notice Execute a swap and revert if it produces no output.
+    /// @param tokenIn The input token.
+    /// @param tokenOut The output token.
+    /// @param amount The input amount.
+    /// @return amountOut The output amount.
+    function _executeSwapOrRevert(
+        address tokenIn,
+        address tokenOut,
+        uint256 amount
+    )
+        internal
+        returns (uint256 amountOut)
+    {
+        amountOut = _executeSwap({tokenIn: tokenIn, tokenOut: tokenOut, amount: amount});
+        if (amountOut == 0) {
+            revert JBSwapCCIPSucker_SwapFailed({tokenIn: tokenIn, tokenOut: tokenOut, amountIn: amount});
+        }
+    }
+
     //*********************************************************************//
     // ----------------------- internal views ---------------------------- //
     //*********************************************************************//
@@ -625,7 +651,7 @@ contract JBSwapCCIPSucker is JBCCIPSucker, IUnlockCallback, IUniswapV3SwapCallba
             if (_nonceContainsLeaf({token: token, nonce: n, leafIndex: leafIndex})) return n;
         }
 
-        revert JBSwapCCIPSucker_BatchNotReceived(0);
+        revert JBSwapCCIPSucker_BatchNotReceived({nonce: 0});
     }
 
     /// @notice Check whether the given nonce's batch range contains the leaf index.