Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/nftlabs/nftlabs-protocols i…
Browse files Browse the repository at this point in the history 
…nto multiwrap
  • Loading branch information
Krishang Nadgauda authored and Krishang Nadgauda committed Apr 1, 2022
2 parents 08fc02a + 6b6aea6 commit 25cb9a6
Show file tree
Hide file tree
Showing 19 changed files with 521 additions and 160 deletions.
57 changes: 41 additions & 16 deletions contracts/drop/DropERC1155.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ contract DropERC1155 is
//////////////////////////////////////////////////////////////*/

bytes32 private constant MODULE_TYPE = bytes32("DropERC1155");
uint256 private constant VERSION = 1;
uint256 private constant VERSION = 2;

// Token name
string public name;
Expand Down Expand Up @@ -73,14 +73,14 @@ contract DropERC1155 is
/// @dev The address that receives all platform fees from all sales.
address private platformFeeRecipient;

/// @dev The % of primary sales collected as platform fees.
uint16 private platformFeeBps;

/// @dev The recipient of who gets the royalty.
address private royaltyRecipient;

/// @dev The (default) address that receives all royalty value.
uint128 private royaltyBps;

/// @dev The % of primary sales collected as platform fees.
uint128 private platformFeeBps;
uint16 private royaltyBps;

/// @dev Contract level metadata.
string public contractURI;
Expand Down Expand Up @@ -149,11 +149,11 @@ contract DropERC1155 is
name = _name;
symbol = _symbol;
royaltyRecipient = _royaltyRecipient;
royaltyBps = _royaltyBps;
royaltyBps = uint16(_royaltyBps);
platformFeeRecipient = _platformFeeRecipient;
primarySaleRecipient = _saleRecipient;
contractURI = _contractURI;
platformFeeBps = _platformFeeBps;
platformFeeBps = uint16(_platformFeeBps);
_owner = _defaultAdmin;

_setupRole(DEFAULT_ADMIN_ROLE, _defaultAdmin);
Expand Down Expand Up @@ -257,10 +257,14 @@ contract DropERC1155 is
// Get the active claim condition index.
uint256 activeConditionId = getActiveClaimConditionId(_tokenId);

// Verify claim validity. If not valid, revert.
verifyClaim(activeConditionId, _msgSender(), _tokenId, _quantity, _currency, _pricePerToken);
/**
* We make allowlist checks (i.e. verifyClaimMerkleProof) before verifying the claim's general
* validity (i.e. verifyClaim) because we give precedence to the check of allow list quantity
* restriction over the check of the general claim condition's quantityLimitPerTransaction
* restriction.
*/

// Verify inclusion in allowlist
// Verify inclusion in allowlist.
(bool validMerkleProof, uint256 merkleProofIndex) = verifyClaimMerkleProof(
activeConditionId,
_msgSender(),
Expand All @@ -270,8 +274,23 @@ contract DropERC1155 is
_proofMaxQuantityPerTransaction
);

// Verify claim validity. If not valid, revert.
bool toVerifyMaxQuantityPerTransaction = _proofMaxQuantityPerTransaction == 0;
verifyClaim(
activeConditionId,
_msgSender(),
_tokenId,
_quantity,
_currency,
_pricePerToken,
toVerifyMaxQuantityPerTransaction
);

if (validMerkleProof && _proofMaxQuantityPerTransaction > 0) {
// Mark the claimer's use of their position in the allowlist.
/**
* Mark the claimer's use of their position in the allowlist. A spot in an allowlist
* can be used only once.
*/
claimCondition[_tokenId].limitMerkleProofClaim[activeConditionId].set(merkleProofIndex);
}

Expand Down Expand Up @@ -317,8 +336,11 @@ contract DropERC1155 is
"startTimestamp must be in ascending order."
);

uint256 supplyClaimedAlready = condition.phases[newStartIndex + i].supplyClaimed;
require(supplyClaimedAlready < _phases[i].maxClaimableSupply, "max supply claimed already");

condition.phases[newStartIndex + i] = _phases[i];
condition.phases[newStartIndex + i].supplyClaimed = 0;
condition.phases[newStartIndex + i].supplyClaimed = supplyClaimedAlready;

