BTT BurnToClaimDropERC721 and extensions (#509)

* test verifyBurnToClaim * Fix [Q-2] Missing sanity check when setting BurnToClaimInfo * test setBurnToClaimInfo * fix tests * test _burnTokensOnOrigin * test _burnTokensOnOrigin * test verifyClaim * test wallet random * test setClaimConditions * test getActiveClaimConditionId * make verifyClaim virtual * test claim * test setContractURI * update as per latest audit for burn-to-claim * test royalty extension * test ownable extension * test delayed-reveal extension * test batch-mint-metadata extension * test lazy-mint extension * test initialize burn-to-claim * test other functions burn-to-claim * test lazyMint main contract * test burnAndClaim main contract * test reveal main contract * other function tests * mark checked * other function tests * fix * fix --------- Co-authored-by: Krishang <krishang@thirdweb.com> Co-authored-by: Joaquim Verges <joaquim.verges@gmail.com>
thirdweb-dev · Oct 16, 2023 · 987c765 · 987c765
1 parent 4cc7fc5
commit 987c765
Show file tree

Hide file tree

Showing 108 changed files with 9,735 additions and 22 deletions.
diff --git a/contracts/extension/BurnToClaim.sol b/contracts/extension/BurnToClaim.sol
@@ -15,6 +15,10 @@ import "./interface/IBurnToClaim.sol";
 abstract contract BurnToClaim is IBurnToClaim {
     BurnToClaimInfo internal burnToClaimInfo;
 
+    function getBurnToClaimInfo() public view returns (BurnToClaimInfo memory) {
+        return burnToClaimInfo;
+    }
+
     function setBurnToClaimInfo(BurnToClaimInfo calldata _burnToClaimInfo) external virtual {
         require(_canSetBurnToClaim(), "Not authorized.");
         require(_burnToClaimInfo.originContractAddress != address(0), "Origin contract not set.");

diff --git a/contracts/extension/Drop.sol b/contracts/extension/Drop.sol
@@ -124,7 +124,7 @@ abstract contract Drop is IDrop {
         address _currency,
         uint256 _pricePerToken,
         AllowlistProof calldata _allowlistProof
-    ) public view returns (bool isOverride) {
+    ) public view virtual returns (bool isOverride) {
         ClaimCondition memory currentClaimPhase = claimCondition.conditions[_conditionId];
         uint256 claimLimit = currentClaimPhase.quantityLimitPerWallet;
         uint256 claimPrice = currentClaimPhase.pricePerToken;

diff --git a/contracts/extension/Drop1155.sol b/contracts/extension/Drop1155.sol
@@ -134,7 +134,7 @@ abstract contract Drop1155 is IDrop1155 {
         address _currency,
         uint256 _pricePerToken,
         AllowlistProof calldata _allowlistProof
-    ) public view returns (bool isOverride) {
+    ) public view virtual returns (bool isOverride) {
         ClaimCondition memory currentClaimPhase = claimCondition[_tokenId].conditions[_conditionId];
         uint256 claimLimit = currentClaimPhase.quantityLimitPerWallet;
         uint256 claimPrice = currentClaimPhase.pricePerToken;

diff --git a/contracts/extension/DropSinglePhase.sol b/contracts/extension/DropSinglePhase.sol
@@ -100,7 +100,7 @@ abstract contract DropSinglePhase is IDropSinglePhase {
         address _currency,
         uint256 _pricePerToken,
         AllowlistProof calldata _allowlistProof
-    ) public view returns (bool isOverride) {
+    ) public view virtual returns (bool isOverride) {
         ClaimCondition memory currentClaimPhase = claimCondition;
         uint256 claimLimit = currentClaimPhase.quantityLimitPerWallet;
         uint256 claimPrice = currentClaimPhase.pricePerToken;

diff --git a/contracts/extension/DropSinglePhase1155.sol b/contracts/extension/DropSinglePhase1155.sol
@@ -108,7 +108,7 @@ abstract contract DropSinglePhase1155 is IDropSinglePhase1155 {
         address _currency,
         uint256 _pricePerToken,
         AllowlistProof calldata _allowlistProof
-    ) public view returns (bool isOverride) {
+    ) public view virtual returns (bool isOverride) {
         ClaimCondition memory currentClaimPhase = claimCondition[_tokenId];
         uint256 claimLimit = currentClaimPhase.quantityLimitPerWallet;
         uint256 claimPrice = currentClaimPhase.pricePerToken;

diff --git a/contracts/extension/upgradeable/Drop.sol b/contracts/extension/upgradeable/Drop.sol
@@ -139,7 +139,7 @@ abstract contract Drop is IDrop {
         address _currency,
         uint256 _pricePerToken,
         AllowlistProof calldata _allowlistProof
-    ) public view returns (bool isOverride) {
+    ) public view virtual returns (bool isOverride) {
         ClaimCondition memory currentClaimPhase = _dropStorage().claimCondition.conditions[_conditionId];
         uint256 claimLimit = currentClaimPhase.quantityLimitPerWallet;
         uint256 claimPrice = currentClaimPhase.pricePerToken;