Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Premint #149

Closed
wants to merge 25 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
3fe53f5
upgrade viem
oveddan Aug 16, 2023
ebe143c
Gasless
oveddan May 31, 2023
1da3d51
Creator attribution - reduce optimizer runs to get contracts to build…
oveddan Aug 22, 2023
fec401c
fix hanging test
oveddan Aug 23, 2023
c959eeb
prettier fix
oveddan Aug 23, 2023
08e6e81
Creator attribution deployed contracts
oveddan Aug 16, 2023
93c7181
deployed new creator attribution
oveddan Aug 18, 2023
a9ace8c
hack - only test fork on zora goerli for premint
oveddan Aug 23, 2023
1d77f78
Merge pull request #156 from ourzora/creator-attribution-published-tag
kulkarohan Aug 28, 2023
a047402
Merge pull request #155 from ourzora/creator-attribution-deployed-con…
kulkarohan Aug 28, 2023
88510f0
Merge pull request #98 from ourzora/gasless
kulkarohan Aug 28, 2023
6923d78
fix: factory tests
kulkarohan Aug 28, 2023
488f6e1
Merge pull request #158 from ourzora/08-28-fix_factory_tests
kulkarohan Aug 29, 2023
453c329
chore: remove alt deploy script
kulkarohan Aug 29, 2023
0d6387f
refactor: early return token id if token exists
kulkarohan Aug 29, 2023
5d499f6
refactor: store 1155 factory as immutable
kulkarohan Aug 29, 2023
adefaf7
chore: update tests
kulkarohan Aug 29, 2023
4434b85
chore: update tests
kulkarohan Sep 1, 2023
075b955
chore: lint
kulkarohan Sep 1, 2023
0bf348e
chore: update rewards package
kulkarohan Sep 1, 2023
c2bfc9f
feat: add first minter reward
kulkarohan Sep 1, 2023
b7ded4d
refactor: implement rewards in legacy mint function
kulkarohan Sep 1, 2023
25e7ac3
refactor: remove legacy mint fee manager
kulkarohan Sep 5, 2023
6b5c145
Merge pull request #160 from ourzora/remove_legacy_mint_fee_manager
kulkarohan Sep 6, 2023
a9756a2
Merge pull request #159 from ourzora/first_minter
kulkarohan Sep 6, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/long-avocados-visit.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@zoralabs/zora-1155-contracts": minor
---

- Added gasless minter
- Added deterministic contract creation
5 changes: 5 additions & 0 deletions .changeset/twelve-comics-sniff.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@zoralabs/zora-1155-contracts": minor
---

Premint with Delegated Minting
2 changes: 2 additions & 0 deletions .env.anvil
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
FORK_RPC_URL="https://testnet.rpc.zora.co/"
FORK_BLOCK_NUMBER=916572
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ lcov.info
dist/

.env
.env*
!.env.example

package/wagmiGenerated.ts
package/chainConfigs.ts
package/chainConfigs.ts

