@zoralabs/comments-contracts 0.0.3 → 0.1.1

package/src/CommentsImpl.sol

@@ -142,7 +142,7 @@ contract CommentsImpl is
         }
     }
 
-    /// @notice Creates a new comment.  Equivalant sparks value in eth must be sent with the transaction.  Must be a holder or creator of the referenced 1155 token.
+    /// @notice Creates a new comment.  Equivalant sparks value in eth must be sent with the transaction.
     /// If not the owner, must send 1 spark.
     /// @param contractAddress The address of the contract
     /// @param tokenId The token ID
@@ -309,13 +309,7 @@ contract CommentsImpl is
         ) {
             return;
         }
-        // if they aren't, commenter or smart wallet must be a token holder, and have included at least 1 spark
-        if (
-            !_accountOrSmartWalletIsTokenHolder(commentIdentifier.contractAddress, commentIdentifier.tokenId, commentIdentifier.commenter, commenterSmartWallet)
-        ) {
-            revert NotTokenHolderOrAdmin();
-        }
-
+        // if they aren't an admin, they must include at least 1 spark
         if (mustSendAtLeastOneSpark && sparksQuantity == 0) {
             revert MustSendAtLeastOneSpark();
         }
@@ -376,18 +370,6 @@ contract CommentsImpl is
         }
     }
 
