@croptop/core-v6 0.0.30 → 0.0.32

package/README.md

@@ -90,4 +90,6 @@ script/
 - fee routing depends on the designated fee project remaining correctly configured; if its terminal rejects payments,
   Croptop refunds the fee to `_msgSender()` instead of trapping ETH in `CTPublisher`
 - burn-lock ownership is intentionally irreversible and should only be used when immutability is desired
+- after burn-locking into `CTProjectOwner`, the previous owner no longer holds the project NFT directly; control is
+  intentionally mediated through Croptop's owner helper and hook-admin surface instead of remaining a plain owner EOA
 - duplicate-content and stale-tier edge cases are guarded by tests, but integrations should still treat metadata reuse carefully

package/USER_JOURNEYS.md

@@ -52,6 +52,17 @@
 2. Restrict future edits to the paths Croptop intentionally exposes.
 3. Accept that this is a product-shaping choice, not a cosmetic deployment detail.
 
+## Journey 5: Support Cross-Chain Payments Through Data Hooks
+
+**Starting state:** a sucker pays the Croptop project on behalf of a remote user via `payRemote`, and `CTDeployer.beforePayRecordedWith` needs to forward the correct beneficiary to downstream hooks.
+
+**Success:** downstream data hooks see the real remote user so any hook-specific accounting accrues to the right person.
+
+**Flow**
+1. The sucker calls `terminal.pay()` with relay-beneficiary metadata.
+2. `CTDeployer.beforePayRecordedWith()` resolves the relay beneficiary when the payer is a registered sucker.
+3. The swapped beneficiary is forwarded to the downstream data hook.
+
 ## Hand-Offs
 
 - Use [nana-721-hook-v6](../nana-721-hook-v6/USER_JOURNEYS.md) for the underlying tier issuance behavior Croptop wraps.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@croptop/core-v6",
-    "version": "0.0.30",
+    "version": "0.0.32",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -16,18 +16,18 @@
         "artifacts": "source ./.env && npx sphinx artifacts --org-id 'ea165b21-7cdc-4d7b-be59-ecdd4c26bee4' --project-name 'croptop-core-v5'"
     },
     "dependencies": {
-        "@bananapus/721-hook-v6": "^0.0.31",
-        "@bananapus/buyback-hook-v6": "^0.0.25",
-        "@bananapus/core-v6": "^0.0.31",
+        "@bananapus/721-hook-v6": "^0.0.33",
+        "@bananapus/buyback-hook-v6": "^0.0.27",
+        "@bananapus/core-v6": "^0.0.34",
         "@bananapus/ownable-v6": "^0.0.17",
-        "@bananapus/permission-ids-v6": "^0.0.15",
-        "@bananapus/router-terminal-v6": "^0.0.25",
-        "@bananapus/suckers-v6": "^0.0.21",
+        "@bananapus/permission-ids-v6": "^0.0.17",
+        "@bananapus/router-terminal-v6": "^0.0.26",
+        "@bananapus/suckers-v6": "^0.0.25",
         "@openzeppelin/contracts": "^5.6.1"
     },
     "devDependencies": {
         "@bananapus/address-registry-v6": "^0.0.17",
-        "@rev-net/core-v6": "^0.0.24",
-        "@sphinx-labs/plugins": "^0.33.1"
+        "@rev-net/core-v6": "^0.0.30",
+        "@sphinx-labs/plugins": "^0.33.3"
     }
-}
+}

package/src/CTDeployer.sol

@@ -28,6 +28,7 @@ import {JBRulesetConfig} from "@bananapus/core-v6/src/structs/JBRulesetConfig.so
 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 {JBRelayBeneficiary} from "@bananapus/suckers-v6/src/libraries/JBRelayBeneficiary.sol";
 
 import {ICTDeployer} from "./interfaces/ICTDeployer.sol";
 import {ICTPublisher} from "./interfaces/ICTPublisher.sol";
@@ -172,6 +173,24 @@ contract CTDeployer is ERC2771Context, JBPermissioned, IJBRulesetDataHook, IERC7
         if (address(hook) == address(0)) {
             return (context.weight, hookSpecifications);
         }
+
+        // Resolve the relay beneficiary — if the payer is a sucker with relay metadata,
+        // swap the beneficiary so downstream hooks see the real user.
+        address effectiveBeneficiary = JBRelayBeneficiary.resolve({
+            payer: context.payer,
+            beneficiary: context.beneficiary,
+            projectId: context.projectId,
+            metadata: context.metadata,
+            registry: SUCKER_REGISTRY
+        });
+
+        // If the beneficiary was swapped, create a memory copy with the new beneficiary.
+        if (effectiveBeneficiary != context.beneficiary) {
+            JBBeforePayRecordedContext memory hookContext = context;
+            hookContext.beneficiary = effectiveBeneficiary;
+            return hook.beforePayRecordedWith(hookContext);
+        }
+
         // slither-disable-next-line unused-return
         return hook.beforePayRecordedWith(context);
     }
@@ -407,7 +426,7 @@ contract CTDeployer is ERC2771Context, JBPermissioned, IJBRulesetDataHook, IERC7
         CTDeployerAllowedPost memory post;
 
         // Iterate through each post to add it to the formatted list.
