Premint #161

oveddan · 2023-09-07T16:48:11Z

Premint - delegated contract & token creation, & minting
First minter rewards
Determinstic contract addresses

oveddan · 2023-09-07T16:48:22Z

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

some minor fixes should be worked on before merging to master

oveddan · 2023-09-15T02:42:18Z

src/premint/README.md

@@ -0,0 +1,59 @@
+# Preminter


this should be made up to date before merging to master

oveddan · 2023-09-15T02:42:41Z

src/premint/ZoraCreator1155Attribution.sol

+    }
+
+    // todo: move to its own contract
+    error MintNotYetStarted();


lets do this todo, and just reference IZora1155Errors.MintNotYetStarted

oveddan · 2023-09-15T02:44:48Z

src/premint/ZoraCreator1155Attribution.sol

+import {ECDSAUpgradeable} from "@zoralabs/openzeppelin-contracts-upgradeable/contracts/utils/cryptography/ECDSAUpgradeable.sol";
+import {ZoraCreatorFixedPriceSaleStrategy} from "../minters/fixed-price/ZoraCreatorFixedPriceSaleStrategy.sol";
+
+struct ContractCreationConfig {


this doesn't quite belong in this file, as it is primarily used to create new contracts and get a deterministic address based on these fields

oveddan · 2023-09-15T02:45:27Z

src/premint/ZoraCreator1155PremintExecutor.sol

+import {IMinter1155} from "../interfaces/IMinter1155.sol";
+import {PremintConfig, ContractCreationConfig, TokenCreationConfig, ZoraCreator1155Attribution} from "./ZoraCreator1155Attribution.sol";
+
+/// @title Enables creation of and minting tokens on Zora1155 contracts transactions using eip-712 signatures.


add Enjoy graphic (and inherit from it)

oveddan · 2023-09-15T02:45:56Z

src/premint/ZoraCreator1155PremintExecutor.sol

+        isNewContract = contractAddress.code.length == 0;
+
+        if (isNewContract) {
+            // if address doesnt exist for hash, createi t


oveddan · 2023-09-15T02:47:31Z

src/premint/ZoraCreator1155PremintExecutor.sol

+        return "ZORA 1155 Premint Executor";
+    }
+
+    // upgrade functionality


duplicate comment

Premint - update documentation

* move upgrade gate to initalizer pattern * formatting

refactor: remove mint fee amount deploy param

refactor: implement first minter reward on adminMint

* refactor: only mint if specified quantity is greater than 0 * fix tests --------- Co-authored-by: Dan Oved <stangogh@gmail.com>

* Can mine for a determinstic address for the proxy shim in a script, and have a test that shows we can determinstically deploy proxy to that address with that salt and deployer account * wip on deploy via script. nneed to create web ui * cleanup * update test to work with new params :) * deployment works now!. lets genericize stuff :) * consolidated into one * end to end scripting works :) * renamed and refactored to be more usable * Determinstic deployer scripts are more generic and can deploy and verify :) * rename * another rename :) * Premint proxy deploy (#211) * made premint executor ugparde scripts. renamed executor to proxy * deploy preminter impl with script, and updated the config for that chain * Have premint proxy deploy scripts. can deploy both now * preminter proxy pushed * Refactor deterministic add upgrade gate (#210) * large refactor * update scripts * updates to test code * test naming updates * compiler run correctly * update with new deterministic configs * make node deps only for scripts * Premint deploy determinstic fix tests (#213) * fixed tests by just making it more dyanmic * fix stack too deep error for coverage * ignore deployment folder for coverage * properly filter out deployment --------- Co-authored-by: Iain Nash <iain@zora.co>

* fix: remove unused param names * fix: linting

iainnash · 2023-09-29T17:17:04Z

package/batchPublish.test.ts

@@ -281,7 +280,7 @@ describe("ZoraCreator1155Preminter", () => {
        [collectorAccount]
      );

-      const zoraMintFee = chainConfigs[zora.id].MINT_FEE_AMOUNT;
+      const zoraMintFee = parseEther("0.0007");


Should this be 0.000777?

i delete this test for now

yes, fixing

* Premint * Add back mint fee getter (#198) * add back mint fee getter * add mint fee to interface * * Updated script to deploy preminter to now deploy the proxy (#189) * Extracted common deployment tasks to reusable helper functions * Added script to upgrade preminter * Premint - move premint state to its own contract (#188) Renamed Premint folder to delegated mint * fix: redeem minter tests * fix: token transfer hook for single token transfers * feat: add unit tests * Seperate upgrade gate new contract (#204) * wip * wip * fix tests * chore: run lint & update natspec * update storage layout --------- Co-authored-by: Rohan Kulkarni <kulkarohan@gmail.com> * refactor: add helper to read uups implementation * fix: param name casing * refactor: use updated zora 1155 impl getter * refactor: add helper to read uups implementation * fix: zora 1155 impl var name * chore: run lint * chore: run lint * refactor: implement first minter reward on adminMint * chore: update runs * refactor: remove mint fee amount deploy param * chore: run lint * chore: run lint * chore: remove mint fee amount from chain configs * chore: update fork test * fix: use mint w rewards to gurantee mint fee amount * Premint: updated documentation (#199) Premint - update documentation * move upgrade gate to initializer pattern (#209) * move upgrade gate to initalizer pattern * formatting * refactor: only mint if specified quantity is greater than 0 (#212) * refactor: only mint if specified quantity is greater than 0 * fix tests --------- Co-authored-by: Dan Oved <stangogh@gmail.com> * Premint - factory proxy 777 deployments (#191) * Can mine for a determinstic address for the proxy shim in a script, and have a test that shows we can determinstically deploy proxy to that address with that salt and deployer account * wip on deploy via script. nneed to create web ui * cleanup * update test to work with new params :) * deployment works now!. lets genericize stuff :) * consolidated into one * end to end scripting works :) * renamed and refactored to be more usable * Determinstic deployer scripts are more generic and can deploy and verify :) * rename * another rename :) * Premint proxy deploy (#211) * made premint executor ugparde scripts. renamed executor to proxy * deploy preminter impl with script, and updated the config for that chain * Have premint proxy deploy scripts. can deploy both now * preminter proxy pushed * Refactor deterministic add upgrade gate (#210) * large refactor * update scripts * updates to test code * test naming updates * compiler run correctly * update with new deterministic configs * make node deps only for scripts * Premint deploy determinstic fix tests (#213) * fixed tests by just making it more dyanmic * fix stack too deep error for coverage * ignore deployment folder for coverage * properly filter out deployment --------- Co-authored-by: Iain Nash <iain@zora.co> * update deps * add back release command * fix version publish * fix contract version * move wagmi cli to proper version * more things in dev deps * move all into deps * update protocol rewards package (#226) * fix build * fix wagmi build * Clean Up Transfer Hook Mock (#229) * fix: remove unused param names * fix: linting --------- Co-authored-by: Rohan Kulkarni <kulkarohan@gmail.com> Co-authored-by: Rohan Kulkarni <rohan@ourzora.com> Co-authored-by: Isabella Smallcombe <isabella@ourzora.com> Co-authored-by: Iain Nash <iain@zora.co> Co-authored-by: Isabella Smallcombe <isabella.smallcombe@gmail.com>

oveddan marked this pull request as ready for review September 7, 2023 16:52

oveddan force-pushed the premint branch 2 times, most recently from b7ee5fa to 01b9ec0 Compare September 11, 2023 16:25

This was referenced Sep 11, 2023

Premint: first minter rewards #162

Merged

Premint: add creator to creator attribution event #163

Merged

oveddan force-pushed the premint branch from 4b7cbd0 to 01b9ec0 Compare September 11, 2023 17:06

oveddan mentioned this pull request Sep 11, 2023

Premint: fix fork tests #164

Merged

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

This was referenced Sep 11, 2023

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

Closed

Premint - premint executor is upgradeable #168

Merged

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

oveddan commented Sep 15, 2023

View reviewed changes

oveddan changed the base branch from main to prerelease-action September 19, 2023 15:12

oveddan force-pushed the premint branch from ce6df73 to 8b99658 Compare September 19, 2023 15:12

This was referenced Sep 19, 2023

Premint prerelease #187

Closed

Premint - move delegated minter state to its own contract #188

Merged

oveddan force-pushed the premint branch from 4e23658 to ab48762 Compare September 19, 2023 22:10

kulkarohan and others added 6 commits September 27, 2023 17:26

fix: use mint w rewards to gurantee mint fee amount

7415a4d

Premint: updated documentation (#199)

3e58f0c

Premint - update documentation

move upgrade gate to initializer pattern (#209)

e6b1fb9

* move upgrade gate to initalizer pattern * formatting

Merge pull request #208 from ourzora/update_constructor

1e0d23a

refactor: remove mint fee amount deploy param

Merge branch 'premint' into update_rewards_logic

d1d2d77

Merge pull request #207 from ourzora/update_rewards_logic

f363f38

refactor: implement first minter reward on adminMint

kulkarohan mentioned this pull request Sep 28, 2023

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

Merged

kulkarohan and others added 16 commits September 28, 2023 20:34

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

4a0a3d7

* refactor: only mint if specified quantity is greater than 0 * fix tests --------- Co-authored-by: Dan Oved <stangogh@gmail.com>

Merge branch 'main' into premint

56f9106

update deps

a93699e

add back release command

b4ce845

fix version publish

e044d37

fix contract version

b5807c4

move wagmi cli to proper version

0c83f54

more things in dev deps

0f0ba70

move all into deps

c226740

update protocol rewards package (#226)

7e16c4d

fix build

895b242

fix wagmi build

841c7dc

Clean Up Transfer Hook Mock (#229)

d587b5a

* fix: remove unused param names * fix: linting

fix preminter file

dd1e4db

test building package in main premint

9118b23

iainnash approved these changes Sep 29, 2023

View reviewed changes

iainnash reviewed Sep 29, 2023

View reviewed changes

oveddan added 2 commits September 29, 2023 13:22

fix eth amount

666454a

remove yarn production flag

17fa62d

oveddan merged commit 399b8e6 into main Sep 29, 2023
3 checks passed

oveddan deleted the premint branch September 29, 2023 17:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Premint #161

Premint #161

oveddan commented Sep 7, 2023 •

edited

Loading

oveddan commented Sep 7, 2023 •

edited by kulkarohan

Loading

oveddan left a comment

oveddan Sep 15, 2023

oveddan Sep 15, 2023

oveddan Sep 15, 2023

oveddan Sep 15, 2023

oveddan Sep 15, 2023

oveddan Sep 15, 2023

iainnash Sep 29, 2023

oveddan Sep 29, 2023

oveddan Sep 29, 2023

Premint #161

Premint #161

Conversation

oveddan commented Sep 7, 2023 • edited Loading

oveddan commented Sep 7, 2023 • edited by kulkarohan Loading

oveddan left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oveddan commented Sep 7, 2023 •

edited

Loading

oveddan commented Sep 7, 2023 •

edited by kulkarohan

Loading