-
Notifications
You must be signed in to change notification settings - Fork 110
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* chore: add zora rewards pkg * chore: update scripts * feat: mintWithRewards * fix: update test setup * chore: update imports * fix: update remappings * chore: update dependencies * chore: update dependencies * chore: add rewards tests * chore: update rewards package * chore: update tests * chore: update rewards dep * refactor: change lister to origin * chore: update tests * chore: update contract version * chore: add zora rewards testnet * chore: update deploys * v1.3.3 * chore: update deploys * chore: update tests * fix: assert latest contract version * chore: fix merge conflicts * refactor: ensure funds recipient cannot be set to address(0) * chore: update deps * refactor: store create referral upon token creation * fix: pass token id * refactor: add common token setup * refactor: reward handling when funds recipient is not set * chore: update dep * chore: update tests * chore: update contract version * chore: update chain config * chore: update deploy config * chore: update runs * chore: update zora testnet deploy * chore: add changeset * chore: update tests * chore: update yarn lock * style: run linter * chore: update deps * chore: update deps * refactor: add rewards storage * chore: update protocol rewards * chore: update remappings * chore: update deploy config * chore: update naming * chore: update zora goerli deploy * chore: update goerli deploy * chore: update op goerli deploy * chore: update base goerli deploy * chore: update deps * chore: update op goerli factory owner * chore: update contract version * chore: update goerli deploy * chore: update zora goerli deploy * chore: update op goerli deploy * chore: update base goerli deploy * chore: update chain configs * refactor: add error for protocol rewards withdraw * chore: update deps * refactor: update rewards handle and withdraw * chore: update tests * chore: update testnets * chore: update version * chore: update config * chore: update deployments * chore: update chain configs * chore: update deploys * Update ZoraCreator1155.t.sol * Update ZoraCreator1155Factory.t.sol * update storage layout * fix fork test * update package json and changeset * yarn lock update --------- Co-authored-by: jgeary <[email protected]> Co-authored-by: iain nash <[email protected]>
- Loading branch information
1 parent
5b3fafd
commit 9f6510d
Showing
40 changed files
with
785 additions
and
174 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
--- | ||
"@zoralabs/zora-1155-contracts": minor | ||
--- | ||
|
||
Add support for rewards | ||
|
||
* Add new minting functions supporting rewards | ||
* Add new "rewards" library |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,10 @@ | ||
{ | ||
"CONTRACT_1155_IMPL": "0x89a53404d3e29c6e5431d73e04F44045d37D01FE", | ||
"FACTORY_IMPL": "0xA06262157905913f855573f53AD48DE2D4ba1F4A", | ||
"FACTORY_PROXY": "0x8732b4bCa198509bB9c40f9a24638Be1eaB7D30c", | ||
"FIXED_PRICE_SALE_STRATEGY": "0xD8EB23E82f0795427F27D7F20CAb56e7630D1166", | ||
"MERKLE_MINT_SALE_STRATEGY": "0x91724462892148fb0bAcD300d7503A80baB32aA5", | ||
"REDEEM_MINTER_FACTORY": "0xD507589779D7a4ec85FF9041dB2C2dc19e4B0554", | ||
"1155_IMPL": "0x0043809514fCFf58b74B0AF2b5870bD5F85abD35", | ||
"FACTORY_IMPL": "0x85ED22CE9B651F42E9F7f95d35B124b5d48EACdb", | ||
"FACTORY_PROXY": "0x8732b4bCa198509bB9c40f9a24638Be1eaB7D30c" | ||
} | ||
"timestamp": 1688510153, | ||
"commit": "f60dd5f" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
{ | ||
"CONTRACT_1155_IMPL": "0x42c10148399080F3d1f5C4278aabc1624c781FbD", | ||
"FACTORY_IMPL": "0x8a08f94eC8eb4041A766A2C9433Ad0EEAE147B09", | ||
"CONTRACT_1155_IMPL": "0x91C1863eD54809c45b53bb6090eb437036c792C4", | ||
"FACTORY_IMPL": "0xdF4A315443Ce2c11e6657D6A98B3a7143DE7B268", | ||
"FACTORY_PROXY": "0x6a357139C1bcDcf0B3AB9bC447932dDdcb956703", | ||
"FIXED_PRICE_SALE_STRATEGY": "0xd81351363b7d80b06E4Ec4De7989f0f91e41A846", | ||
"MERKLE_MINT_SALE_STRATEGY": "0x2c4457D38A329526063b26a2bB2C31B61553Aa98", | ||
"REDEEM_MINTER_FACTORY": "0x27817bAef1341De9Ad04097Bbba4Ea8dA32c8552", | ||
"timestamp": 1684354070, | ||
"commit": "8f9a781" | ||
"timestamp": 1688509842, | ||
"commit": "f60dd5f" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
{ | ||
"FACTORY_OWNER": "0xDB392f4391462d60B8B4413ef72018Ab595Af9D0", | ||
"MINT_FEE_AMOUNT": 777000000000000, | ||
"MINT_FEE_RECIPIENT": "0xd1d1D4e36117aB794ec5d4c78cBD3a8904E691D0" | ||
"MINT_FEE_RECIPIENT": "0xd1d1D4e36117aB794ec5d4c78cBD3a8904E691D0", | ||
"PROTOCOL_REWARDS": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
{ | ||
"FACTORY_OWNER": "0x7A810DCd0f8d83B20212326813Db6EF7E9FD030c", | ||
"MINT_FEE_AMOUNT": 777000000000000, | ||
"MINT_FEE_RECIPIENT": "0x7A810DCd0f8d83B20212326813Db6EF7E9FD030c" | ||
"MINT_FEE_RECIPIENT": "0x7A810DCd0f8d83B20212326813Db6EF7E9FD030c", | ||
"PROTOCOL_REWARDS": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
{ | ||
"FACTORY_OWNER": "0x11cf5f667dc6ad4dee58cb07e4aac6a3fc7e1dcb", | ||
"FACTORY_OWNER": "0xbb45052B2260707655Dfd916a416264f5981192c", | ||
"MINT_FEE_AMOUNT": 777000000000000, | ||
"MINT_FEE_RECIPIENT": "0x5dEe21327CD7CD6725C2578DA1c3E5bb2D2D34b2" | ||
"MINT_FEE_RECIPIENT": "0x5dEe21327CD7CD6725C2578DA1c3E5bb2D2D34b2", | ||
"PROTOCOL_REWARDS": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
{ | ||
"FACTORY_OWNER": "0x8fbC66d36cceB3Ad69B4d672756da54CcFec1cD2", | ||
"MINT_FEE_AMOUNT": 777000000000000, | ||
"MINT_FEE_RECIPIENT": "0x95FD5d77B206cCc0B1f7D7A4077fbE8eb4fC31eF" | ||
"MINT_FEE_RECIPIENT": "0x95FD5d77B206cCc0B1f7D7A4077fbE8eb4fC31eF", | ||
"PROTOCOL_REWARDS": "0x7777777A456fF23D9b6851184472c08FBDa73e32" | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
{ | ||
"FACTORY_OWNER": "0xDC498668B5e6CC518fD58A2ADBF614Fd3A13D3a0", | ||
"MINT_FEE_AMOUNT": 10000, | ||
"MINT_FEE_RECIPIENT": "0x9444390c01Dd5b7249E53FAc31290F7dFF53450D" | ||
"MINT_FEE_RECIPIENT": "0x9444390c01Dd5b7249E53FAc31290F7dFF53450D", | ||
"PROTOCOL_REWARDS": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
{ | ||
"FACTORY_OWNER": "0xdEA20c96253dc2d64897D2b8d27A8d935dE74955", | ||
"MINT_FEE_AMOUNT": 777000000000000, | ||
"MINT_FEE_RECIPIENT": "0xEcfc2ee50409E459c554a2b0376F882Ce916D853" | ||
"MINT_FEE_RECIPIENT": "0xEcfc2ee50409E459c554a2b0376F882Ce916D853", | ||
"PROTOCOL_REWARDS": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B" | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
{ | ||
"FACTORY_OWNER": "0x004d6611884B4A661749B64b2ADc78505c3e1AB3", | ||
"MINT_FEE_AMOUNT": 777000000000000, | ||
"MINT_FEE_RECIPIENT": "0x7bf90111Ad7C22bec9E9dFf8A01A44713CC1b1B6" | ||
"MINT_FEE_RECIPIENT": "0x7bf90111Ad7C22bec9E9dFf8A01A44713CC1b1B6", | ||
"PROTOCOL_REWARDS": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
{ | ||
"FACTORY_OWNER": "0x02539E813cA450C2c7334e885423f4A899a063Fe", | ||
"MINT_FEE_AMOUNT": 777000000000000, | ||
"MINT_FEE_RECIPIENT": "0x02539E813cA450C2c7334e885423f4A899a063Fe" | ||
"MINT_FEE_RECIPIENT": "0x02539E813cA450C2c7334e885423f4A899a063Fe", | ||
"PROTOCOL_REWARDS": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
{ | ||
"FACTORY_OWNER": "0xE84DBB2B25F761751231a9D0DAfbdD4dC3aa8252", | ||
"MINT_FEE_AMOUNT": 777000000000000, | ||
"MINT_FEE_RECIPIENT": "0xE84DBB2B25F761751231a9D0DAfbdD4dC3aa8252" | ||
"MINT_FEE_RECIPIENT": "0xE84DBB2B25F761751231a9D0DAfbdD4dC3aa8252", | ||
"PROTOCOL_REWARDS": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
ds-test/=node_modules/ds-test/src/ | ||
forge-std/=node_modules/forge-std/src/ | ||
@zoralabs/openzeppelin-contracts-upgradeable/=node_modules/@zoralabs/openzeppelin-contracts-upgradeable/ | ||
@zoralabs/protocol-rewards/=node_modules/@zoralabs/protocol-rewards/ | ||
@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/ | ||
_imagine=_imagine/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.