Skip to content

Remove burn auth check #443

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 6, 2022
Merged

Remove burn auth check #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f3cfbc
Remove burn auth check
stegaBOB May 6, 2022
96f9fc0
remove burn stuff
stegaBOB May 6, 2022
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
2 changes: 1 addition & 1 deletion candy-machine/program/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion candy-machine/program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[workspace]
[package]
name = "mpl-candy-machine"
version = "3.2.4"
version = "3.2.5"
description = "NFT Candy Machine v2: programmatic and trustless NFT drops."
authors = ["Jordan Prince", "Metaplex Developers <dev@metaplex.com>"]
repository = "https://github.com/metaplex-foundation/metaplex-program-library"
Expand Down
8 changes: 3 additions & 5 deletions candy-machine/program/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ pub mod candy_machine {
let instruction_sysvar = instruction_sysvar_account_info.data.borrow();
let current_ix = get_instruction_relative(0, &instruction_sysvar_account_info).unwrap();
if !ctx.accounts.metadata.data_is_empty() {
return Err(ErrorCode::MetadataAccountMustBeEmpty.into())
return Err(ErrorCode::MetadataAccountMustBeEmpty.into());
}
// Restrict Who can call Candy Machine via CPI
if current_ix.program_id != candy_machine::id() && current_ix.program_id != GUMDROP_ID {
Expand Down Expand Up @@ -295,9 +295,7 @@ pub mod candy_machine {
&ctx.remaining_accounts[remaining_accounts_counter];
remaining_accounts_counter += 1;

let keys_check = assert_keys_equal(whitelist_token_mint.key(), ws.mint);
let owner_check = assert_keys_equal(whitelist_burn_authority.key(), *whitelist_token_account.owner);
if keys_check.is_err() || owner_check.is_err() {
if assert_keys_equal(whitelist_token_mint.key(), ws.mint).is_err() {
punish_bots(
ErrorCode::CandyMachineNotLive,
payer.to_account_info(),
Expand Down Expand Up @@ -1552,5 +1550,5 @@ pub enum ErrorCode {
#[msg("Provided mint account doesn't match collection PDA mint")]
MismatchedCollectionMint,
#[msg("The metadata account has data in it, and this must be empty to mint a new NFT")]
MetadataAccountMustBeEmpty
MetadataAccountMustBeEmpty,
}