@zoralabs/comments-contracts 0.0.2-COMMENTS.0 → 0.0.2

package/.turbo/turbo-build.log

@@ -1,13 +1,13 @@
 
-> @zoralabs/comments-contracts@0.0.2-COMMENTS.0 build /home/runner/work/zora-protocol-private/zora-protocol-private/packages/comments
+> @zoralabs/comments-contracts@0.0.2 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.2-COMMENTS.0 wagmi:generate /home/runner/work/zora-protocol-private/zora-protocol-private/packages/comments
+> @zoralabs/comments-contracts@0.0.2 wagmi:generate /home/runner/work/zora-protocol-private/zora-protocol-private/packages/comments
 > FOUNDRY_PROFILE=dev forge build && wagmi generate
 
 Compiling 117 files with Solc 0.8.23
-Solc 0.8.23 finished in 52.51s
+Solc 0.8.23 finished in 57.16s
 Compiler run successful!
 - Validating plugins
 ✔ Validating plugins
@@ -18,50 +18,50 @@ Compiler run successful!
 - Writing to package/wagmiGenerated.ts
 ✔ Writing to package/wagmiGenerated.ts
 
-> @zoralabs/comments-contracts@0.0.2-COMMENTS.0 copy-abis /home/runner/work/zora-protocol-private/zora-protocol-private/packages/comments
+> @zoralabs/comments-contracts@0.0.2 copy-abis /home/runner/work/zora-protocol-private/zora-protocol-private/packages/comments
 > pnpm tsx script/bundle-abis.ts
 
 
-> @zoralabs/comments-contracts@0.0.2-COMMENTS.0 prettier:write /home/runner/work/zora-protocol-private/zora-protocol-private/packages/comments
+> @zoralabs/comments-contracts@0.0.2 prettier:write /home/runner/work/zora-protocol-private/zora-protocol-private/packages/comments
 > prettier --write 'src/**/*.sol' 'test/**/*.sol' 'script/**/*.sol'
 
-src/CommentsImpl.sol 1416ms (unchanged)
-src/CommentsImplConstants.sol 45ms (unchanged)
-src/interfaces/ICallerAndCommenter.sol 67ms (unchanged)
-src/interfaces/IComments.sol 59ms (unchanged)
-src/interfaces/IMultiOwnable.sol 10ms (unchanged)
-src/interfaces/ISecondarySwap.sol 18ms (unchanged)
-src/interfaces/IZoraCreator1155.sol 3ms (unchanged)
-src/interfaces/IZoraCreator1155TypesV1.sol 16ms (unchanged)
-src/interfaces/IZoraTimedSaleStrategy.sol 5ms (unchanged)
-src/proxy/CallerAndCommenter.sol 9ms (unchanged)
-src/proxy/Comments.sol 23ms (unchanged)
-src/utils/CallerAndCommenterImpl.sol 346ms (unchanged)
-src/utils/EIP712UpgradeableWithChainId.sol 38ms (unchanged)
-src/version/ContractVersionBase.sol 2ms (unchanged)
-test/CallerAndCommenter_mintAndComment.t copy.sol 247ms (unchanged)
-test/CallerAndCommenter_swapAndComment.t.sol 613ms (unchanged)
-test/CallerAndCommenterTestBase.sol 87ms (unchanged)
-test/Comments_delegateComment.t.sol 131ms (unchanged)
-test/Comments_permit.t.sol 588ms (unchanged)
-test/Comments_smartWallet.t.sol 133ms (unchanged)
-test/Comments.t.sol 664ms (unchanged)
-test/CommentsTestBase.sol 39ms (unchanged)
-test/mocks/Mock1155.sol 23ms (unchanged)
-test/mocks/Mock1155NoCreatorRewardRecipient.sol 20ms (unchanged)
-test/mocks/Mock1155NoOwner.sol 15ms (unchanged)
-test/mocks/MockDelegateCommenter.sol 17ms (unchanged)
+src/CommentsImpl.sol 1473ms (unchanged)
+src/CommentsImplConstants.sol 31ms (unchanged)
+src/interfaces/ICallerAndCommenter.sol 88ms (unchanged)
+src/interfaces/IComments.sol 58ms (unchanged)
+src/interfaces/IMultiOwnable.sol 11ms (unchanged)
+src/interfaces/ISecondarySwap.sol 29ms (unchanged)
+src/interfaces/IZoraCreator1155.sol 4ms (unchanged)
+src/interfaces/IZoraCreator1155TypesV1.sol 19ms (unchanged)
+src/interfaces/IZoraTimedSaleStrategy.sol 9ms (unchanged)
+src/proxy/CallerAndCommenter.sol 15ms (unchanged)
+src/proxy/Comments.sol 27ms (unchanged)
+src/utils/CallerAndCommenterImpl.sol 332ms (unchanged)
+src/utils/EIP712UpgradeableWithChainId.sol 24ms (unchanged)
+src/version/ContractVersionBase.sol 3ms (unchanged)
+test/CallerAndCommenter_mintAndComment.t copy.sol 256ms (unchanged)
+test/CallerAndCommenter_swapAndComment.t.sol 518ms (unchanged)
+test/CallerAndCommenterTestBase.sol 108ms (unchanged)
+test/Comments_delegateComment.t.sol 150ms (unchanged)
+test/Comments_permit.t.sol 392ms (unchanged)
+test/Comments_smartWallet.t.sol 106ms (unchanged)
+test/Comments.t.sol 730ms (unchanged)
+test/CommentsTestBase.sol 61ms (unchanged)
+test/mocks/Mock1155.sol 61ms (unchanged)
+test/mocks/Mock1155NoCreatorRewardRecipient.sol 36ms (unchanged)
+test/mocks/Mock1155NoOwner.sol 33ms (unchanged)
+test/mocks/MockDelegateCommenter.sol 20ms (unchanged)
 test/mocks/MockIZoraCreator1155.sol 2ms (unchanged)
