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

package/.turbo/turbo-build.log

@@ -1,13 +1,13 @@
 
-> @zoralabs/comments-contracts@0.0.1 build /home/runner/work/zora-protocol-private/zora-protocol-private/packages/comments
+> @zoralabs/comments-contracts@0.0.2-COMMENTS.0 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.1 wagmi:generate /home/runner/work/zora-protocol-private/zora-protocol-private/packages/comments
+> @zoralabs/comments-contracts@0.0.2-COMMENTS.0 wagmi:generate /home/runner/work/zora-protocol-private/zora-protocol-private/packages/comments
 > FOUNDRY_PROFILE=dev forge build && wagmi generate
 
-Compiling 93 files with Solc 0.8.23
-Solc 0.8.23 finished in 23.33s
+Compiling 117 files with Solc 0.8.23
+Solc 0.8.23 finished in 52.51s
 Compiler run successful!
 - Validating plugins
 ✔ Validating plugins
@@ -18,32 +18,50 @@ Compiler run successful!
 - Writing to package/wagmiGenerated.ts
 ✔ Writing to package/wagmiGenerated.ts
 
-> @zoralabs/comments-contracts@0.0.1 copy-abis /home/runner/work/zora-protocol-private/zora-protocol-private/packages/comments
+> @zoralabs/comments-contracts@0.0.2-COMMENTS.0 copy-abis /home/runner/work/zora-protocol-private/zora-protocol-private/packages/comments
 > pnpm tsx script/bundle-abis.ts
 
 
-> @zoralabs/comments-contracts@0.0.1 prettier:write /home/runner/work/zora-protocol-private/zora-protocol-private/packages/comments
+> @zoralabs/comments-contracts@0.0.2-COMMENTS.0 prettier:write /home/runner/work/zora-protocol-private/zora-protocol-private/packages/comments
 > prettier --write 'src/**/*.sol' 'test/**/*.sol' 'script/**/*.sol'
 
-src/CommentsImpl.sol 1251ms (unchanged)
-src/deployments/CommentsDeployment.sol 19ms (unchanged)
-src/interfaces/IComments.sol 55ms (unchanged)
-src/interfaces/IZoraCreator1155.sol 10ms (unchanged)
-src/proxy/Comments.sol 25ms (unchanged)
-src/utils/EIP712UpgradeableWithChainId.sol 36ms (unchanged)
-src/version/ContractVersionBase.sol 4ms (unchanged)
-test/Comments_mintAndComment.t.sol 162ms (unchanged)
-test/Comments_permit.t.sol 423ms (unchanged)
-test/Comments.t.sol 577ms (unchanged)
-test/CommentsTestBase.sol 68ms (unchanged)
-test/mocks/Mock1155.sol 34ms (unchanged)
-test/mocks/MockMinter.sol 17ms (unchanged)
-test/mocks/ProtocolRewards.sol 693ms (unchanged)
+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)
+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 57ms (unchanged)
-script/DeployImpl.s.sol 39ms (unchanged)
-script/DeployNonDeterministic.s.sol 29ms (unchanged)
-script/GenerateDeterministicParams.s.sol 31ms (unchanged)
+script/Deploy.s.sol 7ms (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)
 CLI Building entry: package/index.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v7.3.0
@@ -52,9 +70,9 @@ CLI Target: es2021
 CLI Cleaning output folder
 CJS Build start
 ESM Build start
-ESM dist/index.js     27.14 KB
-ESM dist/index.js.map 47.24 KB
-ESM ⚡️ Build success in 30ms
-CJS dist/index.cjs     28.16 KB
-CJS dist/index.cjs.map 47.51 KB
-CJS ⚡️ Build success in 32ms
+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

package/CHANGELOG.md

@@ -0,0 +1,8 @@
+# @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/README.md

@@ -15,56 +15,27 @@ In the `packages/comments` directory:
 
 1. Copy `.env.example` to `.env`
 2. Populate the parameters in `.env`
-3. Set `TURNKEY_TARGET_ADDRESS` to the address of the turnkey account that will sign the deployment.
 
-### Deploying the Comments Contract
+### Deploying the Comments Contracts
 
-1. Generate deterministic config (if not already done):
+1. Deploy the `Comments` contract, you must pass the `--ffi` flag to enable calling an external script to sign the deployment with turnkey:
 
 ```bash
-DEPLOYER={TURNKEY_DEPLOYER_ADDRESS} forge script script/GenerateDeterministicParams.s.sol $(chains zora --rpc) --ffi
-```
-
-This saves the config to `./deterministicConfig/comments.json`.
-
-2. Deploy the `Comments` contract:
-
-```bash
-forge script script/Deploy.s.sol $(chains {chainName} --rpc) --broadcast --verify
+forge script script/Deploy.s.sol $(chains {chainName} --deploy) --broadcast --verify --ffi
 ```
 
 where `{chainName}` is the emdash name of the chain you want to deploy on.
 
-## Seeding a Comments Contract
-
-### Backfilling MintComments
-
-`MintComment` events are legacy events for commenting when minting on
-Zora 1155 contracts. To import the into a Comments contract, so that
-they can be replied to and sparked, the following script can be run.
-
-```
-pnpm tsx scripts/backfillComments.ts {chainName}
-```
+2. Verify the proxy contracts. Since they are deployed with create2, foundry wont always recognize the deployed contract, so verification needs to happen manually:
 
-where `{chainName}` is the emdash name of the chain you want to backfill on.
+for the comments contract:
 
-Example usages:
-
-```
-// for zora sepolia
-pnpm tsx scripts/backfillComments.ts zora-sepolia
-// for zora mainnet
-pnpm tsx scripts/backfillComments.ts zora
-// for base
-pnpm tsx scripts/backfillComments.ts base
+```bash
+forge verify-contract 0x7777777C2B3132e03a65721a41745C07170a5877 Comments $(chains {chainName} --verify) --constructor-args 0x000000000000000000000000064de410ce7aba82396332c5837b4c6b96108283
 ```
 
-### Seeding Comments Contract with some Test Data
-
-Currently only on Zora Sepolia, this will create some comments, replies,
-and sparked comments.
+for the caller and commenter contract:
 
-```
-pnpm tsx scripts/generateCommentsTestData.ts
+```bash
+forge verify-contract 0x77777775C5074b74540d9cC63Dd840A8c692B4B5 CallerAndCommenter $(chains {chainName} --verify) --constructor-args 0x000000000000000000000000064de410ce7aba82396332c5837b4c6b96108283
 ```

package/abis/AddDelegateCommenterRole.json

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

package/abis/CallerAndCommenter.json

@@ -0,0 +1,62 @@
+[
+  {
+    "type": "constructor",
+    "inputs": [
+      {
+        "name": "_logic",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "stateMutability": "nonpayable"
+  },
+  {
+    "type": "fallback",
+    "stateMutability": "payable"
+  },
+  {
+    "type": "event",
+    "name": "Upgraded",
+    "inputs": [
+      {
+        "name": "implementation",
+        "type": "address",
+        "indexed": true,
+        "internalType": "address"
+      }
+    ],
+    "anonymous": false
+  },
+  {
+    "type": "error",
+    "name": "AddressEmptyCode",
+    "inputs": [
+      {
+        "name": "target",
+        "type": "address",
+        "internalType": "address"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "ERC1967InvalidImplementation",
+    "inputs": [
+      {
+        "name": "implementation",
+        "type": "address",
+        "internalType": "address"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "ERC1967NonPayable",
+    "inputs": []
+  },
+  {
+    "type": "error",
+    "name": "FailedInnerCall",
+    "inputs": []
+  }
+]