@croptop/core-v6 0.0.51 → 0.0.53

package/package.json

@@ -1,19 +1,16 @@
 {
   "name": "@croptop/core-v6",
-  "version": "0.0.51",
+  "version": "0.0.53",
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/mejango/croptop-core-v6"
   },
   "files": [
-    "CHANGELOG.md",
     "foundry.toml",
     "references/",
     "remappings.txt",
-    "script/ConfigureFeeProject.s.sol",
-    "script/Deploy.s.sol",
-    "script/helpers/",
+    "script/",
     "src/"
   ],
   "engines": {
@@ -29,12 +26,12 @@
     "artifacts": "source ./.env && npx sphinx artifacts --org-id 'ea165b21-7cdc-4d7b-be59-ecdd4c26bee4' --project-name 'croptop-core-v6'"
   },
   "dependencies": {
-    "@bananapus/721-hook-v6": "^0.0.52",
-    "@bananapus/core-v6": "^0.0.55",
-    "@bananapus/ownable-v6": "^0.0.26",
-    "@bananapus/permission-ids-v6": "^0.0.25",
-    "@bananapus/router-terminal-v6": "^0.0.45",
-    "@bananapus/suckers-v6": "^0.0.48",
+    "@bananapus/721-hook-v6": "^0.0.54",
+    "@bananapus/core-v6": "^0.0.57",
+    "@bananapus/ownable-v6": "^0.0.27",
+    "@bananapus/permission-ids-v6": "^0.0.26",
+    "@bananapus/router-terminal-v6": "^0.0.46",
+    "@bananapus/suckers-v6": "^0.0.49",
     "@openzeppelin/contracts": "5.6.1",
     "@rev-net/core-v6": "^0.0.58"
   },

package/src/CTDeployer.sol

@@ -257,8 +257,9 @@ contract CTDeployer is ERC2771Context, JBPermissioned, IJBRulesetDataHook, IERC7
             }
         }
 
-        // Transfer the project NFT to its intended owner.
-        PROJECTS.transferFrom({from: address(this), to: owner, tokenId: projectId});
+        // Transfer the project NFT to its intended owner. Use the safe path so contract owners must explicitly
+        // support receiving the project NFT before the launch can finalize.
+        PROJECTS.safeTransferFrom(address(this), owner, projectId);
 
         // Give the initial project owner direct collection-control permissions while CTDeployer remains the hook's
         // owner. This preserves the documented Croptop launch tradeoff: the owner can manage the collection directly
@@ -333,6 +334,8 @@ contract CTDeployer is ERC2771Context, JBPermissioned, IJBRulesetDataHook, IERC7
         )
     {
         // If the cash out is from a sucker, return the full cash out amount without taxes or fees.
+        // Sucker cash-outs are the bridge accounting path: the value moving out of this chain must stay proportional
+        // to this chain's local backing. Do not add remote supply/surplus here.
         if (SUCKER_REGISTRY.isSuckerOf({projectId: context.projectId, addr: context.holder})) {
             return (0, context.cashOutCount, context.totalSupply, context.surplus.value, hookSpecifications);
         }

package/src/CTPublisher.sol

@@ -145,8 +145,9 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
                 revert CTPublisher_ZeroTotalSupply({hook: allowedPost.hook, category: allowedPost.category});
             }
 
