@bananapus/suckers-v6 0.0.53 → 0.0.55

package/package.json

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

package/src/JBCCIPSucker.sol

@@ -49,7 +49,8 @@ contract JBCCIPSucker is JBSucker, IAny2EVMMessageReceiver {
     /// committing the bridge message.
     /// @param recipient The address that was supposed to receive the refund.
     /// @param amount The amount of the failed refund.
-    event TransportPaymentRefundFailed(address indexed recipient, uint256 amount);
+    /// @param caller The address that triggered the CCIP send.
+    event TransportPaymentRefundFailed(address indexed recipient, uint256 amount, address caller);
 
     //*********************************************************************//
     // ----------------------- internal constants ------------------------ //
@@ -255,7 +256,7 @@ contract JBCCIPSucker is JBSucker, IAny2EVMMessageReceiver {
         if (refundFailed) {
             // Refund accounting is isolated per caller; reentry cannot increase the retained credit.
             _retainTransportPaymentRefund({account: _msgSender(), amount: refundAmount});
-            emit TransportPaymentRefundFailed({recipient: _msgSender(), amount: refundAmount});
+            emit TransportPaymentRefundFailed({recipient: _msgSender(), amount: refundAmount, caller: _msgSender()});
         }
     }
 

package/src/JBSucker.sol

@@ -446,7 +446,9 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
         } else {
             // Emit an event when a root is rejected due to a stale (non-increasing) nonce.
             // This aids off-chain monitoring in detecting out-of-order or duplicate deliveries.
-            emit StaleRootRejected({token: localToken, receivedNonce: root.remoteRoot.nonce, currentNonce: inbox.nonce});
+            emit StaleRootRejected({
+                token: localToken, receivedNonce: root.remoteRoot.nonce, currentNonce: inbox.nonce, caller: _msgSender()
+            });
         }
 
         // --- Project-wide shared state update (gated by source freshness key) ---
@@ -1590,7 +1592,7 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
     function _retainToRemoteFee(address account, uint256 amount) internal {
         retainedToRemoteFeeOf[account] += amount;
         retainedToRemoteFeeBalance += amount;
-        emit RetainedToRemoteFee({account: account, amount: amount});
+        emit RetainedToRemoteFee({account: account, amount: amount, caller: _msgSender()});
     }
 
     /// @notice Retains a failed transport-payment refund as account-scoped native credit.
@@ -1599,7 +1601,7 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
     function _retainTransportPaymentRefund(address account, uint256 amount) internal {
         retainedTransportPaymentRefundOf[account] += amount;
         retainedTransportPaymentRefundBalance += amount;
-        emit RetainedTransportPaymentRefund({account: account, amount: amount});
+        emit RetainedTransportPaymentRefund({account: account, amount: amount, caller: _msgSender()});
     }
 
     /// @notice Returns the peer address as an EVM address.

package/src/JBSuckerRegistry.sol

