@croptop/core-v6 0.0.8 → 0.0.11

package/src/CTDeployer.sol

@@ -1,21 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import {JBPermissioned} from "@bananapus/core-v6/src/abstract/JBPermissioned.sol";
-import {IJBRulesetDataHook} from "@bananapus/core-v6/src/interfaces/IJBRulesetDataHook.sol";
-import {IJBSuckerRegistry} from "@bananapus/suckers-v6/src/interfaces/IJBSuckerRegistry.sol";
-import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
-import {JBBeforePayRecordedContext} from "@bananapus/core-v6/src/structs/JBBeforePayRecordedContext.sol";
-import {JBCashOutHookSpecification} from "@bananapus/core-v6/src/structs/JBCashOutHookSpecification.sol";
-import {JBPayHookSpecification} from "@bananapus/core-v6/src/structs/JBPayHookSpecification.sol";
-import {JBBeforeCashOutRecordedContext} from "@bananapus/core-v6/src/structs/JBBeforeCashOutRecordedContext.sol";
-import {JBPermissionsData} from "@bananapus/core-v6/src/structs/JBPermissionsData.sol";
-import {JBRuleset} from "@bananapus/core-v6/src/structs/JBRuleset.sol";
-import {JBRulesetConfig} from "@bananapus/core-v6/src/structs/JBRulesetConfig.sol";
-import {JBOwnable} from "@bananapus/ownable-v6/src/JBOwnable.sol";
-import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
+import {ERC2771Context} from "@openzeppelin/contracts/metatx/ERC2771Context.sol";
+import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 import {Context} from "@openzeppelin/contracts/utils/Context.sol";
-
 import {IJB721TiersHook} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHook.sol";
 import {IJB721TiersHookDeployer} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHookDeployer.sol";
 import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";
@@ -24,20 +12,31 @@ import {JB721TierConfig} from "@bananapus/721-hook-v6/src/structs/JB721TierConfi
 import {JB721TiersHookFlags} from "@bananapus/721-hook-v6/src/structs/JB721TiersHookFlags.sol";
 import {JBDeploy721TiersHookConfig} from "@bananapus/721-hook-v6/src/structs/JBDeploy721TiersHookConfig.sol";
 import {JBLaunchProjectConfig} from "@bananapus/721-hook-v6/src/structs/JBLaunchProjectConfig.sol";
+import {JBPermissioned} from "@bananapus/core-v6/src/abstract/JBPermissioned.sol";
 import {IJBController} from "@bananapus/core-v6/src/interfaces/IJBController.sol";
+import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
 import {IJBProjects} from "@bananapus/core-v6/src/interfaces/IJBProjects.sol";
+import {IJBRulesetDataHook} from "@bananapus/core-v6/src/interfaces/IJBRulesetDataHook.sol";
+import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
 import {JBCurrencyIds} from "@bananapus/core-v6/src/libraries/JBCurrencyIds.sol";
+import {JBBeforeCashOutRecordedContext} from "@bananapus/core-v6/src/structs/JBBeforeCashOutRecordedContext.sol";
+import {JBBeforePayRecordedContext} from "@bananapus/core-v6/src/structs/JBBeforePayRecordedContext.sol";
+import {JBCashOutHookSpecification} from "@bananapus/core-v6/src/structs/JBCashOutHookSpecification.sol";
+import {JBPayHookSpecification} from "@bananapus/core-v6/src/structs/JBPayHookSpecification.sol";
+import {JBPermissionsData} from "@bananapus/core-v6/src/structs/JBPermissionsData.sol";
+import {JBRuleset} from "@bananapus/core-v6/src/structs/JBRuleset.sol";
+import {JBRulesetConfig} from "@bananapus/core-v6/src/structs/JBRulesetConfig.sol";
 import {JBTerminalConfig} from "@bananapus/core-v6/src/structs/JBTerminalConfig.sol";
-import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
-import {ERC2771Context} from "@openzeppelin/contracts/metatx/ERC2771Context.sol";
+import {JBOwnable} from "@bananapus/ownable-v6/src/JBOwnable.sol";
 import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
+import {IJBSuckerRegistry} from "@bananapus/suckers-v6/src/interfaces/IJBSuckerRegistry.sol";
 
 import {ICTDeployer} from "./interfaces/ICTDeployer.sol";
 import {ICTPublisher} from "./interfaces/ICTPublisher.sol";
 import {CTAllowedPost} from "./structs/CTAllowedPost.sol";