lastConditionStartTimestamp = _phases[i].startTimestamp;
}
Expand Down Expand Up @@ -402,16 +424,19 @@ contract DropERC1155 is
uint256 _tokenId,
uint256 _quantity,
address _currency,
uint256 _pricePerToken
uint256 _pricePerToken,
bool verifyMaxQuantityPerTransaction
) public view {
ClaimCondition memory currentClaimPhase = claimCondition[_tokenId].phases[_conditionId];

require(
_currency == currentClaimPhase.currency && _pricePerToken == currentClaimPhase.pricePerToken,
"invalid currency or price specified."
);
// If we're checking for an allowlist quantity restriction, ignore the general quantity restriction.
require(
_quantity > 0 && _quantity <= currentClaimPhase.quantityLimitPerTransaction,
_quantity > 0 &&
(!verifyMaxQuantityPerTransaction || _quantity <= currentClaimPhase.quantityLimitPerTransaction),
"invalid quantity claimed."
);
require(
Expand Down Expand Up @@ -569,7 +594,7 @@ contract DropERC1155 is
require(_royaltyBps <= MAX_BPS, "exceed royalty bps");

royaltyRecipient = _royaltyRecipient;
royaltyBps = uint128(_royaltyBps);
royaltyBps = uint16(_royaltyBps);

emit DefaultRoyalty(_royaltyRecipient, _royaltyBps);
}
Expand All @@ -594,7 +619,7 @@ contract DropERC1155 is
{
require(_platformFeeBps <= MAX_BPS, "bps <= 10000.");

platformFeeBps = uint64(_platformFeeBps);
platformFeeBps = uint16(_platformFeeBps);
platformFeeRecipient = _platformFeeRecipient;

emit PlatformFeeInfoUpdated(_platformFeeRecipient, _platformFeeBps);
Expand Down
42 changes: 33 additions & 9 deletions contracts/drop/DropERC20.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ contract DropERC20 is
string memory _contractURI,
address[] memory _trustedForwarders,
address _primarySaleRecipient,
uint256 _platformFeeBps,
address _platformFeeRecipient
address _platformFeeRecipient,
uint256 _platformFeeBps
) external initializer {
// Initialize inherited contracts, most base-like -> most derived.
__ERC2771Context_init_unchained(_trustedForwarders);
Expand Down Expand Up @@ -181,10 +181,14 @@ contract DropERC20 is
// Get the claim conditions.
uint256 activeConditionId = getActiveClaimConditionId();

// Verify claim validity. If not valid, revert.
verifyClaim(activeConditionId, _msgSender(), _quantity, _currency, _pricePerToken);
/**
* We make allowlist checks (i.e. verifyClaimMerkleProof) before verifying the claim's general
* validity (i.e. verifyClaim) because we give precedence to the check of allow list quantity
* restriction over the check of the general claim condition's quantityLimitPerTransaction
* restriction.
*/

// Verify inclusion in allowlist
// Verify inclusion in allowlist.
(bool validMerkleProof, uint256 merkleProofIndex) = verifyClaimMerkleProof(
activeConditionId,
_msgSender(),
Expand All @@ -193,8 +197,22 @@ contract DropERC20 is
_proofMaxQuantityPerTransaction
);

// Verify claim validity. If not valid, revert.
bool toVerifyMaxQuantityPerTransaction = _proofMaxQuantityPerTransaction == 0;
verifyClaim(
activeConditionId,
_msgSender(),
_quantity,
_currency,
_pricePerToken,
toVerifyMaxQuantityPerTransaction
);

if (validMerkleProof && _proofMaxQuantityPerTransaction > 0) {
// Mark the claimer's use of their position in the allowlist.
/**
* Mark the claimer's use of their position in the allowlist. A spot in an allowlist
* can be used only once.
*/
claimCondition.limitMerkleProofClaim[activeConditionId].set(merkleProofIndex);
}

Expand Down Expand Up @@ -238,8 +256,11 @@ contract DropERC20 is
"startTimestamp must be in ascending order."
);

uint256 supplyClaimedAlready = claimCondition.phases[newStartIndex + i].supplyClaimed;
require(supplyClaimedAlready < _phases[i].maxClaimableSupply, "max supply claimed already");

claimCondition.phases[newStartIndex + i] = _phases[i];
claimCondition.phases[newStartIndex + i].supplyClaimed = 0;
claimCondition.phases[newStartIndex + i].supplyClaimed = supplyClaimedAlready;

lastConditionStartTimestamp = _phases[i].startTimestamp;
}
Expand Down Expand Up @@ -324,16 +345,19 @@ contract DropERC20 is
address _claimer,
uint256 _quantity,
address _currency,
uint256 _pricePerToken
uint256 _pricePerToken,
bool verifyMaxQuantityPerTransaction
) public view {
ClaimCondition memory currentClaimPhase = claimCondition.phases[_conditionId];

require(
_currency == currentClaimPhase.currency && _pricePerToken == currentClaimPhase.pricePerToken,
"invalid currency or price specified."
);
// If we're checking for an allowlist quantity restriction, ignore the general quantity restriction.
require(
_quantity > 0 && _quantity <= currentClaimPhase.quantityLimitPerTransaction,
_quantity > 0 &&
(!verifyMaxQuantityPerTransaction || _quantity <= currentClaimPhase.quantityLimitPerTransaction),
"invalid quantity claimed."
);
require(
Expand Down
Loading

0 comments on commit 25cb9a6

Please sign in to comment.