@bananapus/suckers-v6 0.0.72 → 0.0.73

package/README.md

@@ -13,7 +13,7 @@
 - [AUDIT_INSTRUCTIONS.md](./AUDIT_INSTRUCTIONS.md) — scope, entrypoints, and reading order for security review.
 - [SKILLS.md](./SKILLS.md) — reusable patterns and gotchas distilled from this codebase.
 - [STYLE_GUIDE.md](./STYLE_GUIDE.md) — Solidity conventions used across this repo.
-- [CHANGELOG.md](./CHANGELOG.md) — versioned change history.
+- [CHANGELOG.md](./CHANGELOG.md) - V5 to V6 migration changelog.
 
 The codebase includes multiple bridge variants, but the canonical deployment and discovery tooling in this repo is narrower than the full runtime surface. Treat the deployment scripts and helper libraries as the source of truth for what is operationally supported today.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/suckers-v6",
-  "version": "0.0.72",
+  "version": "0.0.73",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -11,7 +11,8 @@
     "references/",
     "remappings.txt",
     "script/",
-    "src/"
+    "src/",
+    "!src/archive/"
   ],
   "engines": {
     "node": ">=20.0.0"
@@ -26,18 +27,18 @@
   },
   "dependencies": {
     "@arbitrum/nitro-contracts": "3.2.0",
-    "@bananapus/core-v6": "^0.0.81",
-    "@bananapus/permission-ids-v6": "^0.0.28",
+    "@bananapus/core-v6": "^0.0.82",
+    "@bananapus/permission-ids-v6": "^0.0.30",
     "@chainlink/contracts-ccip": "1.6.4",
-    "@chainlink/local": "0.2.7",
     "@openzeppelin/contracts": "5.6.1",
-    "@prb/math": "4.1.1",
-    "@uniswap/v3-core": "github:Uniswap/v3-core#6562c52e8f75f0c10f9deaf44861847585fc8129",
-    "@uniswap/v3-periphery": "github:Uniswap/v3-periphery#b325bb0905d922ae61fcc7df85ee802e8df5e96c",
+    "@prb/math": "4.1.2",
     "@uniswap/v4-core": "1.0.2",
     "solady": "0.1.26"
   },
   "devDependencies": {
+    "@chainlink/local": "0.2.9",
+    "@uniswap/v3-core": "1.0.1",
+    "@uniswap/v3-periphery": "1.4.4",
     "@sphinx-labs/plugins": "0.33.3"
   }
 }

package/src/JBSucker.sol

@@ -311,10 +311,9 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
     /// @dev A zero value preserves the default same-address deterministic peer.
     bytes32 private _peer;
 
-    /// @notice The peer chain's per-currency surplus and balance from the latest snapshot. Rebuilt in full each time a
-    /// fresher snapshot is received, so a context that dropped out of the new snapshot is simply absent — no
-    /// per-entry
-    /// versioning or clearing is needed. A read sums these and values them into the requested currency.
+    /// @notice The peer chain's per-currency surplus and balance from the latest snapshot.
+    /// @dev Rebuilt from each fresher snapshot; dropped contexts are absent without per-entry versioning or clearing.
+    /// A read sums these and values them into the requested currency.
     JBPeerChainContext[] private _peerContexts;
 
     //*********************************************************************//
@@ -645,8 +644,7 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
 
     /// @notice Configure which remote-chain tokens each local terminal token maps to, enabling (or disabling) those
     /// tokens for cross-chain bridging. Setting a remote token to `bytes32(0)` disables bridging and flushes any
