Skip to content

Commit

Permalink
cleanup changesets (#334)
Browse files Browse the repository at this point in the history
<!--- Provide a general summary of your changes in the Title above -->

## Description

<!--- Describe your changes in detail -->

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->
<!--- If it fixes an open issue, please link to the issue here. -->

## Does this change the ABI/API?

- [ ] This changes the ABI/API

<!-- If so, please describe how and what potential impact this may have -->

## What tests did you add/modify to account for these changes

<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, tests ran to see how -->
<!--- your change affects other areas of the code, etc. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New module / feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->

- [ ] My code follows the code style of this project.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] i added a changeset to account for this change

## Reviewer Checklist:

- [ ] My review includes a symposis of the changes and potential issues
- [ ] The code style is enforced
- [ ] There are no risky / concerning changes / additions to the PR
  • Loading branch information
oveddan authored Apr 8, 2024
1 parent ca1a724 commit 7aff93d
Show file tree
Hide file tree
Showing 14 changed files with 6 additions and 54 deletions.
4 changes: 3 additions & 1 deletion .changeset/bright-socks-shake.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@
"@zoralabs/zora-1155-contracts": patch
---

1155 no longer has public facing function `computeFreeMintRewards` and `computePaidMintRewards`
- ZoraCreator1155Impl contract no longer has public facing function `computeFreeMintRewards` and `computePaidMintRewards`
- protocol rewards calculation logic has been refactored and moved from the RewardSplits contract to the ZoraCreator1155Impl itself to save on contract size.
- ZoraCreator1155Impl rewards splits are percentage based instead of a fixed value. This % is calculated based on the total reward value. And is based on a % value nearly identical to the previous fixed value.
4 changes: 1 addition & 3 deletions .changeset/brown-insects-rush.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@
"@zoralabs/mints-contracts": minor
---

- 1155 contracts use the MINTs contract to get the mint fee, mint, and redeem a mint ticket upon minting.
- Added `premintWithMints` the `ZoraCreatorPremintExecutorImpl`, enabling it to support preminting with already owned MINTs
- `ZoraMintsImpl` supports collecting zora creator 1155 nfts with new `collect` and `collectPremint` methods. `redeemBatch` is also added.
- 1155 contracts use the MINTs contracts to get the mint fee, mint, and redeem a mint ticket upon minting.
- `ZoraCreator1155Impl` adds a new method `mintWithMints` that allows for minting with MINTs that are already owned.
5 changes: 0 additions & 5 deletions .changeset/fresh-books-sin.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/lovely-trees-check.md

This file was deleted.

2 changes: 0 additions & 2 deletions .changeset/mean-bugs-walk.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
"@zoralabs/mints-contracts": patch
---

- Remove `premintWithMints` function on premintExecutor - and instead, when preminting, MINTs contract just called `premintV2WithSignerContract` with quantity to mint being 0,
and then it calls mintWithMints on the creator contract. This gets rid of the extra method we need to do premintWithMints.
- To support the MINTs contract passing the first minter as an argument to `premintV2WithSignerContract` - we add the field `firstMinter` to `premintV2WithSignerContract`, and then in the 1155 check that the firstMinter argument is not address(0) since it now can be passed in manually.


5 changes: 0 additions & 5 deletions .changeset/mean-tomatoes-applaud.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/nervous-taxis-sit.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/polite-shrimps-sparkle.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/smooth-sloths-give.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/tender-carrots-repeat.md

This file was deleted.

2 changes: 1 addition & 1 deletion .changeset/three-books-march.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"@zoralabs/protocol-deployments": patch
---

Chain ids in protocol-deployments are now numbers instead of strings
Chain ids in published protocol-deployments package are now numbers instead of strings
5 changes: 0 additions & 5 deletions .changeset/three-deers-travel.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/violet-cycles-knock.md

This file was deleted.

3 changes: 1 addition & 2 deletions packages/protocol-sdk/src/mints/mints-contracts.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import {
fixedPriceMinterMinterArguments,
decodeCallFailedError,
safeTransferBatchAndUnwrapTypedDataDefinition,
safeTransferAndUnwrapEthParams,
safeTransferAndUnwrapTypedDataDefinition,
} from "./mints-contracts";
import { getPremintCollectionAddress } from "src/premint/preminter";
Expand All @@ -49,7 +48,7 @@ import { zoraSepolia } from "viem/chains";

const anvilTest = makeAnvilTest({
forkUrl: forkUrls.zoraSepolia,
forkBlockNumber: 7127513,
forkBlockNumber: 7137785,
anvilChainId: zoraSepolia.id,
});

Expand Down

0 comments on commit 7aff93d

Please sign in to comment.