Premint: first minter rewards #162

oveddan · 2023-09-11T16:25:04Z

No description provided.

oveddan · 2023-09-11T16:25:12Z

Current dependencies on/for this PR:

main
- PR Fix published package to properly reference types #193
  - PR Prerelease workflow for versioning + publishing prerelease tags #184
    - PR Premint #161
      - PR refactor: only mint if specified quantity is greater than 0 #212
      - PR refactor: implement first minter reward on adminMint #207
        
        PR refactor: remove mint fee amount deploy param #208
      - PR refactor: add helper to read uups implementation #206
      - PR fix: redeem minter tests #203
      - PR move factory to a standalone contract #202
      - PR Move factory upgrade gate to seperate contract #200
      - PR Premint: updated documentation #199
      - PR Add back mint fee getter #198
      - PR Premint - upgradeable premint, new deployment scripts, and premint proxy deployment #189
        
        PR Premint - expose preminter via js sdk #190
        
        PR Premint - factory proxy 777 deployments #191
        
        PR Premint prerelease #187
      - PR Premint - move delegated minter state to its own contract #188
      - PR Prerelease workflow for versioning + publishing prerelease tags #179
        
        PR Premint - proxy deployment and updated deployment scripts #171
        
        PR Update deployment instructions #183
        
        PR Prerelease ci task #178
        
        PR Expose preminter from package #175
        
        PR Premint: pre-release #173
        
        PR Premint: 1.5.0-gasless release #172
      - PR Premint - include erc1155 errors in premint executor abi, by extracting its errors into interface and importing it #170
      - PR Premint - premint executor is upgradeable #168
        
        PR Premint - wrap erc1155 errors in an error that can be decoded - Erc1155CallReverted(bytes errorRevertedData) #169
      - PR Premint - move attribution lib to contract consumed via interface #166
      - PR Premint: fix fork tests #164
      - PR Premint: add creator to creator attribution event #163
      - PR Premint: first minter rewards #162 👈

This comment was auto-generated by Graphite.

oveddan

you could do this also with gt upstack restack then it restacks your branches' changes on top of the premint branch

oveddan

can you please add test that shows: first minter gets rewards on multiple mints from different minters

src/nft/ZoraCreator1155Impl.sol

kulkarohan · 2023-09-12T20:55:41Z

can you please add test that shows: first minter gets rewards on multiple mints from different minters

https://github.com/ourzora/zora-1155-contracts/pull/162/files#diff-4351e9f1c8712bdd84b0b795fa32bc3f4b01e309cf2b3aeb21d789bef6279cd2R969-R999

oveddan

great improvements and nice new test coverage

oveddan · 2023-09-12T22:27:39Z

test/minters/merkle/ZoraCreatorMerkleMinterStrategy.t.sol


        uint256 maxQuantity = 10;
-        uint256 pricePerToken = 1000000000000000000;
+        uint256 pricePerToken = 1 ether;


nice change here to these units

oveddan · 2023-09-12T22:28:57Z

test/nft/ZoraCreator1155.t.sol

@@ -963,6 +966,66 @@ contract ZoraCreator1155Test is Test {
        target.mintWithRewards(fixedPriceMinter, tokenId, quantity, abi.encode(recipient), address(0));
    }

+    function test_FirstMinterRewardReceivedOnConsecutiveMints(uint256 quantity) public {


awesome test!

oveddan · 2023-09-12T22:31:38Z

src/nft/ZoraCreator1155Impl.sol


        // Execute commands returned from minter
        _executeCommands(minter.requestMint(msg.sender, tokenId, quantity, ethValueSent, minterArguments).commands, ethValueSent, tokenId);

        emit Purchased(msg.sender, address(minter), tokenId, quantity, msg.value);
    }

