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.

Sign up for GitHub

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

Jump to bottom

Vigneshka/minters 2 1 #290

Merged
merged 12 commits into from
Jul 3, 2023
Merged

Vigneshka/minters 2 1 #290

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9089a93
Add platformPerTxFlatFee
Vectorized Jun 26, 2023
a54abae
Rename files and add tests
Vectorized Jun 26, 2023
96d7337
Rename platformFlatFee -> platformFlatFeeTotal
Vectorized Jun 26, 2023
f5eb23f
Add platform fee info to mint info struct
Vectorized Jun 29, 2023
9e623a8
Add SAMV1_1
Vectorized Jun 30, 2023
0529364
Add missing platformPerTxFlatFee to ISAMV1_1
Vectorized Jun 30, 2023
972c49d
generate sam id
vigneshka Jul 1, 2023
a925a4c
changeset
vigneshka Jul 1, 2023
c2b1d71
remove recursive publish
PabloSzx Jul 1, 2023
9e55879
temp
vigneshka Jul 2, 2023
568644a
Refactor totalPrice to totalPriceAndFees
Vectorized Jul 3, 2023
71d1f1c
Add test to ensure no overflow
Vectorized Jul 3, 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
Add platform fee info to mint info struct
  • Loading branch information
@Vectorized @vigneshka
Vectorized authored and vigneshka committed Jul 1, 2023
commit f5eb23f811395b0665c489eae0d2defcc4a074f9
8 changes: 7 additions & 1 deletion contracts/core/interfaces/IMinterModuleV2_1.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,11 +452,17 @@ interface IMinterModuleV2_1 is IERC165 {
function platformFeeBPS() external returns (uint16);

/**
* @dev Returns the platform flat fee.
* @dev Returns the platform flat fee per item.
* @return The configured value.
*/
function platformFlatFee() external returns (uint96);

/**
* @dev Returns the platform flat fee per transaction.
* @return The configured value.
*/
function platformPerTxFlatFee() external returns (uint96);

/**
* @dev Returns the platform fee address.
* @return The configured value.
Expand Down
3 changes: 3 additions & 0 deletions contracts/modules/EditionMaxMinterV2_1.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ contract EditionMaxMinterV2_1 is IEditionMaxMinterV2_1, BaseMinterV2_1 {
info.cutoffTime = editionInfo.editionCutoffTime;

info.affiliateMerkleRoot = baseData.affiliateMerkleRoot;
info.platformFeeBPS = platformFeeBPS;
info.platformFlatFee = platformFlatFee;
info.platformPerTxFlatFee = platformPerTxFlatFee;
}

/**
Expand Down
3 changes: 3 additions & 0 deletions contracts/modules/FixedPriceSignatureMinterV2_1.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,9 @@ contract FixedPriceSignatureMinterV2_1 is IFixedPriceSignatureMinterV2_1, BaseMi
info.signer = mintData.signer;

info.affiliateMerkleRoot = baseData.affiliateMerkleRoot;
info.platformFeeBPS = platformFeeBPS;
info.platformFlatFee = platformFlatFee;
info.platformPerTxFlatFee = platformPerTxFlatFee;
}

/**
Expand Down
3 changes: 3 additions & 0 deletions contracts/modules/MerkleDropMinterV2_1.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,9 @@ contract MerkleDropMinterV2_1 is IMerkleDropMinterV2_1, BaseMinterV2_1 {
info.merkleRootHash = mintData.merkleRootHash;

info.affiliateMerkleRoot = baseData.affiliateMerkleRoot;
info.platformFeeBPS = platformFeeBPS;
info.platformFlatFee = platformFlatFee;
info.platformPerTxFlatFee = platformPerTxFlatFee;
}

/**
Expand Down
3 changes: 3 additions & 0 deletions contracts/modules/RangeEditionMinterV2_1.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,9 @@ contract RangeEditionMinterV2_1 is IRangeEditionMinterV2_1, BaseMinterV2_1 {
info.cutoffTime = mintData.cutoffTime;

info.affiliateMerkleRoot = baseData.affiliateMerkleRoot;
info.platformFeeBPS = platformFeeBPS;
info.platformFlatFee = platformFlatFee;
info.platformPerTxFlatFee = platformPerTxFlatFee;
}

/**
Expand Down
3 changes: 3 additions & 0 deletions contracts/modules/interfaces/IEditionMaxMinterV2_1.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ struct MintInfo {
uint32 totalMinted;
uint32 cutoffTime;
bytes32 affiliateMerkleRoot;
uint16 platformFeeBPS;
uint96 platformFlatFee;
uint96 platformPerTxFlatFee;
}

/**
Expand Down
3 changes: 3 additions & 0 deletions contracts/modules/interfaces/IFixedPriceSignatureMinterV2_1.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ struct MintInfo {
uint32 totalMinted;
address signer;
bytes32 affiliateMerkleRoot;
uint16 platformFeeBPS;
uint96 platformFlatFee;
uint96 platformPerTxFlatFee;
}

/**
Expand Down
3 changes: 3 additions & 0 deletions contracts/modules/interfaces/IMerkleDropMinterV2_1.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ struct MintInfo {
uint32 totalMinted;
bytes32 merkleRootHash;
bytes32 affiliateMerkleRoot;
uint16 platformFeeBPS;
uint96 platformFlatFee;
uint96 platformPerTxFlatFee;
}

/**
Expand Down
3 changes: 3 additions & 0 deletions contracts/modules/interfaces/IRangeEditionMinterV2_1.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ struct MintInfo {
uint32 totalMinted;
uint32 cutoffTime;
bytes32 affiliateMerkleRoot;
uint16 platformFeeBPS;
uint96 platformFlatFee;
uint96 platformPerTxFlatFee;
}

/**
Expand Down