-import {CTSuckerDeploymentConfig} from "./structs/CTSuckerDeploymentConfig.sol";
 import {CTDeployerAllowedPost} from "./structs/CTDeployerAllowedPost.sol";
 import {CTProjectConfig} from "./structs/CTProjectConfig.sol";
+import {CTSuckerDeploymentConfig} from "./structs/CTSuckerDeploymentConfig.sol";
 
 /// @notice A contract that facilitates deploying a simple Juicebox project to receive posts from Croptop templates.
 contract CTDeployer is ERC2771Context, JBPermissioned, IJBRulesetDataHook, IERC721Receiver, ICTDeployer {
@@ -124,24 +123,6 @@ contract CTDeployer is ERC2771Context, JBPermissioned, IJBRulesetDataHook, IERC7
     // ------------------------- external views -------------------------- //
     //*********************************************************************//
 
-    /// @notice Forward the call to the original data hook.
-    /// @dev This function is part of `IJBRulesetDataHook`, and gets called before the revnet processes a payment.
-    /// @param context Standard Juicebox payment context. See `JBBeforePayRecordedContext`.
-    /// @return weight The weight which project tokens are minted relative to. This can be used to customize how many
-    /// tokens get minted by a payment.
-    /// @return hookSpecifications Amounts (out of what's being paid in) to be sent to pay hooks instead of being paid
-    /// into the project. Useful for automatically routing funds from a treasury as payments come in.
-    function beforePayRecordedWith(JBBeforePayRecordedContext calldata context)
-        external
-        view
-        override
-        returns (uint256 weight, JBPayHookSpecification[] memory hookSpecifications)
-    {
-        // Forward the call to the data hook.
-        // slither-disable-next-line unused-return
-        return dataHookOf[context.projectId].beforePayRecordedWith(context);
-    }
-
     /// @notice Allow cash outs from suckers without a tax.
     /// @dev This function is part of `IJBRulesetDataHook`, and gets called before the revnet processes a cash out.
     /// @param context Standard Juicebox cash out context. See `JBBeforeCashOutRecordedContext`.
@@ -171,6 +152,24 @@ contract CTDeployer is ERC2771Context, JBPermissioned, IJBRulesetDataHook, IERC7
         return dataHookOf[context.projectId].beforeCashOutRecordedWith(context);
     }
 
+    /// @notice Forward the call to the original data hook.
+    /// @dev This function is part of `IJBRulesetDataHook`, and gets called before the revnet processes a payment.
+    /// @param context Standard Juicebox payment context. See `JBBeforePayRecordedContext`.
+    /// @return weight The weight which project tokens are minted relative to. This can be used to customize how many
+    /// tokens get minted by a payment.
+    /// @return hookSpecifications Amounts (out of what's being paid in) to be sent to pay hooks instead of being paid
+    /// into the project. Useful for automatically routing funds from a treasury as payments come in.
+    function beforePayRecordedWith(JBBeforePayRecordedContext calldata context)
+        external
+        view
+        override
+        returns (uint256 weight, JBPayHookSpecification[] memory hookSpecifications)
+    {
+        // Forward the call to the data hook.
+        // slither-disable-next-line unused-return
+        return dataHookOf[context.projectId].beforePayRecordedWith(context);
+    }
+
     /// @notice A flag indicating whether an address has permission to mint a project's tokens on-demand.
     /// @dev A project's data hook can allow any address to mint its tokens.
     /// @param projectId The ID of the project whose token can be minted.
@@ -219,6 +218,21 @@ contract CTDeployer is ERC2771Context, JBPermissioned, IJBRulesetDataHook, IERC7
     // ---------------------- external transactions ---------------------- //
     //*********************************************************************//
 
+    /// @notice Claim ownership of the collection.
+    /// @param hook The hook to claim ownership of.
+    function claimCollectionOwnershipOf(IJB721TiersHook hook) external override {
+        // Get the project ID of the hook.
+        uint256 projectId = hook.PROJECT_ID();
+
+        // Make sure the caller is the owner of the project.
+        if (PROJECTS.ownerOf(projectId) != _msgSender()) {
+            revert CTDeployer_NotOwnerOfProject(projectId, address(hook), _msgSender());
+        }
+
+        // Transfer the hook's ownership to the project.
+        JBOwnable(address(hook)).transferOwnershipToProject(projectId);
+    }
+
     /// @notice Deploy a simple project meant to receive posts from Croptop templates.
     /// @param owner The address that'll own the project.
     /// @param projectConfig The configuration for the project.
