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

SuperMinterV1_1 et al. #296

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d0e97dc
Prep files
Vectorized Nov 17, 2023
814e6f2
Reinstall multicaller
Vectorized Nov 17, 2023
56ecca9
forge install: multicaller
Vectorized Nov 17, 2023
289f5f5
Add LibMulticaller.senderOrSigner support
Vectorized Nov 17, 2023
767e950
Tidy
Vectorized Nov 17, 2023
51a192b
freeMintIncentive -> cheapMintIncentive
Vectorized Nov 24, 2023
83f02ac
Add comment on the two types of affiliate fees
Vectorized Nov 24, 2023
00273e4
Remove first collector incentives
Vectorized Nov 25, 2023
e993498
Add more comments and use checked math in mintTo
Vectorized Dec 1, 2023
9df9a7a
Add finalAffiliateIncentive to Minted log. Change finalCheapMintFee -…
Vectorized Dec 1, 2023
9d7530b
Add platform airdrop functionality to SuperMinterV1_1 (#298)
Vectorized Dec 15, 2023
ab5d9c3
Create modern-shirts-try.md
vigneshka Dec 15, 2023
9dc3992
pin version for typechain
vigneshka Dec 15, 2023
8e48a58
tweak ci
vigneshka Dec 15, 2023
3e86b2b
more ci tweaks
vigneshka Dec 15, 2023
babe37c
add back foundry
vigneshka Dec 15, 2023
12c912f
Merge branch 'main' of github.com:soundxyz/sound-protocol into vector…
vigneshka Dec 15, 2023
78f8bd9
bump
vigneshka Dec 15, 2023
4abef49
Merge branch 'main' of github.com:soundxyz/sound-protocol into vector…
vigneshka Dec 15, 2023
44373d5
bump typechain
vigneshka Dec 15, 2023
815ce5b
Merge branch 'main' of github.com:soundxyz/sound-protocol into vector…
vigneshka Dec 15, 2023
df00147
Implement fee changes (#299)
Vectorized Dec 18, 2023
30e8987
Update modern-shirts-try.md
vigneshka Dec 18, 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
Prev Previous commit
Next Next commit
Tidy
  • Loading branch information
Vectorized committed Nov 17, 2023
commit 767e9504899f801328063aad6d5f7e2b170d0d55
4 changes: 2 additions & 2 deletions contracts/modules/SuperMinterV1_1.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
pragma solidity ^0.8.16;

import { Ownable, OwnableRoles } from "solady/auth/OwnableRoles.sol";
import { ISoundEditionV2 } from "@core/interfaces/ISoundEditionV2.sol";
import { ISoundEditionV2_1 } from "@core/interfaces/ISoundEditionV2_1.sol";
import { ISuperMinterV1_1 } from "@modules/interfaces/ISuperMinterV1_1.sol";
import { IERC165 } from "openzeppelin/utils/introspection/IERC165.sol";
import { SafeTransferLib } from "solady/utils/SafeTransferLib.sol";
Expand Down Expand Up @@ -376,7 +376,7 @@ contract SuperMinterV1_1 is ISuperMinterV1_1, EIP712 {

/* ------------------------- MINT --------------------------- */

ISoundEditionV2 edition = ISoundEditionV2(p.edition);
ISoundEditionV2_1 edition = ISoundEditionV2_1(p.edition);
l.quantity = p.quantity;
l.fromTokenId = edition.mint{ value: l.finalArtistFee }(p.tier, p.to, p.quantity);
l.allowlisted = p.allowlisted;
Expand Down
12 changes: 6 additions & 6 deletions tests/modules/SuperMinterV1_1.t.sol
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
pragma solidity ^0.8.16;

import { Merkle } from "murky/Merkle.sol";
import { IERC721AUpgradeable, ISoundEditionV2, SoundEditionV2 } from "@core/SoundEditionV2.sol";
import { IERC721AUpgradeable, ISoundEditionV2_1, SoundEditionV2_1 } from "@core/SoundEditionV2_1.sol";
import { ISuperMinterV1_1, SuperMinterV1_1 } from "@modules/SuperMinterV1_1.sol";
import { DelegateCashLib } from "@modules/utils/DelegateCashLib.sol";
import { LibOps } from "@core/utils/LibOps.sol";
import { Ownable } from "solady/auth/Ownable.sol";
import { SafeCastLib } from "solady/utils/SafeCastLib.sol";
import { LibSort } from "solady/utils/LibSort.sol";
import "../TestConfigV2.sol";
import "../TestConfigV2_1.sol";

contract SuperMinterV1_1Tests is TestConfigV2 {
contract SuperMinterV1_1Tests is TestConfigV2_1 {
SuperMinterV1_1 sm;
SoundEditionV2 edition;
SoundEditionV2_1 edition;
Merkle merkle;

event Minted(
Expand All @@ -36,8 +36,8 @@ contract SuperMinterV1_1Tests is TestConfigV2 {

function setUp() public virtual override {
super.setUp();
ISoundEditionV2.EditionInitialization memory init = genericEditionInitialization();
init.tierCreations = new ISoundEditionV2.TierCreation[](2);
ISoundEditionV2_1.EditionInitialization memory init = genericEditionInitialization();
init.tierCreations = new ISoundEditionV2_1.TierCreation[](2);
init.tierCreations[0].tier = 0;
init.tierCreations[1].tier = 1;
init.tierCreations[1].maxMintableLower = type(uint32).max;
Expand Down
Loading