@bananapus/suckers-v6 0.0.54 → 0.0.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/suckers-v6",
-  "version": "0.0.54",
+  "version": "0.0.56",
   "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/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.

package/src/libraries/JBSwapPoolLib.sol

@@ -271,6 +271,13 @@ library JBSwapPoolLib {
                 amountOut = uint256(uint128(delta0));
             }
 
+            // Exact-input V4 swaps are encoded with a negative amount.
+            // forge-lint: disable-next-line(unsafe-typecast)
+            uint256 requestedAmount = uint256(-amountSpecified);
+            if (amountIn < requestedAmount) {
+                revert JBSwapPoolLib_PartialFill({consumed: amountIn, requested: requestedAmount});
+            }
+
             // Enforce the minimum output from the TWAP quote.
             if (amountOut < minAmountOut) {
                 revert JBSwapPoolLib_SlippageExceeded({amountOut: amountOut, minAmountOut: minAmountOut});