@@ -266,7 +280,8 @@ contract CTDeployer is ERC2771Context, JBPermissioned, IJBRulesetDataHook, IERC7
                     noNewTiersWithReserves: false,
                     noNewTiersWithVotes: false,
                     noNewTiersWithOwnerMinting: false,
-                    preventOverspending: false
+                    preventOverspending: false,
+                    issueTokensForSplits: false
                 })
             }),
             salt: keccak256(abi.encode(projectConfig.salt, _msgSender()))
@@ -325,21 +340,6 @@ contract CTDeployer is ERC2771Context, JBPermissioned, IJBRulesetDataHook, IERC7
         });
     }
 
-    /// @notice Claim ownership of the collection.
-    /// @param hook The hook to claim ownership of.
-    function claimCollectionOwnershipOf(IJB721TiersHook hook) external override {
-        // Get the project ID of the hook.
-        uint256 projectId = hook.PROJECT_ID();
-
-        // Make sure the caller is the owner of the project.
-        if (PROJECTS.ownerOf(projectId) != _msgSender()) {
-            revert CTDeployer_NotOwnerOfProject(projectId, address(hook), _msgSender());
-        }
-
-        // Transfer the hook's ownership to the project.
-        JBOwnable(address(hook)).transferOwnershipToProject(projectId);
-    }
-
     /// @notice Deploy new suckers for an existing project.
     /// @dev Only the juicebox's owner can deploy new suckers.
     /// @param projectId The ID of the project to deploy suckers for.
@@ -407,6 +407,11 @@ contract CTDeployer is ERC2771Context, JBPermissioned, IJBRulesetDataHook, IERC7
     // ------------------------ internal functions ----------------------- //
     //*********************************************************************//
 
+    /// @dev ERC-2771 specifies the context as being a single address (20 bytes).
+    function _contextSuffixLength() internal view virtual override(ERC2771Context, Context) returns (uint256) {
+        return ERC2771Context._contextSuffixLength();
+    }
+
     /// @notice The calldata. Preferred to use over `msg.data`.
     /// @return calldata The `msg.data` of this call.
     function _msgData() internal view override(ERC2771Context, Context) returns (bytes calldata) {
@@ -418,9 +423,4 @@ contract CTDeployer is ERC2771Context, JBPermissioned, IJBRulesetDataHook, IERC7
     function _msgSender() internal view override(ERC2771Context, Context) returns (address sender) {
         return ERC2771Context._msgSender();
     }
-
-    /// @dev ERC-2771 specifies the context as being a single address (20 bytes).
-    function _contextSuffixLength() internal view virtual override(ERC2771Context, Context) returns (uint256) {
-        return ERC2771Context._contextSuffixLength();
-    }
 }

package/src/CTProjectOwner.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
+import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
 import {IJBProjects} from "@bananapus/core-v6/src/interfaces/IJBProjects.sol";
 import {JBPermissionsData} from "@bananapus/core-v6/src/structs/JBPermissionsData.sol";
 import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
-import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 
 import {ICTProjectOwner} from "./interfaces/ICTProjectOwner.sol";
 import {ICTPublisher} from "./interfaces/ICTPublisher.sol";

package/src/CTPublisher.sol

@@ -1,21 +1,21 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
+import {ERC2771Context} from "@openzeppelin/contracts/metatx/ERC2771Context.sol";
+import {Context} from "@openzeppelin/contracts/utils/Context.sol";
 import {IJB721TiersHook} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHook.sol";
 import {IJB721TiersHookStore} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHookStore.sol";
 import {JB721Tier} from "@bananapus/721-hook-v6/src/structs/JB721Tier.sol";
 import {JB721TierConfig} from "@bananapus/721-hook-v6/src/structs/JB721TierConfig.sol";
