@zoralabs/comments-contracts 0.0.3 → 0.1.0

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.0";
     }
 }

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}({