merge main

clients/rust/Cargo.toml

@@ -2,7 +2,7 @@
 name = "mpl-core"
 description = "A flexible digital asset standard for Solana"
 repository = "https://github.com/metaplex-foundation/mpl-core"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2021"
 readme = "README.md"
 license-file = "../../LICENSE"

clients/rust/src/hooked/advanced_types.rs

@@ -1,3 +1,6 @@
+#[cfg(feature = "anchor")]
+use anchor_lang::prelude::AnchorDeserialize;
+#[cfg(not(feature = "anchor"))]
 use borsh::BorshDeserialize;
 use solana_program::pubkey::Pubkey;
 use std::{cmp::Ordering, io::ErrorKind};

clients/rust/src/hooked/asset.rs

@@ -1,3 +1,6 @@
+#[cfg(feature = "anchor")]
+use anchor_lang::prelude::AnchorSerialize;
+#[cfg(not(feature = "anchor"))]
 use borsh::BorshSerialize;
 
 use crate::{

clients/rust/src/hooked/collection.rs

@@ -1,3 +1,6 @@
+#[cfg(feature = "anchor")]
+use anchor_lang::prelude::AnchorSerialize;
+#[cfg(not(feature = "anchor"))]
 use borsh::BorshSerialize;
 
 use crate::{

clients/rust/src/hooked/mod.rs

@@ -10,7 +10,12 @@ pub use asset::*;
 pub mod collection;
 pub use collection::*;
 
-use borsh::{BorshDeserialize, BorshSerialize};
+#[cfg(feature = "anchor")]
+use anchor_lang::prelude::{
+    AnchorDeserialize as CrateDeserialize, AnchorSerialize as CrateSerialize,
+};
+#[cfg(not(feature = "anchor"))]
+use borsh::{BorshDeserialize as CrateDeserialize, BorshSerialize as CrateSerialize};
 use num_traits::FromPrimitive;
 use std::{cmp::Ordering, mem::size_of};
 
@@ -110,15 +115,15 @@ pub fn load_key(account: &AccountInfo, offset: usize) -> Result<Key, std::io::Er
 }
 
 /// A trait for generic blobs of data that have size.
-pub trait DataBlob: BorshSerialize + BorshDeserialize {
+pub trait DataBlob: CrateSerialize + CrateDeserialize {
     /// Get the size of an empty instance of the data blob.
     fn get_initial_size() -> usize;
     /// Get the current size of the data blob.
     fn get_size(&self) -> usize;
 }
 
 /// A trait for Solana accounts.
-pub trait SolanaAccount: BorshSerialize + BorshDeserialize {
+pub trait SolanaAccount: CrateSerialize + CrateDeserialize {
     /// Get the discriminator key for the account.
     fn key() -> Key;
 

clients/rust/src/hooked/plugin.rs

@@ -1,4 +1,7 @@
-use borsh::BorshDeserialize;
+#[cfg(feature = "anchor")]
+use anchor_lang::prelude::AnchorDeserialize as CrateDeserialize;
+#[cfg(not(feature = "anchor"))]
+use borsh::BorshDeserialize as CrateDeserialize;
 use num_traits::FromPrimitive;
 use solana_program::account_info::AccountInfo;
 
@@ -17,7 +20,7 @@ use crate::{
 };
 
 /// Fetch the plugin from the registry.
-pub fn fetch_plugin<T: DataBlob + SolanaAccount, U: BorshDeserialize>(
+pub fn fetch_plugin<T: DataBlob + SolanaAccount, U: CrateDeserialize>(
     account: &AccountInfo,
     plugin_type: PluginType,
 ) -> Result<(PluginAuthority, U, usize), std::io::Error> {

clients/rust/src/indexable_asset.rs

@@ -1,4 +1,7 @@
+#[cfg(feature = "anchor")]
+use anchor_lang::prelude::AnchorDeserialize;
 use base64::prelude::*;
+#[cfg(not(feature = "anchor"))]
 use borsh::BorshDeserialize;
 use num_traits::FromPrimitive;
 use solana_program::pubkey::Pubkey;