@bananapus/suckers-v6 0.0.35 → 0.0.37

package/README.md

@@ -72,8 +72,8 @@ That means every bridge path has two trust surfaces:
 1. `test/unit/registry.t.sol`
 2. `test/unit/multi_chain_evolution.t.sol`
 3. `test/ForkClaimMainnet.t.sol`
-4. `test/audit/PeerSnapshotDesync.t.sol`
-5. `test/audit/ToRemoteFeeIrrecoverable.t.sol`
+4. `test/regression/PeerSnapshotDesync.t.sol`
+5. `test/regression/ToRemoteFeeIrrecoverable.t.sol`
 
 ## Install
 
@@ -113,7 +113,7 @@ src/
   structs/
   utils/
 test/
-  unit, fork, interoperability, attack, audit, and regression coverage
+  unit, fork, interoperability, attack, review, and regression coverage
 script/
   Deploy.s.sol
   helpers/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/suckers-v6",
-  "version": "0.0.35",
+  "version": "0.0.37",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "deploy:mainnets": "source ./.env && npx sphinx propose ./script/Deploy.s.sol --networks mainnets",
     "deploy:testnets": "source ./.env && npx sphinx propose ./script/Deploy.s.sol --networks testnets",
     "artifacts": "source ./.env && npx sphinx artifacts --org-id 'ea165b21-7cdc-4d7b-be59-ecdd4c26bee4' --project-name 'nana-suckers-v6'",
