dnrops
/
anchor
mirror of https://github.com/project-serum/anchor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

spl: implement try_deserialize for Metaplex accounts to ensure initialization (#2439)

This commit is contained in:
Andreas 2023-03-24 11:12:15 -07:00 committed by GitHub
parent f307729bdc
commit 00c2fc3601
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
spl/src/metadata.rs
View File

@ -1,5 +1,5 @@
use anchor_lang::context::CpiContext;
use anchor_lang::{Accounts, Result, ToAccountInfos};
use anchor_lang::{Accounts, ErrorCode, Result, ToAccountInfos};
use mpl_token_metadata::state::{CollectionDetails, DataV2, TokenMetadataAccount};
use mpl_token_metadata::ID;
use solana_program::account_info::AccountInfo;
@ -804,9 +804,17 @@ impl MetadataAccount {
}
impl anchor_lang::AccountDeserialize for MetadataAccount {
fn try_deserialize(buf: &mut &[u8]) -> anchor_lang::Result<Self> {
let md = Self::try_deserialize_unchecked(buf)?;
if md.key != mpl_token_metadata::state::Metadata::key() {
return Err(ErrorCode::AccountNotInitialized.into());
}
Ok(md)
}
fn try_deserialize_unchecked(buf: &mut &[u8]) -> anchor_lang::Result<Self> {
let result = mpl_token_metadata::state::Metadata::safe_deserialize(buf)?;
Ok(MetadataAccount(result))
let md = mpl_token_metadata::state::Metadata::safe_deserialize(buf)?;
Ok(Self(md))
}
}
@ -833,9 +841,17 @@ impl MasterEditionAccount {
}
impl anchor_lang::AccountDeserialize for MasterEditionAccount {
fn try_deserialize(buf: &mut &[u8]) -> anchor_lang::Result<Self> {
let me = Self::try_deserialize_unchecked(buf)?;
if me.key != mpl_token_metadata::state::MasterEditionV2::key() {
return Err(ErrorCode::AccountNotInitialized.into());
}
Ok(me)
}
fn try_deserialize_unchecked(buf: &mut &[u8]) -> anchor_lang::Result<Self> {
let result = mpl_token_metadata::state::MasterEditionV2::safe_deserialize(buf)?;
Ok(MasterEditionAccount(result))
Ok(Self(result))
}
}