-        for (uint256 i; i < numberOfAllowedPosts; i++) {
+        for (uint256 i; i < numberOfAllowedPosts;) {
             // Set the post being iterated on.
             post = allowedPosts[i];
 
@@ -421,6 +440,10 @@ contract CTDeployer is ERC2771Context, JBPermissioned, IJBRulesetDataHook, IERC7
                 maximumSplitPercent: post.maximumSplitPercent,
                 allowedAddresses: post.allowedAddresses
             });
+
+            unchecked {
+                ++i;
+            }
         }
 
         // Set up the allowed posts in the publisher.

package/src/CTPublisher.sol

@@ -134,7 +134,7 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
         tiers = new JB721Tier[](numberOfEncodedIPFSUris);
 
         // Get the tier for each provided encoded IPFS URI.
-        for (uint256 i; i < numberOfEncodedIPFSUris; i++) {
+        for (uint256 i; i < numberOfEncodedIPFSUris;) {
             // Check if there's a tier ID stored for the encoded IPFS URI.
             uint256 tierId = tierIdForEncodedIPFSUriOf[hook][encodedIPFSUris[i]];
 
@@ -143,6 +143,10 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
                 // slither-disable-next-line calls-loop
                 tiers[i] = IJB721TiersHook(hook).STORE().tierOf({hook: hook, id: tierId, includeResolvedUri: false});
             }
+
+            unchecked {
+                ++i;
+            }
         }
     }
 
@@ -214,8 +218,11 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
         uint256 numberOfAddresses = addresses.length;
 
         // Check if the address is included
-        for (uint256 i; i < numberOfAddresses; i++) {
+        for (uint256 i; i < numberOfAddresses;) {
             if (addrs == addresses[i]) return true;
+            unchecked {
+                ++i;
+            }
         }
 
         return false;
@@ -247,7 +254,7 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
         uint256 numberOfAllowedPosts = allowedPosts.length;
 
         // For each post criteria, save the specifications.
-        for (uint256 i; i < numberOfAllowedPosts; i++) {
+        for (uint256 i; i < numberOfAllowedPosts;) {
             // Set the post criteria being iterated on.
             CTAllowedPost memory allowedPost = allowedPosts[i];
 
@@ -285,16 +292,16 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
             // Store the packed value.
             _packedAllowanceFor[allowedPost.hook][allowedPost.category] = packed;
 
-            // Store the allow list.
-            uint256 numberOfAddresses = allowedPost.allowedAddresses.length;
-            // Reset the addresses.
-            delete _allowedAddresses[allowedPost.hook][allowedPost.category];
-            // Add the number allowed addresses.
-            if (numberOfAddresses != 0) {
-                // Keep a reference to the storage of the allowed addresses.
-                for (uint256 j = 0; j < numberOfAddresses; j++) {
-                    _allowedAddresses[allowedPost.hook][allowedPost.category].push(allowedPost.allowedAddresses[j]);
-                }
+            // Store the allow list. Direct assignment replaces the entire storage array in one operation,
+            // avoiding the gas overhead of delete + individual push() calls in a loop.
+            if (allowedPost.allowedAddresses.length != 0) {
+                _allowedAddresses[allowedPost.hook][allowedPost.category] = allowedPost.allowedAddresses;
+            } else {
+                delete _allowedAddresses[allowedPost.hook][allowedPost.category];
+            }
+
+            unchecked {
+                ++i;
             }
         }
     }
@@ -473,7 +480,7 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
 
         // For each post, create tiers after validating to make sure they fulfill the allowance specified by the
         // project's owner.
-        for (uint256 i; i < posts.length; i++) {
+        for (uint256 i; i < posts.length;) {
             // Get the current post being iterated on.
             CTPost memory post = posts[i];
 
@@ -484,10 +491,13 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
             }
 
             // Check for duplicate encodedIPFSUri within the same batch to prevent fee evasion.
-            for (uint256 j; j < i; j++) {
+            for (uint256 j; j < i;) {
                 if (posts[j].encodedIPFSUri == post.encodedIPFSUri) {
                     revert CTPublisher_DuplicatePost(post.encodedIPFSUri);
                 }
+                unchecked {
+                    ++j;
+                }
             }
 
             // Scoped section to prevent stack too deep.
@@ -499,7 +509,7 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
                     // If the tier was removed externally (via adjustTiers), clear the stale mapping
                     // so the code falls through to create a new tier.
                     // slither-disable-next-line calls-loop
-                    if (hook.STORE().isTierRemoved(address(hook), tierId)) {
+                    if (store.isTierRemoved(address(hook), tierId)) {
                         delete tierIdForEncodedIPFSUriOf[address(hook)][post.encodedIPFSUri];
                     } else {
                         tierIdsToMint[i] = tierId;
@@ -590,6 +600,10 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
                 // For new tiers, use the post's price for totalPrice accumulation.
                 totalPrice += post.price;
             }
+
+            unchecked {
+                ++i;
+            }
         }
 
         // Resize the array if there's a mismatch in length.