-import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
 import {JBPermissioned} from "@bananapus/core-v6/src/abstract/JBPermissioned.sol";
 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 {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
 import {JBMetadataResolver} from "@bananapus/core-v6/src/libraries/JBMetadataResolver.sol";
+import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
 import {JBOwnable} from "@bananapus/ownable-v6/src/JBOwnable.sol";
 import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
-import {ERC2771Context} from "@openzeppelin/contracts/metatx/ERC2771Context.sol";
-import {Context} from "@openzeppelin/contracts/utils/Context.sol";
 
 import {ICTPublisher} from "./interfaces/ICTPublisher.sol";
 import {CTAllowedPost} from "./structs/CTAllowedPost.sol";
@@ -27,6 +27,7 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
     // --------------------------- custom errors ------------------------- //
     //*********************************************************************//
 
+    error CTPublisher_DuplicatePost(bytes32 encodedIPFSUri);
     error CTPublisher_EmptyEncodedIPFSUri();
     error CTPublisher_InsufficientEthSent(uint256 expected, uint256 sent);
     error CTPublisher_MaxTotalSupplyLessThanMin(uint256 min, uint256 max);
@@ -449,6 +450,13 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
                 revert CTPublisher_EmptyEncodedIPFSUri();
             }
 
+            // Check for duplicate encodedIPFSUri within the same batch to prevent fee evasion.
+            for (uint256 j; j < i; j++) {
+                if (posts[j].encodedIPFSUri == post.encodedIPFSUri) {
+                    revert CTPublisher_DuplicatePost(post.encodedIPFSUri);
+                }
+            }
+
             // Scoped section to prevent stack too deep.
             {
                 // Check if there's an ID of a tier already minted for this encodedIPFSUri.

package/src/interfaces/ICTDeployer.sol

@@ -5,24 +5,28 @@ import {IJB721TiersHook} from "@bananapus/721-hook-v6/src/interfaces/IJB721Tiers
 import {IJB721TiersHookDeployer} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHookDeployer.sol";
 import {IJBController} from "@bananapus/core-v6/src/interfaces/IJBController.sol";
 import {IJBProjects} from "@bananapus/core-v6/src/interfaces/IJBProjects.sol";
-
-import {ICTPublisher} from "./ICTPublisher.sol";
-import {CTSuckerDeploymentConfig} from "../structs/CTSuckerDeploymentConfig.sol";
 import {CTProjectConfig} from "../structs/CTProjectConfig.sol";
+import {CTSuckerDeploymentConfig} from "../structs/CTSuckerDeploymentConfig.sol";
+import {ICTPublisher} from "./ICTPublisher.sol";
 
+/// @notice Deploys Croptop-configured Juicebox projects with tiered ERC-721 hooks.
 interface ICTDeployer {
-    /// @notice The contract that mints ERC-721s representing Juicebox project ownership.
-    /// @return The projects contract.
-    function PROJECTS() external view returns (IJBProjects);
-
     /// @notice The deployer used to launch tiered ERC-721 hook collections.
     /// @return The hook deployer contract.
     function DEPLOYER() external view returns (IJB721TiersHookDeployer);
 
+    /// @notice The contract that mints ERC-721s representing Juicebox project ownership.
+    /// @return The projects contract.
+    function PROJECTS() external view returns (IJBProjects);
+
     /// @notice The Croptop publisher that manages posting criteria and minting.
     /// @return The publisher contract.
     function PUBLISHER() external view returns (ICTPublisher);
 
+    /// @notice Claim ownership of a tiered ERC-721 hook collection by transferring it to the project.
+    /// @param hook The hook to claim ownership of. The caller must own the project the hook belongs to.
+    function claimCollectionOwnershipOf(IJB721TiersHook hook) external;
+
     /// @notice Deploy a simple Juicebox project configured to receive posts from Croptop templates.
     /// @param owner The address that will own the project after deployment.
     /// @param projectConfig The configuration for the project, including name, symbol, and allowed posts.
@@ -39,10 +43,6 @@ interface ICTDeployer {
         external
         returns (uint256 projectId, IJB721TiersHook hook);
 
-    /// @notice Claim ownership of a tiered ERC-721 hook collection by transferring it to the project.
-    /// @param hook The hook to claim ownership of. The caller must own the project the hook belongs to.
-    function claimCollectionOwnershipOf(IJB721TiersHook hook) external;
-
     /// @notice Deploy new suckers for an existing project.
     /// @param projectId The ID of the project to deploy suckers for.
     /// @param suckerDeploymentConfiguration The suckers to set up for the project.

package/src/interfaces/ICTProjectOwner.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.0;
 
 import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
 import {IJBProjects} from "@bananapus/core-v6/src/interfaces/IJBProjects.sol";
-
 import {ICTPublisher} from "./ICTPublisher.sol";
 
 /// @notice A contract that can receive a Juicebox project NFT (via `safeTransferFrom`) and automatically grants the

package/src/interfaces/ICTPublisher.sol

@@ -4,12 +4,26 @@ pragma solidity ^0.8.0;
 import {IJB721TiersHook} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHook.sol";
 import {JB721Tier} from "@bananapus/721-hook-v6/src/structs/JB721Tier.sol";
 import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
-
 import {CTAllowedPost} from "../structs/CTAllowedPost.sol";
 import {CTPost} from "../structs/CTPost.sol";
 
+/// @notice Manages posting criteria and mints NFTs for Croptop projects.
 interface ICTPublisher {
+    /// @notice Emitted when posting criteria are configured for a hook.
+    /// @param hook The hook address the criteria apply to.
+    /// @param allowedPost The allowed post criteria that were configured.
+    /// @param caller The address that configured the criteria.
     event ConfigurePostingCriteria(address indexed hook, CTAllowedPost allowedPost, address caller);
+
+    /// @notice Emitted when NFT posts are minted.
+    /// @param projectId The ID of the project the posts belong to.
+    /// @param hook The tiered ERC-721 hook the posts were minted from.
+    /// @param nftBeneficiary The address that received the minted NFTs.
+    /// @param feeBeneficiary The address that received fee project tokens.
+    /// @param posts The posts that were minted.
+    /// @param postValue The total value of the posts.
+    /// @param txValue The total value sent with the transaction.
+    /// @param caller The address that minted the posts.
     event Mint(
         uint256 indexed projectId,
         IJB721TiersHook indexed hook,
@@ -21,24 +35,6 @@ interface ICTPublisher {
         address caller
     );
 
-    /// @notice The divisor that describes the fee percent. Equal to 100 divided by the fee percent.
-    /// @return The fee divisor.
-    function FEE_DIVISOR() external view returns (uint256);
-
-    /// @notice The directory that contains the projects being posted to.
-    /// @return The directory contract.
-    function DIRECTORY() external view returns (IJBDirectory);
-
-    /// @notice The ID of the project to which fees will be routed.
-    /// @return The fee project ID.
-    function FEE_PROJECT_ID() external view returns (uint256);
-
-    /// @notice The tier ID that an IPFS metadata URI has been saved to for a given hook.
-    /// @param hook The hook for which the tier ID applies.
-    /// @param encodedIPFSUri The encoded IPFS URI to look up.
-    /// @return The tier ID, or 0 if the URI has not been published.
-    function tierIdForEncodedIPFSUriOf(address hook, bytes32 encodedIPFSUri) external view returns (uint256);
-
     /// @notice The post allowance for a particular category on a particular hook.
     /// @param hook The hook contract for which this allowance applies.
     /// @param category The category for which this allowance applies.
@@ -61,6 +57,24 @@ interface ICTPublisher {
             address[] memory allowedAddresses
         );
 
+    /// @notice The directory that contains the projects being posted to.
+    /// @return The directory contract.
+    function DIRECTORY() external view returns (IJBDirectory);
+
+    /// @notice The divisor that describes the fee percent. Equal to 100 divided by the fee percent.
+    /// @return The fee divisor.
+    function FEE_DIVISOR() external view returns (uint256);
+
+    /// @notice The ID of the project to which fees will be routed.
+    /// @return The fee project ID.
+    function FEE_PROJECT_ID() external view returns (uint256);
+
+    /// @notice The tier ID that an IPFS metadata URI has been saved to for a given hook.
+    /// @param hook The hook for which the tier ID applies.
+    /// @param encodedIPFSUri The encoded IPFS URI to look up.
+    /// @return The tier ID, or 0 if the URI has not been published.
+    function tierIdForEncodedIPFSUriOf(address hook, bytes32 encodedIPFSUri) external view returns (uint256);
+
     /// @notice Get the tiers for the provided encoded IPFS URIs.
     /// @param hook The hook from which to get tiers.
     /// @param encodedIPFSUris The URIs to get tiers of.

package/test/Fork.t.sol

@@ -1,58 +1,107 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
-import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
-import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
+import "forge-std/Test.sol";
 
-import "./../src/CTDeployer.sol";
+// JB core — deploy fresh within fork.
+import {JBPermissions} from "@bananapus/core-v6/src/JBPermissions.sol";
+import {JBProjects} from "@bananapus/core-v6/src/JBProjects.sol";
+import {JBDirectory} from "@bananapus/core-v6/src/JBDirectory.sol";
+import {JBRulesets} from "@bananapus/core-v6/src/JBRulesets.sol";
+import {JBTokens} from "@bananapus/core-v6/src/JBTokens.sol";
+import {JBERC20} from "@bananapus/core-v6/src/JBERC20.sol";
+import {JBSplits} from "@bananapus/core-v6/src/JBSplits.sol";
+import {JBPrices} from "@bananapus/core-v6/src/JBPrices.sol";
+import {JBController} from "@bananapus/core-v6/src/JBController.sol";
+import {JBFundAccessLimits} from "@bananapus/core-v6/src/JBFundAccessLimits.sol";
 import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
+
+// 721 hook — deploy fresh within fork.
+import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStore.sol";
+import {JB721TiersHook} from "@bananapus/721-hook-v6/src/JB721TiersHook.sol";
+import {JB721TiersHookDeployer} from "@bananapus/721-hook-v6/src/JB721TiersHookDeployer.sol";
+import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
+
+// Suckers — deploy fresh within fork.
+import {JBSuckerRegistry} from "@bananapus/suckers-v6/src/JBSuckerRegistry.sol";
+import {JBOptimismSuckerDeployer} from "@bananapus/suckers-v6/src/deployers/JBOptimismSuckerDeployer.sol";
+import {JBOptimismSucker} from "@bananapus/suckers-v6/src/JBOptimismSucker.sol";
+import {JBAddToBalanceMode} from "@bananapus/suckers-v6/src/enums/JBAddToBalanceMode.sol";
+import {IOPMessenger} from "@bananapus/suckers-v6/src/interfaces/IOPMessenger.sol";
+import {IOPStandardBridge} from "@bananapus/suckers-v6/src/interfaces/IOPStandardBridge.sol";
 import {JBSuckerDeployerConfig} from "@bananapus/suckers-v6/src/structs/JBSuckerDeployerConfig.sol";
 import {JBTokenMapping} from "@bananapus/suckers-v6/src/structs/JBTokenMapping.sol";
-import {CTProjectOwner} from "./../src/CTProjectOwner.sol";
-import {CTPublisher} from "./../src/CTPublisher.sol";
+import {IJBSuckerDeployer} from "@bananapus/suckers-v6/src/interfaces/IJBSuckerDeployer.sol";
 
-import "forge-std/Test.sol";
+// Croptop — wildcard import pulls in all structs (CTProjectConfig, CTDeployerAllowedPost, etc.).
+import "./../src/CTDeployer.sol";
+import {CTPublisher} from "./../src/CTPublisher.sol";
 
+/// @notice Fork tests for Croptop. Deploys all JB infrastructure fresh within a mainnet fork.
 contract ForkTest is Test {
-    /// @notice tracks the deployment of the core contracts for the chain we are deploying to.
-    CoreDeployment core;
-    /// @notice tracks the deployment of the 721 hook contracts for the chain we are deploying to.
-    Hook721Deployment hook;
-    /// @notice tracks the deployment of the sucker contracts for the chain we are deploying to.
-    SuckerDeployment suckers;
+    // ───────────────────────── Mainnet addresses
+    // ──────────────────────────
+
+    // OP L1 bridge contracts (exist on Ethereum mainnet).
+    IOPMessenger constant OP_L1_MESSENGER = IOPMessenger(0x25ace71c97B33Cc4729CF772ae268934F7ab5fA1);
+    IOPStandardBridge constant OP_L1_BRIDGE = IOPStandardBridge(0x99C9fc46f92E8a1c0deC1b1747d010903E884bE1);
+
+    // ───────────────────────── JB core (deployed fresh)
+    // ───────────────────
+
+    address multisig = address(0xBEEF);
+    address trustedForwarder = address(0);
+
+    JBPermissions jbPermissions;
+    JBProjects jbProjects;
+    JBDirectory jbDirectory;
+    JBRulesets jbRulesets;
+    JBTokens jbTokens;
+    JBSplits jbSplits;
+    JBPrices jbPrices;
+    JBFundAccessLimits jbFundAccessLimits;
+    JBController jbController;
+
+    // ───────────────────────── 721 hook (deployed fresh)
+    // ──────────────────
+
+    JB721TiersHookDeployer hookDeployer;
+
+    // ───────────────────────── Suckers (deployed fresh)
+    // ───────────────────
+
+    JBSuckerRegistry suckerRegistry;
+    JBOptimismSuckerDeployer opSuckerDeployer;
+
+    // ───────────────────────── Croptop
+    // ────────────────────────────────────
 
     CTPublisher publisher;
     CTDeployer deployer;
 
-    address TRUSTED_FORWARDER;
-
     function setUp() public {
+        // Skip fork tests when the RPC URL is not available (e.g. in CI).
+        string memory rpcUrl = vm.envOr("RPC_ETHEREUM_MAINNET", string(""));
+        if (bytes(rpcUrl).length == 0) {
+            vm.skip(true);
+            return;
+        }
+
         // Fork ETH mainnet.
-        vm.createSelectFork(vm.rpcUrl("ethereum"), 22_432_742);
+        vm.createSelectFork(rpcUrl);
 
-        // Get the deployment addresses for the nana CORE for this chain.
-        // We want to do this outside of the `sphinx` modifier.
-        core = CoreDeploymentLib.getDeployment(
-            vm.envOr("NANA_CORE_DEPLOYMENT_PATH", string("node_modules/@bananapus/core-v6/deployments/"))
-        );
-        // Get the deployment addresses for the 721 hook contracts for this chain.
-        hook = Hook721DeploymentLib.getDeployment(
-            vm.envOr("NANA_721_DEPLOYMENT_PATH", string("node_modules/@bananapus/721-hook-v6/deployments/"))
-        );
-        // Get the deployment addresses for the suckers contracts for this chain.
-        suckers = SuckerDeploymentLib.getDeployment(
-            vm.envOr("NANA_SUCKERS_DEPLOYMENT_PATH", string("node_modules/@bananapus/suckers-v6/deployments/"))
-        );
+        // Deploy all JB core contracts fresh within the fork.
+        _deployJBCore();
+
+        // Deploy the 721 hook infrastructure.
+        _deploy721Hook();
 
-        // We use the same trusted forwarder as the core deployment.
-        TRUSTED_FORWARDER = core.controller.trustedForwarder();
+        // Deploy the sucker infrastructure.
+        _deploySuckers();
 
         // Deploy the croptop contracts.
-        publisher = new CTPublisher(core.directory, core.permissions, 1, TRUSTED_FORWARDER);
-        deployer = new CTDeployer(
-            core.permissions, core.projects, hook.hook_deployer, publisher, suckers.registry, TRUSTED_FORWARDER
-        );
+        publisher = new CTPublisher(jbDirectory, jbPermissions, 1, trustedForwarder);
+        deployer = new CTDeployer(jbPermissions, jbProjects, hookDeployer, publisher, suckerRegistry, trustedForwarder);
     }
 
     function testDeployProject(address owner) public {
@@ -72,7 +121,7 @@ contract ForkTest is Test {
         CTSuckerDeploymentConfig memory suckerConfig =
             CTSuckerDeploymentConfig({deployerConfigurations: new JBSuckerDeployerConfig[](0), salt: bytes32(0)});
 
-        deployer.deployProjectFor(owner, config, suckerConfig, core.controller);
+        deployer.deployProjectFor(owner, config, suckerConfig, jbController);
     }
 
     function testDeployProjectWithSuckers(address owner, bytes32 salt, bytes32 suckerSalt) public {
@@ -100,15 +149,79 @@ contract ForkTest is Test {
         });
 
         JBSuckerDeployerConfig[] memory deployerConfigurations = new JBSuckerDeployerConfig[](1);
-        deployerConfigurations[0] = JBSuckerDeployerConfig({deployer: suckers.optimismDeployer, mappings: tokens});
+        deployerConfigurations[0] =
+            JBSuckerDeployerConfig({deployer: IJBSuckerDeployer(address(opSuckerDeployer)), mappings: tokens});
 
         CTSuckerDeploymentConfig memory suckerConfig =
             CTSuckerDeploymentConfig({deployerConfigurations: deployerConfigurations, salt: suckerSalt});
 
         // Deploy the project.
-        (uint256 projectId,) = deployer.deployProjectFor(owner, config, suckerConfig, core.controller);
+        (uint256 projectId,) = deployer.deployProjectFor(owner, config, suckerConfig, jbController);
 
         // Check that the projectId has a sucker.
-        assertEq(suckers.registry.suckersOf(projectId).length, deployerConfigurations.length);
+        assertEq(suckerRegistry.suckersOf(projectId).length, deployerConfigurations.length);
+    }
+
+    // ───────────────────────── Internal deployment helpers
+    // ────────────────
+
+    function _deployJBCore() internal {
+        jbPermissions = new JBPermissions(trustedForwarder);
+        jbProjects = new JBProjects(multisig, address(0), trustedForwarder);
+        jbDirectory = new JBDirectory(jbPermissions, jbProjects, multisig);
+        JBERC20 jbErc20 = new JBERC20();
+        jbTokens = new JBTokens(jbDirectory, jbErc20);
+        jbRulesets = new JBRulesets(jbDirectory);
+        jbPrices = new JBPrices(jbDirectory, jbPermissions, jbProjects, multisig, trustedForwarder);
+        jbSplits = new JBSplits(jbDirectory);
+        jbFundAccessLimits = new JBFundAccessLimits(jbDirectory);
+
+        jbController = new JBController(
+            jbDirectory,
+            jbFundAccessLimits,
+            jbPermissions,
+            jbPrices,
+            jbProjects,
+            jbRulesets,
+            jbSplits,
+            jbTokens,
+            address(0), // omnichainRulesetOperator
+            trustedForwarder
+        );
+
+        vm.prank(multisig);
+        jbDirectory.setIsAllowedToSetFirstController(address(jbController), true);
+    }
+
+    function _deploy721Hook() internal {
+        JB721TiersHookStore store = new JB721TiersHookStore();
+        JBAddressRegistry addressRegistry = new JBAddressRegistry();
+
+        JB721TiersHook hookImpl =
+            new JB721TiersHook(jbDirectory, jbPermissions, jbRulesets, store, jbSplits, trustedForwarder);
+
+        hookDeployer = new JB721TiersHookDeployer(hookImpl, store, addressRegistry, trustedForwarder);
+    }
+
+    function _deploySuckers() internal {
+        suckerRegistry = new JBSuckerRegistry(jbDirectory, jbPermissions, multisig, trustedForwarder);
+
+        // Deploy the OP sucker deployer with `multisig` as the configurator.
+        opSuckerDeployer =
+            new JBOptimismSuckerDeployer(jbDirectory, jbPermissions, jbTokens, multisig, trustedForwarder);
+
+        // Configure the OP sucker deployer with L1 bridge addresses.
+        vm.startPrank(multisig);
+        opSuckerDeployer.setChainSpecificConstants(OP_L1_MESSENGER, OP_L1_BRIDGE);
+
+        // Deploy and configure the singleton.
+        JBOptimismSucker singleton = new JBOptimismSucker(
+            opSuckerDeployer, jbDirectory, jbPermissions, jbTokens, JBAddToBalanceMode.ON_CLAIM, trustedForwarder
+        );
+        opSuckerDeployer.configureSingleton(singleton);
+
+        // Allow the deployer in the registry.
+        suckerRegistry.allowSuckerDeployer(address(opSuckerDeployer));
+        vm.stopPrank();
     }
 }

package/test/regression/H19_FeeEvasion.t.sol

@@ -20,7 +20,7 @@ import {CTAllowedPost} from "../../src/structs/CTAllowedPost.sol";
 import {CTPost} from "../../src/structs/CTPost.sol";
 
 /// @title H19_FeeEvasion
-/// @notice Regression test for H-19: fee evasion for existing tier mints.
+/// @notice Fee evasion for existing tier mints.
 ///         Before the fix, a user could set post.price = 0 for an existing tier
 ///         to evade the 5% Croptop fee entirely. The fix reads the actual tier price
 ///         from the store for existing tiers.

package/test/regression/L52_StaleTierIdMapping.t.sol

@@ -19,7 +19,7 @@ import {CTAllowedPost} from "../../src/structs/CTAllowedPost.sol";
 import {CTPost} from "../../src/structs/CTPost.sol";
 
 /// @title L52_StaleTierIdMapping
-/// @notice Regression test for L-52: stale tierIdForEncodedIPFSUriOf mapping after external tier removal.
+/// @notice Stale tierIdForEncodedIPFSUriOf mapping after external tier removal.
 ///         When a tier is removed externally via adjustTiers(), the publisher's mapping still pointed
 ///         to the removed tier ID, blocking re-creation. The fix clears the stale mapping and allows
 ///         the post to fall through to new-tier creation.
@@ -159,7 +159,7 @@ contract L52_StaleTierIdMapping is Test {
             abi.encode(false)
         );
 
-        // Mock tierOf for tier 1 so the H-19 price lookup succeeds.
+        // Mock tierOf for tier 1 so the existing-tier price lookup succeeds.
         JB721Tier memory tier = JB721Tier({
             id: 1,
             price: 0.1 ether,