Merge branch 'main' into simple-1

.changeset/config.json

@@ -12,7 +12,6 @@
     "@zoralabs/frame-minter-contracts",
     "docs",
     "@zoralabs/1155-deployments",
-    "smart-wallet",
-    "@zoralabs/sparks-deployments"
+    "@zoralabs/smart-wallet"
   ]
 }

.github/workflows/contract.yml

@@ -2,21 +2,21 @@ name: "Contract"
 on:
   workflow_call:
     inputs:
-        package_folder:
-          required: true
-          type: string
-        coverage_args:
-          required: false
-          type: string
-        name:
-          required: true
-          type: string
-        ignore_coverage_files:
-          required: false
-          type: string
-        skip_storage_layout:
-          type: boolean
-          default: false
+      package_folder:
+        required: true
+        type: string
+      coverage_args:
+        required: false
+        type: string
+      name:
+        required: true
+        type: string
+      ignore_coverage_files:
+        required: false
+        type: string
+      skip_storage_layout:
+        type: boolean
+        default: false
 
 jobs:
   build:
@@ -27,6 +27,7 @@ jobs:
   test:
     needs: build
     uses: ./.github/workflows/test.yml
+    secrets: inherit
     with:
       package_folder: ${{ inputs.package_folder }}
       name: ${{ inputs.name }}
@@ -45,7 +46,7 @@ jobs:
     with:
       package_folder: ${{ inputs.package_folder }}
       name: ${{ inputs.name }}
-  
+
   slither:
     needs: build
     uses: ./.github/workflows/slither.yml

.github/workflows/contracts.yml

@@ -39,7 +39,7 @@ jobs:
     secrets: inherit
     with:
       package_folder: packages/sparks
-      ignore_coverage_files: '"*Ownable*" "*Mock*" "*BatchDataHelper*" "*test*"'
+      ignore_coverage_files: '"*Ownable*" "*Mock*" "*BatchDataHelper*" "*test*" "*script*" "src/deployment/*"'
       skip_storage_layout: true
       name: Sparks
 
@@ -51,9 +51,12 @@ jobs:
       package_folder: packages/1155-deployments
       precache: "pnpm run generate"
 
-  contracts-sparks-deployments:
-    name: Sparks Deployments
-    uses: ./.github/workflows/deployment.yml
+  contracts-comments:
+    name: Comments
+    uses: ./.github/workflows/contract.yml
     secrets: inherit
     with:
-      package_folder: packages/sparks-deployments
+      package_folder: packages/comments
+      name: Comments
+      ignore_coverage_files: '"*lib*" "*mock*"'
+      skip_storage_layout: true

docs/package.json

@@ -32,6 +32,7 @@
     "yaml": "2.3.4"
   },
   "devDependencies": {
+    "@reservoir0x/relay-sdk": "^1.3.3",
     "@zoralabs/tsconfig": "workspace:*"
   }
 }

docs/pages/changelogs/1155-contracts.mdx

@@ -1,6 +1,25 @@
 # Zora 1155 Contracts Changelog
 
 