-    /// pending outbox entries. Requires `MAP_SUCKER_TOKEN` permission from the project owner (or called by the
-    /// registry during deployment).
+    /// pending outbox entries. Requires `MAP_SUCKER_TOKEN` permission from the project owner or deployment registry.
     /// @param maps A list of local and remote terminal token addresses to map, and minimum amount/gas limits for
     /// bridging them.
     function mapTokens(JBTokenMapping[] calldata maps) external payable override {
@@ -705,8 +703,7 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
     ///   For EVM peers: the EVM address left-padded to 32 bytes via `_toBytes32`.
     ///   For SVM peers: the full 32-byte Solana public key.
     /// @param minTokensReclaimed The minimum amount of terminal tokens to cash out for. If the amount cashed out is
-    /// less
-    /// than this, the transaction will revert.
+    /// less than this, the transaction will revert.
     /// @param token The address of the terminal token to cash out for.
     function prepare(
         uint256 projectTokenCount,
@@ -904,9 +901,8 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
     }
 
     /// @notice The peer chain total supply bundled with the peer chain ID and snapshot freshness key.
-    /// @dev Lets aggregators (e.g. `JBSuckerRegistry`) read the value, the peer chain it belongs to, and its
-    /// freshness in one call instead of three separate staticcalls. The `value` is identical to
-    /// `peerChainTotalSupply`.
+    /// @dev Lets aggregators (e.g. `JBSuckerRegistry`) read the value, peer chain, and freshness in one call instead
+    /// of three separate staticcalls. The `value` is identical to `peerChainTotalSupply`.
     /// @return A `JBPeerChainValue` with the total supply, peer chain ID, and snapshot freshness key.
     function peerChainTotalSupplyValue() external view returns (JBPeerChainValue memory) {
         return JBPeerChainValue({
@@ -1074,8 +1070,7 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
         deployer = _msgSender();
     }
 
-    /// @notice Map an ERC-20 token on the local chain to an ERC-20 token on the remote chain, allowing that token to be
-    /// bridged.
+    /// @notice Map an ERC-20 token on the local chain to a remote-chain ERC-20 token for bridging.
     /// @param map The local and remote terminal token addresses to map, and minimum amount/gas limits for bridging
     /// them.
     function mapToken(JBTokenMapping calldata map) public payable override {
@@ -1220,8 +1215,7 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
     /// @return valid Whether the sender is the remote peer.
     function _isRemotePeer(address sender) internal virtual returns (bool valid);
 
-    /// @notice Map an ERC-20 token on the local chain to an ERC-20 token on the remote chain, allowing that token to be
-    /// bridged or disabled.
+    /// @notice Map an ERC-20 token on the local chain to a remote-chain ERC-20 token, or disable bridging.
     /// @dev Once a token has outbox tree entries (`_outboxOf[token].tree.count != 0`), it cannot be remapped to a
     /// different remote token -- it can only be disabled by mapping to `address(0)`, which triggers a final root
     /// flush to settle outstanding claims. This permanence prevents double-spending: if a remapping were allowed

package/src/JBSuckerRegistry.sol

@@ -156,8 +156,7 @@ contract JBSuckerRegistry is ERC2771Context, Ownable, JBPermissioned, IJBSuckerR
         return exists && (val == _SUCKER_EXISTS || val == _SUCKER_DEPRECATED);
     }
 
-    /// @notice Values one sucker's raw peer-chain balance into a currency, bundled with the peer chain ID and
-    /// freshness.
+    /// @notice Values one sucker's raw peer-chain balance into a currency with peer chain ID and freshness.
     /// @dev Exposed as an external self-call boundary so `totalRemoteBalanceOf` can `try` it and drop a single sucker
     /// whose price feed is missing. A context whose currency already matches `currency` folds in at par (no feed read);
     /// a missing cross-currency feed reverts, and the aggregator catches it and skips just this sucker.
@@ -206,8 +205,7 @@ contract JBSuckerRegistry is ERC2771Context, Ownable, JBPermissioned, IJBSuckerR
         return JBPeerChainValue({value: value, peerChainId: chainId, snapshotTimestamp: snapshot});
     }
 
-    /// @notice Values one sucker's raw peer-chain surplus into a currency, bundled with the peer chain ID and
-    /// freshness.
+    /// @notice Values one sucker's raw peer-chain surplus into a currency with peer chain ID and freshness.
     /// @dev Exposed as an external self-call boundary so `totalRemoteSurplusOf` can `try` it and drop a single sucker
     /// whose price feed is missing. A context whose currency already matches `currency` folds in at par (no feed read);
     /// a missing cross-currency feed reverts, and the aggregator catches it and skips just this sucker.

package/src/interfaces/IJBSucker.sol

@@ -222,8 +222,7 @@ interface IJBSucker is IERC165 {
     /// @param token The terminal token to cash out into.
     /// @param metadata Opaque caller-defined attribution payload included in the leaf hash. The sucker protocol does
     /// not inspect this value — it's covered by the merkle root, so the destination contract that consumes the claim
-    /// can
-    /// trust it once the proof verifies. Pass `bytes32(0)` for an ordinary bridge with no attribution context.
+    /// can trust it once the proof verifies. Pass `bytes32(0)` for an ordinary bridge with no attribution context.
     function prepare(
         uint256 projectTokenCount,
         bytes32 beneficiary,

package/src/interfaces/IJBSuckerRegistry.sol

@@ -62,8 +62,7 @@ interface IJBSuckerRegistry {
     /// @return The addresses of every sucker ever registered for `projectId`.
     function allSuckersOf(uint256 projectId) external view returns (address[] memory);
 
-    /// @notice Returns true if the specified sucker belongs to the specified project and was deployed through this
-    /// registry.
+    /// @notice Returns true if the specified sucker belongs to the project and was deployed through this registry.
     /// @param projectId The ID of the project to check for.
     /// @param addr The address of the sucker to check.
     /// @return Whether the sucker belongs to the project.

package/src/libraries/JBSuckerLib.sol

@@ -37,9 +37,7 @@ library JBSuckerLib {
 
     /// @notice Build the cross-chain snapshot message (total supply plus per-context surplus and balance).
     /// @dev Extracted from `JBSucker._buildSnapshotAndSend` to reduce child contract bytecode. Called via DELEGATECALL.
-    /// The snapshot performs no price-feed valuation — it carries surplus and balance per context in each context's
-    /// own
-    /// currency.
+    /// The snapshot carries each context's surplus and balance in its own currency, without price-feed valuation.
     /// @param directory The JB directory to look up controllers and terminals.
     /// @param projectId The project ID.
     /// @param remoteToken The remote token bytes32 address.
@@ -311,11 +309,10 @@ library JBSuckerLib {
     }
 
     /// @notice Builds the local accounting values used in outbound peer-chain snapshots.
-    /// @dev Project token supply stays a single currency-agnostic scalar. Surplus and balance are emitted per
-    /// accounting context in each context's own currency, with no price-feed valuation — the receiving chain folds
-    /// each
-    /// context into its same-asset local context at par. A project data hook may contribute additional supply plus its
-    /// own per-context surplus/balance, appended to the terminal contexts.
+    /// @dev Project token supply stays a single currency-agnostic scalar. Surplus and balance are emitted per context
+    /// in that context's currency, with no price-feed valuation. The receiving chain folds each context into its
+    /// same-asset local context at par. A project data hook may contribute additional supply plus its own per-context
+    /// surplus/balance, appended to the terminal contexts.
     /// @param directory The JB directory to look up controllers and terminals.
     /// @param projectId The project to snapshot.
     /// @return localTotalSupply The total project token supply, including reserved tokens.

package/src/structs/JBInboxTreeRoot.sol

@@ -2,8 +2,7 @@
 pragma solidity ^0.8.0;
 
 /// @notice The root of an inbox tree for a given token in a `JBSucker`.
-/// @dev Inbox trees are used to receive from the remote chain to the local chain. Tokens can be `claim`ed from the
-/// inbox tree.
+/// @dev Inbox trees are used to receive from the remote chain to the local chain. Tokens can be claimed from the tree.
 /// @custom:member nonce Tracks the nonce of the tree. The nonce cannot decrease.
 /// @custom:member root The root of the tree.
 struct JBInboxTreeRoot {

package/src/archive/IJBCeloSuckerDeployer.sol

@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-import {IJBOpSuckerDeployer} from "./IJBOpSuckerDeployer.sol";
-import {IWrappedNativeToken} from "./IWrappedNativeToken.sol";
-import {IOPMessenger} from "./IOPMessenger.sol";
-import {IOPStandardBridge} from "./IOPStandardBridge.sol";
-
-/// @notice Interface for a deployer of Celo-specific suckers (OP Stack with custom gas token).
-interface IJBCeloSuckerDeployer is IJBOpSuckerDeployer {
-    // View functions
-
-    /// @notice The ERC-20 wrapper for the chain's native token on the local chain.
-    function wrappedNative() external view returns (IWrappedNativeToken);
-
-    // State-changing functions
-
-    /// @notice Set the chain-specific OP messenger, bridge, and wrapped native token constants.
-    function setChainSpecificConstants(
-        IOPMessenger messenger,
-        IOPStandardBridge bridge,
-        IWrappedNativeToken wrappedNative
-    )
-        external;
-}

package/src/archive/IJBSwapCCIPSuckerDeployer.sol

@@ -1,28 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {IUniswapV3Factory} from "@uniswap/v3-core/contracts/interfaces/IUniswapV3Factory.sol";
-import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";
-
-import {IJBCCIPSuckerDeployer} from "./IJBCCIPSuckerDeployer.sol";
-
-/// @notice Interface for a deployer of swap-enabled CCIP suckers.
-/// @dev Extends the base CCIP deployer with Uniswap V3/V4 swap configuration for cross-currency bridging.
-interface IJBSwapCCIPSuckerDeployer is IJBCCIPSuckerDeployer {
-    /// @notice The ERC-20 token used for CCIP bridging (e.g., USDC — exists on both chains).
-    function bridgeToken() external view returns (IERC20);
-
-    /// @notice The Uniswap V4 PoolManager. Can be address(0) if V4 is unavailable on this chain.
-    function poolManager() external view returns (IPoolManager);
-
-    /// @notice The Uniswap V3 factory. Can be address(0) if V3 is unavailable on this chain.
-    function v3Factory() external view returns (IUniswapV3Factory);
-
-    /// @notice The Uniswap V4 hook address used during pool discovery (optional).
-    function univ4Hook() external view returns (address);
-
-    /// @notice The ERC-20 wrapper address for the chain's native token (e.g. WETH on Ethereum). Used for V3 native
-    /// swaps.
-    function wrappedNativeToken() external view returns (address);
-}

package/src/archive/JBCeloSucker.sol

@@ -1,188 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
-import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
-import {IJBTerminal} from "@bananapus/core-v6/src/interfaces/IJBTerminal.sol";
-import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
-import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-
-import {JBSucker} from "./JBSucker.sol";
-import {JBOptimismSucker} from "./JBOptimismSucker.sol";
-import {JBCeloSuckerDeployer} from "./deployers/JBCeloSuckerDeployer.sol";
-import {IJBSuckerRegistry} from "./interfaces/IJBSuckerRegistry.sol";
-import {IWrappedNativeToken} from "./interfaces/IWrappedNativeToken.sol";
-import {JBMessageRoot} from "./structs/JBMessageRoot.sol";
-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. 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 {
-    //*********************************************************************//
-    // --------------- public immutable stored properties ---------------- //
-    //*********************************************************************//
-
-    /// @notice The ERC-20 wrapper for the chain's native token on the local chain.
-    IWrappedNativeToken public immutable WRAPPED_NATIVE_TOKEN;
-
-    //*********************************************************************//
-    // ---------------------------- constructor -------------------------- //
-    //*********************************************************************//
-
-    /// @param deployer A contract that deploys clones of this contract.
-    /// @param directory A contract storing directories of terminals and controllers for each project.
-    /// @param permissions A contract storing permissions.
-    /// @param tokens A contract that manages token minting and burning.
-    constructor(
-        JBCeloSuckerDeployer deployer,
-        IJBDirectory directory,
-        IJBPermissions permissions,
-        IJBTokens tokens,
-        uint256 feeProjectId,
-        IJBSuckerRegistry registry,
-        address trustedForwarder
-    )
-        JBOptimismSucker(deployer, directory, permissions, tokens, feeProjectId, registry, trustedForwarder)
-    {
-        // Fetch the wrapped native token by doing a callback to the deployer contract.
-        WRAPPED_NATIVE_TOKEN = JBCeloSuckerDeployer(deployer).wrappedNative();
-    }
-
-    //*********************************************************************//
-    // ------------------------ external views --------------------------- //
-    //*********************************************************************//
-
-    /// @notice Returns the chain on which the peer is located.
-    /// @return chainId of the peer.
-    function peerChainId() external view virtual override returns (uint256) {
-        uint256 chainId = block.chainid;
-        if (chainId == 1) return 42_220;
-        if (chainId == 42_220) return 1;
-        return 0;
-    }
-
-    //*********************************************************************//
-    // --------------------- internal transactions ----------------------- //
-    //*********************************************************************//
-
-    /// @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_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 wrapped native tokens → native tokens.
-            WRAPPED_NATIVE_TOKEN.withdraw(amount);
-
-            // Get the project's primary terminal for native token.
-            IJBTerminal terminal =
-                DIRECTORY.primaryTerminalOf({projectId: cachedProjectId, token: JBConstants.NATIVE_TOKEN});
-
-            if (address(terminal) == address(0)) {
-                revert JBSucker_NoTerminalForToken({projectId: cachedProjectId, token: JBConstants.NATIVE_TOKEN});
-            }
-
-            // Add native ETH to the project's balance.
-            terminal.addToBalanceOf{value: amount}({
-                projectId: cachedProjectId,
-                token: JBConstants.NATIVE_TOKEN,
-                amount: amount,
-                shouldReturnHeldFees: false,
-                memo: "",
-                metadata: ""
-            });
-        } else {
-            super._addToBalance({token: token, amount: amount, cachedProjectId: cachedProjectId});
-        }
-    }
-
-    /// @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 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.
-    /// @param remoteToken Information about the remote token to bridge to.
-    // forge-lint: disable-next-line(mixed-case-function)
-    function _sendRootOverAMB(
-        uint256 transportPayment,
-        uint256 index,
-        address token,
-        uint256 amount,
-        JBRemoteToken memory remoteToken,
-        JBMessageRoot memory message
-    )
-        internal
-        override
-    {
-        index; // Silence unused parameter warning (not needed for Celo bridge).
-
-        // Revert if there's a `msg.value`. The Celo bridge does not expect to be paid.
-        if (transportPayment != 0) {
-            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 first.
-            address bridgeToken = token;
-            if (token == JBConstants.NATIVE_TOKEN) {
-                // 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.
-            SafeERC20.forceApprove({token: IERC20(bridgeToken), spender: address(OPBRIDGE), value: amount});
-
-            // Bridge the ERC-20 token to the peer.
-            OPBRIDGE.bridgeERC20To({
-                localToken: bridgeToken,
-                remoteToken: _toAddress(remoteToken.addr),
-                to: peerAddress,
-                amount: amount,
-                minGasLimit: remoteToken.minGas,
-                extraData: bytes("")
-            });
-
-            SafeERC20.forceApprove({token: IERC20(bridgeToken), spender: address(OPBRIDGE), value: 0});
-        }
-
-        // 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.
-        OPMESSENGER.sendMessage({
-            target: peerAddress,
-            message: abi.encodeCall(JBSucker.fromRemote, (message)),
-            gasLimit: MESSENGER_BASE_GAS_LIMIT
-        });
-    }
-
-    /// @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. 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 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/archive/JBCeloSuckerDeployer.sol

@@ -1,96 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.28;
-
-// External packages (alphabetized).
-import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
-import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
-import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
-
-// Local: interfaces (alphabetized).
-import {IJBCeloSuckerDeployer} from "../interfaces/IJBCeloSuckerDeployer.sol";
-import {IOPMessenger} from "../interfaces/IOPMessenger.sol";
-import {IOPStandardBridge} from "../interfaces/IOPStandardBridge.sol";
-import {IWrappedNativeToken} from "../interfaces/IWrappedNativeToken.sol";
-
-// Local: deployers.
-import {JBOptimismSuckerDeployer} from "./JBOptimismSuckerDeployer.sol";
-
-/// @notice An `IJBSuckerDeployer` implementation to deploy `JBCeloSucker` contracts.
-/// @dev Extends the OP deployer with a `wrappedNative` address for chains where ETH is an ERC-20.
-contract JBCeloSuckerDeployer is JBOptimismSuckerDeployer, IJBCeloSuckerDeployer {
-    //*********************************************************************//
-    // ---------------------- public stored properties ------------------- //
-    //*********************************************************************//
-
-    /// @notice The ERC-20 wrapper for the chain's native token on the local chain.
-    IWrappedNativeToken public override wrappedNative;
-
-    //*********************************************************************//
-    // ---------------------------- constructor -------------------------- //
-    //*********************************************************************//
-
-    /// @param directory The directory of terminals and controllers for projects.
-    /// @param permissions The permissions contract for the deployer.
-    /// @param tokens The contract that manages token minting and burning.
-    /// @param configurator The address of the configurator.
-    /// @param trustedForwarder The trusted forwarder for ERC-2771 meta-transactions.
-    constructor(
-        IJBDirectory directory,
-        IJBPermissions permissions,
-        IJBTokens tokens,
-        address configurator,
-        address trustedForwarder
-    )
-        JBOptimismSuckerDeployer(directory, permissions, tokens, configurator, trustedForwarder)
-    {}
-
-    //*********************************************************************//
-    // ------------------------ internal views --------------------------- //
-    //*********************************************************************//
-
-    /// @notice Check if the layer specific configuration is set or not. Used as a sanity check.
-    /// @return A flag indicating whether the layer specific configuration has been set.
-    function _layerSpecificConfigurationIsSet() internal view override returns (bool) {
-        return
-            address(opMessenger) != address(0) && address(opBridge) != address(0)
-                && address(wrappedNative) != address(0);
-    }
-
-    //*********************************************************************//
-    // --------------------- external transactions ----------------------- //
-    //*********************************************************************//
-
-    /// @notice Handles layer specific configuration including the wrapped native token.
-    /// @param messenger The OPMessenger on this layer.
-    /// @param bridge The OPStandardBridge on this layer.
-    /// @param _wrappedNative The ERC-20 wrapper for the chain's native token on this layer.
-    function setChainSpecificConstants(
-        IOPMessenger messenger,
-        IOPStandardBridge bridge,
-        IWrappedNativeToken _wrappedNative
-    )
-        external
-    {
-        // Make sure the layer specific configuration has not already been set.
-        if (_layerSpecificConfigurationIsSet()) {
-            revert JBSuckerDeployer_AlreadyConfigured({
-                singleton: address(singleton), layerSpecificConfigurationIsSet: true
-            });
-        }
-
-        // Make sure only the configurator can call this function.
-        if (_msgSender() != LAYER_SPECIFIC_CONFIGURATOR) {
-            revert JBSuckerDeployer_Unauthorized({caller: _msgSender(), expected: LAYER_SPECIFIC_CONFIGURATOR});
-        }
-
-        // Configure these layer specific properties.
-        opMessenger = messenger;
-        opBridge = bridge;
-        wrappedNative = _wrappedNative;
-
-        // Make sure the layer specific configuration is properly configured.
-        if (!_layerSpecificConfigurationIsSet()) {
-            revert JBSuckerDeployer_InvalidLayerSpecificConfiguration({configurator: LAYER_SPECIFIC_CONFIGURATOR});
-        }
-    }
-}

package/src/archive/JBConversionRate.sol

@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-/// @notice Immutable conversion rate for one received root batch, keyed by nonce.
-/// @dev Each batch stores its total leaf and local amounts. Individual claims compute their scaled amount as
-/// `claimLeafAmount * localTotal / leafTotal` — no mutable state changes.
-/// @custom:member leafTotal Total leaf-denomination (source chain) amount for this batch.
-/// @custom:member localTotal Total local-denomination (after swap) amount for this batch.
-struct JBConversionRate {
-    uint256 leafTotal;
-    uint256 localTotal;
-}

package/src/archive/JBPendingSwap.sol

@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-/// @notice Bridge tokens from a failed inbound swap, stored for later retry via `retrySwap`.
-/// @custom:member bridgeToken The bridge token received from CCIP.
-/// @custom:member bridgeAmount Amount of bridge tokens to swap.
-/// @custom:member leafTotal Original leaf-denomination total (for conversion rate).
-struct JBPendingSwap {
-    address bridgeToken;
-    uint256 bridgeAmount;
-    uint256 leafTotal;
-}