-            // Make sure the minimum supply does not surpass the maximum supply.
-            if (allowedPost.minimumTotalSupply > allowedPost.maximumTotalSupply) {
+            // Make sure the minimum supply does not surpass the maximum supply. A max of 0 means unlimited.
+            if (allowedPost.maximumTotalSupply != 0 && allowedPost.minimumTotalSupply > allowedPost.maximumTotalSupply)
+            {
                 revert CTPublisher_MaxTotalSupplyLessThanMin({
                     min: allowedPost.minimumTotalSupply, max: allowedPost.maximumTotalSupply
                 });
@@ -380,8 +381,8 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
     /// @return minimumPrice The minimum price that a poster must pay to record a new NFT.
     /// @return minimumTotalSupply The minimum total number of available tokens that a minter must set to record a new
     /// NFT.
-    /// @return maximumTotalSupply The max total supply of NFTs that can be made available when minting. Must be >=
-    /// minimumTotalSupply.
+    /// @return maximumTotalSupply The max total supply of NFTs that can be made available when minting. 0 means
+    /// unlimited.
     /// @return maximumSplitPercent The maximum split percent that a poster can set. 0 means splits are not allowed.
     /// @return allowedAddresses The addresses allowed to post. Returns empty if all addresses are allowed.
     function allowanceFor(
@@ -423,6 +424,10 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
     //*********************************************************************//
 
     /// @notice Setup the posts.
+    /// @dev `adjustTiers` expects newly added tiers to be sorted by ascending category, while the pay metadata must
+    /// keep `tierIdsToMint` aligned with the caller's `posts` array so the requested NFTs are minted in the requested
+    /// order. `_setupPosts` therefore sorts only the tier configs and carries each config's original post index beside
+    /// it.
     /// @param hook The NFT hook on which the posts will apply.
     /// @param posts An array of posts that should be published as NFTs to the specified project.
     /// @return tiersToAdd The tiers that will be created to represent the posts.
@@ -441,6 +446,10 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
         // Set the size of the tier IDs of the posts that should be minted once published.
         tierIdsToMint = new uint256[](posts.length);
 
+        // Track which post produced each new tier. `tiersToAdd` may be sorted before it is sent to the 721 hook, but
+        // `tierIdsToMint` must stay indexed by the original `posts` array for the mint metadata below.
+        uint256[] memory newTierPostIndexes = new uint256[](posts.length);
+
         // Keep a reference to the hook's store for tier lookups.
         IJB721TiersHookStore store = hook.STORE();
 
@@ -532,8 +541,8 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
                     }
 
                     // Make sure the total supply being made available for the post is at most the allowed maximum total
-                    // supply.
-                    if (post.totalSupply > maximumTotalSupply) {
+                    // supply. A max of 0 means unlimited.
+                    if (maximumTotalSupply != 0 && post.totalSupply > maximumTotalSupply) {
                         revert CTPublisher_TotalSupplyTooBig({
                             totalSupply: post.totalSupply, maximumTotalSupply: maximumTotalSupply
                         });
@@ -575,11 +584,8 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
                     splits: post.splits
                 });
 
-                // Set the ID of the tier to mint.
-                tierIdsToMint[i] = startingTierId + numberOfTiersBeingAdded++;
-
-                // Save the encodedIpfsUri as minted.
-                tierIdForEncodedIpfsUriOf[address(hook)][post.encodedIpfsUri] = tierIdsToMint[i];
+                newTierPostIndexes[numberOfTiersBeingAdded] = i;
+                numberOfTiersBeingAdded++;
 
                 // For new tiers, use the post's price for totalPrice accumulation.
                 totalPrice += post.price;
@@ -590,6 +596,49 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
             }
         }
 