-    "analyze": "slither . --config-file slither-ci.config.json"
+    "analyze": "forge lint --deny notes"
   },
   "dependencies": {
     "@arbitrum/nitro-contracts": "3.2.0",

package/references/operations.md

@@ -23,6 +23,6 @@
 
 ## Useful Proof Points
 
-- [`test/SuckerAttacks.t.sol`](../test/SuckerAttacks.t.sol), [`test/SuckerDeepAttacks.t.sol`](../test/SuckerDeepAttacks.t.sol), and [`test/TestAuditGaps.sol`](../test/TestAuditGaps.sol) for security-sensitive assumptions.
+- [`test/SuckerAttacks.t.sol`](../test/SuckerAttacks.t.sol), [`test/SuckerDeepAttacks.t.sol`](../test/SuckerDeepAttacks.t.sol), and [`test/TestRegressionGaps.sol`](../test/TestRegressionGaps.sol) for security-sensitive assumptions.
 - [`test/InteropCompat.t.sol`](../test/InteropCompat.t.sol) when the problem is deployment wiring rather than runtime logic.
-- [`test/unit/invariants.t.sol`](../test/unit/invariants.t.sol), [`test/unit/peer_chain_state.t.sol`](../test/unit/peer_chain_state.t.sol), and [`test/audit/PeerSnapshotDesync.t.sol`](../test/audit/PeerSnapshotDesync.t.sol) when shared accounting or snapshot boundaries are in doubt.
+- [`test/unit/invariants.t.sol`](../test/unit/invariants.t.sol), [`test/unit/peer_chain_state.t.sol`](../test/unit/peer_chain_state.t.sol), and [`test/regression/PeerSnapshotDesync.t.sol`](../test/regression/PeerSnapshotDesync.t.sol) when shared accounting or snapshot boundaries are in doubt.

package/references/runtime.md

@@ -27,4 +27,4 @@
 - [`test/ForkMainnet.t.sol`](../test/ForkMainnet.t.sol), [`test/ForkArbitrum.t.sol`](../test/ForkArbitrum.t.sol), [`test/ForkCelo.t.sol`](../test/ForkCelo.t.sol), and [`test/ForkOPStack.t.sol`](../test/ForkOPStack.t.sol) for real transport assumptions.
 - [`test/ForkSwap.t.sol`](../test/ForkSwap.t.sol), [`test/ForkClaimMainnet.t.sol`](../test/ForkClaimMainnet.t.sol), and [`test/SuckerRegressions.t.sol`](../test/SuckerRegressions.t.sol) for pinned cross-chain edge cases.
 - [`test/unit/invariants.t.sol`](../test/unit/invariants.t.sol), [`test/unit/peer_chain_state.t.sol`](../test/unit/peer_chain_state.t.sol), and [`test/unit/registry.t.sol`](../test/unit/registry.t.sol) for shared-accounting invariants.
-- [`test/SuckerAttacks.t.sol`](../test/SuckerAttacks.t.sol), [`test/SuckerDeepAttacks.t.sol`](../test/SuckerDeepAttacks.t.sol), [`test/audit/PeerSnapshotDesync.t.sol`](../test/audit/PeerSnapshotDesync.t.sol), and [`test/audit/PeerDeterminism.t.sol`](../test/audit/PeerDeterminism.t.sol) when the bug could involve base logic, registry behavior, or a specific bridge implementation.
+- [`test/SuckerAttacks.t.sol`](../test/SuckerAttacks.t.sol), [`test/SuckerDeepAttacks.t.sol`](../test/SuckerDeepAttacks.t.sol), [`test/regression/PeerSnapshotDesync.t.sol`](../test/regression/PeerSnapshotDesync.t.sol), and [`test/regression/PeerDeterminism.t.sol`](../test/regression/PeerDeterminism.t.sol) when the bug could involve base logic, registry behavior, or a specific bridge implementation.

package/src/JBArbitrumSucker.sol

@@ -127,7 +127,6 @@ contract JBArbitrumSucker is JBSucker, IJBArbitrumSucker {
         internal
     {
         address peerAddress = _peerAddress();
-        // slither-disable-next-line unused-return,calls-loop
         ARBINBOX.unsafeCreateRetryableTicket{value: callTransportCost + nativeValue}({
             to: peerAddress,
             l2CallValue: nativeValue,
@@ -144,7 +143,6 @@ contract JBArbitrumSucker is JBSucker, IJBArbitrumSucker {
     /// @param token The ERC-20 token to approve.
     /// @param amount The amount to approve.
     function _approveGateway(address token, uint256 amount) internal {
-        // slither-disable-next-line calls-loop
         SafeERC20.forceApprove({token: IERC20(token), spender: GATEWAYROUTER.getGateway(token), value: amount});
     }
 
@@ -168,10 +166,9 @@ contract JBArbitrumSucker is JBSucker, IJBArbitrumSucker {
         bytes memory data = abi.encodeCall(JBSucker.fromRemote, (message));
 
         // Depending on which layer we are on, send the call to the other layer.
-        // slither-disable-start out-of-order-retryable
         if (LAYER == JBLayer.L1) {
             // L1→L2 requires transport payment for retryable tickets.
-            if (transportPayment == 0) revert JBSucker_ExpectedMsgValue();
+            if (transportPayment == 0) revert JBSucker_ExpectedMsgValue({msgValue: transportPayment});
             _toL2({
                 token: token, transportPayment: transportPayment, amount: amount, data: data, remoteToken: remoteToken
             });
@@ -180,7 +177,6 @@ contract JBArbitrumSucker is JBSucker, IJBArbitrumSucker {
             if (transportPayment != 0) revert JBSucker_UnexpectedMsgValue(transportPayment);
             _toL1({token: token, amount: amount, data: data, remoteToken: remoteToken});
         }
-        // slither-disable-end out-of-order-retryable
     }
 
     /// @notice Bridge the `token` and data to the remote L1 chain.
@@ -208,7 +204,6 @@ contract JBArbitrumSucker is JBSucker, IJBArbitrumSucker {
             _approveGateway({token: token, amount: amount});
 
             // Convert bytes32 types to address at the Arbitrum bridge API boundary.
-            // slither-disable-next-line calls-loop,unused-return
             IArbL2GatewayRouter(address(GATEWAYROUTER))
                 .outboundTransfer({
                 l1Token: _toAddress(remoteToken.addr), to: peerAddress, amount: amount, data: bytes("")
@@ -220,7 +215,6 @@ contract JBArbitrumSucker is JBSucker, IJBArbitrumSucker {
 
         // Send the message to the peer with the reclaimed ETH.
         // Address `100` is the ArbSys precompile address.
-        // slither-disable-next-line calls-loop,unused-return
         ArbSys(address(100)).sendTxToL1{value: nativeValue}({destination: peerAddress, data: data});
     }
 
@@ -251,7 +245,6 @@ contract JBArbitrumSucker is JBSucker, IJBArbitrumSucker {
         uint256 maxSubmissionCost;
 
         {
-            // slither-disable-next-line calls-loop
             maxSubmissionCost =
                 ARBINBOX.calculateRetryableSubmissionFee({dataLength: data.length, baseFee: maxFeePerGas});
 
@@ -267,15 +260,12 @@ contract JBArbitrumSucker is JBSucker, IJBArbitrumSucker {
             {
                 // Get the exact calldata length the gateway will create for the retryable ticket.
                 // The Arbitrum Inbox validates maxSubmissionCost against this actual payload, not the user data.
-                // slither-disable-next-line calls-loop
                 address gateway = GATEWAYROUTER.getGateway(token);
-                // slither-disable-next-line calls-loop
                 uint256 outboundCalldataLength =
                     IL1ArbitrumGateway(gateway)
                 .getOutboundCalldata({
                     _token: token, _from: address(this), _to: _peerAddress(), _amount: amount, _data: bytes("")
                 }).length;
-                // slither-disable-next-line calls-loop
                 maxSubmissionCostERC20 = ARBINBOX.calculateRetryableSubmissionFee({
                     dataLength: outboundCalldataLength, baseFee: maxFeePerGas
                 });
@@ -284,7 +274,9 @@ contract JBArbitrumSucker is JBSucker, IJBArbitrumSucker {
 
             // Ensure we bridge enough for gas costs on L2 side
             if (transportPayment < callTransportCost + tokenTransportCost) {
-                revert JBArbitrumSucker_NotEnoughGas(transportPayment, callTransportCost + tokenTransportCost);
+                revert JBArbitrumSucker_NotEnoughGas({
+                    payment: transportPayment, cost: callTransportCost + tokenTransportCost
+                });
             }
 
             {
@@ -298,8 +290,6 @@ contract JBArbitrumSucker is JBSucker, IJBArbitrumSucker {
             _approveGateway({token: token, amount: amount});
 
             // Perform the ERC-20 bridge transfer. Convert bytes32 peer to address at the Arbitrum bridge API boundary.
-            // slither-disable-start out-of-order-retryable
-            // slither-disable-next-line calls-loop,unused-return
             IArbL1GatewayRouter(address(GATEWAYROUTER)).outboundTransferCustomRefund{value: tokenTransportCost}({
                 token: token,
                 refundTo: _msgSender(),
@@ -312,7 +302,7 @@ contract JBArbitrumSucker is JBSucker, IJBArbitrumSucker {
         } else {
             // Ensure we bridge enough for gas costs on L2 side
             if (transportPayment < callTransportCost) {
-                revert JBArbitrumSucker_NotEnoughGas(transportPayment, callTransportCost);
+                revert JBArbitrumSucker_NotEnoughGas({payment: transportPayment, cost: callTransportCost});
             }
 
             // If the token is the native token then we only need to do a single call.
@@ -328,7 +318,6 @@ contract JBArbitrumSucker is JBSucker, IJBArbitrumSucker {
         // The above check is the same check that makes it `safeCreateRetryableTicket`.
 
         // Convert bytes32 peer to address at the Arbitrum inbox API boundary.
-        // slither-disable-next-line calls-loop,unused-return
         _createRetryableTicket({
             callTransportCost: callTransportCost,
             nativeValue: nativeValue,
@@ -336,6 +325,5 @@ contract JBArbitrumSucker is JBSucker, IJBArbitrumSucker {
             maxFeePerGas: maxFeePerGas,
             data: data
         });
-        // slither-disable-end out-of-order-retryable
     }
 }

package/src/JBCCIPSucker.sol

@@ -163,7 +163,7 @@ contract JBCCIPSucker is JBSucker, IAny2EVMMessageReceiver {
 
         // Make sure that the message came from our peer.
         if (origin != _peerAddress() || any2EvmMessage.sourceChainSelector != REMOTE_CHAIN_SELECTOR) {
-            revert JBSucker_NotPeer(_toBytes32(origin));
+            revert JBSucker_NotPeer({caller: _toBytes32(origin)});
         }
 
         // Discriminate message type: abi.encode(uint8 type, bytes payload).
@@ -174,7 +174,7 @@ contract JBCCIPSucker is JBSucker, IAny2EVMMessageReceiver {
             // Decode the root message from the payload.
             JBMessageRoot memory root = abi.decode(payload, (JBMessageRoot));
 
-            // Only unwrap WETH -> ETH when the root targets native token (not when claiming WETH as ERC-20).
+            // Only unwrap wrapped native token when the root targets native token (not when claiming it as ERC-20).
             if (root.token == bytes32(uint256(uint160(JBConstants.NATIVE_TOKEN)))) {
                 JBCCIPLib.unwrapReceivedTokens({
                     ccipRouter: CCIP_ROUTER, destTokenAmounts: any2EvmMessage.destTokenAmounts
@@ -184,7 +184,7 @@ contract JBCCIPSucker is JBSucker, IAny2EVMMessageReceiver {
             // Forward the root message to this contract's fromRemote handler.
             this.fromRemote(root);
         } else {
-            revert JBCCIPSucker_UnknownMessageType(messageType);
+            revert JBCCIPSucker_UnknownMessageType({messageType: messageType});
         }
     }
 
@@ -224,8 +224,7 @@ contract JBCCIPSucker is JBSucker, IAny2EVMMessageReceiver {
             // Add extra gas for the ERC-20 token transfer on the remote chain.
             gasLimit += remoteToken.minGas;
 
-            // Wrap native ETH -> WETH if needed, build the CCIP token amounts array, and approve the router.
-            // slither-disable-next-line unused-return
+            // Wrap native tokens if needed, build the CCIP token amounts array, and approve the router.
             (tokenAmounts,) = JBCCIPLib.prepareTokenAmounts({ccipRouter: CCIP_ROUTER, token: token, amount: amount});
         } else {
             // No tokens to bridge — use an empty array.
@@ -239,7 +238,6 @@ contract JBCCIPSucker is JBSucker, IAny2EVMMessageReceiver {
         address feeToken = transportPayment == 0 ? CCIPHelper.linkOfChain(block.chainid) : address(0);
 
         // Build and send the CCIP message with the root payload.
-        // slither-disable-next-line reentrancy-events
         (bool refundFailed, uint256 refundAmount) = JBCCIPLib.sendCCIPMessage({
             ccipRouter: CCIP_ROUTER,
             remoteChainSelector: REMOTE_CHAIN_SELECTOR,
@@ -256,7 +254,6 @@ contract JBCCIPSucker is JBSucker, IAny2EVMMessageReceiver {
         // Retain failed refunds as caller credit instead of leaving them project-addable or stranded.
         if (refundFailed) {
             // Refund accounting is isolated per caller; reentry cannot increase the retained credit.
-            // slither-disable-next-line reentrancy-benign
             _retainTransportPaymentRefund({account: _msgSender(), amount: refundAmount});
             emit TransportPaymentRefundFailed({recipient: _msgSender(), amount: refundAmount});
         }
@@ -281,15 +278,15 @@ contract JBCCIPSucker is JBSucker, IAny2EVMMessageReceiver {
     ///
     /// Example: ETH mainnet (native = ETH) <-> Celo (native = CELO, ETH is an ERC-20).
     ///   - On mainnet: `mapToken({localToken: NATIVE_TOKEN, remoteToken: celoETH_address})`
-    ///   - Sending: `_sendRootOverAMB` wraps native ETH -> WETH, bridges WETH via CCIP.
-    ///   - Receiving: `ccipReceive` checks `root.token == NATIVE_TOKEN` to decide whether to unwrap WETH -> ETH.
+    ///   - Sending: `_sendRootOverAMB` wraps native tokens, bridges them via CCIP.
+    ///   - Receiving: `ccipReceive` checks `root.token == NATIVE_TOKEN` to decide whether to unwrap.
     ///     If `root.token` is an ERC-20 address (like celoETH), no unwrap occurs — tokens stay as ERC-20.
     ///
     /// The base class restriction (`NATIVE_TOKEN` can only map to `NATIVE_TOKEN` or `address(0)`) is intentionally
     /// removed here. The base class retains that restriction for OP/Arbitrum where both chains share ETH as native.
     function _validateTokenMapping(JBTokenMapping calldata map) internal pure virtual override {
         // Enforce a reasonable minimum gas limit for bridging. A minimum which is too low could lead to the loss of
-        // funds. CCIP wraps native tokens to WETH before bridging (see `_sendRootOverAMB`), so ALL tokens —
+        // funds. CCIP wraps native tokens before bridging (see `_sendRootOverAMB`), so ALL tokens —
         // including native — need sufficient gas for an ERC-20 transfer on the remote chain.
         if (map.minGas < MESSENGER_ERC20_MIN_GAS_LIMIT) {
             revert JBSucker_BelowMinGas({minGas: map.minGas, minGasLimit: MESSENGER_ERC20_MIN_GAS_LIMIT});

package/src/JBCeloSucker.sol

@@ -20,7 +20,7 @@ import {JBRemoteToken} from "./structs/JBRemoteToken.sol";
 import {JBTokenMapping} from "./structs/JBTokenMapping.sol";
 
 /// @notice A `JBSucker` implementation for Celo — an OP Stack chain with a custom gas token (CELO, not ETH).
-/// @dev ETH exists on Celo only as an ERC-20 (WETH). This sucker wraps native ETH → WETH before bridging
+/// @dev ETH exists on Celo only as an ERC-20. This sucker wraps native ETH before bridging
 /// as ERC-20 via the OP standard bridge, and removes the `NATIVE_TOKEN → NATIVE_TOKEN` restriction so that
 /// native ETH can map to a remote ERC-20.
 contract JBCeloSucker is JBOptimismSucker {
@@ -28,8 +28,8 @@ contract JBCeloSucker is JBOptimismSucker {
     // --------------- public immutable stored properties ---------------- //
     //*********************************************************************//
 
-    /// @notice The wrapped native token (WETH) on the local chain.
-    IWrappedNativeToken public immutable WRAPPED_NATIVE;
+    /// @notice The ERC-20 wrapper for the chain's native token on the local chain.
+    IWrappedNativeToken public immutable WRAPPED_NATIVE_TOKEN;
 
     //*********************************************************************//
     // ---------------------------- constructor -------------------------- //
@@ -53,7 +53,7 @@ contract JBCeloSucker is JBOptimismSucker {
         JBOptimismSucker(deployer, directory, permissions, prices, tokens, feeProjectId, registry, trustedForwarder)
     {
         // Fetch the wrapped native token by doing a callback to the deployer contract.
-        WRAPPED_NATIVE = JBCeloSuckerDeployer(deployer).wrappedNative();
+        WRAPPED_NATIVE_TOKEN = JBCeloSuckerDeployer(deployer).wrappedNative();
     }
 
     //*********************************************************************//
@@ -73,27 +73,26 @@ contract JBCeloSucker is JBOptimismSucker {
     // --------------------- internal transactions ----------------------- //
     //*********************************************************************//
 
-    /// @notice Unwraps WETH → native ETH before adding to the project's balance.
-    /// @dev When tokens are bridged from Celo → L1 via the OP bridge, L1 WETH (ERC-20) is released to the sucker.
-    /// But the L1 project's terminal accepts native ETH (NATIVE_TOKEN), not WETH. This override unwraps the WETH
+    /// @notice Unwraps wrapped native tokens before adding to the project's balance.
+    /// @dev When tokens are bridged from Celo → L1 via the OP bridge, wrapped native tokens (ERC-20) are released to
+    /// the sucker. But the L1 project's terminal accepts native ETH (NATIVE_TOKEN), not the wrapped form. This override
+    /// unwraps
     /// 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 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.
+        if (token == address(WRAPPED_NATIVE_TOKEN)) {
+            // Check addable amount against wrapped native token balance before unwrapping.
             uint256 addableAmount = amountToAddToBalanceOf(token);
             if (amount > addableAmount) {
                 revert JBSucker_InsufficientBalance({amount: amount, balance: addableAmount});
             }
 
-            // Unwrap WETH → native ETH.
-            // slither-disable-next-line calls-loop
-            WRAPPED_NATIVE.withdraw(amount);
+            // Unwrap wrapped native tokens → native tokens.
+            WRAPPED_NATIVE_TOKEN.withdraw(amount);
 
             // Get the project's primary terminal for native token.
-            // slither-disable-next-line calls-loop
             IJBTerminal terminal =
                 DIRECTORY.primaryTerminalOf({projectId: cachedProjectId, token: JBConstants.NATIVE_TOKEN});
 
@@ -102,7 +101,6 @@ contract JBCeloSucker is JBOptimismSucker {
             }
 
             // Add native ETH to the project's balance.
-            // slither-disable-next-line arbitrary-send-eth,calls-loop
             terminal.addToBalanceOf{value: amount}({
                 projectId: cachedProjectId,
                 token: JBConstants.NATIVE_TOKEN,
@@ -118,7 +116,7 @@ contract JBCeloSucker is JBOptimismSucker {
 
     /// @notice Use the `OPMESSENGER` to send the outbox tree for the `token` and the corresponding funds to the peer
     /// over the `OPBRIDGE`.
-    /// @dev For Celo, native ETH is wrapped to WETH and bridged as ERC-20. The messenger message is sent with
+    /// @dev For Celo, native ETH is wrapped and bridged as ERC-20. The messenger message is sent with
     /// `nativeValue = 0` because Celo's native token is CELO (not ETH), so we never attach ETH as msg.value.
     /// @param transportPayment the amount of `msg.value` that is going to get paid for sending this message.
     /// @param token The token to bridge the outbox tree for.
@@ -139,28 +137,25 @@ contract JBCeloSucker is JBOptimismSucker {
 
         // Revert if there's a `msg.value`. The OP bridge does not expect to be paid.
         if (transportPayment != 0) {
-            revert JBSucker_UnexpectedMsgValue(transportPayment);
+            revert JBSucker_UnexpectedMsgValue({value: transportPayment});
         }
 
         // Cache peer address to avoid redundant calls.
         address peerAddress = _toAddress(peer());
 
         if (amount != 0) {
-            // Determine the local token to bridge — native ETH is wrapped to WETH first.
+            // Determine the local token to bridge — native ETH is wrapped first.
             address bridgeToken = token;
             if (token == JBConstants.NATIVE_TOKEN) {
-                // Wrap native ETH → WETH so it can be bridged as ERC-20.
-                // slither-disable-next-line arbitrary-send-eth,calls-loop
-                WRAPPED_NATIVE.deposit{value: amount}();
-                bridgeToken = address(WRAPPED_NATIVE);
+                // Wrap native tokens so they can be bridged as ERC-20.
+                WRAPPED_NATIVE_TOKEN.deposit{value: amount}();
+                bridgeToken = address(WRAPPED_NATIVE_TOKEN);
             }
 
             // Approve the bridge to spend the token.
-            // slither-disable-next-line reentrancy-events
             SafeERC20.forceApprove({token: IERC20(bridgeToken), spender: address(OPBRIDGE), value: amount});
 
             // Bridge the ERC-20 token to the peer.
-            // slither-disable-next-line reentrancy-events,calls-loop
             OPBRIDGE.bridgeERC20To({
                 localToken: bridgeToken,
                 remoteToken: _toAddress(remoteToken.addr),
@@ -174,7 +169,6 @@ contract JBCeloSucker is JBOptimismSucker {
         // Send the messenger message with nativeValue = 0.
         // Celo's native token is CELO, not ETH — we never attach ETH as msg.value on the messenger.
         // On L1, the ETH was already wrapped and bridged as ERC-20 above.
-        // slither-disable-next-line reentrancy-events,calls-loop
         OPMESSENGER.sendMessage({
             target: peerAddress,
             message: abi.encodeCall(JBSucker.fromRemote, (message)),
@@ -183,11 +177,11 @@ contract JBCeloSucker is JBOptimismSucker {
     }
 
     /// @notice Allow `NATIVE_TOKEN` to map to any remote token (not just `NATIVE_TOKEN`).
-    /// @dev Celo uses CELO as native gas token. ETH is an ERC-20 on Celo (WETH). So `NATIVE_TOKEN` on L1
+    /// @dev Celo uses CELO as native gas token. ETH is an ERC-20 on Celo. So `NATIVE_TOKEN` on L1
     /// maps to an ERC-20 address on Celo, not to `NATIVE_TOKEN`. The base class restriction is removed.
     function _validateTokenMapping(JBTokenMapping calldata map) internal pure virtual override {
         // Enforce a reasonable minimum gas limit for bridging. Since we always bridge as ERC-20
-        // (wrapping native ETH to WETH), all tokens need sufficient gas for an ERC-20 transfer.
+        // (wrapping native tokens), all tokens need sufficient gas for an ERC-20 transfer.
         if (map.minGas < MESSENGER_ERC20_MIN_GAS_LIMIT) {
             revert JBSucker_BelowMinGas({minGas: map.minGas, minGasLimit: MESSENGER_ERC20_MIN_GAS_LIMIT});
         }

package/src/JBOptimismSucker.sol

@@ -105,7 +105,7 @@ contract JBOptimismSucker is JBSucker, IJBOptimismSucker {
 
         // Revert if there's a `msg.value`. The OP bridge does not expect to be paid.
         if (transportPayment != 0) {
-            revert JBSucker_UnexpectedMsgValue(transportPayment);
+            revert JBSucker_UnexpectedMsgValue({value: transportPayment});
         }
 
         // Cache peer address to avoid redundant calls.
@@ -115,11 +115,9 @@ contract JBOptimismSucker is JBSucker, IJBOptimismSucker {
         // If the amount is `0` then we do not need to bridge any ERC20.
         if (token != JBConstants.NATIVE_TOKEN && amount != 0) {
             // Approve the tokens being bridged.
-            // slither-disable-next-line reentrancy-events
             SafeERC20.forceApprove({token: IERC20(token), spender: address(OPBRIDGE), value: amount});
 
             // Bridge the tokens to the peer sucker. Convert bytes32 types to address at the OP Bridge API boundary.
-            // slither-disable-next-line reentrancy-events,calls-loop
             OPBRIDGE.bridgeERC20To({
                 localToken: token,
                 remoteToken: _toAddress(remoteToken.addr),
@@ -134,7 +132,6 @@ contract JBOptimismSucker is JBSucker, IJBOptimismSucker {
         }
 
         // Send the message to the peer with the reclaimed ETH.
-        // slither-disable-next-line arbitrary-send-eth,reentrancy-events,calls-loop
         OPMESSENGER.sendMessage{value: nativeValue}({
             target: peerAddress,
             message: abi.encodeCall(JBSucker.fromRemote, (message)),