Skip to content

Commit 38e6d14

Browse files
kumaryash90Krishang Nadgaudankrishang
authored
New Drops + Tiered Drop (#270)
* max supply claimable per wallet * add tests * run prettier * remove global maxWalletClaimCount and walletClaimCount * apply the changes to extensions * add tests * remove BOT check; reduce sigdrop size * run prettier * claim interface update * fix multiphase Drop extension * add Drop1155 extension * write DropERC721Temp with extensions * write DropERC20Temp with extensions * write DropERC1155Temp with extensions; plus delayedReveal * run prettier * allowlist -> override list; update struct * update tests * add tests * saleRecipient mapping for DropERC1155 * tests for DropERC20 and 1155 * forge update * DropERC20: remove unused import * DropERC20: delete commented supportsInterface * Sync versions of all DropERCxxx contracts * DropERC20: cleanup comments * DropERC721: cleanup comments * DropERC1155: cleanup commented code * ERC721Drop: remove unused imports * ERC721Drop: remove BOT check * ERC1155Drop: re-organize contract code * ERC1155Drop: remove BOT check * DropSinglePhase: Remove bitmap * DropSinglePhase1155: Remove bitmap * Drop: remove bitmap * Drop1155: remove bitmap * run prettier * ERC721Drop: remove BOT check test * docs update * DropERC1155: remove burn, keep burnBatch * update Drop design doc * update docs * v3.1.9-2 * update doc, cleanup * forge updates * metadata in ClaimCondition struct * Add SignatureAction * Add LazyMintWithTier * Add SIgnatureActionUpgradeable * Add TieredDrop * Add inital TieredDrop tests * docs update * pkg release * docs updat * pkg release * legacy contracts * Add code comments to Drop related interfaces * Don't enforce camelCase contractName, for legacy contracts * DropERC1155: remove delayed-reveal * v3.2.0-0 * cpy ERC721A * getTokensInTier -> getMetadataInTier * Add getTokensInTier in top level contract * Add code comments for tier related state * Add totalMintedForTier * turn endIdsAtMint from array to mapping + len * return value for verifyClaim * docs * v3.2.0-1 * docs update * pkg release * fix return val for getMetadataInTier * pkg release * delete ERC721A copies * Return correct startId in getTokensInTier ranges * pkg release * document limitations of override-list * legacy SignatureDrop * docs * v3.2.0-2 * Add code comments to top level TieredDrop * Add code comments to LazyMintWithTier * Update description for LazyMintWithTier * Update code comments and description for SignatureAction * getMetadataId public -> internal function * TieredDrop tests skeleton * Fix role restrictions for lazy minting * change default allowlist qty to 0 * update tests * v3.2.0-3 * Add tests for tiered-drop * Fix + cleanup TieredDrop from tests * pkg release * v3.2.0-4 * add getTokensInTier benchmark * Change pricePerToken -> totalPrice * Add getMetadataForAllTiers getTierForToken getAllTiers * Add tier to TokensLazyMinted event * remove contract type and version to cut on size * remove getAllTiers and turn getMetadataForTier private * comment out getMetadataForAllTiers tests due to compilation errors * pkg release Co-authored-by: Krishang Nadgauda <nkrishang@Krishangs-MacBook-Pro.local> Co-authored-by: Krishang <krishang@thirdweb.com>
1 parent 6e0c908 commit 38e6d14

File tree

100 files changed

+20534
-4716
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+20534
-4716
lines changed

‎.solhint.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"code-complexity": ["error", 9],
88
"compiler-version": ["error", "^0.8.0"],
99
"const-name-snakecase": "error",
10-
"contract-name-camelcase": "error",
1110
"event-name-camelcase": "error",
1211
"constructor-syntax": "error",
1312
"func-name-mixedcase": "off",

‎contracts/base/ERC1155Drop.sol‎

Lines changed: 13 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,19 @@ contract ERC1155Drop is
7979
_setupPrimarySaleRecipient(_primarySaleRecipient);
8080
}
8181

82+
/*//////////////////////////////////////////////////////////////
83+
ERC165 Logic
84+
//////////////////////////////////////////////////////////////*/
85+
86+
/// @notice Returns whether this contract supports the given interface.
87+
function supportsInterface(bytes4 interfaceId) public view virtual override(ERC1155, IERC165) returns (bool) {
88+
return
89+
interfaceId == 0x01ffc9a7 || // ERC165 Interface ID for ERC165
90+
interfaceId == 0xd9b67a26 || // ERC165 Interface ID for ERC1155
91+
interfaceId == 0x0e89341c || // ERC165 Interface ID for ERC1155MetadataURI
92+
interfaceId == type(IERC2981).interfaceId; // ERC165 ID for ERC2981
93+
}
94+
8295
/*///////////////////////////////////////////////////////////////
8396
Overriden metadata logic
8497
//////////////////////////////////////////////////////////////*/
@@ -155,67 +168,6 @@ contract ERC1155Drop is
155168
return nextTokenIdToLazyMint;
156169
}
157170