-test/mocks/MockSecondarySwap.sol 31ms (unchanged)
-test/mocks/MockZoraTimedSale.sol 21ms (unchanged)
-test/mocks/ProtocolRewards.sol 401ms (unchanged)
-script/AddDelegateCommenterRole.s.sol 10ms (unchanged)
-script/CommentsDeployerBase.sol 63ms (unchanged)
-script/Deploy.s.sol 7ms (unchanged)
+test/mocks/MockSecondarySwap.sol 35ms (unchanged)
+test/mocks/MockZoraTimedSale.sol 53ms (unchanged)
+test/mocks/ProtocolRewards.sol 905ms (unchanged)
+script/AddDelegateCommenterRole.s.sol 16ms (unchanged)
+script/CommentsDeployerBase.sol 191ms (unchanged)
+script/Deploy.s.sol 8ms (unchanged)
 script/DeployCallerAndCommenterImpl.s.sol 18ms (unchanged)
-script/DeployImpl.s.sol 15ms (unchanged)
-script/DeployNonDeterministic.s.sol 26ms (unchanged)
-script/GenerateDeterministicParams.s.sol 29ms (unchanged)
+script/DeployImpl.s.sol 18ms (unchanged)
+script/DeployNonDeterministic.s.sol 57ms (unchanged)
+script/GenerateDeterministicParams.s.sol 58ms (unchanged)
 CLI Building entry: package/index.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v7.3.0
@@ -70,9 +70,9 @@ CLI Target: es2021
 CLI Cleaning output folder
 CJS Build start
 ESM Build start
-CJS dist/index.cjs     49.03 KB
-CJS dist/index.cjs.map 83.85 KB
-CJS ⚡️ Build success in 25ms
 ESM dist/index.js     47.94 KB
 ESM dist/index.js.map 83.57 KB
-ESM ⚡️ Build success in 25ms
+ESM ⚡️ Build success in 29ms
+CJS dist/index.cjs     49.03 KB
+CJS dist/index.cjs.map 83.85 KB
+CJS ⚡️ Build success in 30ms

package/abis/AddDelegateCommenterRole.json

