Switching to plain deserialize for TM resize (#485)

Switching to plain deserialize for TM resize.
metaplex-foundation · Sep 11, 2024 · 79d1d68 · 79d1d68
1 parent 64fb1f6
commit 79d1d68
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/config/data.rs b/src/config/data.rs
@@ -278,14 +278,18 @@ impl FromStr for Cluster {
     }
 }
 
-impl ToString for Cluster {
-    fn to_string(&self) -> String {
-        match self {
-            Cluster::Devnet => "devnet".to_string(),
-            Cluster::Mainnet => "mainnet".to_string(),
-            Cluster::Localnet => "localnet".to_string(),
-            Cluster::Unknown => "unknown".to_string(),
-        }
+impl Display for Cluster {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "{}",
+            match self {
+                Cluster::Devnet => "devnet",
+                Cluster::Mainnet => "mainnet",
+                Cluster::Localnet => "localnet",
+                Cluster::Unknown => "unknown",
+            }
+        )
     }
 }
 

diff --git a/src/deploy/process.rs b/src/deploy/process.rs
@@ -13,8 +13,9 @@ use anchor_client::solana_sdk::{
     signature::{Keypair, Signer},
 };
 use anyhow::Result;
+use borsh::BorshDeserialize;
 use console::style;
-use mpl_token_metadata::state::{Metadata, TokenMetadataAccount};
+use mpl_token_metadata::state::Metadata;
 
 use crate::{
     cache::*,
@@ -175,7 +176,7 @@ pub async fn process_deploy(args: DeployArgs) -> Result<()> {
 
         let collection_metadata = find_metadata_pda(&collection_mint);
         let data = program.rpc().get_account_data(&collection_metadata)?;
-        let metadata = Metadata::safe_deserialize(data.as_slice())?;
+        let metadata = Metadata::deserialize(&mut data.as_slice())?;
 
         let sig = initialize_candy_machine(
             &config_data,

diff --git a/src/freeze/thaw.rs b/src/freeze/thaw.rs
@@ -3,6 +3,7 @@
 use std::{fmt::Display, time::Duration};
 
 use anchor_client::solana_sdk::compute_budget::ComputeBudgetInstruction;
+use borsh::BorshDeserialize;
 use mpl_candy_guard::{
     accounts::Route as RouteAccount, guards::FreezeInstruction, instruction::Route,
     instructions::RouteArgs, state::GuardType,
@@ -251,7 +252,8 @@ pub async fn process_thaw(args: ThawArgs) -> Result<()> {
                         .unwrap()
                         .value
                         .unwrap();
-                    let metadata = Metadata::safe_deserialize(&metadata_account.data).unwrap();
+                    let metadata =
+                        Metadata::deserialize(&mut metadata_account.data.as_slice()).unwrap();
 
                     let rule_set = if let Some(ProgrammableConfig::V1 { rule_set }) =
                         metadata.programmable_config
@@ -460,7 +462,8 @@ pub async fn process_thaw(args: ThawArgs) -> Result<()> {
                             .unwrap()
                             .value
                             .unwrap();
-                        let metadata = Metadata::safe_deserialize(&metadata_account.data).unwrap();
+                        let metadata =
+                            Metadata::deserialize(&mut metadata_account.data.as_slice()).unwrap();
 
                         let rule_set = if let Some(ProgrammableConfig::V1 { rule_set }) =
                             metadata.programmable_config

diff --git a/src/main.rs b/src/main.rs
@@ -53,6 +53,7 @@ fn setup_logging(level: Option<EnvFilter>) -> Result<()> {
     let file = OpenOptions::new()
         .write(true)
         .create(true)
+        .truncate(true)
         .open(log_path)
         .unwrap();
 

diff --git a/src/mint/process.rs b/src/mint/process.rs
@@ -7,6 +7,7 @@ use anchor_client::solana_sdk::{
     system_program, sysvar,
 };
 use anyhow::Result;
+use borsh::BorshDeserialize;
 use console::style;
 use mpl_candy_machine_core::{
     accounts as nft_accounts, instruction as nft_instruction, AccountVersion, CandyMachine,
@@ -17,7 +18,7 @@ use mpl_token_metadata::{
         find_collection_authority_account, find_metadata_delegate_record_account,
         find_token_record_account,
     },
-    state::{Metadata, TokenMetadataAccount},
+    state::Metadata,
 };
 use solana_client::rpc_response::Response;
 use spl_associated_token_account::get_associated_token_address;
@@ -250,7 +251,7 @@ pub async fn mint(
     let collection_metadata = find_metadata_pda(&collection_mint);
 
     let data = program.rpc().get_account_data(&collection_metadata)?;
-    let metadata = Metadata::safe_deserialize(data.as_slice())?;
+    let metadata = Metadata::deserialize(&mut data.as_slice())?;
 
     let metadata_pda = find_metadata_pda(&nft_mint.pubkey());
     let master_edition_pda = find_master_edition_pda(&nft_mint.pubkey());

diff --git a/src/pdas.rs b/src/pdas.rs
@@ -5,9 +5,10 @@ use anchor_client::{
     Program,
 };
 use anyhow::{anyhow, Result};
+use borsh::BorshDeserialize;
 use mpl_token_metadata::{
     pda::{find_master_edition_account, find_metadata_account},
-    state::{Key, MasterEditionV2, Metadata, TokenMetadataAccount, MAX_MASTER_EDITION_LEN},
+    state::{Key, MasterEditionV2, Metadata, MAX_MASTER_EDITION_LEN},
     utils::try_from_slice_checked,
 };
 
@@ -37,7 +38,7 @@ pub fn get_metadata_pda<C: Deref<Target = impl Signer> + Clone>(
             &metadata_pubkey.to_string()
         )
     })?;
-    let metadata = Metadata::safe_deserialize(metadata_account.data.as_slice());
+    let metadata = Metadata::deserialize(&mut metadata_account.data.as_slice());
     metadata.map(|m| (metadata_pubkey, m)).map_err(|_| {
         anyhow!(
             "Failed to deserialize metadata account: {}",

diff --git a/src/upload/process.rs b/src/upload/process.rs
@@ -55,7 +55,7 @@ pub async fn process_upload(args: UploadArgs) -> Result<()> {
 
     // creates/loads the cache
     let mut cache = load_cache(&args.cache, true)?;
-    if asset_pairs.get(&-1).is_none() {
+    if !asset_pairs.contains_key(&-1) {
         cache.items.remove("-1");
     }