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.

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

BTT BurnToClaimDropERC721 and extensions #509

Merged
merged 38 commits into from
Oct 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
ac3a5ed
test verifyBurnToClaim
kumaryash90 Sep 27, 2023
224e665
Merge branch 'main' into yash/retrospective-burn-to-claim
kumaryash90 Sep 27, 2023
7e6b99d
Fix [Q-2] Missing sanity check when setting BurnToClaimInfo
nkrishang Sep 26, 2023
3bc997d
test setBurnToClaimInfo
kumaryash90 Sep 27, 2023
9652358
Merge branch 'main' into yash/retrospective-burn-to-claim
kumaryash90 Sep 27, 2023
38e80fd
fix tests
kumaryash90 Sep 27, 2023
568e0ce
test _burnTokensOnOrigin
kumaryash90 Sep 27, 2023
8299901
test _burnTokensOnOrigin
kumaryash90 Sep 27, 2023
a6dc17b
test verifyClaim
kumaryash90 Sep 28, 2023
54d4c96
test wallet random
kumaryash90 Sep 28, 2023
45febc8
Merge branch 'main' into yash/retrospective-burn-to-claim
joaquim-verges Sep 28, 2023
66f1d8c
Merge branch 'main' into yash/retrospective-burn-to-claim
joaquim-verges Sep 28, 2023
93c41e0
test setClaimConditions
kumaryash90 Sep 28, 2023
ff8280d
Merge branch 'yash/retrospective-burn-to-claim' of https://github.com…
kumaryash90 Sep 28, 2023
4689827
test getActiveClaimConditionId
kumaryash90 Sep 29, 2023
423bf0f
make verifyClaim virtual
kumaryash90 Oct 9, 2023
ea31e48
test claim
kumaryash90 Oct 9, 2023
fba43ee
test setContractURI
kumaryash90 Oct 9, 2023
f62cb30
Merge branch 'main' into yash/retrospective-burn-to-claim
kumaryash90 Oct 9, 2023
2c3ef9c
update as per latest audit for burn-to-claim
kumaryash90 Oct 9, 2023
574dc57
test royalty extension
kumaryash90 Oct 9, 2023
e36e661
test ownable extension
kumaryash90 Oct 9, 2023
9b980e8
test delayed-reveal extension
kumaryash90 Oct 9, 2023
3b5b9ce
test batch-mint-metadata extension
kumaryash90 Oct 10, 2023
5848efd
test lazy-mint extension
kumaryash90 Oct 10, 2023
c0be82c
test initialize burn-to-claim
kumaryash90 Oct 10, 2023
fe1146a
test other functions burn-to-claim
kumaryash90 Oct 10, 2023
bcc3d36
test lazyMint main contract
kumaryash90 Oct 10, 2023
9f10eb2
test burnAndClaim main contract
kumaryash90 Oct 16, 2023
09c6084
test reveal main contract
kumaryash90 Oct 16, 2023
96e577f
other function tests
kumaryash90 Oct 16, 2023
36795ff
mark checked
kumaryash90 Oct 16, 2023
acf6e57
other function tests
kumaryash90 Oct 16, 2023
ea0b694
Merge branch 'main' into yash/retrospective-burn-to-claim
kumaryash90 Oct 16, 2023
59092d1
Merge branch 'main' into yash/retrospective-burn-to-claim
kumaryash90 Oct 16, 2023
e7d37df
fix
kumaryash90 Oct 16, 2023
12800ad
Merge branch 'main' into yash/retrospective-burn-to-claim
kumaryash90 Oct 16, 2023
00f1b3e
fix
kumaryash90 Oct 16, 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
4 changes: 4 additions & 0 deletions contracts/extension/BurnToClaim.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
Expand Down
2 changes: 1 addition & 1 deletion contracts/extension/Drop.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion contracts/extension/Drop1155.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion contracts/extension/DropSinglePhase.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion contracts/extension/DropSinglePhase1155.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion contracts/extension/upgradeable/Drop.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading
Loading