158-
/*//////////////////////////////////////////////////////////////
159-
Minting/burning logic
160-
//////////////////////////////////////////////////////////////*/
161-
162-
/**
163-
* @notice Lets an owner or approved operator burn NFTs of the given tokenId.
164-
*
165-
* @param _owner The owner of the NFT to burn.
166-
* @param _tokenId The tokenId of the NFT to burn.
167-
* @param _amount The amount of the NFT to burn.
168-
*/
169-
function burn(
170-
address _owner,
171-
uint256 _tokenId,
172-
uint256 _amount
173-
) external virtual {
174-
address caller = msg.sender;
175-
176-
require(caller == _owner || isApprovedForAll[_owner][caller], "Unapproved caller");
177-
require(balanceOf[_owner][_tokenId] >= _amount, "Not enough tokens owned");
178-
179-
_burn(_owner, _tokenId, _amount);
180-
}
181-
182-
/**
183-
* @notice Lets an owner or approved operator burn NFTs of the given tokenIds.
184-
*
185-
* @param _owner The owner of the NFTs to burn.
186-
* @param _tokenIds The tokenIds of the NFTs to burn.
187-
* @param _amounts The amounts of the NFTs to burn.
188-
*/
189-
function burnBatch(
190-
address _owner,
191-
uint256[] memory _tokenIds,
192-
uint256[] memory _amounts
193-
) external virtual {
194-
address caller = msg.sender;
195-
196-
require(caller == _owner || isApprovedForAll[_owner][caller], "Unapproved caller");
197-
require(_tokenIds.length == _amounts.length, "Length mismatch");
198-
199-
for (uint256 i = 0; i < _tokenIds.length; i += 1) {
200-
require(balanceOf[_owner][_tokenIds[i]] >= _amounts[i], "Not enough tokens owned");
201-
}
202-
203-
_burnBatch(_owner, _tokenIds, _amounts);
204-
}
205-
206-
/*//////////////////////////////////////////////////////////////
207-
ERC165 Logic
208-
//////////////////////////////////////////////////////////////*/
209-
210-
/// @notice Returns whether this contract supports the given interface.
211-
function supportsInterface(bytes4 interfaceId) public view virtual override(ERC1155, IERC165) returns (bool) {
212-
return
213-
interfaceId == 0x01ffc9a7 || // ERC165 Interface ID for ERC165
214-
interfaceId == 0xd9b67a26 || // ERC165 Interface ID for ERC1155
215-
interfaceId == 0x0e89341c || // ERC165 Interface ID for ERC1155MetadataURI
216-
interfaceId == type(IERC2981).interfaceId; // ERC165 ID for ERC2981
217-
}
218-
219171
/*///////////////////////////////////////////////////////////////
220172
Internal functions
221173
//////////////////////////////////////////////////////////////*/
@@ -230,7 +182,6 @@ contract ERC1155Drop is
230182
AllowlistProof calldata,
231183
bytes memory
232184
) internal view virtual override {
233-
require(msg.sender == tx.origin, "BOT");
234185
if (_tokenId >= nextTokenIdToLazyMint) {
235186
revert("Not enough minted tokens");
236187
}

‎contracts/base/ERC721Drop.sol‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import "../extension/Ownable.sol";
99
import "../extension/Royalty.sol";
1010
import "../extension/BatchMintMetadata.sol";
1111
import "../extension/PrimarySale.sol";
12-
import "../extension/PermissionsEnumerable.sol";
1312
import "../extension/DropSinglePhase.sol";
1413
import "../extension/LazyMint.sol";
1514
import "../extension/DelayedReveal.sol";
@@ -191,7 +190,6 @@ contract ERC721Drop is
191190
AllowlistProof calldata,
192191
bytes memory
193192
) internal view virtual override {
194-
require(msg.sender == tx.origin, "BOT");
195193
if (_currentIndex + _quantity > nextTokenIdToLazyMint) {
196194
revert("Not enough minted tokens");
197195
}

0 commit comments

Comments
 (0)