Skip to content

Commit 987c765

Browse files
kumaryash90nkrishangjoaquim-verges
authored
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 <[email protected]> Co-authored-by: Joaquim Verges <[email protected]>
1 parent 4cc7fc5 commit 987c765

File tree

108 files changed

+9735
-22
lines changed

Some content is hidden

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

108 files changed

+9735
-22
lines changed

contracts/extension/BurnToClaim.sol

+4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ import "./interface/IBurnToClaim.sol";
1515
abstract contract BurnToClaim is IBurnToClaim {
1616
BurnToClaimInfo internal burnToClaimInfo;
1717

18+
function getBurnToClaimInfo() public view returns (BurnToClaimInfo memory) {
19+
return burnToClaimInfo;
20+
}
21+
1822
function setBurnToClaimInfo(BurnToClaimInfo calldata _burnToClaimInfo) external virtual {
1923
require(_canSetBurnToClaim(), "Not authorized.");
2024
require(_burnToClaimInfo.originContractAddress != address(0), "Origin contract not set.");

contracts/extension/Drop.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ abstract contract Drop is IDrop {
124124
address _currency,
125125
uint256 _pricePerToken,
126126
AllowlistProof calldata _allowlistProof
127-
) public view returns (bool isOverride) {
127+
) public view virtual returns (bool isOverride) {
128128
ClaimCondition memory currentClaimPhase = claimCondition.conditions[_conditionId];
129129
uint256 claimLimit = currentClaimPhase.quantityLimitPerWallet;
130130
uint256 claimPrice = currentClaimPhase.pricePerToken;

contracts/extension/Drop1155.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ abstract contract Drop1155 is IDrop1155 {
134134
address _currency,
135135
uint256 _pricePerToken,
136136
AllowlistProof calldata _allowlistProof
137-
) public view returns (bool isOverride) {
137+
) public view virtual returns (bool isOverride) {
138138
ClaimCondition memory currentClaimPhase = claimCondition[_tokenId].conditions[_conditionId];
139139
uint256 claimLimit = currentClaimPhase.quantityLimitPerWallet;
140140
uint256 claimPrice = currentClaimPhase.pricePerToken;

contracts/extension/DropSinglePhase.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ abstract contract DropSinglePhase is IDropSinglePhase {
100100
address _currency,
101101
uint256 _pricePerToken,
102102
AllowlistProof calldata _allowlistProof
103-
) public view returns (bool isOverride) {
103+
) public view virtual returns (bool isOverride) {
104104
ClaimCondition memory currentClaimPhase = claimCondition;
105105
uint256 claimLimit = currentClaimPhase.quantityLimitPerWallet;
106106
uint256 claimPrice = currentClaimPhase.pricePerToken;

contracts/extension/DropSinglePhase1155.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ abstract contract DropSinglePhase1155 is IDropSinglePhase1155 {
108108
address _currency,
109109
uint256 _pricePerToken,
110110
AllowlistProof calldata _allowlistProof
111-
) public view returns (bool isOverride) {
111+
) public view virtual returns (bool isOverride) {
112112
ClaimCondition memory currentClaimPhase = claimCondition[_tokenId];
113113
uint256 claimLimit = currentClaimPhase.quantityLimitPerWallet;
114114
uint256 claimPrice = currentClaimPhase.pricePerToken;

contracts/extension/upgradeable/Drop.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ abstract contract Drop is IDrop {
139139
address _currency,
140140
uint256 _pricePerToken,
141141
AllowlistProof calldata _allowlistProof
142-
) public view returns (bool isOverride) {
142+
) public view virtual returns (bool isOverride) {
143143
ClaimCondition memory currentClaimPhase = _dropStorage().claimCondition.conditions[_conditionId];
144144
uint256 claimLimit = currentClaimPhase.quantityLimitPerWallet;
145145
uint256 claimPrice = currentClaimPhase.pricePerToken;

0 commit comments

Comments
 (0)