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

Implement fee changes #299

Merged
merged 5 commits into from
Dec 18, 2023

Conversation

Vectorized
Copy link
Collaborator

@Vectorized Vectorized commented Dec 17, 2023

So we will use back the old way of redirecting fees.

  • Renamed affiliateFee to affiliateBPSFee.
  • Remove the extra final rewards stuff in the MintedLog struct. I'm lazy.

Copy link

changeset-bot bot commented Dec 17, 2023

⚠️ No Changeset found

Latest commit: 9711ffc

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes changesets to release 1 package
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 and others added 4 commits December 17, 2023 02:13
* nit suggestion

* changes

* Fix code and fuzz test

* Tidy

* Nit comment

---------

Co-authored-by: Vignesh Hirudayakanth <vigneshkanth@gmail.com>
@vigneshka vigneshka merged commit df00147 into vectorized/affiliate-flat-fee Dec 18, 2023
5 checks passed
@vigneshka vigneshka deleted the vectorized/fee-changes-2 branch December 18, 2023 06:05
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants