Simplified fees and rewards #300
Merged
Conversation
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
|
| Name | Type |
|---|---|
| @soundxyz/sound-protocol | Patch |
Click here to learn what changesets are, and how to add one.
Click here if you're a maintainer who wants to add a changeset to this PR
Vectorized
commented
Dec 17, 2023
contracts/modules/SuperMinterV2.sol
Outdated
| @@ -985,16 +959,16 @@ contract SuperMinterV1_1 is ISuperMinterV1_1, EIP712 { | |||
| function _validatePlatformFeeConfig(PlatformFeeConfig memory c) internal pure { | |||
| if ( | |||
| LibOps.or( | |||
| LibOps.or(c.perTxFlat > MAX_PLATFORM_PER_TX_FLAT_FEE, c.perMintBPS > MAX_PLATFORM_PER_MINT_FEE_BPS), | |||
| LibOps.or(c.platformTxFlatFee > MAX_PLATFORM_PER_TX_FLAT_FEE, c.platformMintBPSFee > MAX_PLATFORM_PER_MINT_FEE_BPS), | |||
There was a problem hiding this comment.
Nit, would call it platformMintFeeBPS instead.
Vectorized
commented
Dec 17, 2023
contracts/modules/SuperMinterV2.sol
Outdated
| f.finalArtistFee -= affiliateBPSFee; | ||
| f.finalAffiliateFee = affiliateBPSFee; | ||
| } else { | ||
| f.finalAffiliateFee = 0; |
There was a problem hiding this comment.
Can skip the else. f.finalAffiliateFee is initialized to zero.
Vectorized
commented
Dec 17, 2023
contracts/modules/SuperMinterV2.sol
Outdated
| f.artistReward = c.thresholdArtistReward * uint256(quantity); | ||
| f.affiliateReward = c.thresholdAffiliateReward * uint256(quantity); | ||
| f.platformReward = c.thresholdPlatformReward * uint256(quantity); | ||
| f.finalPlatformFee = 0; |
There was a problem hiding this comment.
Can skip the else. f.finalPlatformFee is initialized to zero.
vigneshka
added a commit
that referenced
this pull request
Dec 18, 2023
* Implement fee changes * T * Fix prices and add tests * Add tests * Simplified fees and rewards (#300) * nit suggestion * changes * Fix code and fuzz test * Tidy * Nit comment --------- Co-authored-by: Vignesh Hirudayakanth <vigneshkanth@gmail.com> --------- Co-authored-by: Vignesh Hirudayakanth <vigneshkanth@gmail.com>
vigneshka
added a commit
that referenced
this pull request
Dec 18, 2023
* Prep files * Reinstall multicaller * forge install: multicaller v1.3.1 * Add LibMulticaller.senderOrSigner support * Tidy * freeMintIncentive -> cheapMintIncentive * Add comment on the two types of affiliate fees * Remove first collector incentives * Add more comments and use checked math in mintTo * Add finalAffiliateIncentive to Minted log. Change finalCheapMintFee -> finalCheapMintIncentive * Add platform airdrop functionality to SuperMinterV1_1 (#298) * Add presave functionality to SuperMinterV1_1 * Rename PRESAVE -> PLATFORM_AIRDROP * Force PLATFORM_AIRDROP to only use platform signer * Remove artist-customizable signer, everyone must use platform signer * Make mintTo and platformAirdrop return fromTokenId, use airdrop in platformAirdrop * Remove signer from MintData * Update create2 deployment script * Create modern-shirts-try.md * pin version for typechain * tweak ci * more ci tweaks * add back foundry * bump * bump typechain * Implement fee changes (#299) * Implement fee changes * T * Fix prices and add tests * Add tests * Simplified fees and rewards (#300) * nit suggestion * changes * Fix code and fuzz test * Tidy * Nit comment --------- Co-authored-by: Vignesh Hirudayakanth <vigneshkanth@gmail.com> --------- Co-authored-by: Vignesh Hirudayakanth <vigneshkanth@gmail.com> * Update modern-shirts-try.md --------- Co-authored-by: Vignesh Hirudayakanth <vigneshkanth@gmail.com>
vigneshka
added a commit
that referenced
this pull request
Dec 18, 2023
* Clone files and bump versions * SuperMinterV1_1 et al. (#296) * Prep files * Reinstall multicaller * forge install: multicaller v1.3.1 * Add LibMulticaller.senderOrSigner support * Tidy * freeMintIncentive -> cheapMintIncentive * Add comment on the two types of affiliate fees * Remove first collector incentives * Add more comments and use checked math in mintTo * Add finalAffiliateIncentive to Minted log. Change finalCheapMintFee -> finalCheapMintIncentive * Add platform airdrop functionality to SuperMinterV1_1 (#298) * Add presave functionality to SuperMinterV1_1 * Rename PRESAVE -> PLATFORM_AIRDROP * Force PLATFORM_AIRDROP to only use platform signer * Remove artist-customizable signer, everyone must use platform signer * Make mintTo and platformAirdrop return fromTokenId, use airdrop in platformAirdrop * Remove signer from MintData * Update create2 deployment script * Create modern-shirts-try.md * pin version for typechain * tweak ci * more ci tweaks * add back foundry * bump * bump typechain * Implement fee changes (#299) * Implement fee changes * T * Fix prices and add tests * Add tests * Simplified fees and rewards (#300) * nit suggestion * changes * Fix code and fuzz test * Tidy * Nit comment --------- Co-authored-by: Vignesh Hirudayakanth <vigneshkanth@gmail.com> --------- Co-authored-by: Vignesh Hirudayakanth <vigneshkanth@gmail.com> * Update modern-shirts-try.md --------- Co-authored-by: Vignesh Hirudayakanth <vigneshkanth@gmail.com> * Update .github/workflows/canary.yml --------- Co-authored-by: Vectorized <webby1111@hotmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://www.notion.so/soundxyz/Protocol-Fee-Change-Summary-89891704b74f4b98b223aa4b5097ba37