diff --git a/clients/rust/src/generated/instructions/add_collection_plugin_v1.rs b/clients/rust/src/generated/instructions/add_collection_plugin_v1.rs index eef1af12..8ed472af 100644 --- a/clients/rust/src/generated/instructions/add_collection_plugin_v1.rs +++ b/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 } } } diff --git a/clients/rust/src/generated/instructions/add_plugin_v1.rs b/clients/rust/src/generated/instructions/add_plugin_v1.rs index 14903cea..cdf2bb69 100644 --- a/clients/rust/src/generated/instructions/add_plugin_v1.rs +++ b/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 } } } diff --git a/clients/rust/src/generated/instructions/approve_collection_plugin_authority_v1.rs b/clients/rust/src/generated/instructions/approve_collection_plugin_authority_v1.rs index d8f83a21..0a117ef1 100644 --- a/clients/rust/src/generated/instructions/approve_collection_plugin_authority_v1.rs +++ b/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 } } } diff --git a/clients/rust/src/generated/instructions/approve_plugin_authority_v1.rs b/clients/rust/src/generated/instructions/approve_plugin_authority_v1.rs index 1218bdbd..a259c598 100644 --- a/clients/rust/src/generated/instructions/approve_plugin_authority_v1.rs +++ b/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 } } } diff --git a/clients/rust/src/generated/instructions/burn_collection_v1.rs b/clients/rust/src/generated/instructions/burn_collection_v1.rs index 4ebebe30..6bcc5032 100644 --- a/clients/rust/src/generated/instructions/burn_collection_v1.rs +++ b/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 } } } diff --git a/clients/rust/src/generated/instructions/burn_v1.rs b/clients/rust/src/generated/instructions/burn_v1.rs index 8ee626fb..803c102e 100644 --- a/clients/rust/src/generated/instructions/burn_v1.rs +++ b/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 } } } diff --git a/clients/rust/src/generated/instructions/collect.rs b/clients/rust/src/generated/instructions/collect.rs index 35ab6310..3593b4f1 100644 --- a/clients/rust/src/generated/instructions/collect.rs +++ b/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 } } } diff --git a/clients/rust/src/generated/instructions/compress_v1.rs b/clients/rust/src/generated/instructions/compress_v1.rs index 0aad8809..ddee8f22 100644 --- a/clients/rust/src/generated/instructions/compress_v1.rs +++ b/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 } } } diff --git a/clients/rust/src/generated/instructions/create_collection_v1.rs b/clients/rust/src/generated/instructions/create_collection_v1.rs index 64d5265a..7c6a08af 100644 --- a/clients/rust/src/generated/instructions/create_collection_v1.rs +++ b/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 } } } diff --git a/clients/rust/src/generated/instructions/create_v1.rs b/clients/rust/src/generated/instructions/create_v1.rs index 54ab43aa..ccbcd918 100644 --- a/clients/rust/src/generated/instructions/create_v1.rs +++ b/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 } } } diff --git a/clients/rust/src/generated/instructions/decompress_v1.rs b/clients/rust/src/generated/instructions/decompress_v1.rs index 945e15c6..c634069e 100644 --- a/clients/rust/src/generated/instructions/decompress_v1.rs +++ b/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 } } } diff --git a/clients/rust/src/generated/instructions/remove_collection_plugin_v1.rs b/clients/rust/src/generated/instructions/remove_collection_plugin_v1.rs index bed34644..036df350 100644 --- a/clients/rust/src/generated/instructions/remove_collection_plugin_v1.rs +++ b/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 } } } diff --git a/clients/rust/src/generated/instructions/remove_plugin_v1.rs b/clients/rust/src/generated/instructions/remove_plugin_v1.rs index df666098..82a7d727 100644 --- a/clients/rust/src/generated/instructions/remove_plugin_v1.rs +++ b/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 } } } diff --git a/clients/rust/src/generated/instructions/revoke_collection_plugin_authority_v1.rs b/clients/rust/src/generated/instructions/revoke_collection_plugin_authority_v1.rs index 21cbf000..32c33832 100644 --- a/clients/rust/src/generated/instructions/revoke_collection_plugin_authority_v1.rs +++ b/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 } } } diff --git a/clients/rust/src/generated/instructions/revoke_plugin_authority_v1.rs b/clients/rust/src/generated/instructions/revoke_plugin_authority_v1.rs index 3fc7be43..bd6b1c2a 100644 --- a/clients/rust/src/generated/instructions/revoke_plugin_authority_v1.rs +++ b/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 } } } diff --git a/clients/rust/src/generated/instructions/transfer_v1.rs b/clients/rust/src/generated/instructions/transfer_v1.rs index cba522f2..8fb04cdd 100644 --- a/clients/rust/src/generated/instructions/transfer_v1.rs +++ b/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 } } } diff --git a/clients/rust/src/generated/instructions/update_collection_plugin_v1.rs b/clients/rust/src/generated/instructions/update_collection_plugin_v1.rs index 2ca4788c..f5dbfe0f 100644 --- a/clients/rust/src/generated/instructions/update_collection_plugin_v1.rs +++ b/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 } } } diff --git a/clients/rust/src/generated/instructions/update_collection_v1.rs b/clients/rust/src/generated/instructions/update_collection_v1.rs index 12f3e407..7ed50069 100644 --- a/clients/rust/src/generated/instructions/update_collection_v1.rs +++ b/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 } } } diff --git a/clients/rust/src/generated/instructions/update_plugin_v1.rs b/clients/rust/src/generated/instructions/update_plugin_v1.rs index 5baa6f50..8e894d08 100644 --- a/clients/rust/src/generated/instructions/update_plugin_v1.rs +++ b/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 } } } diff --git a/clients/rust/src/generated/instructions/update_v1.rs b/clients/rust/src/generated/instructions/update_v1.rs index 0b81ad7e..62ccd844 100644 --- a/clients/rust/src/generated/instructions/update_v1.rs +++ b/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 } } } diff --git a/clients/rust/src/generated/types/rule_set.rs b/clients/rust/src/generated/types/rule_set.rs index 1fd87934..dbe34b51 100644 --- a/clients/rust/src/generated/types/rule_set.rs +++ b/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::>") + )] ProgramAllowList(Vec), + #[cfg_attr( + feature = "serde", + serde(with = "serde_with::As::>") + )] ProgramDenyList(Vec), } diff --git a/clients/rust/src/generated/types/update_authority.rs b/clients/rust/src/generated/types/update_authority.rs index 4aa85693..4ede9d33 100644 --- a/clients/rust/src/generated/types/update_authority.rs +++ b/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::") + )] Address(Pubkey), + #[cfg_attr( + feature = "serde", + serde(with = "serde_with::As::") + )] Collection(Pubkey), } diff --git a/clients/rust/src/generated/types/update_delegate.rs b/clients/rust/src/generated/types/update_delegate.rs index 243b0183..dedcb944 100644 --- a/clients/rust/src/generated/types/update_delegate.rs +++ b/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::>") + )] pub additional_delegates: Vec, } diff --git a/package.json b/package.json index ecfe3e28..3bf7441f 100644 --- a/package.json +++ b/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" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 19fba33a..d2f6ea82 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ devDependencies: specifier: ^0.12.1 version: 0.12.1(typescript@4.9.4) '@metaplex-foundation/kinobi': - specifier: ^0.18.3 - version: 0.18.3(fastestsmallesttextencoderdecoder@1.0.22) + specifier: ^0.18.5 + version: 0.18.5(fastestsmallesttextencoderdecoder@1.0.22) '@metaplex-foundation/shank-js': specifier: ^0.1.7 version: 0.1.7 @@ -89,8 +89,8 @@ packages: resolution: {integrity: sha512-S9RulC2fFCFOQraz61bij+5YCHhSO9llJegK8c8Y6731fSi6snUSQJdCUqYS8AIgR0TKbQvdvgSyIIdbDFZbBA==} dev: true - /@metaplex-foundation/kinobi@0.18.3(fastestsmallesttextencoderdecoder@1.0.22): - resolution: {integrity: sha512-va8n1DVYlzhVA6xLpTgiUzxRUB3Dvo53pwDUYYEuKBX43zXKrgg5SWZ438UX23/5iFNv+6M01L+5/Z4oh43fAw==} + /@metaplex-foundation/kinobi@0.18.5(fastestsmallesttextencoderdecoder@1.0.22): + resolution: {integrity: sha512-qh4h4xGB+PHR5o4rcZki+wsIeZYi6R9SRV5UMqGi/rfDJXk0ckAZ+fxdam+mCc4N8HWLLWmEJbF5gx8E5K0fOA==} dependencies: '@noble/hashes': 1.4.0 '@prettier/sync': 0.5.1(prettier@3.2.5)