# not currently using pnpm
pnpm-lock.yaml
13 changes: 7 additions & 6 deletions addresses/999.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"CONTRACT_1155_IMPL": "0x91C1863eD54809c45b53bb6090eb437036c792C4",
"FACTORY_IMPL": "0xdF4A315443Ce2c11e6657D6A98B3a7143DE7B268",
"FACTORY_PROXY": "0x6a357139C1bcDcf0B3AB9bC447932dDdcb956703",
"CONTRACT_1155_IMPL": "0xe349c0e2C91DE151F7Fc469BF9c39F8A05EF59D2",
"FACTORY_IMPL": "0x93B2BCa3b7734370BB5bdcaB5Ef83b8E995cb9e0",
"FACTORY_PROXY": "0x368d9Fa8Fe07652a73E91986A7Eee2436D218739",
"FIXED_PRICE_SALE_STRATEGY": "0xd81351363b7d80b06E4Ec4De7989f0f91e41A846",
"MERKLE_MINT_SALE_STRATEGY": "0x2c4457D38A329526063b26a2bB2C31B61553Aa98",
"PREMINTER": "0x9D0162AC5ff579670f9b941db7eb7675667883B5",
"REDEEM_MINTER_FACTORY": "0x27817bAef1341De9Ad04097Bbba4Ea8dA32c8552",
"timestamp": 1688509842,
"commit": "f60dd5f"
}
"timestamp": 1692386956,
"commit": "d077c85"
}
2 changes: 1 addition & 1 deletion foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
fs_permissions = [{access = "read", path = "./addresses"}, {access = "read", path = "./chainConfigs"}, {access = "read", path = "./package.json"}]
libs = ['_imagine', 'node_modules', 'script']
optimizer = true
optimizer_runs = 3000
optimizer_runs = 500
out = 'out'
solc_version = '0.8.17'
src = 'src'
Expand Down
17 changes: 12 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zoralabs/zora-1155-contracts",
"version": "1.4.0",
"version": "1.4.5-gasless",
"repository": "[email protected]:ourzora/creator-contracts.git",
"author": "Iain <[email protected]>",
"license": "MIT",
Expand All @@ -14,14 +14,16 @@
"prettier": "prettier --write 'src/**/*.sol' 'test/**/*.sol' 'package/**/*.ts' 'wagmi.config.ts'",
"coverage": "forge coverage --report lcov",
"write-gas-report": "forge test --gas-report > gasreport.ansi",
"prepack": "node script/copy-deployed-contracts.mjs && yarn wagmi && yarn bundle-configs && yarn build",
"prepack": "yarn wagmi && yarn bundle-configs && yarn build",
"update-new-deployment-addresses": "node script/copy-deployed-contracts.mjs deploy",
"build": "tsup",
"bundle-configs": "node script/bundle-chainConfigs.mjs && yarn prettier",
"wagmi": "wagmi generate",
"publish-packages": "yarn prepack && changeset publish",
"storage-inspect:check": "./script/storage-check.sh check ZoraCreator1155Impl ZoraCreator1155FactoryImpl",
"storage-inspect:generate": "./script/storage-check.sh generate ZoraCreator1155Impl ZoraCreator1155FactoryImpl",
"js-test:watch": "vitest dev",
"anvil": "source .env.anvil && anvil --fork-url $FORK_RPC_URL --fork-block-number $FORK_BLOCK_NUMBER --chain-id 31337",
"release": "yarn run prepack && changeset publish"
},
"files": [
Expand All @@ -34,20 +36,25 @@
"dependencies": {
"@openzeppelin/contracts": "4.9.2",
"@zoralabs/openzeppelin-contracts-upgradeable": "4.8.4",
"@zoralabs/protocol-rewards": "1.1.1",
"@zoralabs/protocol-rewards": "1.1.2",
"ds-test": "https://github.com/dapphub/ds-test#cd98eff28324bfac652e63a239a60632a761790b",
"forge-std": "https://github.com/foundry-rs/forge-std#cd7d533f9a0ee0ec02ad81e0a8f262bc4203c653"
"forge-std": "https://github.com/foundry-rs/forge-std#cd7d533f9a0ee0ec02ad81e0a8f262bc4203c653",
"solmate": "^6.1.0"
},
"devDependencies": {
"@changesets/cli": "^2.26.1",
"@types/node": "^20.1.2",
"@wagmi/cli": "^1.0.1",
"abitype": "^0.8.7",
"es-main": "^1.2.0",
"glob": "^10.2.2",
"listr2": "^6.4.2",
"prettier": "^2.8.8",
"prettier-plugin-solidity": "^1.1.3",
"tsup": "^6.7.0",
"typescript": "^5.0.4"
"typescript": "^5.0.4",
"viem": "^1.6.0",
"vite": "^4.1.4",
"vitest": "~0.30.1"
}
}
Loading
Loading