From 1b060729cefa749f36564f212f67c0c5eca87007 Mon Sep 17 00:00:00 2001 From: Dan Oved <stangogh@gmail.com> Date: Fri, 13 Oct 2023 08:34:07 -0700 Subject: [PATCH 1/2] Add missing protocol rewards readme (#265) --- packages/protocol-rewards/README.md | 34 +++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 packages/protocol-rewards/README.md diff --git a/packages/protocol-rewards/README.md b/packages/protocol-rewards/README.md new file mode 100644 index 000000000..88e1202c7 --- /dev/null +++ b/packages/protocol-rewards/README.md @@ -0,0 +1,34 @@ +# Zora Protocol Rewards + +Zora is about bringing creativity onchain. Protocol Rewards is our latest offering for creators and developers to earn from their contributions to our growing ecosystem. + +This repository features: +- The `ERC721Rewards` and `ERC1155Rewards` abstract smart contracts which handle reward computation and routing for Zora [ERC-721](https://github.com/ourzora/zora-drops-contracts) and [ERC-1155](https://github.com/ourzora/zora-1155-contracts) NFT mints +- The `ProtocolRewards` singleton smart contract used to deposit and withdraw rewards + +Documentation is available at [docs.zora.co](https://docs.zora.co). + +## Implementation Caveats + +The `ProtocolRewards` contract has a implementation caveat. If you send any value to a zero (`address(0)`) address in `depositRewards`, that value is implicitly burnt by being locked in the contract at the zero address. The function will not revert or redirect those funds as currently designed. We may re-visit this design in the future but for the release of v1.1 this is the current and expected behavior. + +## Deployed Addresses + +`ProtocolRewards` v1.1 is deterministically deployed at 0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B. + +Current Supported Chains: +- Zora Mainnet +- Zora Goerli +- Ethereum Mainnet +- Ethereum Goerli +- OP Mainnet +- OP Goerli +- Base Mainnet +- Base Goerli + +## Install + +To interact with the `ProtocolRewards` contract: +```sh +yarn add @zoralabs/protocol-rewards +``` From 64f028a4514a6d73a18879d46d2d2590a83f9ce4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:41:46 -0400 Subject: [PATCH 2/2] Version Packages (#266) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> --- .changeset/odd-poems-lie.md | 5 ----- packages/1155-contracts/CHANGELOG.md | 6 ++++++ packages/1155-contracts/package.json | 2 +- packages/1155-contracts/src/version/ContractVersionBase.sol | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 .changeset/odd-poems-lie.md diff --git a/.changeset/odd-poems-lie.md b/.changeset/odd-poems-lie.md deleted file mode 100644 index f5219ca5e..000000000 --- a/.changeset/odd-poems-lie.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@zoralabs/zora-1155-contracts": patch ---- - -Exporting abi diff --git a/packages/1155-contracts/CHANGELOG.md b/packages/1155-contracts/CHANGELOG.md index a76d359ce..f6f7e6532 100644 --- a/packages/1155-contracts/CHANGELOG.md +++ b/packages/1155-contracts/CHANGELOG.md @@ -1,5 +1,11 @@ # @zoralabs/zora-1155-contracts +## 2.0.4 + +### Patch Changes + +- 64da698: Exporting abi + ## 2.0.3 ### Patch Changes diff --git a/packages/1155-contracts/package.json b/packages/1155-contracts/package.json index c96c59690..84b485b58 100644 --- a/packages/1155-contracts/package.json +++ b/packages/1155-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@zoralabs/zora-1155-contracts", - "version": "2.0.3", + "version": "2.0.4", "repository": "git@github.com:ourzora/zora-protocol.git", "author": "Iain <iain@zora.co>", "license": "MIT", diff --git a/packages/1155-contracts/src/version/ContractVersionBase.sol b/packages/1155-contracts/src/version/ContractVersionBase.sol index 76e267a80..613681690 100644 --- a/packages/1155-contracts/src/version/ContractVersionBase.sol +++ b/packages/1155-contracts/src/version/ContractVersionBase.sol @@ -1,5 +1,5 @@ // This file is automatically generated by code; do not manually update -// Last updated on 2023-10-05T22:37:20.442Z +// Last updated on 2023-10-13T15:34:50.319Z // SPDX-License-Identifier: MIT pragma solidity 0.8.17; @@ -10,6 +10,6 @@ import {IVersionedContract} from "../interfaces/IVersionedContract.sol"; contract ContractVersionBase is IVersionedContract { /// @notice The version of the contract function contractVersion() external pure override returns (string memory) { - return "2.0.3"; + return "2.0.4"; } }