@@ -500,8 +500,13 @@ contract JBSuckerRegistry is ERC2771Context, Ownable, JBPermissioned, IJBSuckerR
         override
         returns (address[] memory suckers)
     {
+        // Cache the project owner so deployment and explicit-peer authorization are both checked against the same
+        // project authority, not a delegated operator.
+        address projectOwner = PROJECTS.ownerOf(projectId);
+
+        // `DEPLOY_SUCKERS` authorizes creating suckers and applying their launch-time token mappings.
         _requirePermissionFrom({
-            account: PROJECTS.ownerOf(projectId), projectId: projectId, permissionId: JBPermissionIds.DEPLOY_SUCKERS
+            account: projectOwner, projectId: projectId, permissionId: JBPermissionIds.DEPLOY_SUCKERS
         });
 
         // Create an array to store the suckers as they are deployed.
@@ -516,16 +521,9 @@ contract JBSuckerRegistry is ERC2771Context, Ownable, JBPermissioned, IJBSuckerR
         // default peer symmetry assumption will not hold.
         salt = keccak256(abi.encode(sender, salt));
 
-        // Cache the project owner so the explicit-peer gate can check against the original authority, not a
-        // delegated operator. The default same-address peering invariant (peer == 0 or peer == address(this))
-        // does not need this stronger gate, but a non-symmetric explicit peer authorizes that arbitrary address
-        // to deliver outbox roots and mint project tokens — so it must require a permission strictly broader
-        // than ops automation's `DEPLOY_SUCKERS`.
-        address projectOwner = PROJECTS.ownerOf(projectId);
-
         // Iterate through the configurations and deploy the suckers.
         for (uint256 i; i < configurations.length;) {
-            // Get the configuration being iterated over.
+            // Copy the configuration once because its deployer, peer, mappings, and event payload are all reused below.
             JBSuckerDeployerConfig memory configuration = configurations[i];
 
             // Make sure the deployer is allowed.
@@ -533,13 +531,11 @@ contract JBSuckerRegistry is ERC2771Context, Ownable, JBPermissioned, IJBSuckerR
                 revert JBSuckerRegistry_InvalidDeployer({deployer: configuration.deployer});
             }
 
-            // If the configuration specifies a non-symmetric explicit peer, require the additional
-            // `SET_SUCKER_PEER` permission. Default peering (peer == 0 or peer == bytes32 of address(this)) is
-            // unaffected. Without this gate, a delegated operator with only `DEPLOY_SUCKERS` could register an
-            // attacker peer and use the resulting sucker's mint authority to deliver fabricated outbox roots.
-            // forge-lint: disable-next-line(unsafe-typecast)
-            bytes32 selfPeer = bytes32(uint256(uint160(address(this))));
-            if (configuration.peer != bytes32(0) && configuration.peer != selfPeer) {
+            // `peer == 0` tells the sucker to use its own clone address as the deterministic same-address peer, so the
+            // deploy permission is enough for that default path.
+            // Every nonzero value is an explicit remote authority, including this registry's address.
+            if (configuration.peer != bytes32(0)) {
+                // Only a caller with `SET_SUCKER_PEER` may choose that explicit remote authority.
                 _requirePermissionFrom({
                     account: projectOwner, projectId: projectId, permissionId: JBPermissionIds.SET_SUCKER_PEER
                 });

package/src/JBSwapCCIPSucker.sol

@@ -106,7 +106,10 @@ contract JBSwapCCIPSucker is JBCCIPSucker, IUnlockCallback, IUniswapV3SwapCallba
     /// @param nonce The nonce of the batch whose swap was retried.
     /// @param bridgeAmount The amount of bridge tokens that were swapped.
     /// @param localAmount The amount of local tokens received from the retry swap.
-    event SwapRetried(address indexed localToken, uint64 indexed nonce, uint256 bridgeAmount, uint256 localAmount);
+    /// @param caller The address that retried the swap.
+    event SwapRetried(
+        address indexed localToken, uint64 indexed nonce, uint256 bridgeAmount, uint256 localAmount, address caller
+    );
 
     //*********************************************************************//
     // --------------- public immutable stored properties ---------------- //
@@ -510,7 +513,11 @@ contract JBSwapCCIPSucker is JBCCIPSucker, IUnlockCallback, IUniswapV3SwapCallba
 
         _retrySwapLocked = false;
         emit SwapRetried({
-            localToken: localToken, nonce: nonce, bridgeAmount: pending.bridgeAmount, localAmount: localAmount
+            localToken: localToken,
+            nonce: nonce,
+            bridgeAmount: pending.bridgeAmount,
+            localAmount: localAmount,
+            caller: _msgSender()
         });
     }
 
@@ -643,7 +650,7 @@ contract JBSwapCCIPSucker is JBCCIPSucker, IUnlockCallback, IUniswapV3SwapCallba
 
             if (refundFailed) {
                 _retainTransportPaymentRefund({account: _msgSender(), amount: refundAmount});
-                emit TransportPaymentRefundFailed({recipient: _msgSender(), amount: refundAmount});
+                emit TransportPaymentRefundFailed({recipient: _msgSender(), amount: refundAmount, caller: _msgSender()});
             }
         }
     }

package/src/interfaces/IJBSucker.sol

@@ -74,7 +74,8 @@ interface IJBSucker is IERC165 {
     /// @param token The terminal token address.
     /// @param receivedNonce The nonce of the rejected root.
     /// @param currentNonce The current nonce that was expected.
-    event StaleRootRejected(address indexed token, uint64 receivedNonce, uint64 currentNonce);
+    /// @param caller The address that relayed the stale root.
+    event StaleRootRejected(address indexed token, uint64 receivedNonce, uint64 currentNonce, address caller);
 
     // View functions
 

package/src/interfaces/IJBSuckerExtended.sol

@@ -34,12 +34,14 @@ interface IJBSuckerExtended is IJBSucker {
     /// @notice Emitted when a failed `toRemoteFee` payment is retained for later refund.
     /// @param account The account that can reclaim the retained fee.
     /// @param amount The retained fee amount.
-    event RetainedToRemoteFee(address indexed account, uint256 amount);
+    /// @param caller The address that caused the fee to be retained.
+    event RetainedToRemoteFee(address indexed account, uint256 amount, address caller);
 
     /// @notice Emitted when a failed transport-payment refund is retained for later refund.
     /// @param account The account that can reclaim the retained refund.
     /// @param amount The retained refund amount.
-    event RetainedTransportPaymentRefund(address indexed account, uint256 amount);
+    /// @param caller The address that caused the refund to be retained.
+    event RetainedTransportPaymentRefund(address indexed account, uint256 amount, address caller);
 
     /// @notice Emitted when an account claims retained `toRemoteFee` ETH.
     /// @param account The account whose retained fee balance was claimed.