Premint - upgradeable premint, new deployment scripts, and premint proxy deployment #189

oveddan · 2023-09-19T22:10:26Z

New deployment scripts and deployments for premint.

Changed DeployPreminter.s.sol to script/DeployNewPreminterAndFactoryProxy.s.sol and extracted common deployment functions deployNew1155AndFactoryProxy and deployNewPreminterProxy to helper methods in the base deployment contract, allowing for more composability/reusability in deployment scripts. Updated the base Deploy.s.sol to use these helper methods.
Added an UpgradePreminter.s.sol script that deploys a new preminter version and updates the proxy

oveddan · 2023-09-19T22:10:44Z

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 · 2023-09-19T22:23:01Z

ToDo:

how do you upgrade both erc1155 and preminter?

.storage-layout

src/nft/ZoraCreator1155Impl.sol

oveddan · 2023-09-21T18:38:41Z

this diff is really big let me fix

oveddan · 2023-09-21T18:40:52Z

@iainnash PR updated to just be this diff. it needed to be restacked

* Extracted common deployment tasks to reusable helper functions * Added script to upgrade preminter

* 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> Co-authored-by: Rohan Kulkarni <[email protected]> Co-authored-by: Isabella Smallcombe <[email protected]> Co-authored-by: Iain Nash <[email protected]> Co-authored-by: Isabella Smallcombe <[email protected]>

* 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 * make first minter on-chain gas sponsor * fix tests * prettier * add changeset * update changeset * fix build * first minter test fixes --------- Co-authored-by: Dan Oved <[email protected]> Co-authored-by: Rohan Kulkarni <[email protected]> Co-authored-by: Rohan Kulkarni <[email protected]> Co-authored-by: Isabella Smallcombe <[email protected]>

* 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> Co-authored-by: Rohan Kulkarni <[email protected]> Co-authored-by: Isabella Smallcombe <[email protected]> Co-authored-by: Iain Nash <[email protected]> Co-authored-by: Isabella Smallcombe <[email protected]>

* 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 * make first minter on-chain gas sponsor * fix tests * prettier * add changeset * update changeset * fix build * first minter test fixes --------- Co-authored-by: Dan Oved <[email protected]> Co-authored-by: Rohan Kulkarni <[email protected]> Co-authored-by: Rohan Kulkarni <[email protected]> Co-authored-by: Isabella Smallcombe <[email protected]>

oveddan force-pushed the premint-deploy-scripts-and-deployment branch from 8b99658 to f38ec60 Compare September 19, 2023 22:17

oveddan marked this pull request as ready for review September 19, 2023 22:23

oveddan requested review from iainnash, IsabellaSmallcombe and kulkarohan September 19, 2023 22:23

oveddan mentioned this pull request Sep 20, 2023

Fix published package to properly reference types #193

Merged

oveddan force-pushed the premint branch from ab48762 to 4ab220c Compare September 20, 2023 17:23

oveddan force-pushed the premint-deploy-scripts-and-deployment branch from f38ec60 to 4cd305c Compare September 20, 2023 17:23

oveddan force-pushed the premint branch from 4ab220c to d01994a Compare September 21, 2023 00:48

oveddan force-pushed the premint-deploy-scripts-and-deployment branch from 4cd305c to e57221f Compare September 21, 2023 00:48

oveddan force-pushed the premint branch from d01994a to 0d1edad Compare September 21, 2023 00:50

iainnash reviewed Sep 21, 2023

View reviewed changes

.storage-layout Outdated Show resolved Hide resolved

iainnash reviewed Sep 21, 2023

View reviewed changes

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

oveddan force-pushed the premint-deploy-scripts-and-deployment branch from e57221f to 7f3c54f Compare September 21, 2023 18:40

oveddan force-pushed the premint branch from 0d1edad to 2c6b7d6 Compare September 21, 2023 20:36

oveddan mentioned this pull request Sep 21, 2023

Add back mint fee getter #198

Merged

oveddan force-pushed the premint-deploy-scripts-and-deployment branch from 7f3c54f to b5e16e6 Compare September 22, 2023 15:55

oveddan mentioned this pull request Sep 22, 2023

Premint: updated documentation #199

Merged

iainnash force-pushed the premint branch from 2c6b7d6 to 7b43696 Compare September 26, 2023 19:57

iainnash mentioned this pull request Sep 26, 2023

Move factory upgrade gate to seperate contract #200

Closed

oveddan force-pushed the premint branch from 7b43696 to 068989e Compare September 26, 2023 21:07

* Updated script to deploy preminter to now deploy the proxy

e752d05

* Extracted common deployment tasks to reusable helper functions * Added script to upgrade preminter

oveddan force-pushed the premint-deploy-scripts-and-deployment branch from fb20c36 to e752d05 Compare September 26, 2023 21:16

oveddan merged commit bd93a06 into premint Sep 26, 2023
3 checks passed

oveddan deleted the premint-deploy-scripts-and-deployment branch September 26, 2023 21:16

iainnash mentioned this pull request Sep 26, 2023

move factory to a standalone contract #202

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Premint - upgradeable premint, new deployment scripts, and premint proxy deployment #189

Premint - upgradeable premint, new deployment scripts, and premint proxy deployment #189

oveddan commented Sep 19, 2023 •

edited

Loading

oveddan commented Sep 19, 2023 •

edited by kulkarohan

Loading

oveddan commented Sep 19, 2023

oveddan commented Sep 21, 2023

oveddan commented Sep 21, 2023

Premint - upgradeable premint, new deployment scripts, and premint proxy deployment #189

Premint - upgradeable premint, new deployment scripts, and premint proxy deployment #189

Conversation

oveddan commented Sep 19, 2023 • edited Loading

oveddan commented Sep 19, 2023 • edited by kulkarohan Loading

oveddan commented Sep 19, 2023

oveddan commented Sep 21, 2023

oveddan commented Sep 21, 2023

oveddan commented Sep 19, 2023 •

edited

Loading

oveddan commented Sep 19, 2023 •

edited by kulkarohan

Loading