Danenbm/update from main (#80)

* Serde Pubkey DisplayFromStr (#78)

* Update kinobi version

* Regenerate clients

* chore: Release mpl-core version 0.5.0

---------

Co-authored-by: danenbm <[email protected]>

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.4.4"
+version = "0.5.0"
 edition = "2021"
 readme = "README.md"
 license-file = "../../LICENSE"

clients/rust/src/generated/instructions/add_collection_plugin_v1.rs

@@ -86,12 +86,12 @@ impl AddCollectionPluginV1 {
 }
 
 #[derive(BorshDeserialize, BorshSerialize)]
-struct AddCollectionPluginV1InstructionData {
+pub struct AddCollectionPluginV1InstructionData {
     discriminator: u8,
 }
 
 impl AddCollectionPluginV1InstructionData {
-    fn new() -> Self {
+    pub fn new() -> Self {
         Self { discriminator: 3 }
     }
 }

clients/rust/src/generated/instructions/add_plugin_v1.rs

@@ -95,12 +95,12 @@ impl AddPluginV1 {
 }
 
 #[derive(BorshDeserialize, BorshSerialize)]
-struct AddPluginV1InstructionData {
+pub struct AddPluginV1InstructionData {
     discriminator: u8,
 }
 
 impl AddPluginV1InstructionData {
-    fn new() -> Self {
+    pub fn new() -> Self {
         Self { discriminator: 2 }
     }
 }

clients/rust/src/generated/instructions/approve_collection_plugin_authority_v1.rs

@@ -86,12 +86,12 @@ impl ApproveCollectionPluginAuthorityV1 {
 }
 
 #[derive(BorshDeserialize, BorshSerialize)]
-struct ApproveCollectionPluginAuthorityV1InstructionData {
+pub struct ApproveCollectionPluginAuthorityV1InstructionData {
     discriminator: u8,
 }
 
 impl ApproveCollectionPluginAuthorityV1InstructionData {
-    fn new() -> Self {
+    pub fn new() -> Self {
         Self { discriminator: 9 }
     }
 }

clients/rust/src/generated/instructions/approve_plugin_authority_v1.rs

@@ -97,12 +97,12 @@ impl ApprovePluginAuthorityV1 {
 }
 
 #[derive(BorshDeserialize, BorshSerialize)]
-struct ApprovePluginAuthorityV1InstructionData {
+pub struct ApprovePluginAuthorityV1InstructionData {
     discriminator: u8,
 }
 
 impl ApprovePluginAuthorityV1InstructionData {
-    fn new() -> Self {
+    pub fn new() -> Self {
         Self { discriminator: 8 }
     }
 }

clients/rust/src/generated/instructions/burn_collection_v1.rs

@@ -77,12 +77,12 @@ impl BurnCollectionV1 {
 }
 
 #[derive(BorshDeserialize, BorshSerialize)]
-struct BurnCollectionV1InstructionData {
+pub struct BurnCollectionV1InstructionData {
     discriminator: u8,
 }
 
 impl BurnCollectionV1InstructionData {
-    fn new() -> Self {
+    pub fn new() -> Self {
         Self { discriminator: 13 }
     }
 }

clients/rust/src/generated/instructions/burn_v1.rs

@@ -101,12 +101,12 @@ impl BurnV1 {
 }
 
 #[derive(BorshDeserialize, BorshSerialize)]
-struct BurnV1InstructionData {
+pub struct BurnV1InstructionData {
     discriminator: u8,
 }
 
 impl BurnV1InstructionData {
-    fn new() -> Self {
+    pub fn new() -> Self {
         Self { discriminator: 12 }
     }
 }

clients/rust/src/generated/instructions/collect.rs

@@ -46,12 +46,12 @@ impl Collect {
 }
 
 #[derive(BorshDeserialize, BorshSerialize)]
-struct CollectInstructionData {
+pub struct CollectInstructionData {
     discriminator: u8,
 }
 
 impl CollectInstructionData {
-    fn new() -> Self {
+    pub fn new() -> Self {
         Self { discriminator: 19 }
     }
 }

clients/rust/src/generated/instructions/compress_v1.rs

@@ -87,12 +87,12 @@ impl CompressV1 {
 }
 
 #[derive(BorshDeserialize, BorshSerialize)]
-struct CompressV1InstructionData {
+pub struct CompressV1InstructionData {
     discriminator: u8,
 }
 
 impl CompressV1InstructionData {
-    fn new() -> Self {
+    pub fn new() -> Self {
         Self { discriminator: 17 }
     }
 }

clients/rust/src/generated/instructions/create_collection_v1.rs

@@ -73,12 +73,12 @@ impl CreateCollectionV1 {
 }
 
 #[derive(BorshDeserialize, BorshSerialize)]
-struct CreateCollectionV1InstructionData {
+pub struct CreateCollectionV1InstructionData {
     discriminator: u8,
 }
 
 impl CreateCollectionV1InstructionData {
-    fn new() -> Self {
+    pub fn new() -> Self {
         Self { discriminator: 1 }
     }
 }

clients/rust/src/generated/instructions/create_v1.rs

@@ -120,12 +120,12 @@ impl CreateV1 {
 }
 
 #[derive(BorshDeserialize, BorshSerialize)]
-struct CreateV1InstructionData {
+pub struct CreateV1InstructionData {
     discriminator: u8,
 }
 
 impl CreateV1InstructionData {
-    fn new() -> Self {
+    pub fn new() -> Self {
         Self { discriminator: 0 }
     }
 }

clients/rust/src/generated/instructions/decompress_v1.rs

@@ -94,12 +94,12 @@ impl DecompressV1 {
 }
 
 #[derive(BorshDeserialize, BorshSerialize)]
-struct DecompressV1InstructionData {
+pub struct DecompressV1InstructionData {
     discriminator: u8,
 }
 
 impl DecompressV1InstructionData {
-    fn new() -> Self {
+    pub fn new() -> Self {
         Self { discriminator: 18 }
     }
 }

clients/rust/src/generated/instructions/remove_collection_plugin_v1.rs

@@ -85,12 +85,12 @@ impl RemoveCollectionPluginV1 {
 }
 
 #[derive(BorshDeserialize, BorshSerialize)]
-struct RemoveCollectionPluginV1InstructionData {
+pub struct RemoveCollectionPluginV1InstructionData {
     discriminator: u8,
 }
 
 impl RemoveCollectionPluginV1InstructionData {
-    fn new() -> Self {
+    pub fn new() -> Self {
         Self { discriminator: 5 }
     }
 }

clients/rust/src/generated/instructions/remove_plugin_v1.rs

@@ -94,12 +94,12 @@ impl RemovePluginV1 {
 }
 
 #[derive(BorshDeserialize, BorshSerialize)]
-struct RemovePluginV1InstructionData {
+pub struct RemovePluginV1InstructionData {
     discriminator: u8,
 }
 
 impl RemovePluginV1InstructionData {
-    fn new() -> Self {
+    pub fn new() -> Self {
         Self { discriminator: 4 }
     }
 }

clients/rust/src/generated/instructions/revoke_collection_plugin_authority_v1.rs

@@ -85,12 +85,12 @@ impl RevokeCollectionPluginAuthorityV1 {
 }
 
 #[derive(BorshDeserialize, BorshSerialize)]
-struct RevokeCollectionPluginAuthorityV1InstructionData {
+pub struct RevokeCollectionPluginAuthorityV1InstructionData {
     discriminator: u8,
 }
 
 impl RevokeCollectionPluginAuthorityV1InstructionData {
-    fn new() -> Self {
+    pub fn new() -> Self {
         Self { discriminator: 11 }
     }
 }

clients/rust/src/generated/instructions/revoke_plugin_authority_v1.rs

@@ -96,12 +96,12 @@ impl RevokePluginAuthorityV1 {
 }
 
 #[derive(BorshDeserialize, BorshSerialize)]
-struct RevokePluginAuthorityV1InstructionData {
+pub struct RevokePluginAuthorityV1InstructionData {
     discriminator: u8,
 }
 
 impl RevokePluginAuthorityV1InstructionData {
-    fn new() -> Self {
+    pub fn new() -> Self {
         Self { discriminator: 10 }
     }
 }

clients/rust/src/generated/instructions/transfer_v1.rs

@@ -107,12 +107,12 @@ impl TransferV1 {
 }
 
 #[derive(BorshDeserialize, BorshSerialize)]
-struct TransferV1InstructionData {
+pub struct TransferV1InstructionData {
     discriminator: u8,
 }
 
 impl TransferV1InstructionData {
-    fn new() -> Self {
+    pub fn new() -> Self {
         Self { discriminator: 14 }
     }
 }

clients/rust/src/generated/instructions/update_collection_plugin_v1.rs

@@ -85,12 +85,12 @@ impl UpdateCollectionPluginV1 {
 }
 
 #[derive(BorshDeserialize, BorshSerialize)]
-struct UpdateCollectionPluginV1InstructionData {
+pub struct UpdateCollectionPluginV1InstructionData {
     discriminator: u8,
 }
 
 impl UpdateCollectionPluginV1InstructionData {
-    fn new() -> Self {
+    pub fn new() -> Self {
         Self { discriminator: 7 }
     }
 }

clients/rust/src/generated/instructions/update_collection_v1.rs

@@ -97,12 +97,12 @@ impl UpdateCollectionV1 {
 }
 
 #[derive(BorshDeserialize, BorshSerialize)]
-struct UpdateCollectionV1InstructionData {
+pub struct UpdateCollectionV1InstructionData {
     discriminator: u8,
 }
 
 impl UpdateCollectionV1InstructionData {
-    fn new() -> Self {
+    pub fn new() -> Self {
         Self { discriminator: 16 }
     }
 }

clients/rust/src/generated/instructions/update_plugin_v1.rs

@@ -94,12 +94,12 @@ impl UpdatePluginV1 {
 }
 
 #[derive(BorshDeserialize, BorshSerialize)]
-struct UpdatePluginV1InstructionData {
+pub struct UpdatePluginV1InstructionData {
     discriminator: u8,
 }
 
 impl UpdatePluginV1InstructionData {
-    fn new() -> Self {
+    pub fn new() -> Self {
         Self { discriminator: 6 }
     }
 }

clients/rust/src/generated/instructions/update_v1.rs

@@ -94,12 +94,12 @@ impl UpdateV1 {
 }
 
 #[derive(BorshDeserialize, BorshSerialize)]
-struct UpdateV1InstructionData {
+pub struct UpdateV1InstructionData {
     discriminator: u8,
 }
 
 impl UpdateV1InstructionData {
-    fn new() -> Self {
+    pub fn new() -> Self {
         Self { discriminator: 15 }
     }
 }

clients/rust/src/generated/types/rule_set.rs

@@ -13,6 +13,14 @@ use solana_program::pubkey::Pubkey;
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum RuleSet {
     None,
+    #[cfg_attr(
+        feature = "serde",
+        serde(with = "serde_with::As::<Vec<serde_with::DisplayFromStr>>")
+    )]
     ProgramAllowList(Vec<Pubkey>),
+    #[cfg_attr(
+        feature = "serde",
+        serde(with = "serde_with::As::<Vec<serde_with::DisplayFromStr>>")
+    )]
     ProgramDenyList(Vec<Pubkey>),
 }

clients/rust/src/generated/types/update_authority.rs

@@ -13,6 +13,14 @@ use solana_program::pubkey::Pubkey;
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum UpdateAuthority {
     None,
+    #[cfg_attr(
+        feature = "serde",
+        serde(with = "serde_with::As::<serde_with::DisplayFromStr>")
+    )]
     Address(Pubkey),
+    #[cfg_attr(
+        feature = "serde",
+        serde(with = "serde_with::As::<serde_with::DisplayFromStr>")
+    )]
     Collection(Pubkey),
 }

clients/rust/src/generated/types/update_delegate.rs

@@ -12,5 +12,9 @@ use solana_program::pubkey::Pubkey;
 #[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct UpdateDelegate {
+    #[cfg_attr(
+        feature = "serde",
+        serde(with = "serde_with::As::<Vec<serde_with::DisplayFromStr>>")
+    )]
     pub additional_delegates: Vec<Pubkey>,
 }

package.json

@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "@metaplex-foundation/amman": "^0.12.1",
-    "@metaplex-foundation/kinobi": "^0.18.3",
+    "@metaplex-foundation/kinobi": "^0.18.5",
     "@metaplex-foundation/shank-js": "^0.1.7",
     "typescript": "^4.9.4"
   },