Fixing borrow issues.

metaplex-foundation · Sep 10, 2024 · 2473b25 · 2473b25
1 parent a893b18
commit 2473b25
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 16 deletions.
diff --git a/auction-house/program/src/utils.rs b/auction-house/program/src/utils.rs
@@ -380,8 +380,7 @@ pub fn pay_creator_fees<'a>(
     is_native: bool,
 ) -> Result<u64> {
     let data = &metadata_info.data.borrow_mut();
-    if metadata_info.data_is_empty() || data[0] != mpl_token_metadata::state::Key::MetadataV1 as u8
-    {
+    if data.is_empty() || data[0] != mpl_token_metadata::state::Key::MetadataV1 as u8 {
         return Err(AuctionHouseError::MetadataDoesntExist.into());
     }
     let metadata = Metadata::deserialize(&mut data.as_ref())?;

diff --git a/candy-machine/program/src/processor/collection/remove_collection.rs b/candy-machine/program/src/processor/collection/remove_collection.rs
@@ -33,9 +33,7 @@ pub fn handle_remove_collection(ctx: Context<RemoveCollection>) -> Result<()> {
     candy_machine.assert_not_minted(error!(CandyError::NoChangingCollectionDuringMint))?;
 
     let data = &ctx.accounts.metadata.data.borrow_mut();
-    if ctx.accounts.metadata.data_is_empty()
-        || data[0] != mpl_token_metadata::state::Key::MetadataV1 as u8
-    {
+    if data.is_empty() || data[0] != mpl_token_metadata::state::Key::MetadataV1 as u8 {
         return Err(CandyError::InvalidMetadataAccount.into());
     }
     let metadata = Metadata::deserialize(&mut data.as_ref())?;

diff --git a/candy-machine/program/src/processor/collection/set_collection.rs b/candy-machine/program/src/processor/collection/set_collection.rs
@@ -41,9 +41,7 @@ pub struct SetCollection<'info> {
 pub fn handle_set_collection(ctx: Context<SetCollection>) -> Result<()> {
     let mint = ctx.accounts.mint.to_account_info();
     let data = &ctx.accounts.metadata.data.borrow_mut();
-    if ctx.accounts.metadata.data_is_empty()
-        || data[0] != mpl_token_metadata::state::Key::MetadataV1 as u8
-    {
+    if data.is_empty() || data[0] != mpl_token_metadata::state::Key::MetadataV1 as u8 {
         return Err(CandyError::InvalidMetadataAccount.into());
     }
     let metadata = Metadata::deserialize(&mut data.as_ref())?;

diff --git a/fixed-price-sale/program/src/processor/buy.rs b/fixed-price-sale/program/src/processor/buy.rs
@@ -374,7 +374,7 @@ impl<'info> Buy<'info> {
         )?;
 
         let data = &metadata.data.borrow_mut();
-        if metadata.data_is_empty() || data[0] != mpl_token_metadata::state::Key::MetadataV1 as u8 {
+        if data.is_empty() || data[0] != mpl_token_metadata::state::Key::MetadataV1 as u8 {
             return Err(ErrorCode::InvalidMetadataAccount.into());
         }
         let metadata_data = Metadata::deserialize(&mut data.as_ref())?;

diff --git a/fixed-price-sale/program/src/processor/claim_resource.rs b/fixed-price-sale/program/src/processor/claim_resource.rs
@@ -70,7 +70,7 @@ impl<'info> ClaimResource<'info> {
 
         // Update primary sale flag
         let data = &metadata.data.borrow_mut();
-        if metadata.data_is_empty() || data[0] != mpl_token_metadata::state::Key::MetadataV1 as u8 {
+        if data.is_empty() || data[0] != mpl_token_metadata::state::Key::MetadataV1 as u8 {
             return Err(ErrorCode::InvalidMetadataAccount.into());
         }
         let metadata_state = mpl_token_metadata::state::Metadata::deserialize(&mut data.as_ref())?;

diff --git a/fixed-price-sale/program/src/processor/init_selling_resource.rs b/fixed-price-sale/program/src/processor/init_selling_resource.rs
@@ -46,7 +46,7 @@ impl<'info> InitSellingResource<'info> {
         )?;
 
         let data = &metadata.data.borrow_mut();
-        if metadata.data_is_empty() || data[0] != mpl_token_metadata::state::Key::MetadataV1 as u8 {
+        if data.is_empty() || data[0] != mpl_token_metadata::state::Key::MetadataV1 as u8 {
             return Err(ErrorCode::InvalidMetadataAccount.into());
         }
         let metadata = mpl_token_metadata::state::Metadata::deserialize(&mut data.as_ref())?;

diff --git a/fixed-price-sale/program/src/processor/save_primary_metadata_creators.rs b/fixed-price-sale/program/src/processor/save_primary_metadata_creators.rs
@@ -11,7 +11,7 @@ impl<'info> SavePrimaryMetadataCreators<'info> {
         let admin = &self.admin;
         let secondary_metadata_creators = &mut self.primary_metadata_creators;
         let data = &metadata.data.borrow_mut();
-        if metadata.data_is_empty() || data[0] != mpl_token_metadata::state::Key::MetadataV1 as u8 {
+        if data.is_empty() || data[0] != mpl_token_metadata::state::Key::MetadataV1 as u8 {
             return Err(ErrorCode::InvalidMetadataAccount.into());
         }
         let metadata_state = mpl_token_metadata::state::Metadata::deserialize(&mut data.as_ref())?;

diff --git a/fixed-price-sale/program/src/processor/withdraw.rs b/fixed-price-sale/program/src/processor/withdraw.rs
@@ -60,7 +60,7 @@ impl<'info> Withdraw<'info> {
 
         // Obtain right creators according to sale type
         let data = &metadata.data.borrow_mut();
-        if metadata.data_is_empty() || data[0] != mpl_token_metadata::state::Key::MetadataV1 as u8 {
+        if data.is_empty() || data[0] != mpl_token_metadata::state::Key::MetadataV1 as u8 {
             return Err(ErrorCode::InvalidMetadataAccount.into());
         }
         let metadata = mpl_token_metadata::state::Metadata::deserialize(&mut data.as_ref())?;

diff --git a/hydra/program/src/utils/validation/mod.rs b/hydra/program/src/utils/validation/mod.rs
@@ -118,9 +118,7 @@ pub fn assert_valid_metadata(
     mint: &AccountInfo,
 ) -> Result<Metadata> {
     let data = &metadata_account.data.borrow_mut();
-    if metadata_account.data_is_empty()
-        || data[0] != mpl_token_metadata::state::Key::MetadataV1 as u8
-    {
+    if data.is_empty() || data[0] != mpl_token_metadata::state::Key::MetadataV1 as u8 {
         return Err(HydraError::InvalidMetadata.into());
     }
     let meta = mpl_token_metadata::state::Metadata::deserialize(&mut data.as_ref())?;

diff --git a/test.sh b/test.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+function exists_in_list() {
+    LIST=$1
+    DELIMITER=$2
+    VALUE=$3
+    echo $LIST | tr "$DELIMITER" '\n' | grep -F -q -x "$VALUE"
+}
+
+input=$1
+
+programs="auction-house auctioneer candy-machine fixed-price-sale gumdrop hydra token-entangler"
+
+mkdir -p test-programs
+
+if exists_in_list "$programs" " " $input; then
+    echo "testing $input"
+    cd $input/program
+    cargo test-bpf --bpf-out-dir ../../test-programs/
+    cd ../../
+
+elif [[ $input = "all" ]]
+then
+    echo "testing all programs"
+    for program in ${programs}; do
+        echo "testing $program"
+        cd $program/program
+        cargo test-bpf --bpf-out-dir ../../test-programs/
+        cd ../../
+    done
+    #echo "building testing-utils"
+    #cd core/rust/testing-utils
+    #cargo build-bpf --bpf-out-dir ../../../test-programs/
+    #cd ../../../
+elif [[ $input = "token-auth-rules" ]]
+then
+    solana program dump -u https://api.mainnet-beta.solana.com auth9SigNpDKz4sJJ1DfCTuZrZNSAgh9sFD3rboVmgg ./test-programs/mpl_token_auth_rules.so
+elif [[ $input = "rooster" ]]
+then
+    solana program dump -u https://api.mainnet-beta.solana.com Roostrnex2Z9Y2XZC49sFAdZARP8E4iFpEnZC5QJWdz ./test-programs/rooster.so
+else
+    echo "Invalid program name: $input"
+    exit 1
+fi
+
+