@bananapus/suckers-v6 0.0.48 → 0.0.49

package/src/interfaces/IJBSuckerRegistry.sol

@@ -77,13 +77,15 @@ interface IJBSuckerRegistry {
     function suckersOf(uint256 projectId) external view returns (address[] memory);
 
     /// @notice The cumulative total supply across all remote peer chains for a project.
-    /// @dev Sums `peerChainTotalSupply` from each active sucker. Silently skips suckers that revert.
+    /// @dev Dedupes same-peer active suckers by freshest snapshot, then sums peer-chain values. Silently skips suckers
+    /// that revert.
     /// @param projectId The ID of the project.
     /// @return totalSupply The combined peer chain total supply.
     function remoteTotalSupplyOf(uint256 projectId) external view returns (uint256 totalSupply);
 
     /// @notice The cumulative balance across all remote peer chains for a project, denominated in a given currency.
-    /// @dev Sums `peerChainBalanceOf` from each active sucker. Silently skips suckers that revert.
+    /// @dev Dedupes same-peer active suckers by freshest snapshot, then sums peer-chain values. Silently skips suckers
+    /// that revert.
     /// @param projectId The ID of the project.
     /// @param decimals The decimal precision for the returned value.
     /// @param currency The currency to normalize to.
@@ -98,7 +100,8 @@ interface IJBSuckerRegistry {
         returns (uint256 balance);
 
     /// @notice The cumulative surplus across all remote peer chains for a project, denominated in a given currency.
-    /// @dev Sums `peerChainSurplusOf` from each active sucker. Silently skips suckers that revert.
+    /// @dev Dedupes same-peer active suckers by freshest snapshot, then sums peer-chain values. Silently skips suckers
+    /// that revert.
     /// @param projectId The ID of the project.
     /// @param decimals The decimal precision for the returned value.
     /// @param currency The currency to normalize to.

package/src/libraries/CCIPHelper.sol

@@ -133,6 +133,70 @@ library CCIPHelper {
     /// @notice The wrapped native token address for Tempo mod chain.
     address public constant TEMPO_MOD_WETH = 0xbb2D3310E4232085d432A2e04b2Ac09c46F634E4;
 
+    /// @notice Returns the LINK token address for a given chain ID.
+    /// @param chainId The EVM chain ID to look up.
+    /// @return link The LINK token address.
+    function linkOfChain(uint256 chainId) public pure returns (address link) {
+        if (chainId == ETH_ID) {
+            return ETH_LINK;
+        } else if (chainId == OP_ID) {
+            return OP_LINK;
+        } else if (chainId == ARB_ID) {
+            return ARB_LINK;
+        } else if (chainId == BASE_ID) {
+            return BASE_LINK;
+        } else if (chainId == ETH_SEP_ID) {
+            return ETH_SEP_LINK;
+        } else if (chainId == OP_SEP_ID) {
+            return OP_SEP_LINK;
+        } else if (chainId == ARB_SEP_ID) {
+            return ARB_SEP_LINK;
+        } else if (chainId == BASE_SEP_ID) {
+            return BASE_SEP_LINK;
+        } else if (chainId == TEMPO_ID) {
+            return TEMPO_LINK;
+        } else if (chainId == TEMPO_MOD_ID) {
+            return TEMPO_MOD_LINK;
+        } else {
+            revert CCIPHelper_UnsupportedChain({chainId: chainId});
+        }
+    }
+
+    /// @notice Returns the wrapped native token address for a given chain ID.
+    /// @param chainId The EVM chain ID to look up.
+    /// @return weth The wrapped native token address.
+    function wethOfChain(uint256 chainId) public pure returns (address weth) {
+        if (chainId == ETH_ID) {
+            return ETH_WETH;
+        } else if (chainId == OP_ID) {
+            return OP_WETH;
+        } else if (chainId == ARB_ID) {
+            return ARB_WETH;
+        } else if (chainId == POLY_ID) {
+            return POLY_WETH;
+        } else if (chainId == AVA_ID) {
+            return AVA_WETH;
+        } else if (chainId == BNB_ID) {
+            return BNB_WETH;
+        } else if (chainId == BASE_ID) {
+            return BASE_WETH;
+        } else if (chainId == ETH_SEP_ID) {
+            return ETH_SEP_WETH;
+        } else if (chainId == ARB_SEP_ID) {
+            return ARB_SEP_WETH;
+        } else if (chainId == OP_SEP_ID) {
+            return OP_SEP_WETH;
+        } else if (chainId == BASE_SEP_ID) {
+            return BASE_SEP_WETH;
+        } else if (chainId == TEMPO_ID) {
+            return TEMPO_WETH;
+        } else if (chainId == TEMPO_MOD_ID) {
+            return TEMPO_MOD_WETH;
+        } else {
+            revert CCIPHelper_UnsupportedChain({chainId: chainId});
+        }
+    }
+
     /// @notice Returns the CCIP router address for a given chain ID.
     /// @param chainId The EVM chain ID to look up.
     /// @return router The CCIP router address.
@@ -202,68 +266,4 @@ library CCIPHelper {
             revert CCIPHelper_UnsupportedChain({chainId: chainId});
         }
     }
-
-    /// @notice Returns the wrapped native token address for a given chain ID.
-    /// @param chainId The EVM chain ID to look up.
-    /// @return weth The wrapped native token address.
-    function wethOfChain(uint256 chainId) public pure returns (address weth) {
-        if (chainId == ETH_ID) {
-            return ETH_WETH;
-        } else if (chainId == OP_ID) {
-            return OP_WETH;
-        } else if (chainId == ARB_ID) {
-            return ARB_WETH;
-        } else if (chainId == POLY_ID) {
-            return POLY_WETH;
-        } else if (chainId == AVA_ID) {
-            return AVA_WETH;
-        } else if (chainId == BNB_ID) {
-            return BNB_WETH;
-        } else if (chainId == BASE_ID) {
-            return BASE_WETH;
-        } else if (chainId == ETH_SEP_ID) {
-            return ETH_SEP_WETH;
-        } else if (chainId == ARB_SEP_ID) {
-            return ARB_SEP_WETH;
-        } else if (chainId == OP_SEP_ID) {
-            return OP_SEP_WETH;
-        } else if (chainId == BASE_SEP_ID) {
-            return BASE_SEP_WETH;
-        } else if (chainId == TEMPO_ID) {
-            return TEMPO_WETH;
-        } else if (chainId == TEMPO_MOD_ID) {
-            return TEMPO_MOD_WETH;
-        } else {
-            revert CCIPHelper_UnsupportedChain({chainId: chainId});
-        }
-    }
-
-    /// @notice Returns the LINK token address for a given chain ID.
-    /// @param chainId The EVM chain ID to look up.
-    /// @return link The LINK token address.
-    function linkOfChain(uint256 chainId) public pure returns (address link) {
-        if (chainId == ETH_ID) {
-            return ETH_LINK;
-        } else if (chainId == OP_ID) {
-            return OP_LINK;
-        } else if (chainId == ARB_ID) {
-            return ARB_LINK;
-        } else if (chainId == BASE_ID) {
-            return BASE_LINK;
-        } else if (chainId == ETH_SEP_ID) {
-            return ETH_SEP_LINK;
-        } else if (chainId == OP_SEP_ID) {
-            return OP_SEP_LINK;
-        } else if (chainId == ARB_SEP_ID) {
-            return ARB_SEP_LINK;
-        } else if (chainId == BASE_SEP_ID) {
-            return BASE_SEP_LINK;
-        } else if (chainId == TEMPO_ID) {
-            return TEMPO_LINK;
-        } else if (chainId == TEMPO_MOD_ID) {
-            return TEMPO_MOD_LINK;
-        } else {
-            revert CCIPHelper_UnsupportedChain({chainId: chainId});
-        }
-    }
 }

package/src/libraries/JBCCIPLib.sol

@@ -133,10 +133,15 @@ library JBCCIPLib {
             SafeERC20.forceApprove({token: IERC20(feeToken), spender: router, value: totalApproval});
 
             ICCIPRouter(router).ccipSend({destinationChainSelector: chainSel, message: message});
+
+            _clearTokenAmountApprovals({router: router, tokenAmounts: tokenAmounts});
+            SafeERC20.forceApprove({token: IERC20(feeToken), spender: router, value: 0});
         } else {
             // Native ETH fee path.
             ICCIPRouter(router).ccipSend{value: fees}({destinationChainSelector: chainSel, message: message});
 
+            _clearTokenAmountApprovals({router: router, tokenAmounts: tokenAmounts});
+
             // Calculate the excess transport payment to refund.
             refundAmount = transportPayment - fees;
 
@@ -189,4 +194,17 @@ library JBCCIPLib {
         // ABI-decode the type and payload from the raw data.
         (messageType, payload) = abi.decode(data, (uint8, bytes));
     }
+
+    //*********************************************************************//
+    // ----------------------- private helpers --------------------------- //
+    //*********************************************************************//
+
+    /// @notice Clear token approvals granted to the CCIP router for the current message.
+    /// @param router The CCIP router whose allowances should be revoked.
+    /// @param tokenAmounts The bridged token amounts approved for this message.
+    function _clearTokenAmountApprovals(address router, Client.EVMTokenAmount[] memory tokenAmounts) private {
+        for (uint256 i; i < tokenAmounts.length; i++) {
+            SafeERC20.forceApprove({token: IERC20(tokenAmounts[i].token), spender: router, value: 0});
+        }
+    }
 }

package/src/libraries/JBSuckerLib.sol

@@ -38,6 +38,56 @@ library JBSuckerLib {
     /// @notice The ETH decimal precision used for cross-chain peer snapshots.
     uint8 internal constant _ETH_DECIMALS = 18;
 
+    //*********************************************************************//
+    // ---------------------- external transactions ---------------------- //
+    //*********************************************************************//
+
+    /// @notice Build the cross-chain snapshot message (total supply, surplus, balance).
+    /// @dev Extracted from `JBSucker._buildSnapshotAndSend` to reduce child contract bytecode.
+    /// Called via DELEGATECALL. Includes ETH aggregate computation inline (cannot call own external fns).
+    /// @param directory The JB directory to look up controllers and terminals.
+    /// @param prices The price oracle to use for non-ETH terminal-token balances.
+    /// @param projectId The project ID.
+    /// @param remoteToken The remote token bytes32 address.
+    /// @param amount The amount of terminal tokens to bridge.
+    /// @param nonce The outbox nonce for this send.
+    /// @param root The merkle root of the outbox tree.
+    /// @param messageVersion The message format version.
+    /// @param sourceTimestamp The monotonic source freshness key for this snapshot.
+    /// @return message The constructed JBMessageRoot.
+    function buildSnapshotMessage(
+        IJBDirectory directory,
+        IJBPrices prices,
+        uint256 projectId,
+        bytes32 remoteToken,
+        uint256 amount,
+        uint64 nonce,
+        bytes32 root,
+        uint8 messageVersion,
+        uint256 sourceTimestamp
+    )
+        external
+        view
+        returns (JBMessageRoot memory message)
+    {
+        (uint256 localTotalSupply, uint256 ethSurplus, uint256 ethBalance) =
+            _snapshotAccountsOf({directory: directory, prices: prices, projectId: projectId});
+
+        // Construct the cross-chain message with the snapshot data.
+        message = JBMessageRoot({
+            version: messageVersion,
+            token: remoteToken,
+            amount: amount,
+            remoteRoot: JBInboxTreeRoot({nonce: nonce, root: root}),
+            sourceTotalSupply: localTotalSupply,
+            sourceCurrency: JBCurrencyIds.ETH,
+            sourceDecimals: _ETH_DECIMALS,
+            sourceSurplus: ethSurplus,
+            sourceBalance: ethBalance,
+            sourceTimestamp: sourceTimestamp
+        });
+    }
+
     //*********************************************************************//
     // ------------------------- external views -------------------------- //
     //*********************************************************************//
@@ -61,8 +111,114 @@ library JBSuckerLib {
         return _buildETHAggregateInternal({directory: directory, projectId: projectId, prices: prices});
     }
 
+    /// @notice Compute a branch root from a leaf, branch, and index. Wraps MerkleLib.branchRoot so its
+    /// ~170 lines of unrolled assembly live in the library's bytecode instead of each sucker's.
+    /// @param item The leaf hash.
+    /// @param branch The 32-element merkle proof branch.
+    /// @param index The leaf index.
+    /// @return The computed merkle root.
+    function computeBranchRoot(bytes32 item, bytes32[32] memory branch, uint256 index) external pure returns (bytes32) {
+        // Delegate to MerkleLib's unrolled assembly implementation.
+        return MerkleLib.branchRoot({item: item, branch: branch, index: index});
+    }
+
+    /// @notice Compute the merkle tree root from branch and count. Loop-based replacement for the unrolled
+    /// MerkleLib.root() — saves ~3KB per sucker when called via DELEGATECALL instead of inlining.
+    /// @param branch The 32-element branch array (caller copies from storage to memory).
+    /// @param count The number of leaves inserted into the tree.
+    /// @return current The merkle root.
+    function computeTreeRoot(bytes32[32] memory branch, uint256 count) external pure returns (bytes32 current) {
+        // An empty tree has a well-known root.
+        if (count == 0) return MerkleLib.Z_32;
+
+        // solhint-disable-next-line no-inline-assembly
+        assembly ("memory-safe") {
+            // Build zero hashes on-the-fly: Z[0] = 0, Z[i+1] = keccak256(Z[i], Z[i]).
+            let zPtr := mload(0x40)
+            mstore(0x40, add(zPtr, 0x420)) // 33 slots × 32 bytes
+            mstore(zPtr, 0) // Z[0] = bytes32(0)
+            for { let j := 0 } lt(j, 32) { j := add(j, 1) } {
+                let prev := mload(add(zPtr, mul(j, 0x20)))
+                mstore(0x00, prev)
+                mstore(0x20, prev)
+                mstore(add(zPtr, mul(add(j, 1), 0x20)), keccak256(0x00, 0x40))
+            }
+
+            // Walk bits of `count` from LSB to MSB.
+            // First set bit → initialize current = keccak256(branch[i], Z[i]).
+            // Each subsequent level → merge branch[i] or Z[i] with current.
+            let started := 0
+            for { let i := 0 } lt(i, 32) { i := add(i, 1) } {
+                switch started
+                case 0 {
+                    if and(count, shl(i, 1)) {
+                        mstore(0x00, mload(add(branch, mul(i, 0x20))))
+                        mstore(0x20, mload(add(zPtr, mul(i, 0x20))))
+                        current := keccak256(0x00, 0x40)
+                        started := 1
+                    }
+                }
+                default {
+                    switch and(count, shl(i, 1))
+                    case 0 {
+                        mstore(0x00, current)
+                        mstore(0x20, mload(add(zPtr, mul(i, 0x20))))
+                    }
+                    default {
+                        mstore(0x00, mload(add(branch, mul(i, 0x20))))
+                        mstore(0x20, current)
+                    }
+                    current := keccak256(0x00, 0x40)
+                }
+            }
+        }
+    }
+
+    /// @notice Convert a peer chain snapshot value to the requested currency and decimal precision.
+    /// @param prices The price oracle to use when currency conversion is needed.
+    /// @param projectId The project ID.
+    /// @param source The peer chain snapshot containing value, currency, and decimals.
+    /// @param decimals The target decimal precision.
+    /// @param currency The target currency.
+    /// @return converted The converted value.
+    function convertPeerValue(
+        IJBPrices prices,
+        uint256 projectId,
+        JBDenominatedAmount memory source,
+        uint256 decimals,
+        uint256 currency
+    )
+        external
+        view
+        returns (uint256 converted)
+    {
+        // Nothing to convert if the source value is zero.
+        if (source.value == 0) return 0;
+
+        // If the source currency matches the target, just adjust decimals.
+        // forge-lint: disable-next-line(unsafe-typecast)
+        if (source.currency == uint32(currency)) {
+            converted = JBFixedPointNumber.adjustDecimals({
+                value: source.value, decimals: source.decimals, targetDecimals: decimals
+            });
+        } else {
+            // Convert using the price oracle.
+            try prices.pricePerUnitOf({
+                projectId: projectId,
+                pricingCurrency: source.currency,
+                // forge-lint: disable-next-line(unsafe-typecast)
+                unitCurrency: uint32(currency),
+                decimals: source.decimals
+            }) returns (
+                uint256 price
+            ) {
+                converted = mulDiv({x: source.value, y: 10 ** decimals, denominator: price});
+            } catch {}
+        }
+    }
+
     //*********************************************************************//
-    // ----------------------- internal helpers -------------------------- //
+    // ------------------------- internal views -------------------------- //
     //*********************************************************************//
 
     /// @dev Shared implementation for ETH aggregate. Internal so it can be called from other
@@ -151,49 +307,6 @@ library JBSuckerLib {
         }
     }
 
-    /// @notice Convert a peer chain snapshot value to the requested currency and decimal precision.
-    /// @param prices The price oracle to use when currency conversion is needed.
-    /// @param projectId The project ID.
-    /// @param source The peer chain snapshot containing value, currency, and decimals.
-    /// @param decimals The target decimal precision.
-    /// @param currency The target currency.
-    /// @return converted The converted value.
-    function convertPeerValue(
-        IJBPrices prices,
-        uint256 projectId,
-        JBDenominatedAmount memory source,
-        uint256 decimals,
-        uint256 currency
-    )
-        external
-        view
-        returns (uint256 converted)
-    {
-        // Nothing to convert if the source value is zero.
-        if (source.value == 0) return 0;
-
-        // If the source currency matches the target, just adjust decimals.
-        // forge-lint: disable-next-line(unsafe-typecast)
-        if (source.currency == uint32(currency)) {
-            converted = JBFixedPointNumber.adjustDecimals({
-                value: source.value, decimals: source.decimals, targetDecimals: decimals
-            });
-        } else {
-            // Convert using the price oracle.
-            try prices.pricePerUnitOf({
-                projectId: projectId,
-                pricingCurrency: source.currency,
-                // forge-lint: disable-next-line(unsafe-typecast)
-                unitCurrency: uint32(currency),
-                decimals: source.decimals
-            }) returns (
-                uint256 price
-            ) {
-                converted = mulDiv({x: source.value, y: 10 ** decimals, denominator: price});
-            } catch {}
-        }
-    }
-
     /// @notice Return the project's controller if it exists and advertises the controller interface.
     /// @param directory The JB directory to look up the controller.
     /// @param projectId The project ID.
@@ -208,56 +321,6 @@ library JBSuckerLib {
         } catch {}
     }
 