+## 2.13.2
+
+### Patch Changes
+
+- [1fd92cc8](https://github.com/ourzora/zora-protocol/commit/1fd92cc8): Add contractName field.
+
+## 2.13.1
+
+### Patch Changes
+
+- [ad707434](https://github.com/ourzora/zora-protocol/commit/ad707434): Updated the 1155 Implementation reduceSupply function to be gated to the `TimedSaleStrategy` constructor argument
+  to ensure markets are launched when desired.
+
+## 2.13.0
+
+### Minor Changes
+
+- [737fbef9](https://github.com/ourzora/zora-protocol/commit/737fbef9): Mint fee on the 1155 contract changed to 0.000111 eth
+
 ## 2.12.4
 
 ### Patch Changes

docs/pages/changelogs/protocol-deployments.mdx

@@ -1,11 +1,44 @@
 # @zoralabs/protocol-deployments Changelog
 
 
+## 0.3.9
+
+### Patch Changes
+
+- [4928687d](https://github.com/ourzora/zora-protocol/commit/4928687d): - Include the `Comments` and `CallerAndCommenter` abis and deployed addresses.
+  - Added new exports for Comments contract cross-chain functionality:
+    - Introduced `permitCommentTypedDataDefinition` function to generate typed data for cross-chain permit commenting
+    - Introduced `permitSparkCommentTypedDataDefinition` function to generate typed data for cross-chain permit sparking
+    - Introduced `permitTimedSaleMintAndCommentTypedDataType` to generate typed data for cross-chain permit minting and commenting.
+    - Introduced `permitBuyOnSecondaryAndCommentTypedDataDefinition` function to generate typed data for cross-chain permit buying on secondary and commenting.
+    - Added `sparkValue` helper function to get the value of a Spark
+
+## 0.3.8
+
+### Patch Changes
+
+- [ad707434](https://github.com/ourzora/zora-protocol/commit/ad707434): Updated the 1155 Implementation reduceSupply function to be gated to the `TimedSaleStrategy` constructor argument
+  to ensure markets are launched when desired.
+- [2e68a87c](https://github.com/ourzora/zora-protocol/commit/2e68a87c): Updated 1155 impl versions and addresses
+- [17cc9821](https://github.com/ourzora/zora-protocol/commit/17cc9821): Publishing `SponsoredSparksSpender` addresses and abi
+
+## 0.3.7
+
+### Patch Changes
+
+- [c08ec3b3](https://github.com/ourzora/zora-protocol/commit/c08ec3b3): Deployed SponsoredSparksSpender to more chains
+
+## 0.3.6
+
+### Patch Changes
+
+- [d6aa9a00](https://github.com/ourzora/zora-protocol/commit/d6aa9a00): Fixed the minter address for ZoraTimedSaleStrategy to point to the deterministically deployed address with the correct contract version.
+
 ## 0.3.5
 
 ### Patch Changes
 
-- [4a29c2b9](https://github.com/ourzora/zora-protocol/commit/4a29c2b9): Bump viem to 2.21.21.
+- [4a29c2b9](https://github.com/ourzora/zora-protocol/commit/4a29c2b9): Bump viem to 2.21.21
 
 ## 0.3.4
 

docs/pages/changelogs/protocol-sdk.mdx

@@ -1,6 +1,62 @@
 # @zoralabs/protocol-sdk Changelog
 
 
+## 0.11.9
+
+### Patch Changes
+
+- [9d5d1638](https://github.com/ourzora/zora-protocol/commit/9d5d1638): When minting + commenting, and using the timed sale strategy, protocol sdk will call the CallerAndCommenter contract
+- [088ec6fb](https://github.com/ourzora/zora-protocol/commit/088ec6fb): When buying on secondary, you can now add a comment, which will call the CallerAndCommenter's buyOnSecondaryAndComment function.
+- Updated dependencies [4928687d](https://github.com/ourzora/zora-protocol/commit/4928687d)
+  - @zoralabs/protocol-deployments@0.3.9
+
+## 0.11.8
+
+### Patch Changes
+
+- [330f1131](https://github.com/ourzora/zora-protocol/commit/330f1131): Fix royalties queries to filter by erc20z that have secondary activated
+
+## 0.11.7
+
+### Patch Changes
+
+- [041871d7](https://github.com/ourzora/zora-protocol/commit/041871d7): Fix royalties query for secondary tokens to query subgraph for royaltyRecipient instead of user.
+
+## 0.11.6
+
+### Patch Changes
+
+- Updated dependencies [ad707434](https://github.com/ourzora/zora-protocol/commit/ad707434)
+- Updated dependencies [2e68a87c](https://github.com/ourzora/zora-protocol/commit/2e68a87c)
+- Updated dependencies [17cc9821](https://github.com/ourzora/zora-protocol/commit/17cc9821)
+  - @zoralabs/protocol-deployments@0.3.8
+
+## 0.11.5
+
+### Patch Changes
+
+- [85d09fa5](https://github.com/ourzora/zora-protocol/commit/85d09fa5): - Adds new fields to `SecondaryInfo` type to expose more information about the secondary market configuration:
+
+  - `name`: The ERC20Z token name
+  - `symbol`: The ERC20Z token symbol
+  - `saleStart`: Earliest time tokens can be minted
+  - `marketCountdown`: Time after minimum mints reached until secondary market launches
+  - `minimumMintsForCountdown`: Minimum mints required to start countdown
+  - `mintCount`: Total number of tokens minted so far
+  - Deprecates `minimumMarketEth` parameter in favor of `minimumMintsForCountdown` when creating tokens:
+    - `minimumMintsForCountdown` directly specifies minimum number of mints (defaults to `1111`)
+    - `minimumMarketEth` is still supported but calculated internally as `minimumMintsForCountdown * 0.0000111 ETH`
+
+- Updated dependencies [c08ec3b3](https://github.com/ourzora/zora-protocol/commit/c08ec3b3)
+  - @zoralabs/protocol-deployments@0.3.7
+
+## 0.11.4
+
+### Patch Changes
+
+- Updated dependencies [d6aa9a00](https://github.com/ourzora/zora-protocol/commit/d6aa9a00)
+  - @zoralabs/protocol-deployments@0.3.6
+
 ## 0.11.3
 
 ### Patch Changes