@@ -1,17 +1,4 @@
 [
-  {
-    "type": "function",
-    "name": "IS_SCRIPT",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool",
-        "internalType": "bool"
-      }
-    ],
-    "stateMutability": "view"
-  },
   {
     "type": "function",
     "name": "run",

package/abis/DeployCallerAndCommenterImpl.json

@@ -1,17 +1,4 @@
 [
-  {
-    "type": "function",
-    "name": "IS_SCRIPT",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool",
-        "internalType": "bool"
-      }
-    ],
-    "stateMutability": "view"
-  },
   {
     "type": "function",
     "name": "run",

package/abis/DeployImpl.json

@@ -1,17 +1,4 @@
 [
-  {
-    "type": "function",
-    "name": "IS_SCRIPT",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool",
-        "internalType": "bool"
-      }
-    ],
-    "stateMutability": "view"
-  },
   {
     "type": "function",
     "name": "run",

package/abis/DeployNonDeterministic.json

@@ -1,17 +1,4 @@
 [
-  {
-    "type": "function",
-    "name": "IS_SCRIPT",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool",
-        "internalType": "bool"
-      }
-    ],
-    "stateMutability": "view"
-  },
   {
     "type": "function",
     "name": "run",

package/abis/DeployScript.json

@@ -1,17 +1,4 @@
 [
-  {
-    "type": "function",
-    "name": "IS_SCRIPT",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool",
-        "internalType": "bool"
-      }
-    ],
-    "stateMutability": "view"
-  },
   {
     "type": "function",
     "name": "run",

package/abis/GenerateDeterministicParams.json

@@ -1,17 +1,4 @@
 [
-  {
-    "type": "function",
-    "name": "IS_SCRIPT",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool",
-        "internalType": "bool"
-      }
-    ],
-    "stateMutability": "view"
-  },
   {
     "type": "function",
     "name": "run",

package/addresses/1.json

@@ -0,0 +1,9 @@
+{
+  "CALLER_AND_COMMENTER": "0x77777775C5074b74540d9cC63Dd840A8c692B4B5",
+  "CALLER_AND_COMMENTER_IMPL": "0x455c9D3188A3Cd94aCDE8E5Ec90cA92FC10805EA",
+  "CALLER_AND_COMMENTER_VERSION": "0.0.2",
+  "COMMENTS": "0x7777777C2B3132e03a65721a41745C07170a5877",
+  "COMMENTS_BLOCK_NUMBER": 21123814,
+  "COMMENTS_IMPL": "0x0000000000000000000000000000000000000000",
+  "COMMENTS_IMPL_BLOCK_NUMBER": 0
+}

package/addresses/10.json

@@ -1,7 +1,7 @@
 {
   "CALLER_AND_COMMENTER": "0x77777775C5074b74540d9cC63Dd840A8c692B4B5",
-  "CALLER_AND_COMMENTER_IMPL": "0x91509707F397e357DCe975399Fc98bB58081Ad63",
-  "CALLER_AND_COMMENTER_VERSION": "",
+  "CALLER_AND_COMMENTER_IMPL": "0x0950D0eC9a7c51d5f0Fc542F54a3F72e0CB519a1",
+  "CALLER_AND_COMMENTER_VERSION": "0.0.2",
   "COMMENTS": "0x7777777C2B3132e03a65721a41745C07170a5877",
   "COMMENTS_BLOCK_NUMBER": 126971499,
   "COMMENTS_IMPL": "0xA880EA1095dFcafa4cBe1C0EFa5e7b861A6634b6",

package/addresses/11155111.json

@@ -1,9 +1,9 @@
 {
   "CALLER_AND_COMMENTER": "0x77777775C5074b74540d9cC63Dd840A8c692B4B5",
-  "CALLER_AND_COMMENTER_IMPL": "0x35ca784918bf11692708c1D530691704AAcEA95E",
-  "CALLER_AND_COMMENTER_VERSION": "",
+  "CALLER_AND_COMMENTER_IMPL": "0x24581Ea0d28199d7d2275534917747Bce4e1B0A7",
+  "CALLER_AND_COMMENTER_VERSION": "0.0.2",
   "COMMENTS": "0x7777777C2B3132e03a65721a41745C07170a5877",
   "COMMENTS_BLOCK_NUMBER": 6977641,
   "COMMENTS_IMPL": "0xd92F69d5581BF9536c77550aeA1d74DDaE88B5B7",
   "COMMENTS_IMPL_BLOCK_NUMBER": 6977641
-}
+}

package/addresses/42161.json

@@ -1,7 +1,7 @@
 {
   "CALLER_AND_COMMENTER": "0x77777775C5074b74540d9cC63Dd840A8c692B4B5",
-  "CALLER_AND_COMMENTER_IMPL": "0xD1F822051f3BbaDc79b7F7B4cE160525976dcD94",
-  "CALLER_AND_COMMENTER_VERSION": "",
+  "CALLER_AND_COMMENTER_IMPL": "0x1Eb7Bf3a08784D7cB08CC2AE1448012C0c02bDa2",
+  "CALLER_AND_COMMENTER_VERSION": "0.0.2",
   "COMMENTS": "0x7777777C2B3132e03a65721a41745C07170a5877",
   "COMMENTS_BLOCK_NUMBER": 266241993,
   "COMMENTS_IMPL": "0x073ef87C54c192c21ddEf881fE18064b6161fAC9",

package/addresses/7777777.json

@@ -1,9 +1,9 @@
 {
   "CALLER_AND_COMMENTER": "0x77777775C5074b74540d9cC63Dd840A8c692B4B5",
-  "CALLER_AND_COMMENTER_IMPL": "0xed0a281fdC555e061005D2B4B4eEc73B802b7b68",
-  "CALLER_AND_COMMENTER_VERSION": "",
+  "CALLER_AND_COMMENTER_IMPL": "0x2C256f0464A9e1a4292c87eb455c5601Bcae4436",
+  "CALLER_AND_COMMENTER_VERSION": "0.0.2",
   "COMMENTS": "0x7777777C2B3132e03a65721a41745C07170a5877",
   "COMMENTS_BLOCK_NUMBER": 21297164,
   "COMMENTS_IMPL": "0xFD2FDCE0d316410d3F57459DF33f88626EDF5Bc0",
   "COMMENTS_IMPL_BLOCK_NUMBER": 21296491
-}
+}

package/addresses/81457.json

@@ -0,0 +1,9 @@
+{
+  "CALLER_AND_COMMENTER": "0x77777775C5074b74540d9cC63Dd840A8c692B4B5",
+  "CALLER_AND_COMMENTER_IMPL": "0xD1F822051f3BbaDc79b7F7B4cE160525976dcD94",
+  "CALLER_AND_COMMENTER_VERSION": "",
+  "COMMENTS": "0x7777777C2B3132e03a65721a41745C07170a5877",
+  "COMMENTS_BLOCK_NUMBER": 11006995,
+  "COMMENTS_IMPL": "0x5f6b93d92ed8b51de3cb8ce135e29ca4a3a64e88",
+  "COMMENTS_IMPL_BLOCK_NUMBER": 0
+}

package/addresses/8453.json

@@ -1,7 +1,7 @@
 {
   "CALLER_AND_COMMENTER": "0x77777775C5074b74540d9cC63Dd840A8c692B4B5",
-  "CALLER_AND_COMMENTER_IMPL": "0x7d42Ee84D377D37cfc9EbF10C3aEe56da326642d",
-  "CALLER_AND_COMMENTER_VERSION": "",
+  "CALLER_AND_COMMENTER_IMPL": "0xaD607aF6c0b35Dd24d11693385C6aF8969d9abA8",
+  "CALLER_AND_COMMENTER_VERSION": "0.0.2",
   "COMMENTS": "0x7777777C2B3132e03a65721a41745C07170a5877",
   "COMMENTS_BLOCK_NUMBER": 21374808,
   "COMMENTS_IMPL": "0x8f5B2dd6160D96B48a35F0619BC32b4b997cA37F",

package/addresses/84532.json

@@ -1,7 +1,7 @@
 {
   "CALLER_AND_COMMENTER": "0x77777775C5074b74540d9cC63Dd840A8c692B4B5",
-  "CALLER_AND_COMMENTER_IMPL": "0x2B8eF6E51717Af2C1AadFbC611D3852563B76E8f",
-  "CALLER_AND_COMMENTER_VERSION": "",
+  "CALLER_AND_COMMENTER_IMPL": "0x8e90D8cfc0CA66EA143930E4c5F7E31Bf16F722b",
+  "CALLER_AND_COMMENTER_VERSION": "0.0.2",
   "COMMENTS": "0x7777777C2B3132e03a65721a41745C07170a5877",
   "COMMENTS_BLOCK_NUMBER": 17267821,
   "COMMENTS_IMPL": "0x05177c381CaC95d8DC872b14218f67C9fB903966",

package/addresses/999999999.json

@@ -1,6 +1,6 @@
 {
   "CALLER_AND_COMMENTER": "0x77777775C5074b74540d9cC63Dd840A8c692B4B5",
-  "CALLER_AND_COMMENTER_IMPL": "0xAca467FCcb8b0550070E1fD3B58B7a5338889e7F",
+  "CALLER_AND_COMMENTER_IMPL": "0x93f84e1D51A738BaF7B19a648C8723352b935B5A",
   "CALLER_AND_COMMENTER_VERSION": "",
   "COMMENTS": "0x7777777C2B3132e03a65721a41745C07170a5877",
   "COMMENTS_BLOCK_NUMBER": 15602117,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zoralabs/comments-contracts",
-  "version": "0.0.2-COMMENTS.0",
+  "version": "0.0.2",
   "author": "oveddan",
   "license": "MIT",
   "type": "module",
@@ -36,10 +36,10 @@
     "typescript": "^5.2.2",
     "viem": "^2.21.18",
     "@zoralabs/sparks-contracts": "^0.2.4",
-    "@zoralabs/protocol-rewards": "^1.2.5-COMMENTS.0",
+    "@zoralabs/protocol-rewards": "^1.2.5",
     "@zoralabs/shared-contracts": "^0.0.1",
     "@zoralabs/tsconfig": "^0.0.1",
-    "@zoralabs/zora-1155-contracts": "^2.13.0"
+    "@zoralabs/zora-1155-contracts": "^2.13.2"
   },
   "dependencies": {
     "abitype": "^1.0.2",
@@ -53,7 +53,7 @@
     "test-gas": "forge test --gas-report",
     "storage-inspect:check": "./script/storage-check.sh check ZoraTimedSaleStrategyImpl",
     "storage-inspect:generate": "./script/storage-check.sh generate ZoraTimedSaleStrategyImpl",
-    "build:sizes": "forge build --sizes",
+    "build:sizes": "forge build src/ --sizes",
     "copy-abis": "pnpm tsx script/bundle-abis.ts",
     "coverage": "FOUNDRY_PROFILE=default forge coverage --report lcov",
     "build": "pnpm run wagmi:generate && pnpm run copy-abis && pnpm run prettier:write && tsup",

package/script/CommentsDeployerBase.sol

@@ -122,6 +122,7 @@ contract CommentsDeployerBase is ProxyDeployerScript {
 
         // deploy caller and commenter impl
         deployment.callerAndCommenterImpl = address(deployCallerAndCommenterImpl(commentsAddress));
+        deployment.callerAndCommenterVersion = CallerAndCommenterImpl(deployment.callerAndCommenterImpl).contractVersion();
 
         bytes memory upgradeToAndCall = abi.encodeWithSelector(
             UUPSUpgradeable.upgradeToAndCall.selector,

package/script/DeployCallerAndCommenterImpl.s.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.13;
 import "forge-std/console2.sol";
 
 import {CommentsDeployerBase} from "./CommentsDeployerBase.sol";
+import {CallerAndCommenterImpl} from "../src/utils/CallerAndCommenterImpl.sol";
 import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 
 contract DeployCallerAndCommenterImpl is CommentsDeployerBase {
@@ -13,6 +14,7 @@ contract DeployCallerAndCommenterImpl is CommentsDeployerBase {
         vm.startBroadcast();
 
         config.callerAndCommenterImpl = deployCallerAndCommenterImpl(config.comments);
+        config.callerAndCommenterVersion = CallerAndCommenterImpl(config.callerAndCommenterImpl).contractVersion();
 
         vm.stopBroadcast();
 

package/src/utils/CallerAndCommenterImpl.sol

@@ -232,7 +232,7 @@ contract CallerAndCommenterImpl is
 
     bytes32 constant PERMIT_BUY_ON_SECONDARY_AND_COMMENT_DOMAIN =
         keccak256(
-            "PermitBuyOnSecondaryAndComment(address commenter,uint256 quantity,address collection,uint256 tokenId,address excessRefundRecipient,uint256 maxEthToSpend,uint160 sqrtPriceLimitX96,string comment,uint256 deadline,bytes32 nonce,uint32 sourceChainId,uint32 destinationChainId)"
+            "PermitBuyOnSecondaryAndComment(address commenter,uint256 quantity,address collection,uint256 tokenId,uint256 maxEthToSpend,uint160 sqrtPriceLimitX96,string comment,uint256 deadline,bytes32 nonce,uint32 sourceChainId,uint32 destinationChainId)"
         );
 
     function _hashPermitBuyOnSecondaryAndComment(PermitBuyOnSecondaryAndComment memory permit) internal pure returns (bytes memory) {
@@ -287,7 +287,7 @@ contract CallerAndCommenterImpl is
             );
     }
 
-    /// @notice Sells Zora 1155 tokens on secondary market and adds a comment, without needing to pay a spark for the comment.
+    /// @notice Sells Zora 1155 tokens on secondary market and adds a comment.
     /// @dev Must sent ETH value of one spark for the comment.  Commenter must have approved this contract to transfer the tokens
     /// on the 1155 contract.
     /// @param commenter The address of the commenter. Must match the msg.sender. Commenter will be the seller of the tokens.

package/CHANGELOG.md

@@ -1,8 +0,0 @@
-# @zoralabs/comments-contracts
-
-## 0.0.2-COMMENTS.0
-
-### Patch Changes
-
-- c6e1c1bc: Added new deployments for comments
-- ad1ba7ca: Added ability to buy on secondary and comment

package/abis/CommentsDeployerBase.json

@@ -1,15 +0,0 @@
-[
-  {
-    "type": "function",
-    "name": "IS_SCRIPT",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool",
-        "internalType": "bool"
-      }
-    ],
-    "stateMutability": "view"
-  }
-]

package/abis/ProxyDeployerScript.json

@@ -1,15 +0,0 @@
-[
-  {
-    "type": "function",
-    "name": "IS_SCRIPT",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool",
-        "internalType": "bool"
-      }
-    ],
-    "stateMutability": "view"
-  }
-]