-    //*********************************************************************//
-    // -------------------- external state-changing ---------------------- //
-    //*********************************************************************//
-
-    /// @notice Build the cross-chain snapshot message (total supply, surplus, balance).
-    /// @dev Extracted from `JBSucker._buildSnapshotAndSend` to reduce child contract bytecode.
-    /// Called via DELEGATECALL. Includes ETH aggregate computation inline (cannot call own external fns).
-    /// @param directory The JB directory to look up controllers and terminals.
-    /// @param prices The price oracle to use for non-ETH terminal-token balances.
-    /// @param projectId The project ID.
-    /// @param remoteToken The remote token bytes32 address.
-    /// @param amount The amount of terminal tokens to bridge.
-    /// @param nonce The outbox nonce for this send.
-    /// @param root The merkle root of the outbox tree.
-    /// @param messageVersion The message format version.
-    /// @param sourceTimestamp The monotonic source freshness key for this snapshot.
-    /// @return message The constructed JBMessageRoot.
-    function buildSnapshotMessage(
-        IJBDirectory directory,
-        IJBPrices prices,
-        uint256 projectId,
-        bytes32 remoteToken,
-        uint256 amount,
-        uint64 nonce,
-        bytes32 root,
-        uint8 messageVersion,
-        uint256 sourceTimestamp
-    )
-        external
-        view
-        returns (JBMessageRoot memory message)
-    {
-        (uint256 localTotalSupply, uint256 ethSurplus, uint256 ethBalance) =
-            _snapshotAccountsOf({directory: directory, prices: prices, projectId: projectId});
-
-        // Construct the cross-chain message with the snapshot data.
-        message = JBMessageRoot({
-            version: messageVersion,
-            token: remoteToken,
-            amount: amount,
-            remoteRoot: JBInboxTreeRoot({nonce: nonce, root: root}),
-            sourceTotalSupply: localTotalSupply,
-            sourceCurrency: JBCurrencyIds.ETH,
-            sourceDecimals: _ETH_DECIMALS,
-            sourceSurplus: ethSurplus,
-            sourceBalance: ethBalance,
-            sourceTimestamp: sourceTimestamp
-        });
-    }
-
     /// @notice Optional project-specific adjusted accounts to add to peer-chain snapshots.
     /// @dev Reads the current ruleset's data hook and asks it for extra supply/surplus. Non-supporting hooks,
     /// broken hooks, and short return data are ignored so a project's baseline snapshot remains usable.