+    /// @dev Get and/or set the first minter a token
+    function _handleFirstMinter(uint256 tokenId, bytes calldata data) internal returns (address) {


very minor (and optional improvement) - for readability, having returns (address firstMinter) would be clearer.

oveddan · 2023-09-13T00:27:37Z

Looks like test coverage went down to 69.5% - maybe some tests were deleted?

oveddan · 2023-09-13T00:36:12Z

todo:

fix test coverage
fix fork tests

* refactor: remove legacy mint fee contracts * refactor: remove unusued import * chore: update tests * chore: lint * chore: update runs * chore: update storage layout * style: update natspec * chore: update tests * chore: remove unused var * chore: update tests * fix: move hardcoded fork vars to constants * added first minter changeset * * Added changeset that depreates redeem minters. * Remove Redeem minter from coverage. --------- Co-authored-by: Rohan Kulkarni <[email protected]>

MINTs contract implementation and integration with Zora Creator 1155s and the Premint Executor. Additional improvements: * Created a new `DeterminsticTransparentProxyDeployer` for deploying the MINTs contract, which follows the TransparentProxyDeployer upgradeability method * Moved many contracts and entities into a new private shared package `shared-contracts` - enabling both the MINTs contract and Zora creator 1155 contract to use them. * simplified/flattened out rewards splits calculations to save contract storage size

This was referenced Sep 11, 2023

Premint #161

Merged

Premint: add creator to creator attribution event #163

Merged

Premint: fix fork tests #164

Merged

oveddan force-pushed the premint branch from 01b9ec0 to d898b10 Compare September 11, 2023 18:44

oveddan force-pushed the premint-first-minter-rewards branch from b7ee5fa to 3486445 Compare September 11, 2023 18:52

oveddan force-pushed the premint branch from 8d81d3b to d54c425 Compare September 11, 2023 20:08

oveddan commented Sep 11, 2023

View reviewed changes

src/nft/ZoraCreator1155Impl.sol Outdated Show resolved Hide resolved

oveddan mentioned this pull request Sep 11, 2023

Premint - move attribution lib to contract consumed via interface #166

Closed

oveddan commented Sep 12, 2023

View reviewed changes

src/nft/ZoraCreator1155Impl.sol Show resolved Hide resolved

oveddan mentioned this pull request Sep 12, 2023

Premint - premint executor is upgradeable #168

Merged

oveddan commented Sep 12, 2023

View reviewed changes

kulkarohan approved these changes Sep 12, 2023

View reviewed changes

oveddan commented Sep 12, 2023

View reviewed changes

oveddan force-pushed the premint branch from bc7052e to fbde89a Compare September 12, 2023 22:39

oveddan force-pushed the premint-first-minter-rewards branch 2 times, most recently from 62e0ee5 to 44366b7 Compare September 12, 2023 23:13

This was referenced Sep 13, 2023

Premint - wrap erc1155 errors in an error that can be decoded - Erc1155CallReverted(bytes errorRevertedData) #169

Closed

Premint - include erc1155 errors in premint executor abi, by extracting its errors into interface and importing it #170

Merged

kulkarohan added 7 commits September 14, 2023 09:38

refactor: remove legacy mint fee contracts

c1ae41a

refactor: remove unusued import

a981877

chore: update tests

cff0bd7

chore: lint

94246fa

chore: update runs

032af48

chore: update storage layout

7acce7e

style: update natspec

381a0f2

This was referenced Sep 21, 2023

Add back mint fee getter #198

Merged

Premint: updated documentation #199

Merged

This was referenced Sep 26, 2023

Move factory upgrade gate to seperate contract #200

Closed

move factory to a standalone contract #202

Closed

This was referenced Sep 26, 2023

fix: redeem minter tests #203

Merged

refactor: add helper to read uups implementation #206

Merged

refactor: implement first minter reward on adminMint #207

Merged

refactor: remove mint fee amount deploy param #208

Merged

kulkarohan mentioned this pull request Sep 28, 2023

refactor: only mint if specified quantity is greater than 0 #212

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Premint: first minter rewards #162

Premint: first minter rewards #162

oveddan commented Sep 11, 2023

oveddan commented Sep 11, 2023 •

edited by kulkarohan

Loading

oveddan left a comment

oveddan left a comment

kulkarohan commented Sep 12, 2023

oveddan left a comment

oveddan Sep 12, 2023

oveddan Sep 12, 2023

oveddan Sep 12, 2023

oveddan commented Sep 13, 2023

oveddan commented Sep 13, 2023

Premint: first minter rewards #162

Premint: first minter rewards #162

Conversation

oveddan commented Sep 11, 2023

oveddan commented Sep 11, 2023 • edited by kulkarohan Loading

oveddan left a comment

Choose a reason for hiding this comment

oveddan left a comment

Choose a reason for hiding this comment

kulkarohan commented Sep 12, 2023

oveddan left a comment

Choose a reason for hiding this comment

oveddan Sep 12, 2023

Choose a reason for hiding this comment

oveddan Sep 12, 2023

Choose a reason for hiding this comment

oveddan Sep 12, 2023

Choose a reason for hiding this comment

oveddan commented Sep 13, 2023

oveddan commented Sep 13, 2023

oveddan commented Sep 11, 2023 •

edited by kulkarohan

Loading