-    function _accountOrSmartWalletIsTokenHolder(address contractAddress, uint256 tokenId, address user, address smartWallet) internal view returns (bool) {
-        bool isCoin = _isCoinComment(contractAddress, tokenId);
-
-        if (isCoin) {
-            return
-                ICoinComments(contractAddress).balanceOf(user) >= 1e18 ||
-                (smartWallet != address(0) && ICoinComments(contractAddress).balanceOf(smartWallet) >= 1e18);
-        } else {
-            return _isTokenHolder(contractAddress, tokenId, user) || (smartWallet != address(0) && _isTokenHolder(contractAddress, tokenId, smartWallet));
-        }
-    }
-
     function _isTokenAdmin(address contractAddress, uint256 tokenId, address user) internal view returns (bool) {
         try IZoraCreator1155(contractAddress).isAdminOrRole(user, tokenId, PERMISSION_BIT_ADMIN) returns (bool isAdmin) {
             return isAdmin;

package/src/interfaces/IComments.sol

@@ -133,9 +133,6 @@ interface IComments {
     /// @param actual The actual address that attempted to comment
     error CommenterMismatch(address expected, address actual);
 
-    /// @notice Occurs when a non-token holder or non-admin attempts an action restricted to token holders or admins
-    error NotTokenHolderOrAdmin();
-
     /// @notice Occurs when attempting to spark a comment without sending at least one spark
     error MustSendAtLeastOneSpark();
 

package/src/version/ContractVersionBase.sol

@@ -9,6 +9,6 @@ import {IVersionedContract} from "@zoralabs/shared-contracts/interfaces/IVersion
 contract ContractVersionBase is IVersionedContract {
     /// @notice The version of the contract
     function contractVersion() external pure override returns (string memory) {
-        return "0.0.3";
+        return "0.1.1";
     }
 }

package/test/Comments.t.sol

@@ -470,14 +470,13 @@ contract CommentsTest is CommentsTestBase {
         postComment(commenter, address(mock1155), tokenId1, "", emptyCommentIdentifier);
     }
 
-    function testRevertOnNotTokenHolderOrAdmin() public {
+    function testNonHolderCanCommentWithSpark() public {
         address nonHolder = makeAddr("nonHolder");
 
-        // We don't set up the commenter with a token, so they're neither a holder nor an admin
+        // We don't set up the commenter with a token, but they should be able to comment with a spark
         vm.deal(nonHolder, SPARKS_VALUE);
 
-        vm.expectRevert(IComments.NotTokenHolderOrAdmin.selector);
-        postComment(nonHolder, address(mock1155), tokenId1, "Attempting to comment without holding token", emptyCommentIdentifier);
+        postComment(nonHolder, address(mock1155), tokenId1, "Commenting without holding token", emptyCommentIdentifier);
     }
 
     function testCommentRevertsWhenSendTooMuchValue() public {
@@ -674,11 +673,10 @@ contract CommentsTest is CommentsTestBase {
         comments.comment(commenter, address(mockCoin), tokenId0, "test comment", emptyCommentIdentifier, address(0), address(0));
     }
 
-    function testRevertCommentAsNonCoinHolder() public {
+    function testNonCoinHolderCanCommentWithSpark() public {
         address nonHolder = makeAddr("nonHolder");
         vm.deal(nonHolder, SPARKS_VALUE);
 
-        vm.expectRevert(abi.encodeWithSignature("NotTokenHolderOrAdmin()"));
         vm.prank(nonHolder);
         comments.comment{value: SPARKS_VALUE}(nonHolder, address(mockCoin), tokenId0, "test comment", emptyCommentIdentifier, address(0), address(0));
     }

package/test/Comments_delegateComment.t.sol

@@ -120,10 +120,27 @@ contract Comments_mintAndCommentTest is Test {
         });
     }
 
-    function test_delegateComment_revertsWhenNotOwnerOrCreator() public {
+    function test_delegateComment_nonOwnerCanCommentWithSpark() public {
         address notOwner = makeAddr("notOwner");
         vm.prank(notOwner);
-        vm.expectRevert(IComments.NotTokenHolderOrAdmin.selector);
+
         mockDelegateCommenter.forwardComment(address(mock1155), tokenId1, "test");
     }
+
+    function test_delegateComment_canCommentWithZeroSparks() public {
+        // Delegate commenter should be able to comment with 0 spark value
+        vm.prank(commenter);
+        mockDelegateCommenter.forwardComment(address(mock1155), tokenId1, "test comment with 0 sparks");
+
+        // Verify the comment was created successfully
+        IComments.CommentIdentifier memory expectedCommentIdentifier = IComments.CommentIdentifier({
+            commenter: commenter,
+            contractAddress: address(mock1155),
+            tokenId: tokenId1,
+            nonce: bytes32(0)
+        });
+
+        (, bool exists) = comments.hashAndCheckCommentExists(expectedCommentIdentifier);
+        assertTrue(exists, "Comment should exist");
+    }
 }

package/test/Comments_permit.t.sol

@@ -124,13 +124,13 @@ contract CommentsPermitTest is CommentsTestBase {
         _assertCommentExists(expectedCommentIdentifier);
     }
 
-    function testPermitComment_Not1155Holder() public {
+    function testPermitComment_Non1155HolderCanCommentWithSpark() public {
         IComments.PermitComment memory permitComment = _createPermitComment(collectorWithToken, "test comment");
         bytes memory signature = _signPermitComment(permitComment, collectorWithTokenPrivateKey);
 
         address executor = makeAddr("executor");
         vm.deal(executor, SPARKS_VALUE);
-        vm.expectRevert(IComments.NotTokenHolderOrAdmin.selector);
+
         _executePermitComment(executor, permitComment, signature);
     }
 

package/test/Comments_smartWallet.t.sol

@@ -90,12 +90,11 @@ contract Comments_smartWallet is CommentsTestBase {
         assertTrue(exists);
     }
 
-    function test_commentWithSmartWalletOwner_revertsWhenNotHolder() public {
+    function test_commentWithSmartWalletOwner_canCommentWithSpark() public {
         address smartWallet = address(new MockMultiOwnable(address(collectorWithoutToken)));
 
         IComments.CommentIdentifier memory emptyReplyTo;
 
-        vm.expectRevert(abi.encodeWithSelector(IComments.NotTokenHolderOrAdmin.selector));
         vm.prank(collectorWithoutToken);
         vm.deal(collectorWithoutToken, SPARKS_VALUE);
         comments.comment{value: SPARKS_VALUE}({
@@ -193,10 +192,9 @@ contract Comments_smartWallet is CommentsTestBase {
         assertTrue(exists);
     }
 
-    function test_commentWithSmartWalletOwner_revertsWhenNotCoinHolder() public {
+    function test_commentWithSmartWalletOwner_nonCoinHolderCanCommentWithSpark() public {
         address smartWallet = address(new MockMultiOwnable(address(collectorWithoutToken)));
 
-        vm.expectRevert(abi.encodeWithSelector(IComments.NotTokenHolderOrAdmin.selector));
         vm.prank(collectorWithoutToken);
         vm.deal(collectorWithoutToken, SPARKS_VALUE);
         comments.comment{value: SPARKS_VALUE}({

package/.turbo/turbo-build.log

@@ -1,84 +0,0 @@
-
-> @zoralabs/comments-contracts@0.0.3 build /home/runner/work/zora-protocol-private/zora-protocol-private/packages/comments
-> pnpm run wagmi:generate && pnpm run copy-abis && pnpm run prettier:write && tsup
-
-
-> @zoralabs/comments-contracts@0.0.3 wagmi:generate /home/runner/work/zora-protocol-private/zora-protocol-private/packages/comments
-> FOUNDRY_PROFILE=dev forge build && wagmi generate && pnpm exec rename-generated-abi-casing ./package/wagmiGenerated.ts
-
-Compiling 121 files with Solc 0.8.23
-Solc 0.8.23 finished in 65.77s
-Compiler run successful!
-- Validating plugins
-✔ Validating plugins
-- Resolving contracts
-✔ Resolving contracts
-- Running plugins
-✔ Running plugins
-- Writing to package/wagmiGenerated.ts
-✔ Writing to package/wagmiGenerated.ts
-🔄 Processing 1 file(s) to replace 'Abi' with 'ABI'...
-📝 Processing ./package/wagmiGenerated.ts...
-✅ Updated ./package/wagmiGenerated.ts (2 replacements)
-✨ All files processed successfully!
-
-> @zoralabs/comments-contracts@0.0.3 copy-abis /home/runner/work/zora-protocol-private/zora-protocol-private/packages/comments
-> pnpm exec bundle-abis
-
-
-> @zoralabs/comments-contracts@0.0.3 prettier:write /home/runner/work/zora-protocol-private/zora-protocol-private/packages/comments
-> prettier --write 'src/**/*.sol' 'test/**/*.sol' 'script/**/*.sol'
-
-src/CommentsImpl.sol 828ms (unchanged)
-src/CommentsImplConstants.sol 23ms (unchanged)
-src/interfaces/ICallerAndCommenter.sol 30ms (unchanged)
-src/interfaces/ICoinComments.sol 5ms (unchanged)
-src/interfaces/IComments.sol 35ms (unchanged)
-src/interfaces/IMultiOwnable.sol 2ms (unchanged)
-src/interfaces/ISecondarySwap.sol 15ms (unchanged)
-src/interfaces/IZoraCreator1155.sol 4ms (unchanged)
-src/interfaces/IZoraCreator1155TypesV1.sol 14ms (unchanged)
-src/interfaces/IZoraTimedSaleStrategy.sol 4ms (unchanged)
-src/proxy/CallerAndCommenter.sol 8ms (unchanged)
-src/proxy/Comments.sol 13ms (unchanged)
-src/utils/CallerAndCommenterImpl.sol 140ms (unchanged)
-src/utils/EIP712UpgradeableWithChainId.sol 13ms (unchanged)
-src/version/ContractVersionBase.sol 2ms (unchanged)
-test/CallerAndCommenter_mintAndComment.t copy.sol 129ms (unchanged)
-test/CallerAndCommenter_swapAndComment.t.sol 272ms (unchanged)
-test/CallerAndCommenterTestBase.sol 50ms (unchanged)
-test/Comments_delegateComment.t.sol 86ms (unchanged)
-test/Comments_permit.t.sol 194ms (unchanged)
-test/Comments_smartWallet.t.sol 89ms (unchanged)
-test/Comments.t.sol 411ms (unchanged)
-test/CommentsTestBase.sol 66ms (unchanged)
-test/mocks/Mock1155.sol 29ms (unchanged)
-test/mocks/Mock1155NoCreatorRewardRecipient.sol 19ms (unchanged)
-test/mocks/Mock1155NoOwner.sol 14ms (unchanged)
-test/mocks/MockCoin.sol 14ms (unchanged)
-test/mocks/MockDelegateCommenter.sol 25ms (unchanged)
-test/mocks/MockIZoraCreator1155.sol 3ms (unchanged)
-test/mocks/MockSecondarySwap.sol 20ms (unchanged)
-test/mocks/MockZoraTimedSale.sol 26ms (unchanged)
-test/mocks/ProtocolRewards.sol 362ms (unchanged)
-script/AddDelegateCommenterRole.s.sol 10ms (unchanged)
-script/CommentsDeployerBase.sol 60ms (unchanged)
-script/Deploy.s.sol 7ms (unchanged)
-script/DeployCallerAndCommenterImpl.s.sol 16ms (unchanged)
-script/DeployImpl.s.sol 16ms (unchanged)
-script/DeployNonDeterministic.s.sol 21ms (unchanged)
-script/GenerateDeterministicParams.s.sol 25ms (unchanged)
-CLI Building entry: package/index.ts
-CLI Using tsconfig: tsconfig.json
-CLI tsup v7.3.0
-CLI Using tsup config: /home/runner/work/zora-protocol-private/zora-protocol-private/packages/comments/tsup.config.ts
-CLI Target: es2021
-CLI Cleaning output folder
-CJS Build start
-ESM Build start
-ESM dist/index.js     47.94 KB
-ESM dist/index.js.map 83.57 KB
-ESM ⚡️ Build success in 23ms
-CJS dist/index.cjs     49.03 KB
-CJS dist/index.cjs.map 83.85 KB
-CJS ⚡️ Build success in 25ms

package/abis/AddDelegateCommenterRole.json

@@ -1,9 +0,0 @@
-[
-  {
-    "type": "function",
-    "name": "run",
-    "inputs": [],
-    "outputs": [],
-    "stateMutability": "view"
-  }
-]