@@ -337,71 +400,4 @@ library JBSuckerLib {
             ethBalance += additionalBalance;
         }
     }
-
-    //*********************************************************************//
-    // -------------------- merkle tree helpers -------------------------- //
-    //*********************************************************************//
-
-    /// @notice Compute the merkle tree root from branch and count. Loop-based replacement for the unrolled
-    /// MerkleLib.root() — saves ~3KB per sucker when called via DELEGATECALL instead of inlining.
-    /// @param branch The 32-element branch array (caller copies from storage to memory).
-    /// @param count The number of leaves inserted into the tree.
-    /// @return current The merkle root.
-    function computeTreeRoot(bytes32[32] memory branch, uint256 count) external pure returns (bytes32 current) {
-        // An empty tree has a well-known root.
-        if (count == 0) return MerkleLib.Z_32;
-
-        // solhint-disable-next-line no-inline-assembly
-        assembly ("memory-safe") {
-            // Build zero hashes on-the-fly: Z[0] = 0, Z[i+1] = keccak256(Z[i], Z[i]).
-            let zPtr := mload(0x40)
-            mstore(0x40, add(zPtr, 0x420)) // 33 slots × 32 bytes
-            mstore(zPtr, 0) // Z[0] = bytes32(0)
-            for { let j := 0 } lt(j, 32) { j := add(j, 1) } {
-                let prev := mload(add(zPtr, mul(j, 0x20)))
-                mstore(0x00, prev)
-                mstore(0x20, prev)
-                mstore(add(zPtr, mul(add(j, 1), 0x20)), keccak256(0x00, 0x40))
-            }
-
-            // Walk bits of `count` from LSB to MSB.
-            // First set bit → initialize current = keccak256(branch[i], Z[i]).
-            // Each subsequent level → merge branch[i] or Z[i] with current.
-            let started := 0
-            for { let i := 0 } lt(i, 32) { i := add(i, 1) } {
-                switch started
-                case 0 {
-                    if and(count, shl(i, 1)) {
-                        mstore(0x00, mload(add(branch, mul(i, 0x20))))
-                        mstore(0x20, mload(add(zPtr, mul(i, 0x20))))
-                        current := keccak256(0x00, 0x40)
-                        started := 1
-                    }
-                }
-                default {
-                    switch and(count, shl(i, 1))
-                    case 0 {
-                        mstore(0x00, current)
-                        mstore(0x20, mload(add(zPtr, mul(i, 0x20))))
-                    }
-                    default {
-                        mstore(0x00, mload(add(branch, mul(i, 0x20))))
-                        mstore(0x20, current)
-                    }
-                    current := keccak256(0x00, 0x40)
-                }
-            }
-        }
-    }
-
-    /// @notice Compute a branch root from a leaf, branch, and index. Wraps MerkleLib.branchRoot so its
-    /// ~170 lines of unrolled assembly live in the library's bytecode instead of each sucker's.
-    /// @param item The leaf hash.
-    /// @param branch The 32-element merkle proof branch.
-    /// @param index The leaf index.
-    /// @return The computed merkle root.
-    function computeBranchRoot(bytes32 item, bytes32[32] memory branch, uint256 index) external pure returns (bytes32) {
-        // Delegate to MerkleLib's unrolled assembly implementation.
-        return MerkleLib.branchRoot({item: item, branch: branch, index: index});
-    }
 }