+        // The 721 store requires new tiers sorted by ascending category. This insertion sort normalizes caller input
+        // so multi-category publishes do not revert just because posts were supplied in mint order instead of category
+        // order. It is intentionally stable: equal-category posts stay in caller order because the loop only moves
+        // prior tiers with a strictly greater category.
+        for (uint256 i = 1; i < numberOfTiersBeingAdded;) {
+            // Keep the tier and its original post index together while shifting larger-category tiers to the right.
+            JB721TierConfig memory tierToSort = tiersToAdd[i];
+            uint256 postIndexToSort = newTierPostIndexes[i];
+            uint256 j = i;
+
+            while (j != 0 && tiersToAdd[j - 1].category > tierToSort.category) {
+                // Shift both arrays in lockstep; otherwise the tier ID assigned after sorting would be written back to
+                // the wrong post in `tierIdsToMint`.
+                tiersToAdd[j] = tiersToAdd[j - 1];
+                newTierPostIndexes[j] = newTierPostIndexes[j - 1];
+
+                unchecked {
+                    --j;
+                }
+            }
+
+            // Insert the tier at its category-sorted position with the original post index still attached.
+            tiersToAdd[j] = tierToSort;
+            newTierPostIndexes[j] = postIndexToSort;
+
+            unchecked {
+                ++i;
+            }
+        }
+
+        // Now that the store-facing tier order is final, translate each newly-created tier ID back into the caller's
+        // post order. The pay metadata expects this array to line up with `posts`, not with the sorted `tiersToAdd`.
+        for (uint256 i; i < numberOfTiersBeingAdded;) {
+            uint256 postIndex = newTierPostIndexes[i];
+            uint256 tierId = startingTierId + i;
+            tierIdsToMint[postIndex] = tierId;
+            tierIdForEncodedIpfsUriOf[address(hook)][posts[postIndex].encodedIpfsUri] = tierId;
+
+            unchecked {
+                ++i;
+            }
+        }
+
         // Resize the array if there's a mismatch in length.
         if (numberOfTiersBeingAdded != posts.length) {
             assembly ("memory-safe") {

package/src/interfaces/ICTPublisher.sol

@@ -40,7 +40,7 @@ interface ICTPublisher {
     /// @param category The category for which this allowance applies.
     /// @return minimumPrice The minimum price a poster must pay to publish a new NFT.
     /// @return minimumTotalSupply The minimum total supply a poster must set for a new NFT.
-    /// @return maximumTotalSupply The maximum total supply allowed for a new NFT. Must be >= minimumTotalSupply.
+    /// @return maximumTotalSupply The maximum total supply allowed for a new NFT. 0 means unlimited.
     /// @return maximumSplitPercent The maximum split percent allowed for a new NFT.
     /// @return allowedAddresses The addresses allowed to post. Empty if all addresses are allowed.
     function allowanceFor(

package/CHANGELOG.md

@@ -1,64 +0,0 @@
-# Changelog
-
-## Scope
-
-This file describes the verified change from `croptop-core-v5` to the current `croptop-core-v6` repo.
-
-## Current v6 surface
-
-- `CTDeployer`
-- `CTProjectOwner`
-- `CTPublisher`
-- `CTAllowedPost`
-- `CTDeployerAllowedPost`
-- `CTPost`
-
-## 0.0.47 — Bump v6 deps to nana-core-v6 0.0.53 cohort
-
-- `@bananapus/core-v6`: `^0.0.49 → ^0.0.53` ([PR #145](https://github.com/Bananapus/nana-core-v6/pull/145)).
-- `@bananapus/721-hook-v6`: `^0.0.49 → ^0.0.50`.
-- `@bananapus/suckers-v6`: `^0.0.43 → ^0.0.46`.
-- All `JBRulesetMetadata` test literals patched to include `pauseCrossProjectFeeFreeInflows: false`.
-
-## Summary
-
-- `CTPost` and the related allowlist structs now carry split-routing data, so a post can route part of its payment through `JBSplit[]` recipients.
-- The deployer now acts as the data-hook entry point instead of wiring the 721 hook directly, which is what enables the intended omnichain and sucker-aware cash-out behavior.
-- v6 closes several correctness gaps that were easy to miss in v5: duplicate posts in a batch are rejected, existing tiers use on-chain pricing instead of caller-supplied pricing, and stale tier mappings are recreated when tiers were removed externally.
-- The repo was moved to the v6 dependency set and Solidity `0.8.28`.
-
-## Verified deltas
-
-- `CTPost` gained `splitPercent` and `JBSplit[] splits`.
-- `CTAllowedPost` and `CTDeployerAllowedPost` gained `maximumSplitPercent`.
-- `ICTPublisher.allowanceFor(...)` now returns five values instead of four because `maximumSplitPercent` is part of the result.
-- `CTDeployer` now points project metadata to itself as the data hook instead of pointing directly at the 721 hook.
-- The repo carries dedicated regression tests for duplicate-URI fee evasion, stale tier mappings, and existing-tier pricing.
-
-## Breaking ABI changes
-
-- `CTPost` is not v5-compatible because it now includes `splitPercent` and `splits`.
-- `CTAllowedPost` and `CTDeployerAllowedPost` are not v5-compatible because they now include `maximumSplitPercent`.
-- `ICTPublisher.allowanceFor(...)` return decoding changed because of the added field.
-
-## Indexer impact
-
-- Any event or log decoding path that embeds `CTPost` or `CTAllowedPost` must be updated for the new struct layouts.
-- Post-publishing integrations should not assume the old "all payment goes to treasury" model once split-bearing posts are live.
-
-## Migration notes
-
-- Rebuild any ABI or indexer code that decodes `CTPost` or `CTAllowedPost`. Their layouts are not v5-compatible.
-- If you integrated the deployer as if the 721 hook were the direct data hook, update that assumption. The deployer is now part of the routing path.
-- Re-check any fee logic that trusted caller-supplied prices for existing tiers. That is not the v6 behavior.
-
-## ABI appendix
-
-- Changed structs
-  - `CTPost`
-  - `CTAllowedPost`
-  - `CTDeployerAllowedPost`
-- Changed decoding expectations
-  - `ICTPublisher.allowanceFor(...)`
-- Behaviorally important surface shift
-  - deployer acts as the data-hook entrypoint