From d2587925ce7999d8016527517b2a9ba474e60c75 Mon Sep 17 00:00:00 2001 From: blockiosaurus Date: Thu, 2 May 2024 13:31:37 -0400 Subject: [PATCH 1/6] Adding anchor types. --- Cargo.lock | 210 ++++++++++++++- clients/rust/Cargo.toml | 2 + .../src/generated/accounts/base_asset_v1.rs | 14 +- .../generated/accounts/base_collection_v1.rs | 14 +- .../src/generated/accounts/hashed_asset_v1.rs | 14 +- .../generated/accounts/plugin_header_v1.rs | 14 +- .../generated/accounts/plugin_registry_v1.rs | 14 +- .../instructions/add_collection_plugin_v1.rs | 7 +- .../generated/instructions/add_plugin_v1.rs | 7 +- .../approve_collection_plugin_authority_v1.rs | 7 +- .../approve_plugin_authority_v1.rs | 7 +- .../instructions/burn_collection_v1.rs | 7 +- .../src/generated/instructions/burn_v1.rs | 7 +- .../instructions/create_collection_v1.rs | 7 +- .../src/generated/instructions/create_v1.rs | 7 +- .../generated/instructions/decompress_v1.rs | 7 +- .../remove_collection_plugin_v1.rs | 7 +- .../instructions/remove_plugin_v1.rs | 7 +- .../revoke_collection_plugin_authority_v1.rs | 7 +- .../revoke_plugin_authority_v1.rs | 7 +- .../src/generated/instructions/transfer_v1.rs | 7 +- .../update_collection_plugin_v1.rs | 7 +- .../instructions/update_collection_v1.rs | 7 +- .../instructions/update_plugin_v1.rs | 7 +- .../src/generated/instructions/update_v1.rs | 7 +- clients/rust/src/generated/types/attribute.rs | 14 +- .../rust/src/generated/types/attributes.rs | 13 +- .../rust/src/generated/types/burn_delegate.rs | 14 +- .../src/generated/types/compression_proof.rs | 13 +- clients/rust/src/generated/types/creator.rs | 13 +- .../rust/src/generated/types/data_state.rs | 13 +- clients/rust/src/generated/types/edition.rs | 14 +- .../generated/types/external_plugin_record.rs | 13 +- .../src/generated/types/extra_accounts.rs | 13 +- .../src/generated/types/freeze_delegate.rs | 14 +- .../generated/types/hashable_plugin_schema.rs | 13 +- .../generated/types/hashed_asset_schema.rs | 14 +- clients/rust/src/generated/types/key.rs | 13 +- .../src/generated/types/master_edition.rs | 14 +- .../types/permanent_burn_delegate.rs | 14 +- .../types/permanent_freeze_delegate.rs | 14 +- .../types/permanent_transfer_delegate.rs | 14 +- clients/rust/src/generated/types/plugin.rs | 13 +- .../src/generated/types/plugin_authority.rs | 13 +- .../generated/types/plugin_authority_pair.rs | 13 +- .../rust/src/generated/types/plugin_type.rs | 13 +- .../src/generated/types/registry_record.rs | 13 +- clients/rust/src/generated/types/royalties.rs | 13 +- clients/rust/src/generated/types/rule_set.rs | 13 +- .../src/generated/types/transfer_delegate.rs | 14 +- .../src/generated/types/update_authority.rs | 13 +- .../src/generated/types/update_delegate.rs | 13 +- configs/kinobi.cjs | 2 +- package.json | 2 +- pnpm-lock.yaml | 243 +----------------- 55 files changed, 614 insertions(+), 402 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8cdc787e..bdf53288 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -117,6 +117,171 @@ dependencies = [ "alloc-no-stdlib", ] +[[package]] +name = "anchor-attribute-access-control" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd7368e171b3a317885dc08ec0f74eed9d0ad6c726cc819593aed81440dca926" +dependencies = [ + "anchor-syn", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "anchor-attribute-account" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f527df85a8cba3f2bea04e46ed71b66e525ea378c7fec538aa205f4520b73e31" +dependencies = [ + "anchor-syn", + "bs58 0.5.1", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "anchor-attribute-constant" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3eb1dc1845cf8636c2e046a274ca074dabd3884ac8ed11cc4ed64b7e8ef5a318" +dependencies = [ + "anchor-syn", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "anchor-attribute-error" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f382e41514c59a77ffa7bb1a47df9a0359564a749b6934485c742c11962e540" +dependencies = [ + "anchor-syn", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "anchor-attribute-event" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "473a122aeed3f6b666438236338d2ef7833ee5fdc5688e1baa80185d61088a53" +dependencies = [ + "anchor-syn", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "anchor-attribute-program" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f88c7ffe2eb40aeac43ffd0d74a6671581158aedfaa0552330a2ef92fa5c889" +dependencies = [ + "anchor-lang-idl", + "anchor-syn", + "anyhow", + "bs58 0.5.1", + "heck 0.3.3", + "proc-macro2 1.0.76", + "quote 1.0.35", + "serde_json", + "syn 1.0.109", +] + +[[package]] +name = "anchor-derive-accounts" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9b97c99dcec135aae0ff908c14bcfcd3e78cfc16a0c6f245135038f0e6d390" +dependencies = [ + "anchor-syn", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "anchor-derive-serde" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbece98f6ad9c37070edc0841326c9623a249346cd74f433e7cef69b14f7f31d" +dependencies = [ + "anchor-syn", + "borsh-derive-internal 0.10.3", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "anchor-derive-space" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8badbe2648bc99a85ee05a7a5f9512e5e2af8ffac71476a69350cb278057ac53" +dependencies = [ + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "anchor-lang" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e41feb9c1cd9f4b0fad1c004fc8f289183f3ce27e9db38fa6e434470c716fb1e" +dependencies = [ + "anchor-attribute-access-control", + "anchor-attribute-account", + "anchor-attribute-constant", + "anchor-attribute-error", + "anchor-attribute-event", + "anchor-attribute-program", + "anchor-derive-accounts", + "anchor-derive-serde", + "anchor-derive-space", + "arrayref", + "base64 0.21.7", + "bincode", + "borsh 0.10.3", + "bytemuck", + "getrandom 0.2.12", + "solana-program", + "thiserror", +] + +[[package]] +name = "anchor-lang-idl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b29da81eae478b1bb846749b06b8a2cb9c6f9ed26ca793b0c916793fdf36adab" +dependencies = [ + "anyhow", + "serde", + "serde_json", +] + +[[package]] +name = "anchor-syn" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac53f2378bc08e89e20c2b893c01986ffd34cfbc69a17e35bd6f754753e9fdad" +dependencies = [ + "anyhow", + "bs58 0.5.1", + "heck 0.3.3", + "proc-macro2 1.0.76", + "quote 1.0.35", + "serde", + "serde_json", + "sha2 0.10.8", + "syn 1.0.109", + "thiserror", +] + [[package]] name = "android-tzdata" version = "0.1.1" @@ -626,6 +791,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" +[[package]] +name = "bs58" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" +dependencies = [ + "tinyvec", +] + [[package]] name = "bumpalo" version = "3.14.0" @@ -1560,6 +1734,15 @@ version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "heck" version = "0.4.1" @@ -2082,6 +2265,7 @@ dependencies = [ name = "mpl-core" version = "0.5.1" dependencies = [ + "anchor-lang", "assert_matches", "base64 0.22.0", "borsh 0.10.3", @@ -3435,7 +3619,7 @@ dependencies = [ "Inflector", "base64 0.21.7", "bincode", - "bs58", + "bs58 0.4.0", "bv", "lazy_static", "serde", @@ -3660,7 +3844,7 @@ dependencies = [ "ahash 0.8.6", "blake3", "block-buffer 0.10.4", - "bs58", + "bs58 0.4.0", "bv", "byteorder", "cc", @@ -3811,7 +3995,7 @@ dependencies = [ "blake3", "borsh 0.10.3", "borsh 0.9.3", - "bs58", + "bs58 0.4.0", "bv", "bytemuck", "cc", @@ -3995,7 +4179,7 @@ dependencies = [ "async-trait", "base64 0.21.7", "bincode", - "bs58", + "bs58 0.4.0", "indicatif", "log", "reqwest", @@ -4019,7 +4203,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4462198830687b83870985db945c5d49c720d83abf516c8206fefba12cca689d" dependencies = [ "base64 0.21.7", - "bs58", + "bs58 0.4.0", "jsonrpc-core", "reqwest", "semver", @@ -4130,7 +4314,7 @@ dependencies = [ "bincode", "bitflags 1.3.2", "borsh 0.10.3", - "bs58", + "bs58 0.4.0", "bytemuck", "byteorder", "chrono", @@ -4178,7 +4362,7 @@ version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e0e0e7ee984b0f9179a1d4f4e9e67ce675de2324b5a98b61d2bdb61be3c19bb" dependencies = [ - "bs58", + "bs58 0.4.0", "proc-macro2 1.0.76", "quote 1.0.35", "rustversion", @@ -4313,7 +4497,7 @@ dependencies = [ "base64 0.21.7", "bincode", "borsh 0.10.3", - "bs58", + "bs58 0.4.0", "lazy_static", "log", "serde", @@ -4762,7 +4946,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2 1.0.76", "quote 1.0.35", "rustversion", @@ -4775,7 +4959,7 @@ version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2 1.0.76", "quote 1.0.35", "rustversion", @@ -5314,6 +5498,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + [[package]] name = "unicode-width" version = "0.1.11" diff --git a/clients/rust/Cargo.toml b/clients/rust/Cargo.toml index 8ccf50bd..501529f0 100644 --- a/clients/rust/Cargo.toml +++ b/clients/rust/Cargo.toml @@ -13,6 +13,7 @@ crate-type = ["cdylib", "lib"] [features] test-sbf = [] serde = ["dep:serde", "dep:serde_with"] +anchor = ["dep:anchor-lang"] [dependencies] borsh = "^0.10" @@ -23,6 +24,7 @@ serde_with = { version = "^3.0", optional = true } solana-program = "> 1.14, < 1.18" thiserror = "^1.0" base64 = "0.22.0" +anchor-lang = { version = "0.30.0", optional = true } [dev-dependencies] assert_matches = "1.5.0" diff --git a/clients/rust/src/generated/accounts/base_asset_v1.rs b/clients/rust/src/generated/accounts/base_asset_v1.rs index 371867ed..12709266 100644 --- a/clients/rust/src/generated/accounts/base_asset_v1.rs +++ b/clients/rust/src/generated/accounts/base_asset_v1.rs @@ -7,12 +7,22 @@ use crate::generated::types::Key; use crate::generated::types::UpdateAuthority; +#[cfg(feature = "anchor")] +use anchor_lang::AnchorDeserialize; +#[cfg(not(feature = "anchor"))] use borsh::BorshDeserialize; -use borsh::BorshSerialize; use solana_program::pubkey::Pubkey; -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct BaseAssetV1 { pub key: Key, #[cfg_attr( diff --git a/clients/rust/src/generated/accounts/base_collection_v1.rs b/clients/rust/src/generated/accounts/base_collection_v1.rs index 09e157e3..1b8af327 100644 --- a/clients/rust/src/generated/accounts/base_collection_v1.rs +++ b/clients/rust/src/generated/accounts/base_collection_v1.rs @@ -6,12 +6,22 @@ //! use crate::generated::types::Key; +#[cfg(feature = "anchor")] +use anchor_lang::AnchorDeserialize; +#[cfg(not(feature = "anchor"))] use borsh::BorshDeserialize; -use borsh::BorshSerialize; use solana_program::pubkey::Pubkey; -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct BaseCollectionV1 { pub key: Key, #[cfg_attr( diff --git a/clients/rust/src/generated/accounts/hashed_asset_v1.rs b/clients/rust/src/generated/accounts/hashed_asset_v1.rs index 1b87fc03..45786b37 100644 --- a/clients/rust/src/generated/accounts/hashed_asset_v1.rs +++ b/clients/rust/src/generated/accounts/hashed_asset_v1.rs @@ -6,11 +6,21 @@ //! use crate::generated::types::Key; +#[cfg(feature = "anchor")] +use anchor_lang::AnchorDeserialize; +#[cfg(not(feature = "anchor"))] use borsh::BorshDeserialize; -use borsh::BorshSerialize; -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct HashedAssetV1 { pub key: Key, pub hash: [u8; 32], diff --git a/clients/rust/src/generated/accounts/plugin_header_v1.rs b/clients/rust/src/generated/accounts/plugin_header_v1.rs index 386ac39b..b8244e99 100644 --- a/clients/rust/src/generated/accounts/plugin_header_v1.rs +++ b/clients/rust/src/generated/accounts/plugin_header_v1.rs @@ -6,11 +6,21 @@ //! use crate::generated::types::Key; +#[cfg(feature = "anchor")] +use anchor_lang::AnchorDeserialize; +#[cfg(not(feature = "anchor"))] use borsh::BorshDeserialize; -use borsh::BorshSerialize; -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct PluginHeaderV1 { pub key: Key, pub plugin_registry_offset: u64, diff --git a/clients/rust/src/generated/accounts/plugin_registry_v1.rs b/clients/rust/src/generated/accounts/plugin_registry_v1.rs index 76a8ebd9..e1bd441f 100644 --- a/clients/rust/src/generated/accounts/plugin_registry_v1.rs +++ b/clients/rust/src/generated/accounts/plugin_registry_v1.rs @@ -8,11 +8,21 @@ use crate::generated::types::ExternalPluginRecord; use crate::generated::types::Key; use crate::generated::types::RegistryRecord; +#[cfg(feature = "anchor")] +use anchor_lang::AnchorDeserialize; +#[cfg(not(feature = "anchor"))] use borsh::BorshDeserialize; -use borsh::BorshSerialize; -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct PluginRegistryV1 { pub key: Key, pub registry: Vec, 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 8ed472af..c40b4546 100644 --- a/clients/rust/src/generated/instructions/add_collection_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/add_collection_plugin_v1.rs @@ -96,7 +96,12 @@ impl AddCollectionPluginV1InstructionData { } } -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct AddCollectionPluginV1InstructionArgs { pub plugin: Plugin, diff --git a/clients/rust/src/generated/instructions/add_plugin_v1.rs b/clients/rust/src/generated/instructions/add_plugin_v1.rs index cdf2bb69..4e132796 100644 --- a/clients/rust/src/generated/instructions/add_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/add_plugin_v1.rs @@ -105,7 +105,12 @@ impl AddPluginV1InstructionData { } } -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct AddPluginV1InstructionArgs { pub plugin: Plugin, 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 0a117ef1..792701ca 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 @@ -96,7 +96,12 @@ impl ApproveCollectionPluginAuthorityV1InstructionData { } } -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct ApproveCollectionPluginAuthorityV1InstructionArgs { pub plugin_type: PluginType, 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 a259c598..85be6572 100644 --- a/clients/rust/src/generated/instructions/approve_plugin_authority_v1.rs +++ b/clients/rust/src/generated/instructions/approve_plugin_authority_v1.rs @@ -107,7 +107,12 @@ impl ApprovePluginAuthorityV1InstructionData { } } -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct ApprovePluginAuthorityV1InstructionArgs { pub plugin_type: PluginType, diff --git a/clients/rust/src/generated/instructions/burn_collection_v1.rs b/clients/rust/src/generated/instructions/burn_collection_v1.rs index 6bcc5032..4c4893e4 100644 --- a/clients/rust/src/generated/instructions/burn_collection_v1.rs +++ b/clients/rust/src/generated/instructions/burn_collection_v1.rs @@ -87,7 +87,12 @@ impl BurnCollectionV1InstructionData { } } -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct BurnCollectionV1InstructionArgs { pub compression_proof: Option, diff --git a/clients/rust/src/generated/instructions/burn_v1.rs b/clients/rust/src/generated/instructions/burn_v1.rs index 803c102e..0660e6a5 100644 --- a/clients/rust/src/generated/instructions/burn_v1.rs +++ b/clients/rust/src/generated/instructions/burn_v1.rs @@ -111,7 +111,12 @@ impl BurnV1InstructionData { } } -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct BurnV1InstructionArgs { pub compression_proof: Option, diff --git a/clients/rust/src/generated/instructions/create_collection_v1.rs b/clients/rust/src/generated/instructions/create_collection_v1.rs index 7c6a08af..85237a7e 100644 --- a/clients/rust/src/generated/instructions/create_collection_v1.rs +++ b/clients/rust/src/generated/instructions/create_collection_v1.rs @@ -83,7 +83,12 @@ impl CreateCollectionV1InstructionData { } } -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct CreateCollectionV1InstructionArgs { pub name: String, diff --git a/clients/rust/src/generated/instructions/create_v1.rs b/clients/rust/src/generated/instructions/create_v1.rs index ccbcd918..98cc2889 100644 --- a/clients/rust/src/generated/instructions/create_v1.rs +++ b/clients/rust/src/generated/instructions/create_v1.rs @@ -130,7 +130,12 @@ impl CreateV1InstructionData { } } -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct CreateV1InstructionArgs { pub data_state: DataState, diff --git a/clients/rust/src/generated/instructions/decompress_v1.rs b/clients/rust/src/generated/instructions/decompress_v1.rs index c634069e..43c09626 100644 --- a/clients/rust/src/generated/instructions/decompress_v1.rs +++ b/clients/rust/src/generated/instructions/decompress_v1.rs @@ -104,7 +104,12 @@ impl DecompressV1InstructionData { } } -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct DecompressV1InstructionArgs { pub compression_proof: CompressionProof, 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 036df350..e05bf0b7 100644 --- a/clients/rust/src/generated/instructions/remove_collection_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/remove_collection_plugin_v1.rs @@ -95,7 +95,12 @@ impl RemoveCollectionPluginV1InstructionData { } } -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct RemoveCollectionPluginV1InstructionArgs { pub plugin_type: PluginType, diff --git a/clients/rust/src/generated/instructions/remove_plugin_v1.rs b/clients/rust/src/generated/instructions/remove_plugin_v1.rs index 82a7d727..d6d2a2fb 100644 --- a/clients/rust/src/generated/instructions/remove_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/remove_plugin_v1.rs @@ -104,7 +104,12 @@ impl RemovePluginV1InstructionData { } } -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct RemovePluginV1InstructionArgs { pub plugin_type: PluginType, 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 32c33832..5b5a2b10 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 @@ -95,7 +95,12 @@ impl RevokeCollectionPluginAuthorityV1InstructionData { } } -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct RevokeCollectionPluginAuthorityV1InstructionArgs { pub plugin_type: PluginType, 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 bd6b1c2a..2a29c3af 100644 --- a/clients/rust/src/generated/instructions/revoke_plugin_authority_v1.rs +++ b/clients/rust/src/generated/instructions/revoke_plugin_authority_v1.rs @@ -106,7 +106,12 @@ impl RevokePluginAuthorityV1InstructionData { } } -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct RevokePluginAuthorityV1InstructionArgs { pub plugin_type: PluginType, diff --git a/clients/rust/src/generated/instructions/transfer_v1.rs b/clients/rust/src/generated/instructions/transfer_v1.rs index 8fb04cdd..b8860a89 100644 --- a/clients/rust/src/generated/instructions/transfer_v1.rs +++ b/clients/rust/src/generated/instructions/transfer_v1.rs @@ -117,7 +117,12 @@ impl TransferV1InstructionData { } } -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct TransferV1InstructionArgs { pub compression_proof: Option, 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 f5dbfe0f..f3cdb40b 100644 --- a/clients/rust/src/generated/instructions/update_collection_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/update_collection_plugin_v1.rs @@ -95,7 +95,12 @@ impl UpdateCollectionPluginV1InstructionData { } } -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct UpdateCollectionPluginV1InstructionArgs { pub plugin: Plugin, diff --git a/clients/rust/src/generated/instructions/update_collection_v1.rs b/clients/rust/src/generated/instructions/update_collection_v1.rs index 7ed50069..fa13ba36 100644 --- a/clients/rust/src/generated/instructions/update_collection_v1.rs +++ b/clients/rust/src/generated/instructions/update_collection_v1.rs @@ -107,7 +107,12 @@ impl UpdateCollectionV1InstructionData { } } -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct UpdateCollectionV1InstructionArgs { pub new_name: Option, diff --git a/clients/rust/src/generated/instructions/update_plugin_v1.rs b/clients/rust/src/generated/instructions/update_plugin_v1.rs index 8e894d08..9033c7a9 100644 --- a/clients/rust/src/generated/instructions/update_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/update_plugin_v1.rs @@ -104,7 +104,12 @@ impl UpdatePluginV1InstructionData { } } -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct UpdatePluginV1InstructionArgs { pub plugin: Plugin, diff --git a/clients/rust/src/generated/instructions/update_v1.rs b/clients/rust/src/generated/instructions/update_v1.rs index 62ccd844..27f9b456 100644 --- a/clients/rust/src/generated/instructions/update_v1.rs +++ b/clients/rust/src/generated/instructions/update_v1.rs @@ -104,7 +104,12 @@ impl UpdateV1InstructionData { } } -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct UpdateV1InstructionArgs { pub new_name: Option, diff --git a/clients/rust/src/generated/types/attribute.rs b/clients/rust/src/generated/types/attribute.rs index 0f6097c0..bd6190f7 100644 --- a/clients/rust/src/generated/types/attribute.rs +++ b/clients/rust/src/generated/types/attribute.rs @@ -5,11 +5,15 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; - -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct Attribute { pub key: String, pub value: String, diff --git a/clients/rust/src/generated/types/attributes.rs b/clients/rust/src/generated/types/attributes.rs index 835c72f2..32d8158f 100644 --- a/clients/rust/src/generated/types/attributes.rs +++ b/clients/rust/src/generated/types/attributes.rs @@ -6,11 +6,16 @@ //! use crate::generated::types::Attribute; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct Attributes { pub attribute_list: Vec, } diff --git a/clients/rust/src/generated/types/burn_delegate.rs b/clients/rust/src/generated/types/burn_delegate.rs index a201926e..59671d5e 100644 --- a/clients/rust/src/generated/types/burn_delegate.rs +++ b/clients/rust/src/generated/types/burn_delegate.rs @@ -5,9 +5,13 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; - -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct BurnDelegate {} diff --git a/clients/rust/src/generated/types/compression_proof.rs b/clients/rust/src/generated/types/compression_proof.rs index 91a227ac..ce98badc 100644 --- a/clients/rust/src/generated/types/compression_proof.rs +++ b/clients/rust/src/generated/types/compression_proof.rs @@ -7,12 +7,17 @@ use crate::generated::types::HashablePluginSchema; use crate::generated::types::UpdateAuthority; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; use solana_program::pubkey::Pubkey; -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct CompressionProof { #[cfg_attr( feature = "serde", diff --git a/clients/rust/src/generated/types/creator.rs b/clients/rust/src/generated/types/creator.rs index 677c3d58..c63272cd 100644 --- a/clients/rust/src/generated/types/creator.rs +++ b/clients/rust/src/generated/types/creator.rs @@ -5,12 +5,17 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; use solana_program::pubkey::Pubkey; -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct Creator { #[cfg_attr( feature = "serde", diff --git a/clients/rust/src/generated/types/data_state.rs b/clients/rust/src/generated/types/data_state.rs index c3f910a7..a8129cd8 100644 --- a/clients/rust/src/generated/types/data_state.rs +++ b/clients/rust/src/generated/types/data_state.rs @@ -5,14 +5,17 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; use num_derive::FromPrimitive; -#[derive( - BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq, PartialOrd, Hash, FromPrimitive, +#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Hash, FromPrimitive)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub enum DataState { AccountState, LedgerState, diff --git a/clients/rust/src/generated/types/edition.rs b/clients/rust/src/generated/types/edition.rs index e662e858..0900154e 100644 --- a/clients/rust/src/generated/types/edition.rs +++ b/clients/rust/src/generated/types/edition.rs @@ -5,11 +5,15 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; - -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct Edition { pub number: u32, } diff --git a/clients/rust/src/generated/types/external_plugin_record.rs b/clients/rust/src/generated/types/external_plugin_record.rs index 9f185453..05fe3b80 100644 --- a/clients/rust/src/generated/types/external_plugin_record.rs +++ b/clients/rust/src/generated/types/external_plugin_record.rs @@ -6,11 +6,16 @@ //! use crate::generated::types::PluginAuthority; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct ExternalPluginRecord { pub authority: PluginAuthority, pub offset: u64, diff --git a/clients/rust/src/generated/types/extra_accounts.rs b/clients/rust/src/generated/types/extra_accounts.rs index 73ebf3f7..566cc0e1 100644 --- a/clients/rust/src/generated/types/extra_accounts.rs +++ b/clients/rust/src/generated/types/extra_accounts.rs @@ -5,12 +5,17 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; use solana_program::pubkey::Pubkey; -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub enum ExtraAccounts { None, SplHook { diff --git a/clients/rust/src/generated/types/freeze_delegate.rs b/clients/rust/src/generated/types/freeze_delegate.rs index 012858db..def66a42 100644 --- a/clients/rust/src/generated/types/freeze_delegate.rs +++ b/clients/rust/src/generated/types/freeze_delegate.rs @@ -5,11 +5,15 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; - -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct FreezeDelegate { pub frozen: bool, } diff --git a/clients/rust/src/generated/types/hashable_plugin_schema.rs b/clients/rust/src/generated/types/hashable_plugin_schema.rs index 6ec12ff9..b0d5332e 100644 --- a/clients/rust/src/generated/types/hashable_plugin_schema.rs +++ b/clients/rust/src/generated/types/hashable_plugin_schema.rs @@ -7,11 +7,16 @@ use crate::generated::types::Plugin; use crate::generated::types::PluginAuthority; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct HashablePluginSchema { pub index: u64, pub authority: PluginAuthority, diff --git a/clients/rust/src/generated/types/hashed_asset_schema.rs b/clients/rust/src/generated/types/hashed_asset_schema.rs index 2bc0f967..d96233fc 100644 --- a/clients/rust/src/generated/types/hashed_asset_schema.rs +++ b/clients/rust/src/generated/types/hashed_asset_schema.rs @@ -5,11 +5,15 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; - -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct HashedAssetSchema { pub asset_hash: [u8; 32], pub plugin_hashes: Vec<[u8; 32]>, diff --git a/clients/rust/src/generated/types/key.rs b/clients/rust/src/generated/types/key.rs index 451a6393..0027f862 100644 --- a/clients/rust/src/generated/types/key.rs +++ b/clients/rust/src/generated/types/key.rs @@ -5,14 +5,17 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; use num_derive::FromPrimitive; -#[derive( - BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq, PartialOrd, Hash, FromPrimitive, +#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Hash, FromPrimitive)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub enum Key { Uninitialized, AssetV1, diff --git a/clients/rust/src/generated/types/master_edition.rs b/clients/rust/src/generated/types/master_edition.rs index 566c8d77..623eb9e0 100644 --- a/clients/rust/src/generated/types/master_edition.rs +++ b/clients/rust/src/generated/types/master_edition.rs @@ -5,11 +5,15 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; - -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct MasterEdition { pub max_supply: Option, pub name: Option, diff --git a/clients/rust/src/generated/types/permanent_burn_delegate.rs b/clients/rust/src/generated/types/permanent_burn_delegate.rs index 93caf612..b8470ad4 100644 --- a/clients/rust/src/generated/types/permanent_burn_delegate.rs +++ b/clients/rust/src/generated/types/permanent_burn_delegate.rs @@ -5,9 +5,13 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; - -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct PermanentBurnDelegate {} diff --git a/clients/rust/src/generated/types/permanent_freeze_delegate.rs b/clients/rust/src/generated/types/permanent_freeze_delegate.rs index cba42b08..68691c6e 100644 --- a/clients/rust/src/generated/types/permanent_freeze_delegate.rs +++ b/clients/rust/src/generated/types/permanent_freeze_delegate.rs @@ -5,11 +5,15 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; - -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct PermanentFreezeDelegate { pub frozen: bool, } diff --git a/clients/rust/src/generated/types/permanent_transfer_delegate.rs b/clients/rust/src/generated/types/permanent_transfer_delegate.rs index 81dfb376..73fa741b 100644 --- a/clients/rust/src/generated/types/permanent_transfer_delegate.rs +++ b/clients/rust/src/generated/types/permanent_transfer_delegate.rs @@ -5,9 +5,13 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; - -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct PermanentTransferDelegate {} diff --git a/clients/rust/src/generated/types/plugin.rs b/clients/rust/src/generated/types/plugin.rs index 57a77a63..a7f8c3b3 100644 --- a/clients/rust/src/generated/types/plugin.rs +++ b/clients/rust/src/generated/types/plugin.rs @@ -16,11 +16,16 @@ use crate::generated::types::PermanentTransferDelegate; use crate::generated::types::Royalties; use crate::generated::types::TransferDelegate; use crate::generated::types::UpdateDelegate; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub enum Plugin { Royalties(Royalties), FreezeDelegate(FreezeDelegate), diff --git a/clients/rust/src/generated/types/plugin_authority.rs b/clients/rust/src/generated/types/plugin_authority.rs index 07b06f72..8e3ff259 100644 --- a/clients/rust/src/generated/types/plugin_authority.rs +++ b/clients/rust/src/generated/types/plugin_authority.rs @@ -5,12 +5,17 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; use solana_program::pubkey::Pubkey; -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub enum PluginAuthority { None, Owner, diff --git a/clients/rust/src/generated/types/plugin_authority_pair.rs b/clients/rust/src/generated/types/plugin_authority_pair.rs index 117523a5..cadf3576 100644 --- a/clients/rust/src/generated/types/plugin_authority_pair.rs +++ b/clients/rust/src/generated/types/plugin_authority_pair.rs @@ -7,11 +7,16 @@ use crate::generated::types::Plugin; use crate::generated::types::PluginAuthority; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct PluginAuthorityPair { pub plugin: Plugin, pub authority: Option, diff --git a/clients/rust/src/generated/types/plugin_type.rs b/clients/rust/src/generated/types/plugin_type.rs index d6d4518c..70cdd605 100644 --- a/clients/rust/src/generated/types/plugin_type.rs +++ b/clients/rust/src/generated/types/plugin_type.rs @@ -5,14 +5,17 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; use num_derive::FromPrimitive; -#[derive( - BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq, PartialOrd, Hash, FromPrimitive, +#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Hash, FromPrimitive)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub enum PluginType { Royalties, FreezeDelegate, diff --git a/clients/rust/src/generated/types/registry_record.rs b/clients/rust/src/generated/types/registry_record.rs index 90ac6658..460470a2 100644 --- a/clients/rust/src/generated/types/registry_record.rs +++ b/clients/rust/src/generated/types/registry_record.rs @@ -7,11 +7,16 @@ use crate::generated::types::PluginAuthority; use crate::generated::types::PluginType; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct RegistryRecord { pub plugin_type: PluginType, pub authority: PluginAuthority, diff --git a/clients/rust/src/generated/types/royalties.rs b/clients/rust/src/generated/types/royalties.rs index d9d04892..a618e291 100644 --- a/clients/rust/src/generated/types/royalties.rs +++ b/clients/rust/src/generated/types/royalties.rs @@ -7,11 +7,16 @@ use crate::generated::types::Creator; use crate::generated::types::RuleSet; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct Royalties { pub basis_points: u16, pub creators: Vec, diff --git a/clients/rust/src/generated/types/rule_set.rs b/clients/rust/src/generated/types/rule_set.rs index dbe34b51..65a05e9f 100644 --- a/clients/rust/src/generated/types/rule_set.rs +++ b/clients/rust/src/generated/types/rule_set.rs @@ -5,12 +5,17 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; use solana_program::pubkey::Pubkey; -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub enum RuleSet { None, #[cfg_attr( diff --git a/clients/rust/src/generated/types/transfer_delegate.rs b/clients/rust/src/generated/types/transfer_delegate.rs index 89716c84..e96ca802 100644 --- a/clients/rust/src/generated/types/transfer_delegate.rs +++ b/clients/rust/src/generated/types/transfer_delegate.rs @@ -5,9 +5,13 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; - -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct TransferDelegate {} diff --git a/clients/rust/src/generated/types/update_authority.rs b/clients/rust/src/generated/types/update_authority.rs index 4ede9d33..f5a6d506 100644 --- a/clients/rust/src/generated/types/update_authority.rs +++ b/clients/rust/src/generated/types/update_authority.rs @@ -5,12 +5,17 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; use solana_program::pubkey::Pubkey; -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub enum UpdateAuthority { None, #[cfg_attr( diff --git a/clients/rust/src/generated/types/update_delegate.rs b/clients/rust/src/generated/types/update_delegate.rs index dedcb944..a4787680 100644 --- a/clients/rust/src/generated/types/update_delegate.rs +++ b/clients/rust/src/generated/types/update_delegate.rs @@ -5,12 +5,17 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; use solana_program::pubkey::Pubkey; -#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr( + not(feature = "anchor"), + derive(borsh::BorshSerialize, borsh::BorshDeserialize) +)] +#[cfg_attr( + feature = "anchor", + derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) +)] pub struct UpdateDelegate { #[cfg_attr( feature = "serde", diff --git a/configs/kinobi.cjs b/configs/kinobi.cjs index 930fd8de..df24b651 100755 --- a/configs/kinobi.cjs +++ b/configs/kinobi.cjs @@ -1,5 +1,5 @@ const path = require("path"); -const k = require("@metaplex-foundation/kinobi"); +const k = require("../../kinobi/dist/cjs"); // Paths. const clientDir = path.join(__dirname, "..", "clients"); diff --git a/package.json b/package.json index 3bf7441f..e38e4deb 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ }, "devDependencies": { "@metaplex-foundation/amman": "^0.12.1", - "@metaplex-foundation/kinobi": "^0.18.5", + "@metaplex-foundation/kinobi": "link:../kinobi/dist", "@metaplex-foundation/shank-js": "^0.1.7", "typescript": "^4.9.4" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d2f6ea82..927e799f 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.5 - version: 0.18.5(fastestsmallesttextencoderdecoder@1.0.22) + specifier: link:../kinobi/dist + version: link:../kinobi/dist '@metaplex-foundation/shank-js': specifier: ^0.1.7 version: 0.1.7 @@ -89,21 +89,6 @@ packages: resolution: {integrity: sha512-S9RulC2fFCFOQraz61bij+5YCHhSO9llJegK8c8Y6731fSi6snUSQJdCUqYS8AIgR0TKbQvdvgSyIIdbDFZbBA==} dev: true - /@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) - '@solana/codecs-strings': 2.0.0-preview.1(fastestsmallesttextencoderdecoder@1.0.22) - chalk: 4.1.2 - json-stable-stringify: 1.1.1 - nunjucks: 3.2.4 - prettier: 3.2.5 - transitivePeerDependencies: - - chokidar - - fastestsmallesttextencoderdecoder - dev: true - /@metaplex-foundation/rustbin@0.3.5: resolution: {integrity: sha512-m0wkRBEQB/8krwMwKBvFugufZtYwMXiGHud2cTDAv+aGXK4M90y0Hx67/wpu+AqqoQfdV8VM9YezUOHKD+Z5kA==} dependencies: @@ -136,15 +121,6 @@ packages: engines: {node: '>= 16'} dev: true - /@prettier/sync@0.5.1(prettier@3.2.5): - resolution: {integrity: sha512-tpF+A1e4ynO2U4fTH21Sjgm9EYENmqg4zmJCMLrmLVfzIzuDc1cKGXyxrxbFgcH8qQRfowyDCZFAUukwhiZlsw==} - peerDependencies: - prettier: '*' - dependencies: - make-synchronized: 0.2.8 - prettier: 3.2.5 - dev: true - /@sideway/address@4.1.5: resolution: {integrity: sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==} dependencies: @@ -184,38 +160,6 @@ packages: buffer: 6.0.3 dev: true - /@solana/codecs-core@2.0.0-preview.1: - resolution: {integrity: sha512-0y3kgFSJAOApNGefEOgLRMiXOHVmcF29Xw3zmR4LDUABvytG3ecKMXGz5oLt3vdaU2CyN3tuUVeGmQjrd0U1kw==} - dependencies: - '@solana/errors': 2.0.0-preview.1 - dev: true - - /@solana/codecs-numbers@2.0.0-preview.1: - resolution: {integrity: sha512-NFA8itgcYUY3hkWMBpVRozd2poy1zfOvkIWZKx/D69oIMUtQTBpKrodRVBuhlBkAv12vDNkFljqVySpcMZMl7A==} - dependencies: - '@solana/codecs-core': 2.0.0-preview.1 - '@solana/errors': 2.0.0-preview.1 - dev: true - - /@solana/codecs-strings@2.0.0-preview.1(fastestsmallesttextencoderdecoder@1.0.22): - resolution: {integrity: sha512-kBAxE9ZD5/c8j9CkPxqc55dbo7R50Re3k94SXR+k13DZCCs37Fyn0/mAkw/S95fofbi/zsi4jSfmsT5vCZD75A==} - peerDependencies: - fastestsmallesttextencoderdecoder: ^1.0.22 - dependencies: - '@solana/codecs-core': 2.0.0-preview.1 - '@solana/codecs-numbers': 2.0.0-preview.1 - '@solana/errors': 2.0.0-preview.1 - fastestsmallesttextencoderdecoder: 1.0.22 - dev: true - - /@solana/errors@2.0.0-preview.1: - resolution: {integrity: sha512-mnBWfLVwMH4hxwb4sWZ7G7djQCMsyymjysvUPDiF89LueTBm1hfdxUv8Cy1uUCGsJ3jO3scdPwB4noOgr0rG/g==} - hasBin: true - dependencies: - chalk: 5.3.0 - commander: 12.0.0 - dev: true - /@solana/spl-token-registry@0.2.4574: resolution: {integrity: sha512-JzlfZmke8Rxug20VT/VpI2XsXlsqMlcORIUivF+Yucj7tFi7A0dXG7h+2UnD0WaZJw8BrUz2ABNkUnv89vbv1A==} engines: {node: '>=10'} @@ -302,10 +246,6 @@ packages: through: 2.3.8 dev: true - /a-sync-waterfall@1.0.1: - resolution: {integrity: sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==} - dev: true - /accepts@1.3.8: resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==} engines: {node: '>= 0.6'} @@ -342,10 +282,6 @@ packages: resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==} dev: true - /asap@2.0.6: - resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==} - dev: true - /asynckit@0.4.0: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} dev: true @@ -441,30 +377,6 @@ packages: node-gyp-build: 4.8.0 dev: true - /call-bind@1.0.7: - resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==} - engines: {node: '>= 0.4'} - dependencies: - es-define-property: 1.0.0 - es-errors: 1.3.0 - function-bind: 1.1.2 - get-intrinsic: 1.2.4 - set-function-length: 1.2.2 - dev: true - - /chalk@4.1.2: - resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} - engines: {node: '>=10'} - dependencies: - ansi-styles: 4.3.0 - supports-color: 7.2.0 - dev: true - - /chalk@5.3.0: - resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==} - engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} - dev: true - /check-more-types@2.24.0: resolution: {integrity: sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==} engines: {node: '>= 0.8.0'} @@ -497,20 +409,10 @@ packages: delayed-stream: 1.0.0 dev: true - /commander@12.0.0: - resolution: {integrity: sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==} - engines: {node: '>=18'} - dev: true - /commander@2.20.3: resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} dev: true - /commander@5.1.0: - resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==} - engines: {node: '>= 6'} - dev: true - /cookie@0.4.2: resolution: {integrity: sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==} engines: {node: '>= 0.6'} @@ -562,15 +464,6 @@ packages: resolution: {integrity: sha512-aWS3UIVH+NPGCD1kki+DCU9Dua032iSsO43LqQpcs4R3+dVv7tX0qBGjiVHJHjplsoUM2XRO/KB92glqc68awg==} dev: true - /define-data-property@1.1.4: - resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==} - engines: {node: '>= 0.4'} - dependencies: - es-define-property: 1.0.0 - es-errors: 1.3.0 - gopd: 1.0.1 - dev: true - /delay@5.0.0: resolution: {integrity: sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw==} engines: {node: '>=10'} @@ -633,18 +526,6 @@ packages: - utf-8-validate dev: true - /es-define-property@1.0.0: - resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==} - engines: {node: '>= 0.4'} - dependencies: - get-intrinsic: 1.2.4 - dev: true - - /es-errors@1.3.0: - resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==} - engines: {node: '>= 0.4'} - dev: true - /es6-promise@4.2.8: resolution: {integrity: sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==} dev: true @@ -700,10 +581,6 @@ packages: resolution: {integrity: sha512-wpYMUmFu5f00Sm0cj2pfivpmawLZ0NKdviQ4w9zJeR8JVtOpOxHmLaJuj0vxvGqMJQWyP/COUkF75/57OKyRag==} dev: true - /fastestsmallesttextencoderdecoder@1.0.22: - resolution: {integrity: sha512-Pb8d48e+oIuY4MaM64Cd7OW1gt4nxCHs7/ddPPZ/Ic3sg8yVGM7O9wDvZ7us6ScaUupzM+pfBolwtYhN1IxBIw==} - dev: true - /file-uri-to-path@1.0.0: resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==} dev: true @@ -733,65 +610,16 @@ packages: resolution: {integrity: sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==} dev: true - /function-bind@1.1.2: - resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} - dev: true - /get-caller-file@2.0.5: resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} engines: {node: 6.* || 8.* || >= 10.*} dev: true - /get-intrinsic@1.2.4: - resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==} - engines: {node: '>= 0.4'} - dependencies: - es-errors: 1.3.0 - function-bind: 1.1.2 - has-proto: 1.0.3 - has-symbols: 1.0.3 - hasown: 2.0.2 - dev: true - /get-stream@6.0.1: resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} engines: {node: '>=10'} dev: true - /gopd@1.0.1: - resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} - dependencies: - get-intrinsic: 1.2.4 - dev: true - - /has-flag@4.0.0: - resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} - engines: {node: '>=8'} - dev: true - - /has-property-descriptors@1.0.2: - resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==} - dependencies: - es-define-property: 1.0.0 - dev: true - - /has-proto@1.0.3: - resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==} - engines: {node: '>= 0.4'} - dev: true - - /has-symbols@1.0.3: - resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} - engines: {node: '>= 0.4'} - dev: true - - /hasown@2.0.2: - resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} - engines: {node: '>= 0.4'} - dependencies: - function-bind: 1.1.2 - dev: true - /human-signals@2.1.0: resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} engines: {node: '>=10.17.0'} @@ -817,10 +645,6 @@ packages: engines: {node: '>=8'} dev: true - /isarray@2.0.5: - resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==} - dev: true - /isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} dev: true @@ -869,24 +693,10 @@ packages: resolution: {integrity: sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==} dev: true - /json-stable-stringify@1.1.1: - resolution: {integrity: sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - isarray: 2.0.5 - jsonify: 0.0.1 - object-keys: 1.1.1 - dev: true - /json-stringify-safe@5.0.1: resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==} dev: true - /jsonify@0.0.1: - resolution: {integrity: sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==} - dev: true - /jsonparse@1.3.1: resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==} engines: {'0': node >= 0.2.0} @@ -908,10 +718,6 @@ packages: yallist: 4.0.0 dev: true - /make-synchronized@0.2.8: - resolution: {integrity: sha512-jtXnKYCxjmGaXiZhXbDbGPbh4YyTvIIbOgcQjtAboc4RSm9k3nyhTFvFQB0cfs7QFKuZXKe2D2RvOkv1c+vpxg==} - dev: true - /map-stream@0.1.0: resolution: {integrity: sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==} dev: true @@ -993,31 +799,11 @@ packages: resolution: {integrity: sha512-qaKRmtYPZ5qdw4jWJD6bxEf1FJEqllJrwxCLIm0sQU/A7v2/czigzOb+C2uSiFsa9lBUzeH7M1oK+Q+OLxL3kA==} dev: true - /nunjucks@3.2.4: - resolution: {integrity: sha512-26XRV6BhkgK0VOxfbU5cQI+ICFUtMLixv1noZn1tGU38kQH5A5nmmbk/O45xdyBhD1esk47nKrY0mvQpZIhRjQ==} - engines: {node: '>= 6.9.0'} - hasBin: true - peerDependencies: - chokidar: ^3.3.0 - peerDependenciesMeta: - chokidar: - optional: true - dependencies: - a-sync-waterfall: 1.0.1 - asap: 2.0.6 - commander: 5.1.0 - dev: true - /object-assign@4.1.1: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} engines: {node: '>=0.10.0'} dev: true - /object-keys@1.1.1: - resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} - engines: {node: '>= 0.4'} - dev: true - /onetime@5.1.2: resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} engines: {node: '>=6'} @@ -1044,12 +830,6 @@ packages: selective-whitespace: 1.0.4 dev: true - /prettier@3.2.5: - resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==} - engines: {node: '>=14'} - hasBin: true - dev: true - /ps-tree@1.2.0: resolution: {integrity: sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==} engines: {node: '>= 0.10'} @@ -1103,18 +883,6 @@ packages: lru-cache: 6.0.0 dev: true - /set-function-length@1.2.2: - resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==} - engines: {node: '>= 0.4'} - dependencies: - define-data-property: 1.1.4 - es-errors: 1.3.0 - function-bind: 1.1.2 - get-intrinsic: 1.2.4 - gopd: 1.0.1 - has-property-descriptors: 1.0.2 - dev: true - /shebang-command@2.0.0: resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} engines: {node: '>=8'} @@ -1237,13 +1005,6 @@ packages: resolution: {integrity: sha512-nPewA6m9mR3d6k7WkZ8N8zpTWfenFH3q9pA2PkuiZxINr9DKB2+40wEQf0ixn8VaGuJ78AB6iWOtStI+/4FKZQ==} dev: true - /supports-color@7.2.0: - resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} - engines: {node: '>=8'} - dependencies: - has-flag: 4.0.0 - dev: true - /text-encoding-utf-8@1.0.2: resolution: {integrity: sha512-8bw4MY9WjdsD2aMtO0OzOCY3pXGYNx2d2FfHRVUKkiCPDWjKuOlhLVASS+pD7VkLTVjW268LYJHwsnPFlBpbAg==} dev: true From 02b263e262fa157174d111313fdeacd806510333 Mon Sep 17 00:00:00 2001 From: blockiosaurus Date: Thu, 2 May 2024 20:18:04 -0400 Subject: [PATCH 2/6] Update. --- clients/rust/src/generated/accounts/base_asset_v1.rs | 2 +- clients/rust/src/generated/accounts/base_collection_v1.rs | 2 +- clients/rust/src/generated/accounts/hashed_asset_v1.rs | 2 +- clients/rust/src/generated/accounts/plugin_header_v1.rs | 2 +- clients/rust/src/generated/accounts/plugin_registry_v1.rs | 2 +- .../src/generated/instructions/add_collection_plugin_v1.rs | 2 +- clients/rust/src/generated/instructions/add_plugin_v1.rs | 2 +- .../instructions/approve_collection_plugin_authority_v1.rs | 2 +- .../src/generated/instructions/approve_plugin_authority_v1.rs | 2 +- clients/rust/src/generated/instructions/burn_collection_v1.rs | 2 +- clients/rust/src/generated/instructions/burn_v1.rs | 2 +- .../rust/src/generated/instructions/create_collection_v1.rs | 2 +- clients/rust/src/generated/instructions/create_v1.rs | 2 +- clients/rust/src/generated/instructions/decompress_v1.rs | 2 +- .../src/generated/instructions/remove_collection_plugin_v1.rs | 2 +- clients/rust/src/generated/instructions/remove_plugin_v1.rs | 2 +- .../instructions/revoke_collection_plugin_authority_v1.rs | 2 +- .../src/generated/instructions/revoke_plugin_authority_v1.rs | 2 +- clients/rust/src/generated/instructions/transfer_v1.rs | 2 +- .../src/generated/instructions/update_collection_plugin_v1.rs | 2 +- .../rust/src/generated/instructions/update_collection_v1.rs | 2 +- clients/rust/src/generated/instructions/update_plugin_v1.rs | 2 +- clients/rust/src/generated/instructions/update_v1.rs | 2 +- clients/rust/src/generated/types/attribute.rs | 3 ++- clients/rust/src/generated/types/attributes.rs | 3 ++- clients/rust/src/generated/types/burn_delegate.rs | 3 ++- clients/rust/src/generated/types/compression_proof.rs | 3 ++- clients/rust/src/generated/types/creator.rs | 3 ++- clients/rust/src/generated/types/data_state.rs | 3 ++- clients/rust/src/generated/types/edition.rs | 3 ++- clients/rust/src/generated/types/external_plugin_record.rs | 3 ++- clients/rust/src/generated/types/extra_accounts.rs | 3 ++- clients/rust/src/generated/types/freeze_delegate.rs | 3 ++- clients/rust/src/generated/types/hashable_plugin_schema.rs | 3 ++- clients/rust/src/generated/types/hashed_asset_schema.rs | 3 ++- clients/rust/src/generated/types/key.rs | 3 ++- clients/rust/src/generated/types/master_edition.rs | 3 ++- clients/rust/src/generated/types/permanent_burn_delegate.rs | 3 ++- clients/rust/src/generated/types/permanent_freeze_delegate.rs | 3 ++- .../rust/src/generated/types/permanent_transfer_delegate.rs | 3 ++- clients/rust/src/generated/types/plugin.rs | 3 ++- clients/rust/src/generated/types/plugin_authority.rs | 3 ++- clients/rust/src/generated/types/plugin_authority_pair.rs | 3 ++- clients/rust/src/generated/types/plugin_type.rs | 3 ++- clients/rust/src/generated/types/registry_record.rs | 3 ++- clients/rust/src/generated/types/royalties.rs | 3 ++- clients/rust/src/generated/types/rule_set.rs | 3 ++- clients/rust/src/generated/types/transfer_delegate.rs | 3 ++- clients/rust/src/generated/types/update_authority.rs | 3 ++- clients/rust/src/generated/types/update_delegate.rs | 3 ++- 50 files changed, 77 insertions(+), 50 deletions(-) diff --git a/clients/rust/src/generated/accounts/base_asset_v1.rs b/clients/rust/src/generated/accounts/base_asset_v1.rs index 12709266..884d0ecb 100644 --- a/clients/rust/src/generated/accounts/base_asset_v1.rs +++ b/clients/rust/src/generated/accounts/base_asset_v1.rs @@ -13,7 +13,6 @@ use anchor_lang::AnchorDeserialize; use borsh::BorshDeserialize; use solana_program::pubkey::Pubkey; -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -23,6 +22,7 @@ use solana_program::pubkey::Pubkey; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct BaseAssetV1 { pub key: Key, #[cfg_attr( diff --git a/clients/rust/src/generated/accounts/base_collection_v1.rs b/clients/rust/src/generated/accounts/base_collection_v1.rs index 1b8af327..344d6811 100644 --- a/clients/rust/src/generated/accounts/base_collection_v1.rs +++ b/clients/rust/src/generated/accounts/base_collection_v1.rs @@ -12,7 +12,6 @@ use anchor_lang::AnchorDeserialize; use borsh::BorshDeserialize; use solana_program::pubkey::Pubkey; -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -22,6 +21,7 @@ use solana_program::pubkey::Pubkey; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct BaseCollectionV1 { pub key: Key, #[cfg_attr( diff --git a/clients/rust/src/generated/accounts/hashed_asset_v1.rs b/clients/rust/src/generated/accounts/hashed_asset_v1.rs index 45786b37..335f717b 100644 --- a/clients/rust/src/generated/accounts/hashed_asset_v1.rs +++ b/clients/rust/src/generated/accounts/hashed_asset_v1.rs @@ -11,7 +11,6 @@ use anchor_lang::AnchorDeserialize; #[cfg(not(feature = "anchor"))] use borsh::BorshDeserialize; -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -21,6 +20,7 @@ use borsh::BorshDeserialize; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct HashedAssetV1 { pub key: Key, pub hash: [u8; 32], diff --git a/clients/rust/src/generated/accounts/plugin_header_v1.rs b/clients/rust/src/generated/accounts/plugin_header_v1.rs index b8244e99..4c685601 100644 --- a/clients/rust/src/generated/accounts/plugin_header_v1.rs +++ b/clients/rust/src/generated/accounts/plugin_header_v1.rs @@ -11,7 +11,6 @@ use anchor_lang::AnchorDeserialize; #[cfg(not(feature = "anchor"))] use borsh::BorshDeserialize; -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -21,6 +20,7 @@ use borsh::BorshDeserialize; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct PluginHeaderV1 { pub key: Key, pub plugin_registry_offset: u64, diff --git a/clients/rust/src/generated/accounts/plugin_registry_v1.rs b/clients/rust/src/generated/accounts/plugin_registry_v1.rs index e1bd441f..e58034a3 100644 --- a/clients/rust/src/generated/accounts/plugin_registry_v1.rs +++ b/clients/rust/src/generated/accounts/plugin_registry_v1.rs @@ -13,7 +13,6 @@ use anchor_lang::AnchorDeserialize; #[cfg(not(feature = "anchor"))] use borsh::BorshDeserialize; -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -23,6 +22,7 @@ use borsh::BorshDeserialize; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct PluginRegistryV1 { pub key: Key, pub registry: Vec, 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 c40b4546..88ab9b36 100644 --- a/clients/rust/src/generated/instructions/add_collection_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/add_collection_plugin_v1.rs @@ -96,13 +96,13 @@ impl AddCollectionPluginV1InstructionData { } } -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr( feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct AddCollectionPluginV1InstructionArgs { pub plugin: Plugin, pub init_authority: Option, diff --git a/clients/rust/src/generated/instructions/add_plugin_v1.rs b/clients/rust/src/generated/instructions/add_plugin_v1.rs index 4e132796..54230c19 100644 --- a/clients/rust/src/generated/instructions/add_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/add_plugin_v1.rs @@ -105,13 +105,13 @@ impl AddPluginV1InstructionData { } } -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr( feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct AddPluginV1InstructionArgs { pub plugin: Plugin, pub init_authority: Option, 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 792701ca..d4dcce33 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 @@ -96,13 +96,13 @@ impl ApproveCollectionPluginAuthorityV1InstructionData { } } -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr( feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct ApproveCollectionPluginAuthorityV1InstructionArgs { pub plugin_type: PluginType, pub new_authority: PluginAuthority, 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 85be6572..3a9f9c83 100644 --- a/clients/rust/src/generated/instructions/approve_plugin_authority_v1.rs +++ b/clients/rust/src/generated/instructions/approve_plugin_authority_v1.rs @@ -107,13 +107,13 @@ impl ApprovePluginAuthorityV1InstructionData { } } -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr( feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct ApprovePluginAuthorityV1InstructionArgs { pub plugin_type: PluginType, pub new_authority: PluginAuthority, diff --git a/clients/rust/src/generated/instructions/burn_collection_v1.rs b/clients/rust/src/generated/instructions/burn_collection_v1.rs index 4c4893e4..3a5eb994 100644 --- a/clients/rust/src/generated/instructions/burn_collection_v1.rs +++ b/clients/rust/src/generated/instructions/burn_collection_v1.rs @@ -87,13 +87,13 @@ impl BurnCollectionV1InstructionData { } } -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr( feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct BurnCollectionV1InstructionArgs { pub compression_proof: Option, } diff --git a/clients/rust/src/generated/instructions/burn_v1.rs b/clients/rust/src/generated/instructions/burn_v1.rs index 0660e6a5..15a6d967 100644 --- a/clients/rust/src/generated/instructions/burn_v1.rs +++ b/clients/rust/src/generated/instructions/burn_v1.rs @@ -111,13 +111,13 @@ impl BurnV1InstructionData { } } -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr( feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct BurnV1InstructionArgs { pub compression_proof: Option, } diff --git a/clients/rust/src/generated/instructions/create_collection_v1.rs b/clients/rust/src/generated/instructions/create_collection_v1.rs index 85237a7e..64de397c 100644 --- a/clients/rust/src/generated/instructions/create_collection_v1.rs +++ b/clients/rust/src/generated/instructions/create_collection_v1.rs @@ -83,13 +83,13 @@ impl CreateCollectionV1InstructionData { } } -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr( feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct CreateCollectionV1InstructionArgs { pub name: String, pub uri: String, diff --git a/clients/rust/src/generated/instructions/create_v1.rs b/clients/rust/src/generated/instructions/create_v1.rs index 98cc2889..ff770150 100644 --- a/clients/rust/src/generated/instructions/create_v1.rs +++ b/clients/rust/src/generated/instructions/create_v1.rs @@ -130,13 +130,13 @@ impl CreateV1InstructionData { } } -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr( feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct CreateV1InstructionArgs { pub data_state: DataState, pub name: String, diff --git a/clients/rust/src/generated/instructions/decompress_v1.rs b/clients/rust/src/generated/instructions/decompress_v1.rs index 43c09626..cf6b3dfa 100644 --- a/clients/rust/src/generated/instructions/decompress_v1.rs +++ b/clients/rust/src/generated/instructions/decompress_v1.rs @@ -104,13 +104,13 @@ impl DecompressV1InstructionData { } } -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr( feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct DecompressV1InstructionArgs { pub compression_proof: CompressionProof, } 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 e05bf0b7..444ddf62 100644 --- a/clients/rust/src/generated/instructions/remove_collection_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/remove_collection_plugin_v1.rs @@ -95,13 +95,13 @@ impl RemoveCollectionPluginV1InstructionData { } } -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr( feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct RemoveCollectionPluginV1InstructionArgs { pub plugin_type: PluginType, } diff --git a/clients/rust/src/generated/instructions/remove_plugin_v1.rs b/clients/rust/src/generated/instructions/remove_plugin_v1.rs index d6d2a2fb..73afdf4e 100644 --- a/clients/rust/src/generated/instructions/remove_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/remove_plugin_v1.rs @@ -104,13 +104,13 @@ impl RemovePluginV1InstructionData { } } -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr( feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct RemovePluginV1InstructionArgs { pub plugin_type: PluginType, } 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 5b5a2b10..b414e0c2 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 @@ -95,13 +95,13 @@ impl RevokeCollectionPluginAuthorityV1InstructionData { } } -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr( feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct RevokeCollectionPluginAuthorityV1InstructionArgs { pub plugin_type: PluginType, } 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 2a29c3af..84b78959 100644 --- a/clients/rust/src/generated/instructions/revoke_plugin_authority_v1.rs +++ b/clients/rust/src/generated/instructions/revoke_plugin_authority_v1.rs @@ -106,13 +106,13 @@ impl RevokePluginAuthorityV1InstructionData { } } -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr( feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct RevokePluginAuthorityV1InstructionArgs { pub plugin_type: PluginType, } diff --git a/clients/rust/src/generated/instructions/transfer_v1.rs b/clients/rust/src/generated/instructions/transfer_v1.rs index b8860a89..07cd5cc1 100644 --- a/clients/rust/src/generated/instructions/transfer_v1.rs +++ b/clients/rust/src/generated/instructions/transfer_v1.rs @@ -117,13 +117,13 @@ impl TransferV1InstructionData { } } -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr( feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct TransferV1InstructionArgs { pub compression_proof: Option, } 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 f3cdb40b..f5d06b94 100644 --- a/clients/rust/src/generated/instructions/update_collection_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/update_collection_plugin_v1.rs @@ -95,13 +95,13 @@ impl UpdateCollectionPluginV1InstructionData { } } -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr( feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct UpdateCollectionPluginV1InstructionArgs { pub plugin: Plugin, } diff --git a/clients/rust/src/generated/instructions/update_collection_v1.rs b/clients/rust/src/generated/instructions/update_collection_v1.rs index fa13ba36..bdca2669 100644 --- a/clients/rust/src/generated/instructions/update_collection_v1.rs +++ b/clients/rust/src/generated/instructions/update_collection_v1.rs @@ -107,13 +107,13 @@ impl UpdateCollectionV1InstructionData { } } -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr( feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct UpdateCollectionV1InstructionArgs { pub new_name: Option, pub new_uri: Option, diff --git a/clients/rust/src/generated/instructions/update_plugin_v1.rs b/clients/rust/src/generated/instructions/update_plugin_v1.rs index 9033c7a9..d0fb3dae 100644 --- a/clients/rust/src/generated/instructions/update_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/update_plugin_v1.rs @@ -104,13 +104,13 @@ impl UpdatePluginV1InstructionData { } } -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr( feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct UpdatePluginV1InstructionArgs { pub plugin: Plugin, } diff --git a/clients/rust/src/generated/instructions/update_v1.rs b/clients/rust/src/generated/instructions/update_v1.rs index 27f9b456..1129a9b9 100644 --- a/clients/rust/src/generated/instructions/update_v1.rs +++ b/clients/rust/src/generated/instructions/update_v1.rs @@ -104,13 +104,13 @@ impl UpdateV1InstructionData { } } -#[derive(Clone, Debug, Eq, PartialEq)] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr( feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct UpdateV1InstructionArgs { pub new_name: Option, pub new_uri: Option, diff --git a/clients/rust/src/generated/types/attribute.rs b/clients/rust/src/generated/types/attribute.rs index bd6190f7..bd04e1f9 100644 --- a/clients/rust/src/generated/types/attribute.rs +++ b/clients/rust/src/generated/types/attribute.rs @@ -5,7 +5,7 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -14,6 +14,7 @@ feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct Attribute { pub key: String, pub value: String, diff --git a/clients/rust/src/generated/types/attributes.rs b/clients/rust/src/generated/types/attributes.rs index 32d8158f..0ddbde13 100644 --- a/clients/rust/src/generated/types/attributes.rs +++ b/clients/rust/src/generated/types/attributes.rs @@ -7,7 +7,7 @@ use crate::generated::types::Attribute; -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -16,6 +16,7 @@ use crate::generated::types::Attribute; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct Attributes { pub attribute_list: Vec, } diff --git a/clients/rust/src/generated/types/burn_delegate.rs b/clients/rust/src/generated/types/burn_delegate.rs index 59671d5e..f698fb2b 100644 --- a/clients/rust/src/generated/types/burn_delegate.rs +++ b/clients/rust/src/generated/types/burn_delegate.rs @@ -5,7 +5,7 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -14,4 +14,5 @@ feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct BurnDelegate {} diff --git a/clients/rust/src/generated/types/compression_proof.rs b/clients/rust/src/generated/types/compression_proof.rs index ce98badc..005aaef2 100644 --- a/clients/rust/src/generated/types/compression_proof.rs +++ b/clients/rust/src/generated/types/compression_proof.rs @@ -9,7 +9,7 @@ use crate::generated::types::HashablePluginSchema; use crate::generated::types::UpdateAuthority; use solana_program::pubkey::Pubkey; -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -18,6 +18,7 @@ use solana_program::pubkey::Pubkey; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct CompressionProof { #[cfg_attr( feature = "serde", diff --git a/clients/rust/src/generated/types/creator.rs b/clients/rust/src/generated/types/creator.rs index c63272cd..befe9087 100644 --- a/clients/rust/src/generated/types/creator.rs +++ b/clients/rust/src/generated/types/creator.rs @@ -7,7 +7,7 @@ use solana_program::pubkey::Pubkey; -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -16,6 +16,7 @@ use solana_program::pubkey::Pubkey; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct Creator { #[cfg_attr( feature = "serde", diff --git a/clients/rust/src/generated/types/data_state.rs b/clients/rust/src/generated/types/data_state.rs index a8129cd8..540abeeb 100644 --- a/clients/rust/src/generated/types/data_state.rs +++ b/clients/rust/src/generated/types/data_state.rs @@ -7,7 +7,7 @@ use num_derive::FromPrimitive; -#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Hash, FromPrimitive)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -16,6 +16,7 @@ use num_derive::FromPrimitive; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Hash, FromPrimitive)] pub enum DataState { AccountState, LedgerState, diff --git a/clients/rust/src/generated/types/edition.rs b/clients/rust/src/generated/types/edition.rs index 0900154e..2bebd4c4 100644 --- a/clients/rust/src/generated/types/edition.rs +++ b/clients/rust/src/generated/types/edition.rs @@ -5,7 +5,7 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -14,6 +14,7 @@ feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct Edition { pub number: u32, } diff --git a/clients/rust/src/generated/types/external_plugin_record.rs b/clients/rust/src/generated/types/external_plugin_record.rs index 05fe3b80..30031dc3 100644 --- a/clients/rust/src/generated/types/external_plugin_record.rs +++ b/clients/rust/src/generated/types/external_plugin_record.rs @@ -7,7 +7,7 @@ use crate::generated::types::PluginAuthority; -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -16,6 +16,7 @@ use crate::generated::types::PluginAuthority; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct ExternalPluginRecord { pub authority: PluginAuthority, pub offset: u64, diff --git a/clients/rust/src/generated/types/extra_accounts.rs b/clients/rust/src/generated/types/extra_accounts.rs index 566cc0e1..9c0e5840 100644 --- a/clients/rust/src/generated/types/extra_accounts.rs +++ b/clients/rust/src/generated/types/extra_accounts.rs @@ -7,7 +7,7 @@ use solana_program::pubkey::Pubkey; -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -16,6 +16,7 @@ use solana_program::pubkey::Pubkey; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub enum ExtraAccounts { None, SplHook { diff --git a/clients/rust/src/generated/types/freeze_delegate.rs b/clients/rust/src/generated/types/freeze_delegate.rs index def66a42..acaeeb50 100644 --- a/clients/rust/src/generated/types/freeze_delegate.rs +++ b/clients/rust/src/generated/types/freeze_delegate.rs @@ -5,7 +5,7 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -14,6 +14,7 @@ feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct FreezeDelegate { pub frozen: bool, } diff --git a/clients/rust/src/generated/types/hashable_plugin_schema.rs b/clients/rust/src/generated/types/hashable_plugin_schema.rs index b0d5332e..de17fbc0 100644 --- a/clients/rust/src/generated/types/hashable_plugin_schema.rs +++ b/clients/rust/src/generated/types/hashable_plugin_schema.rs @@ -8,7 +8,7 @@ use crate::generated::types::Plugin; use crate::generated::types::PluginAuthority; -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -17,6 +17,7 @@ use crate::generated::types::PluginAuthority; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct HashablePluginSchema { pub index: u64, pub authority: PluginAuthority, diff --git a/clients/rust/src/generated/types/hashed_asset_schema.rs b/clients/rust/src/generated/types/hashed_asset_schema.rs index d96233fc..6816d939 100644 --- a/clients/rust/src/generated/types/hashed_asset_schema.rs +++ b/clients/rust/src/generated/types/hashed_asset_schema.rs @@ -5,7 +5,7 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -14,6 +14,7 @@ feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct HashedAssetSchema { pub asset_hash: [u8; 32], pub plugin_hashes: Vec<[u8; 32]>, diff --git a/clients/rust/src/generated/types/key.rs b/clients/rust/src/generated/types/key.rs index 0027f862..a2a49639 100644 --- a/clients/rust/src/generated/types/key.rs +++ b/clients/rust/src/generated/types/key.rs @@ -7,7 +7,7 @@ use num_derive::FromPrimitive; -#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Hash, FromPrimitive)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -16,6 +16,7 @@ use num_derive::FromPrimitive; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Hash, FromPrimitive)] pub enum Key { Uninitialized, AssetV1, diff --git a/clients/rust/src/generated/types/master_edition.rs b/clients/rust/src/generated/types/master_edition.rs index 623eb9e0..a9262ebb 100644 --- a/clients/rust/src/generated/types/master_edition.rs +++ b/clients/rust/src/generated/types/master_edition.rs @@ -5,7 +5,7 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -14,6 +14,7 @@ feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct MasterEdition { pub max_supply: Option, pub name: Option, diff --git a/clients/rust/src/generated/types/permanent_burn_delegate.rs b/clients/rust/src/generated/types/permanent_burn_delegate.rs index b8470ad4..bea1b283 100644 --- a/clients/rust/src/generated/types/permanent_burn_delegate.rs +++ b/clients/rust/src/generated/types/permanent_burn_delegate.rs @@ -5,7 +5,7 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -14,4 +14,5 @@ feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct PermanentBurnDelegate {} diff --git a/clients/rust/src/generated/types/permanent_freeze_delegate.rs b/clients/rust/src/generated/types/permanent_freeze_delegate.rs index 68691c6e..eb4c9533 100644 --- a/clients/rust/src/generated/types/permanent_freeze_delegate.rs +++ b/clients/rust/src/generated/types/permanent_freeze_delegate.rs @@ -5,7 +5,7 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -14,6 +14,7 @@ feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct PermanentFreezeDelegate { pub frozen: bool, } diff --git a/clients/rust/src/generated/types/permanent_transfer_delegate.rs b/clients/rust/src/generated/types/permanent_transfer_delegate.rs index 73fa741b..b54c985b 100644 --- a/clients/rust/src/generated/types/permanent_transfer_delegate.rs +++ b/clients/rust/src/generated/types/permanent_transfer_delegate.rs @@ -5,7 +5,7 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -14,4 +14,5 @@ feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct PermanentTransferDelegate {} diff --git a/clients/rust/src/generated/types/plugin.rs b/clients/rust/src/generated/types/plugin.rs index a7f8c3b3..140d0c67 100644 --- a/clients/rust/src/generated/types/plugin.rs +++ b/clients/rust/src/generated/types/plugin.rs @@ -17,7 +17,7 @@ use crate::generated::types::Royalties; use crate::generated::types::TransferDelegate; use crate::generated::types::UpdateDelegate; -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -26,6 +26,7 @@ use crate::generated::types::UpdateDelegate; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub enum Plugin { Royalties(Royalties), FreezeDelegate(FreezeDelegate), diff --git a/clients/rust/src/generated/types/plugin_authority.rs b/clients/rust/src/generated/types/plugin_authority.rs index 8e3ff259..d7943f2b 100644 --- a/clients/rust/src/generated/types/plugin_authority.rs +++ b/clients/rust/src/generated/types/plugin_authority.rs @@ -7,7 +7,7 @@ use solana_program::pubkey::Pubkey; -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -16,6 +16,7 @@ use solana_program::pubkey::Pubkey; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub enum PluginAuthority { None, Owner, diff --git a/clients/rust/src/generated/types/plugin_authority_pair.rs b/clients/rust/src/generated/types/plugin_authority_pair.rs index cadf3576..308356a8 100644 --- a/clients/rust/src/generated/types/plugin_authority_pair.rs +++ b/clients/rust/src/generated/types/plugin_authority_pair.rs @@ -8,7 +8,7 @@ use crate::generated::types::Plugin; use crate::generated::types::PluginAuthority; -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -17,6 +17,7 @@ use crate::generated::types::PluginAuthority; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct PluginAuthorityPair { pub plugin: Plugin, pub authority: Option, diff --git a/clients/rust/src/generated/types/plugin_type.rs b/clients/rust/src/generated/types/plugin_type.rs index 70cdd605..000dccfe 100644 --- a/clients/rust/src/generated/types/plugin_type.rs +++ b/clients/rust/src/generated/types/plugin_type.rs @@ -7,7 +7,7 @@ use num_derive::FromPrimitive; -#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Hash, FromPrimitive)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -16,6 +16,7 @@ use num_derive::FromPrimitive; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Hash, FromPrimitive)] pub enum PluginType { Royalties, FreezeDelegate, diff --git a/clients/rust/src/generated/types/registry_record.rs b/clients/rust/src/generated/types/registry_record.rs index 460470a2..0015ca3b 100644 --- a/clients/rust/src/generated/types/registry_record.rs +++ b/clients/rust/src/generated/types/registry_record.rs @@ -8,7 +8,7 @@ use crate::generated::types::PluginAuthority; use crate::generated::types::PluginType; -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -17,6 +17,7 @@ use crate::generated::types::PluginType; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct RegistryRecord { pub plugin_type: PluginType, pub authority: PluginAuthority, diff --git a/clients/rust/src/generated/types/royalties.rs b/clients/rust/src/generated/types/royalties.rs index a618e291..f5dddb59 100644 --- a/clients/rust/src/generated/types/royalties.rs +++ b/clients/rust/src/generated/types/royalties.rs @@ -8,7 +8,7 @@ use crate::generated::types::Creator; use crate::generated::types::RuleSet; -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -17,6 +17,7 @@ use crate::generated::types::RuleSet; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct Royalties { pub basis_points: u16, pub creators: Vec, diff --git a/clients/rust/src/generated/types/rule_set.rs b/clients/rust/src/generated/types/rule_set.rs index 65a05e9f..75bdc49a 100644 --- a/clients/rust/src/generated/types/rule_set.rs +++ b/clients/rust/src/generated/types/rule_set.rs @@ -7,7 +7,7 @@ use solana_program::pubkey::Pubkey; -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -16,6 +16,7 @@ use solana_program::pubkey::Pubkey; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub enum RuleSet { None, #[cfg_attr( diff --git a/clients/rust/src/generated/types/transfer_delegate.rs b/clients/rust/src/generated/types/transfer_delegate.rs index e96ca802..92a49463 100644 --- a/clients/rust/src/generated/types/transfer_delegate.rs +++ b/clients/rust/src/generated/types/transfer_delegate.rs @@ -5,7 +5,7 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -14,4 +14,5 @@ feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct TransferDelegate {} diff --git a/clients/rust/src/generated/types/update_authority.rs b/clients/rust/src/generated/types/update_authority.rs index f5a6d506..0c89e0b6 100644 --- a/clients/rust/src/generated/types/update_authority.rs +++ b/clients/rust/src/generated/types/update_authority.rs @@ -7,7 +7,7 @@ use solana_program::pubkey::Pubkey; -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -16,6 +16,7 @@ use solana_program::pubkey::Pubkey; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub enum UpdateAuthority { None, #[cfg_attr( diff --git a/clients/rust/src/generated/types/update_delegate.rs b/clients/rust/src/generated/types/update_delegate.rs index a4787680..f34c69c7 100644 --- a/clients/rust/src/generated/types/update_delegate.rs +++ b/clients/rust/src/generated/types/update_delegate.rs @@ -7,7 +7,7 @@ use solana_program::pubkey::Pubkey; -#[derive(Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr( not(feature = "anchor"), derive(borsh::BorshSerialize, borsh::BorshDeserialize) @@ -16,6 +16,7 @@ use solana_program::pubkey::Pubkey; feature = "anchor", derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) )] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct UpdateDelegate { #[cfg_attr( feature = "serde", From e9e71fe4d704abb69f2be888ccdbd5d25a7918e9 Mon Sep 17 00:00:00 2001 From: blockiosaurus Date: Tue, 7 May 2024 11:12:36 -0400 Subject: [PATCH 3/6] Updating Kinobi dependency. --- .../src/generated/accounts/base_asset_v1.rs | 18 +- .../generated/accounts/base_collection_v1.rs | 18 +- .../src/generated/accounts/hashed_asset_v1.rs | 18 +- .../generated/accounts/plugin_header_v1.rs | 18 +- .../generated/accounts/plugin_registry_v1.rs | 18 +- .../instructions/add_collection_plugin_v1.rs | 18 +- .../generated/instructions/add_plugin_v1.rs | 18 +- .../approve_collection_plugin_authority_v1.rs | 18 +- .../approve_plugin_authority_v1.rs | 18 +- .../instructions/burn_collection_v1.rs | 18 +- .../src/generated/instructions/burn_v1.rs | 18 +- .../src/generated/instructions/collect.rs | 11 +- .../src/generated/instructions/compress_v1.rs | 11 +- .../instructions/create_collection_v1.rs | 18 +- .../src/generated/instructions/create_v1.rs | 18 +- .../generated/instructions/decompress_v1.rs | 18 +- .../remove_collection_plugin_v1.rs | 18 +- .../instructions/remove_plugin_v1.rs | 18 +- .../revoke_collection_plugin_authority_v1.rs | 18 +- .../revoke_plugin_authority_v1.rs | 18 +- .../src/generated/instructions/transfer_v1.rs | 18 +- .../update_collection_plugin_v1.rs | 18 +- .../instructions/update_collection_v1.rs | 18 +- .../instructions/update_plugin_v1.rs | 18 +- .../src/generated/instructions/update_v1.rs | 18 +- clients/rust/src/generated/types/attribute.rs | 19 +- .../rust/src/generated/types/attributes.rs | 18 +- .../rust/src/generated/types/burn_delegate.rs | 19 +- .../src/generated/types/compression_proof.rs | 18 +- clients/rust/src/generated/types/creator.rs | 18 +- .../rust/src/generated/types/data_state.rs | 18 +- clients/rust/src/generated/types/edition.rs | 19 +- .../generated/types/external_plugin_record.rs | 18 +- .../src/generated/types/extra_accounts.rs | 18 +- .../src/generated/types/freeze_delegate.rs | 19 +- .../generated/types/hashable_plugin_schema.rs | 18 +- .../generated/types/hashed_asset_schema.rs | 19 +- clients/rust/src/generated/types/key.rs | 18 +- .../src/generated/types/master_edition.rs | 19 +- .../types/permanent_burn_delegate.rs | 19 +- .../types/permanent_freeze_delegate.rs | 19 +- .../types/permanent_transfer_delegate.rs | 19 +- clients/rust/src/generated/types/plugin.rs | 18 +- .../src/generated/types/plugin_authority.rs | 18 +- .../generated/types/plugin_authority_pair.rs | 18 +- .../rust/src/generated/types/plugin_type.rs | 18 +- .../src/generated/types/registry_record.rs | 18 +- clients/rust/src/generated/types/royalties.rs | 18 +- clients/rust/src/generated/types/rule_set.rs | 18 +- .../src/generated/types/transfer_delegate.rs | 19 +- .../src/generated/types/update_authority.rs | 18 +- .../src/generated/types/update_delegate.rs | 18 +- package.json | 2 +- pnpm-lock.yaml | 243 +++++++++++++++++- 54 files changed, 726 insertions(+), 451 deletions(-) diff --git a/clients/rust/src/generated/accounts/base_asset_v1.rs b/clients/rust/src/generated/accounts/base_asset_v1.rs index 884d0ecb..ed0a74de 100644 --- a/clients/rust/src/generated/accounts/base_asset_v1.rs +++ b/clients/rust/src/generated/accounts/base_asset_v1.rs @@ -8,20 +8,16 @@ use crate::generated::types::Key; use crate::generated::types::UpdateAuthority; #[cfg(feature = "anchor")] -use anchor_lang::AnchorDeserialize; +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] -use borsh::BorshDeserialize; +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; use solana_program::pubkey::Pubkey; -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct BaseAssetV1 { pub key: Key, diff --git a/clients/rust/src/generated/accounts/base_collection_v1.rs b/clients/rust/src/generated/accounts/base_collection_v1.rs index 344d6811..08dbbf79 100644 --- a/clients/rust/src/generated/accounts/base_collection_v1.rs +++ b/clients/rust/src/generated/accounts/base_collection_v1.rs @@ -7,20 +7,16 @@ use crate::generated::types::Key; #[cfg(feature = "anchor")] -use anchor_lang::AnchorDeserialize; +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] -use borsh::BorshDeserialize; +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; use solana_program::pubkey::Pubkey; -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct BaseCollectionV1 { pub key: Key, diff --git a/clients/rust/src/generated/accounts/hashed_asset_v1.rs b/clients/rust/src/generated/accounts/hashed_asset_v1.rs index 335f717b..d82e8ff1 100644 --- a/clients/rust/src/generated/accounts/hashed_asset_v1.rs +++ b/clients/rust/src/generated/accounts/hashed_asset_v1.rs @@ -7,19 +7,15 @@ use crate::generated::types::Key; #[cfg(feature = "anchor")] -use anchor_lang::AnchorDeserialize; +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] -use borsh::BorshDeserialize; +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct HashedAssetV1 { pub key: Key, diff --git a/clients/rust/src/generated/accounts/plugin_header_v1.rs b/clients/rust/src/generated/accounts/plugin_header_v1.rs index 4c685601..6ef5cce2 100644 --- a/clients/rust/src/generated/accounts/plugin_header_v1.rs +++ b/clients/rust/src/generated/accounts/plugin_header_v1.rs @@ -7,19 +7,15 @@ use crate::generated::types::Key; #[cfg(feature = "anchor")] -use anchor_lang::AnchorDeserialize; +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] -use borsh::BorshDeserialize; +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct PluginHeaderV1 { pub key: Key, diff --git a/clients/rust/src/generated/accounts/plugin_registry_v1.rs b/clients/rust/src/generated/accounts/plugin_registry_v1.rs index e58034a3..ea36feb3 100644 --- a/clients/rust/src/generated/accounts/plugin_registry_v1.rs +++ b/clients/rust/src/generated/accounts/plugin_registry_v1.rs @@ -9,19 +9,15 @@ use crate::generated::types::ExternalPluginRecord; use crate::generated::types::Key; use crate::generated::types::RegistryRecord; #[cfg(feature = "anchor")] -use anchor_lang::AnchorDeserialize; +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] -use borsh::BorshDeserialize; +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct PluginRegistryV1 { pub key: Key, 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 88ab9b36..069c7568 100644 --- a/clients/rust/src/generated/instructions/add_collection_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/add_collection_plugin_v1.rs @@ -7,8 +7,12 @@ use crate::generated::types::Plugin; use crate::generated::types::PluginAuthority; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; /// Accounts. pub struct AddCollectionPluginV1 { @@ -85,7 +89,8 @@ impl AddCollectionPluginV1 { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] pub struct AddCollectionPluginV1InstructionData { discriminator: u8, } @@ -97,11 +102,8 @@ impl AddCollectionPluginV1InstructionData { } #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct AddCollectionPluginV1InstructionArgs { pub plugin: Plugin, diff --git a/clients/rust/src/generated/instructions/add_plugin_v1.rs b/clients/rust/src/generated/instructions/add_plugin_v1.rs index 54230c19..b95921ed 100644 --- a/clients/rust/src/generated/instructions/add_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/add_plugin_v1.rs @@ -7,8 +7,12 @@ use crate::generated::types::Plugin; use crate::generated::types::PluginAuthority; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; /// Accounts. pub struct AddPluginV1 { @@ -94,7 +98,8 @@ impl AddPluginV1 { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] pub struct AddPluginV1InstructionData { discriminator: u8, } @@ -106,11 +111,8 @@ impl AddPluginV1InstructionData { } #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct AddPluginV1InstructionArgs { pub plugin: Plugin, 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 d4dcce33..8f8d5a44 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 @@ -7,8 +7,12 @@ use crate::generated::types::PluginAuthority; use crate::generated::types::PluginType; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; /// Accounts. pub struct ApproveCollectionPluginAuthorityV1 { @@ -85,7 +89,8 @@ impl ApproveCollectionPluginAuthorityV1 { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] pub struct ApproveCollectionPluginAuthorityV1InstructionData { discriminator: u8, } @@ -97,11 +102,8 @@ impl ApproveCollectionPluginAuthorityV1InstructionData { } #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct ApproveCollectionPluginAuthorityV1InstructionArgs { pub plugin_type: PluginType, 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 3a9f9c83..b8f2fab9 100644 --- a/clients/rust/src/generated/instructions/approve_plugin_authority_v1.rs +++ b/clients/rust/src/generated/instructions/approve_plugin_authority_v1.rs @@ -7,8 +7,12 @@ use crate::generated::types::PluginAuthority; use crate::generated::types::PluginType; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; /// Accounts. pub struct ApprovePluginAuthorityV1 { @@ -96,7 +100,8 @@ impl ApprovePluginAuthorityV1 { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] pub struct ApprovePluginAuthorityV1InstructionData { discriminator: u8, } @@ -108,11 +113,8 @@ impl ApprovePluginAuthorityV1InstructionData { } #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct ApprovePluginAuthorityV1InstructionArgs { pub plugin_type: PluginType, diff --git a/clients/rust/src/generated/instructions/burn_collection_v1.rs b/clients/rust/src/generated/instructions/burn_collection_v1.rs index 3a5eb994..69fb7d76 100644 --- a/clients/rust/src/generated/instructions/burn_collection_v1.rs +++ b/clients/rust/src/generated/instructions/burn_collection_v1.rs @@ -6,8 +6,12 @@ //! use crate::generated::types::CompressionProof; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; /// Accounts. pub struct BurnCollectionV1 { @@ -76,7 +80,8 @@ impl BurnCollectionV1 { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] pub struct BurnCollectionV1InstructionData { discriminator: u8, } @@ -88,11 +93,8 @@ impl BurnCollectionV1InstructionData { } #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct BurnCollectionV1InstructionArgs { pub compression_proof: Option, diff --git a/clients/rust/src/generated/instructions/burn_v1.rs b/clients/rust/src/generated/instructions/burn_v1.rs index 15a6d967..f0c065d6 100644 --- a/clients/rust/src/generated/instructions/burn_v1.rs +++ b/clients/rust/src/generated/instructions/burn_v1.rs @@ -6,8 +6,12 @@ //! use crate::generated::types::CompressionProof; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; /// Accounts. pub struct BurnV1 { @@ -100,7 +104,8 @@ impl BurnV1 { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] pub struct BurnV1InstructionData { discriminator: u8, } @@ -112,11 +117,8 @@ impl BurnV1InstructionData { } #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct BurnV1InstructionArgs { pub compression_proof: Option, diff --git a/clients/rust/src/generated/instructions/collect.rs b/clients/rust/src/generated/instructions/collect.rs index 3593b4f1..a276a0a8 100644 --- a/clients/rust/src/generated/instructions/collect.rs +++ b/clients/rust/src/generated/instructions/collect.rs @@ -5,8 +5,12 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; /// Accounts. pub struct Collect { @@ -45,7 +49,8 @@ impl Collect { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] pub struct CollectInstructionData { discriminator: u8, } diff --git a/clients/rust/src/generated/instructions/compress_v1.rs b/clients/rust/src/generated/instructions/compress_v1.rs index ddee8f22..e984e44e 100644 --- a/clients/rust/src/generated/instructions/compress_v1.rs +++ b/clients/rust/src/generated/instructions/compress_v1.rs @@ -5,8 +5,12 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; /// Accounts. pub struct CompressV1 { @@ -86,7 +90,8 @@ impl CompressV1 { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] pub struct CompressV1InstructionData { discriminator: u8, } diff --git a/clients/rust/src/generated/instructions/create_collection_v1.rs b/clients/rust/src/generated/instructions/create_collection_v1.rs index 64de397c..c3e7fe5b 100644 --- a/clients/rust/src/generated/instructions/create_collection_v1.rs +++ b/clients/rust/src/generated/instructions/create_collection_v1.rs @@ -6,8 +6,12 @@ //! use crate::generated::types::PluginAuthorityPair; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; /// Accounts. pub struct CreateCollectionV1 { @@ -72,7 +76,8 @@ impl CreateCollectionV1 { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] pub struct CreateCollectionV1InstructionData { discriminator: u8, } @@ -84,11 +89,8 @@ impl CreateCollectionV1InstructionData { } #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct CreateCollectionV1InstructionArgs { pub name: String, diff --git a/clients/rust/src/generated/instructions/create_v1.rs b/clients/rust/src/generated/instructions/create_v1.rs index ff770150..86609249 100644 --- a/clients/rust/src/generated/instructions/create_v1.rs +++ b/clients/rust/src/generated/instructions/create_v1.rs @@ -7,8 +7,12 @@ use crate::generated::types::DataState; use crate::generated::types::PluginAuthorityPair; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; /// Accounts. pub struct CreateV1 { @@ -119,7 +123,8 @@ impl CreateV1 { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] pub struct CreateV1InstructionData { discriminator: u8, } @@ -131,11 +136,8 @@ impl CreateV1InstructionData { } #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct CreateV1InstructionArgs { pub data_state: DataState, diff --git a/clients/rust/src/generated/instructions/decompress_v1.rs b/clients/rust/src/generated/instructions/decompress_v1.rs index cf6b3dfa..722d7bc2 100644 --- a/clients/rust/src/generated/instructions/decompress_v1.rs +++ b/clients/rust/src/generated/instructions/decompress_v1.rs @@ -6,8 +6,12 @@ //! use crate::generated::types::CompressionProof; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; /// Accounts. pub struct DecompressV1 { @@ -93,7 +97,8 @@ impl DecompressV1 { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] pub struct DecompressV1InstructionData { discriminator: u8, } @@ -105,11 +110,8 @@ impl DecompressV1InstructionData { } #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct DecompressV1InstructionArgs { pub compression_proof: CompressionProof, 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 444ddf62..5b1349c3 100644 --- a/clients/rust/src/generated/instructions/remove_collection_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/remove_collection_plugin_v1.rs @@ -6,8 +6,12 @@ //! use crate::generated::types::PluginType; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; /// Accounts. pub struct RemoveCollectionPluginV1 { @@ -84,7 +88,8 @@ impl RemoveCollectionPluginV1 { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] pub struct RemoveCollectionPluginV1InstructionData { discriminator: u8, } @@ -96,11 +101,8 @@ impl RemoveCollectionPluginV1InstructionData { } #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct RemoveCollectionPluginV1InstructionArgs { pub plugin_type: PluginType, diff --git a/clients/rust/src/generated/instructions/remove_plugin_v1.rs b/clients/rust/src/generated/instructions/remove_plugin_v1.rs index 73afdf4e..b740e43a 100644 --- a/clients/rust/src/generated/instructions/remove_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/remove_plugin_v1.rs @@ -6,8 +6,12 @@ //! use crate::generated::types::PluginType; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; /// Accounts. pub struct RemovePluginV1 { @@ -93,7 +97,8 @@ impl RemovePluginV1 { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] pub struct RemovePluginV1InstructionData { discriminator: u8, } @@ -105,11 +110,8 @@ impl RemovePluginV1InstructionData { } #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct RemovePluginV1InstructionArgs { pub plugin_type: PluginType, 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 b414e0c2..a5184c3b 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 @@ -6,8 +6,12 @@ //! use crate::generated::types::PluginType; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; /// Accounts. pub struct RevokeCollectionPluginAuthorityV1 { @@ -84,7 +88,8 @@ impl RevokeCollectionPluginAuthorityV1 { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] pub struct RevokeCollectionPluginAuthorityV1InstructionData { discriminator: u8, } @@ -96,11 +101,8 @@ impl RevokeCollectionPluginAuthorityV1InstructionData { } #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct RevokeCollectionPluginAuthorityV1InstructionArgs { pub plugin_type: PluginType, 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 84b78959..8303e711 100644 --- a/clients/rust/src/generated/instructions/revoke_plugin_authority_v1.rs +++ b/clients/rust/src/generated/instructions/revoke_plugin_authority_v1.rs @@ -6,8 +6,12 @@ //! use crate::generated::types::PluginType; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; /// Accounts. pub struct RevokePluginAuthorityV1 { @@ -95,7 +99,8 @@ impl RevokePluginAuthorityV1 { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] pub struct RevokePluginAuthorityV1InstructionData { discriminator: u8, } @@ -107,11 +112,8 @@ impl RevokePluginAuthorityV1InstructionData { } #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct RevokePluginAuthorityV1InstructionArgs { pub plugin_type: PluginType, diff --git a/clients/rust/src/generated/instructions/transfer_v1.rs b/clients/rust/src/generated/instructions/transfer_v1.rs index 07cd5cc1..97bd5749 100644 --- a/clients/rust/src/generated/instructions/transfer_v1.rs +++ b/clients/rust/src/generated/instructions/transfer_v1.rs @@ -6,8 +6,12 @@ //! use crate::generated::types::CompressionProof; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; /// Accounts. pub struct TransferV1 { @@ -106,7 +110,8 @@ impl TransferV1 { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] pub struct TransferV1InstructionData { discriminator: u8, } @@ -118,11 +123,8 @@ impl TransferV1InstructionData { } #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct TransferV1InstructionArgs { pub compression_proof: Option, 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 f5d06b94..f1fc17b8 100644 --- a/clients/rust/src/generated/instructions/update_collection_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/update_collection_plugin_v1.rs @@ -6,8 +6,12 @@ //! use crate::generated::types::Plugin; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; /// Accounts. pub struct UpdateCollectionPluginV1 { @@ -84,7 +88,8 @@ impl UpdateCollectionPluginV1 { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] pub struct UpdateCollectionPluginV1InstructionData { discriminator: u8, } @@ -96,11 +101,8 @@ impl UpdateCollectionPluginV1InstructionData { } #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct UpdateCollectionPluginV1InstructionArgs { pub plugin: Plugin, diff --git a/clients/rust/src/generated/instructions/update_collection_v1.rs b/clients/rust/src/generated/instructions/update_collection_v1.rs index bdca2669..3fb37df5 100644 --- a/clients/rust/src/generated/instructions/update_collection_v1.rs +++ b/clients/rust/src/generated/instructions/update_collection_v1.rs @@ -5,8 +5,12 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use borsh::BorshDeserialize; -use borsh::BorshSerialize; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; /// Accounts. pub struct UpdateCollectionV1 { @@ -96,7 +100,8 @@ impl UpdateCollectionV1 { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] pub struct UpdateCollectionV1InstructionData { discriminator: u8, } @@ -108,11 +113,8 @@ impl UpdateCollectionV1InstructionData { } #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct UpdateCollectionV1InstructionArgs { pub new_name: Option, diff --git a/clients/rust/src/generated/instructions/update_plugin_v1.rs b/clients/rust/src/generated/instructions/update_plugin_v1.rs index d0fb3dae..2bf2456b 100644 --- a/clients/rust/src/generated/instructions/update_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/update_plugin_v1.rs @@ -6,8 +6,12 @@ //! use crate::generated::types::Plugin; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; /// Accounts. pub struct UpdatePluginV1 { @@ -93,7 +97,8 @@ impl UpdatePluginV1 { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] pub struct UpdatePluginV1InstructionData { discriminator: u8, } @@ -105,11 +110,8 @@ impl UpdatePluginV1InstructionData { } #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct UpdatePluginV1InstructionArgs { pub plugin: Plugin, diff --git a/clients/rust/src/generated/instructions/update_v1.rs b/clients/rust/src/generated/instructions/update_v1.rs index 1129a9b9..6864f8d0 100644 --- a/clients/rust/src/generated/instructions/update_v1.rs +++ b/clients/rust/src/generated/instructions/update_v1.rs @@ -6,8 +6,12 @@ //! use crate::generated::types::UpdateAuthority; -use borsh::BorshDeserialize; -use borsh::BorshSerialize; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; /// Accounts. pub struct UpdateV1 { @@ -93,7 +97,8 @@ impl UpdateV1 { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] pub struct UpdateV1InstructionData { discriminator: u8, } @@ -105,11 +110,8 @@ impl UpdateV1InstructionData { } #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct UpdateV1InstructionArgs { pub new_name: Option, diff --git a/clients/rust/src/generated/types/attribute.rs b/clients/rust/src/generated/types/attribute.rs index bd04e1f9..3bf08958 100644 --- a/clients/rust/src/generated/types/attribute.rs +++ b/clients/rust/src/generated/types/attribute.rs @@ -5,15 +5,16 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; + +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct Attribute { pub key: String, diff --git a/clients/rust/src/generated/types/attributes.rs b/clients/rust/src/generated/types/attributes.rs index 0ddbde13..4ab9141d 100644 --- a/clients/rust/src/generated/types/attributes.rs +++ b/clients/rust/src/generated/types/attributes.rs @@ -6,16 +6,16 @@ //! use crate::generated::types::Attribute; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct Attributes { pub attribute_list: Vec, diff --git a/clients/rust/src/generated/types/burn_delegate.rs b/clients/rust/src/generated/types/burn_delegate.rs index f698fb2b..0b8e8317 100644 --- a/clients/rust/src/generated/types/burn_delegate.rs +++ b/clients/rust/src/generated/types/burn_delegate.rs @@ -5,14 +5,15 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; + +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct BurnDelegate {} diff --git a/clients/rust/src/generated/types/compression_proof.rs b/clients/rust/src/generated/types/compression_proof.rs index 005aaef2..d66a6b45 100644 --- a/clients/rust/src/generated/types/compression_proof.rs +++ b/clients/rust/src/generated/types/compression_proof.rs @@ -7,17 +7,17 @@ use crate::generated::types::HashablePluginSchema; use crate::generated::types::UpdateAuthority; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; use solana_program::pubkey::Pubkey; -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct CompressionProof { #[cfg_attr( diff --git a/clients/rust/src/generated/types/creator.rs b/clients/rust/src/generated/types/creator.rs index befe9087..4355e1ba 100644 --- a/clients/rust/src/generated/types/creator.rs +++ b/clients/rust/src/generated/types/creator.rs @@ -5,17 +5,17 @@ //! [https://github.com/metaplex-foundation/kinobi] //! +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; use solana_program::pubkey::Pubkey; -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct Creator { #[cfg_attr( diff --git a/clients/rust/src/generated/types/data_state.rs b/clients/rust/src/generated/types/data_state.rs index 540abeeb..7a41c5ea 100644 --- a/clients/rust/src/generated/types/data_state.rs +++ b/clients/rust/src/generated/types/data_state.rs @@ -5,17 +5,17 @@ //! [https://github.com/metaplex-foundation/kinobi] //! +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; use num_derive::FromPrimitive; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Hash, FromPrimitive)] pub enum DataState { AccountState, diff --git a/clients/rust/src/generated/types/edition.rs b/clients/rust/src/generated/types/edition.rs index 2bebd4c4..0bd88faf 100644 --- a/clients/rust/src/generated/types/edition.rs +++ b/clients/rust/src/generated/types/edition.rs @@ -5,15 +5,16 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; + +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct Edition { pub number: u32, diff --git a/clients/rust/src/generated/types/external_plugin_record.rs b/clients/rust/src/generated/types/external_plugin_record.rs index 30031dc3..1fef9049 100644 --- a/clients/rust/src/generated/types/external_plugin_record.rs +++ b/clients/rust/src/generated/types/external_plugin_record.rs @@ -6,16 +6,16 @@ //! use crate::generated::types::PluginAuthority; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct ExternalPluginRecord { pub authority: PluginAuthority, diff --git a/clients/rust/src/generated/types/extra_accounts.rs b/clients/rust/src/generated/types/extra_accounts.rs index 9c0e5840..09802baf 100644 --- a/clients/rust/src/generated/types/extra_accounts.rs +++ b/clients/rust/src/generated/types/extra_accounts.rs @@ -5,17 +5,17 @@ //! [https://github.com/metaplex-foundation/kinobi] //! +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; use solana_program::pubkey::Pubkey; -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub enum ExtraAccounts { None, diff --git a/clients/rust/src/generated/types/freeze_delegate.rs b/clients/rust/src/generated/types/freeze_delegate.rs index acaeeb50..7546a994 100644 --- a/clients/rust/src/generated/types/freeze_delegate.rs +++ b/clients/rust/src/generated/types/freeze_delegate.rs @@ -5,15 +5,16 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; + +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct FreezeDelegate { pub frozen: bool, diff --git a/clients/rust/src/generated/types/hashable_plugin_schema.rs b/clients/rust/src/generated/types/hashable_plugin_schema.rs index de17fbc0..585c8d6f 100644 --- a/clients/rust/src/generated/types/hashable_plugin_schema.rs +++ b/clients/rust/src/generated/types/hashable_plugin_schema.rs @@ -7,16 +7,16 @@ use crate::generated::types::Plugin; use crate::generated::types::PluginAuthority; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct HashablePluginSchema { pub index: u64, diff --git a/clients/rust/src/generated/types/hashed_asset_schema.rs b/clients/rust/src/generated/types/hashed_asset_schema.rs index 6816d939..14170eb7 100644 --- a/clients/rust/src/generated/types/hashed_asset_schema.rs +++ b/clients/rust/src/generated/types/hashed_asset_schema.rs @@ -5,15 +5,16 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; + +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct HashedAssetSchema { pub asset_hash: [u8; 32], diff --git a/clients/rust/src/generated/types/key.rs b/clients/rust/src/generated/types/key.rs index a2a49639..b39e6f42 100644 --- a/clients/rust/src/generated/types/key.rs +++ b/clients/rust/src/generated/types/key.rs @@ -5,17 +5,17 @@ //! [https://github.com/metaplex-foundation/kinobi] //! +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; use num_derive::FromPrimitive; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Hash, FromPrimitive)] pub enum Key { Uninitialized, diff --git a/clients/rust/src/generated/types/master_edition.rs b/clients/rust/src/generated/types/master_edition.rs index a9262ebb..ba590ff8 100644 --- a/clients/rust/src/generated/types/master_edition.rs +++ b/clients/rust/src/generated/types/master_edition.rs @@ -5,15 +5,16 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; + +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct MasterEdition { pub max_supply: Option, diff --git a/clients/rust/src/generated/types/permanent_burn_delegate.rs b/clients/rust/src/generated/types/permanent_burn_delegate.rs index bea1b283..2af45fbd 100644 --- a/clients/rust/src/generated/types/permanent_burn_delegate.rs +++ b/clients/rust/src/generated/types/permanent_burn_delegate.rs @@ -5,14 +5,15 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; + +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct PermanentBurnDelegate {} diff --git a/clients/rust/src/generated/types/permanent_freeze_delegate.rs b/clients/rust/src/generated/types/permanent_freeze_delegate.rs index eb4c9533..498ce634 100644 --- a/clients/rust/src/generated/types/permanent_freeze_delegate.rs +++ b/clients/rust/src/generated/types/permanent_freeze_delegate.rs @@ -5,15 +5,16 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; + +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct PermanentFreezeDelegate { pub frozen: bool, diff --git a/clients/rust/src/generated/types/permanent_transfer_delegate.rs b/clients/rust/src/generated/types/permanent_transfer_delegate.rs index b54c985b..2d156e0b 100644 --- a/clients/rust/src/generated/types/permanent_transfer_delegate.rs +++ b/clients/rust/src/generated/types/permanent_transfer_delegate.rs @@ -5,14 +5,15 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; + +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct PermanentTransferDelegate {} diff --git a/clients/rust/src/generated/types/plugin.rs b/clients/rust/src/generated/types/plugin.rs index 140d0c67..91d4977d 100644 --- a/clients/rust/src/generated/types/plugin.rs +++ b/clients/rust/src/generated/types/plugin.rs @@ -16,16 +16,16 @@ use crate::generated::types::PermanentTransferDelegate; use crate::generated::types::Royalties; use crate::generated::types::TransferDelegate; use crate::generated::types::UpdateDelegate; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub enum Plugin { Royalties(Royalties), diff --git a/clients/rust/src/generated/types/plugin_authority.rs b/clients/rust/src/generated/types/plugin_authority.rs index d7943f2b..b4f63c4f 100644 --- a/clients/rust/src/generated/types/plugin_authority.rs +++ b/clients/rust/src/generated/types/plugin_authority.rs @@ -5,17 +5,17 @@ //! [https://github.com/metaplex-foundation/kinobi] //! +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; use solana_program::pubkey::Pubkey; -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub enum PluginAuthority { None, diff --git a/clients/rust/src/generated/types/plugin_authority_pair.rs b/clients/rust/src/generated/types/plugin_authority_pair.rs index 308356a8..21053be7 100644 --- a/clients/rust/src/generated/types/plugin_authority_pair.rs +++ b/clients/rust/src/generated/types/plugin_authority_pair.rs @@ -7,16 +7,16 @@ use crate::generated::types::Plugin; use crate::generated::types::PluginAuthority; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct PluginAuthorityPair { pub plugin: Plugin, diff --git a/clients/rust/src/generated/types/plugin_type.rs b/clients/rust/src/generated/types/plugin_type.rs index 000dccfe..0ec26c73 100644 --- a/clients/rust/src/generated/types/plugin_type.rs +++ b/clients/rust/src/generated/types/plugin_type.rs @@ -5,17 +5,17 @@ //! [https://github.com/metaplex-foundation/kinobi] //! +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; use num_derive::FromPrimitive; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Hash, FromPrimitive)] pub enum PluginType { Royalties, diff --git a/clients/rust/src/generated/types/registry_record.rs b/clients/rust/src/generated/types/registry_record.rs index 0015ca3b..ab60b36b 100644 --- a/clients/rust/src/generated/types/registry_record.rs +++ b/clients/rust/src/generated/types/registry_record.rs @@ -7,16 +7,16 @@ use crate::generated::types::PluginAuthority; use crate::generated::types::PluginType; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct RegistryRecord { pub plugin_type: PluginType, diff --git a/clients/rust/src/generated/types/royalties.rs b/clients/rust/src/generated/types/royalties.rs index f5dddb59..cf9122b4 100644 --- a/clients/rust/src/generated/types/royalties.rs +++ b/clients/rust/src/generated/types/royalties.rs @@ -7,16 +7,16 @@ use crate::generated::types::Creator; use crate::generated::types::RuleSet; +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct Royalties { pub basis_points: u16, diff --git a/clients/rust/src/generated/types/rule_set.rs b/clients/rust/src/generated/types/rule_set.rs index 75bdc49a..ed602d36 100644 --- a/clients/rust/src/generated/types/rule_set.rs +++ b/clients/rust/src/generated/types/rule_set.rs @@ -5,17 +5,17 @@ //! [https://github.com/metaplex-foundation/kinobi] //! +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; use solana_program::pubkey::Pubkey; -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub enum RuleSet { None, diff --git a/clients/rust/src/generated/types/transfer_delegate.rs b/clients/rust/src/generated/types/transfer_delegate.rs index 92a49463..a9420d5a 100644 --- a/clients/rust/src/generated/types/transfer_delegate.rs +++ b/clients/rust/src/generated/types/transfer_delegate.rs @@ -5,14 +5,15 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; + +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct TransferDelegate {} diff --git a/clients/rust/src/generated/types/update_authority.rs b/clients/rust/src/generated/types/update_authority.rs index 0c89e0b6..c04e0b9c 100644 --- a/clients/rust/src/generated/types/update_authority.rs +++ b/clients/rust/src/generated/types/update_authority.rs @@ -5,17 +5,17 @@ //! [https://github.com/metaplex-foundation/kinobi] //! +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; use solana_program::pubkey::Pubkey; -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub enum UpdateAuthority { None, diff --git a/clients/rust/src/generated/types/update_delegate.rs b/clients/rust/src/generated/types/update_delegate.rs index f34c69c7..75de48c0 100644 --- a/clients/rust/src/generated/types/update_delegate.rs +++ b/clients/rust/src/generated/types/update_delegate.rs @@ -5,17 +5,17 @@ //! [https://github.com/metaplex-foundation/kinobi] //! +#[cfg(feature = "anchor")] +use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; +#[cfg(not(feature = "anchor"))] +use borsh::{BorshDeserialize, BorshSerialize}; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; use solana_program::pubkey::Pubkey; -#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr( - not(feature = "anchor"), - derive(borsh::BorshSerialize, borsh::BorshDeserialize) -)] -#[cfg_attr( - feature = "anchor", - derive(anchor_lang::AnchorSerialize, anchor_lang::AnchorDeserialize) -)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] +#[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct UpdateDelegate { #[cfg_attr( diff --git a/package.json b/package.json index e38e4deb..186d2a64 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ }, "devDependencies": { "@metaplex-foundation/amman": "^0.12.1", - "@metaplex-foundation/kinobi": "link:../kinobi/dist", + "@metaplex-foundation/kinobi": "0.18.7-alpha.0", "@metaplex-foundation/shank-js": "^0.1.7", "typescript": "^4.9.4" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 927e799f..3de6a452 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: link:../kinobi/dist - version: link:../kinobi/dist + specifier: 0.18.7-alpha.0 + version: 0.18.7-alpha.0(fastestsmallesttextencoderdecoder@1.0.22) '@metaplex-foundation/shank-js': specifier: ^0.1.7 version: 0.1.7 @@ -89,6 +89,21 @@ packages: resolution: {integrity: sha512-S9RulC2fFCFOQraz61bij+5YCHhSO9llJegK8c8Y6731fSi6snUSQJdCUqYS8AIgR0TKbQvdvgSyIIdbDFZbBA==} dev: true + /@metaplex-foundation/kinobi@0.18.7-alpha.0(fastestsmallesttextencoderdecoder@1.0.22): + resolution: {integrity: sha512-eRIFlMBoYfk7beuJIZr2+kH1mUdE8X+D9XV0d+JGFCr0Pom/0eo6zFWxx3ghMyhQeHHjkoLP+uCHpDAv5mIZxQ==} + dependencies: + '@noble/hashes': 1.4.0 + '@prettier/sync': 0.5.2(prettier@3.2.5) + '@solana/codecs-strings': 2.0.0-preview.1(fastestsmallesttextencoderdecoder@1.0.22) + chalk: 4.1.2 + json-stable-stringify: 1.1.1 + nunjucks: 3.2.4 + prettier: 3.2.5 + transitivePeerDependencies: + - chokidar + - fastestsmallesttextencoderdecoder + dev: true + /@metaplex-foundation/rustbin@0.3.5: resolution: {integrity: sha512-m0wkRBEQB/8krwMwKBvFugufZtYwMXiGHud2cTDAv+aGXK4M90y0Hx67/wpu+AqqoQfdV8VM9YezUOHKD+Z5kA==} dependencies: @@ -121,6 +136,15 @@ packages: engines: {node: '>= 16'} dev: true + /@prettier/sync@0.5.2(prettier@3.2.5): + resolution: {integrity: sha512-Yb569su456XNx5BsH/Vyem7xD6g/y9iLmLUzRKM1a/dhU/D7HqqvkAG72znulXlMXztbV0iiu9O5AL8K98TzZQ==} + peerDependencies: + prettier: '*' + dependencies: + make-synchronized: 0.2.9 + prettier: 3.2.5 + dev: true + /@sideway/address@4.1.5: resolution: {integrity: sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==} dependencies: @@ -160,6 +184,38 @@ packages: buffer: 6.0.3 dev: true + /@solana/codecs-core@2.0.0-preview.1: + resolution: {integrity: sha512-0y3kgFSJAOApNGefEOgLRMiXOHVmcF29Xw3zmR4LDUABvytG3ecKMXGz5oLt3vdaU2CyN3tuUVeGmQjrd0U1kw==} + dependencies: + '@solana/errors': 2.0.0-preview.1 + dev: true + + /@solana/codecs-numbers@2.0.0-preview.1: + resolution: {integrity: sha512-NFA8itgcYUY3hkWMBpVRozd2poy1zfOvkIWZKx/D69oIMUtQTBpKrodRVBuhlBkAv12vDNkFljqVySpcMZMl7A==} + dependencies: + '@solana/codecs-core': 2.0.0-preview.1 + '@solana/errors': 2.0.0-preview.1 + dev: true + + /@solana/codecs-strings@2.0.0-preview.1(fastestsmallesttextencoderdecoder@1.0.22): + resolution: {integrity: sha512-kBAxE9ZD5/c8j9CkPxqc55dbo7R50Re3k94SXR+k13DZCCs37Fyn0/mAkw/S95fofbi/zsi4jSfmsT5vCZD75A==} + peerDependencies: + fastestsmallesttextencoderdecoder: ^1.0.22 + dependencies: + '@solana/codecs-core': 2.0.0-preview.1 + '@solana/codecs-numbers': 2.0.0-preview.1 + '@solana/errors': 2.0.0-preview.1 + fastestsmallesttextencoderdecoder: 1.0.22 + dev: true + + /@solana/errors@2.0.0-preview.1: + resolution: {integrity: sha512-mnBWfLVwMH4hxwb4sWZ7G7djQCMsyymjysvUPDiF89LueTBm1hfdxUv8Cy1uUCGsJ3jO3scdPwB4noOgr0rG/g==} + hasBin: true + dependencies: + chalk: 5.3.0 + commander: 12.0.0 + dev: true + /@solana/spl-token-registry@0.2.4574: resolution: {integrity: sha512-JzlfZmke8Rxug20VT/VpI2XsXlsqMlcORIUivF+Yucj7tFi7A0dXG7h+2UnD0WaZJw8BrUz2ABNkUnv89vbv1A==} engines: {node: '>=10'} @@ -246,6 +302,10 @@ packages: through: 2.3.8 dev: true + /a-sync-waterfall@1.0.1: + resolution: {integrity: sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==} + dev: true + /accepts@1.3.8: resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==} engines: {node: '>= 0.6'} @@ -282,6 +342,10 @@ packages: resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==} dev: true + /asap@2.0.6: + resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==} + dev: true + /asynckit@0.4.0: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} dev: true @@ -377,6 +441,30 @@ packages: node-gyp-build: 4.8.0 dev: true + /call-bind@1.0.7: + resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==} + engines: {node: '>= 0.4'} + dependencies: + es-define-property: 1.0.0 + es-errors: 1.3.0 + function-bind: 1.1.2 + get-intrinsic: 1.2.4 + set-function-length: 1.2.2 + dev: true + + /chalk@4.1.2: + resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} + engines: {node: '>=10'} + dependencies: + ansi-styles: 4.3.0 + supports-color: 7.2.0 + dev: true + + /chalk@5.3.0: + resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==} + engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} + dev: true + /check-more-types@2.24.0: resolution: {integrity: sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==} engines: {node: '>= 0.8.0'} @@ -409,10 +497,20 @@ packages: delayed-stream: 1.0.0 dev: true + /commander@12.0.0: + resolution: {integrity: sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==} + engines: {node: '>=18'} + dev: true + /commander@2.20.3: resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} dev: true + /commander@5.1.0: + resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==} + engines: {node: '>= 6'} + dev: true + /cookie@0.4.2: resolution: {integrity: sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==} engines: {node: '>= 0.6'} @@ -464,6 +562,15 @@ packages: resolution: {integrity: sha512-aWS3UIVH+NPGCD1kki+DCU9Dua032iSsO43LqQpcs4R3+dVv7tX0qBGjiVHJHjplsoUM2XRO/KB92glqc68awg==} dev: true + /define-data-property@1.1.4: + resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==} + engines: {node: '>= 0.4'} + dependencies: + es-define-property: 1.0.0 + es-errors: 1.3.0 + gopd: 1.0.1 + dev: true + /delay@5.0.0: resolution: {integrity: sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw==} engines: {node: '>=10'} @@ -526,6 +633,18 @@ packages: - utf-8-validate dev: true + /es-define-property@1.0.0: + resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==} + engines: {node: '>= 0.4'} + dependencies: + get-intrinsic: 1.2.4 + dev: true + + /es-errors@1.3.0: + resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==} + engines: {node: '>= 0.4'} + dev: true + /es6-promise@4.2.8: resolution: {integrity: sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==} dev: true @@ -581,6 +700,10 @@ packages: resolution: {integrity: sha512-wpYMUmFu5f00Sm0cj2pfivpmawLZ0NKdviQ4w9zJeR8JVtOpOxHmLaJuj0vxvGqMJQWyP/COUkF75/57OKyRag==} dev: true + /fastestsmallesttextencoderdecoder@1.0.22: + resolution: {integrity: sha512-Pb8d48e+oIuY4MaM64Cd7OW1gt4nxCHs7/ddPPZ/Ic3sg8yVGM7O9wDvZ7us6ScaUupzM+pfBolwtYhN1IxBIw==} + dev: true + /file-uri-to-path@1.0.0: resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==} dev: true @@ -610,16 +733,65 @@ packages: resolution: {integrity: sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==} dev: true + /function-bind@1.1.2: + resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} + dev: true + /get-caller-file@2.0.5: resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} engines: {node: 6.* || 8.* || >= 10.*} dev: true + /get-intrinsic@1.2.4: + resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==} + engines: {node: '>= 0.4'} + dependencies: + es-errors: 1.3.0 + function-bind: 1.1.2 + has-proto: 1.0.3 + has-symbols: 1.0.3 + hasown: 2.0.2 + dev: true + /get-stream@6.0.1: resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} engines: {node: '>=10'} dev: true + /gopd@1.0.1: + resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} + dependencies: + get-intrinsic: 1.2.4 + dev: true + + /has-flag@4.0.0: + resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} + engines: {node: '>=8'} + dev: true + + /has-property-descriptors@1.0.2: + resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==} + dependencies: + es-define-property: 1.0.0 + dev: true + + /has-proto@1.0.3: + resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==} + engines: {node: '>= 0.4'} + dev: true + + /has-symbols@1.0.3: + resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} + engines: {node: '>= 0.4'} + dev: true + + /hasown@2.0.2: + resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} + engines: {node: '>= 0.4'} + dependencies: + function-bind: 1.1.2 + dev: true + /human-signals@2.1.0: resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} engines: {node: '>=10.17.0'} @@ -645,6 +817,10 @@ packages: engines: {node: '>=8'} dev: true + /isarray@2.0.5: + resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==} + dev: true + /isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} dev: true @@ -693,10 +869,24 @@ packages: resolution: {integrity: sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==} dev: true + /json-stable-stringify@1.1.1: + resolution: {integrity: sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.7 + isarray: 2.0.5 + jsonify: 0.0.1 + object-keys: 1.1.1 + dev: true + /json-stringify-safe@5.0.1: resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==} dev: true + /jsonify@0.0.1: + resolution: {integrity: sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==} + dev: true + /jsonparse@1.3.1: resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==} engines: {'0': node >= 0.2.0} @@ -718,6 +908,10 @@ packages: yallist: 4.0.0 dev: true + /make-synchronized@0.2.9: + resolution: {integrity: sha512-4wczOs8SLuEdpEvp3vGo83wh8rjJ78UsIk7DIX5fxdfmfMJGog4bQzxfvOwq7Q3yCHLC4jp1urPHIxRS/A93gA==} + dev: true + /map-stream@0.1.0: resolution: {integrity: sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==} dev: true @@ -799,11 +993,31 @@ packages: resolution: {integrity: sha512-qaKRmtYPZ5qdw4jWJD6bxEf1FJEqllJrwxCLIm0sQU/A7v2/czigzOb+C2uSiFsa9lBUzeH7M1oK+Q+OLxL3kA==} dev: true + /nunjucks@3.2.4: + resolution: {integrity: sha512-26XRV6BhkgK0VOxfbU5cQI+ICFUtMLixv1noZn1tGU38kQH5A5nmmbk/O45xdyBhD1esk47nKrY0mvQpZIhRjQ==} + engines: {node: '>= 6.9.0'} + hasBin: true + peerDependencies: + chokidar: ^3.3.0 + peerDependenciesMeta: + chokidar: + optional: true + dependencies: + a-sync-waterfall: 1.0.1 + asap: 2.0.6 + commander: 5.1.0 + dev: true + /object-assign@4.1.1: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} engines: {node: '>=0.10.0'} dev: true + /object-keys@1.1.1: + resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} + engines: {node: '>= 0.4'} + dev: true + /onetime@5.1.2: resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} engines: {node: '>=6'} @@ -830,6 +1044,12 @@ packages: selective-whitespace: 1.0.4 dev: true + /prettier@3.2.5: + resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==} + engines: {node: '>=14'} + hasBin: true + dev: true + /ps-tree@1.2.0: resolution: {integrity: sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==} engines: {node: '>= 0.10'} @@ -883,6 +1103,18 @@ packages: lru-cache: 6.0.0 dev: true + /set-function-length@1.2.2: + resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==} + engines: {node: '>= 0.4'} + dependencies: + define-data-property: 1.1.4 + es-errors: 1.3.0 + function-bind: 1.1.2 + get-intrinsic: 1.2.4 + gopd: 1.0.1 + has-property-descriptors: 1.0.2 + dev: true + /shebang-command@2.0.0: resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} engines: {node: '>=8'} @@ -1005,6 +1237,13 @@ packages: resolution: {integrity: sha512-nPewA6m9mR3d6k7WkZ8N8zpTWfenFH3q9pA2PkuiZxINr9DKB2+40wEQf0ixn8VaGuJ78AB6iWOtStI+/4FKZQ==} dev: true + /supports-color@7.2.0: + resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} + engines: {node: '>=8'} + dependencies: + has-flag: 4.0.0 + dev: true + /text-encoding-utf-8@1.0.2: resolution: {integrity: sha512-8bw4MY9WjdsD2aMtO0OzOCY3pXGYNx2d2FfHRVUKkiCPDWjKuOlhLVASS+pD7VkLTVjW268LYJHwsnPFlBpbAg==} dev: true From d25d80277fcc7e83dd97a82166a9565cdc9a260c Mon Sep 17 00:00:00 2001 From: blockiosaurus Date: Tue, 7 May 2024 13:52:00 -0400 Subject: [PATCH 4/6] Fixing kinobi reference. --- configs/kinobi.cjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/kinobi.cjs b/configs/kinobi.cjs index df24b651..930fd8de 100755 --- a/configs/kinobi.cjs +++ b/configs/kinobi.cjs @@ -1,5 +1,5 @@ const path = require("path"); -const k = require("../../kinobi/dist/cjs"); +const k = require("@metaplex-foundation/kinobi"); // Paths. const clientDir = path.join(__dirname, "..", "clients"); From 3416a50e6e87981b46bb72d523fccba535eae975 Mon Sep 17 00:00:00 2001 From: blockiosaurus Date: Tue, 7 May 2024 21:16:48 -0400 Subject: [PATCH 5/6] Bumping Kinobi version and fixing clients. --- Cargo.lock | 976 +++++++++--------- .../src/generated/accounts/base_asset_v1.rs | 4 +- .../generated/accounts/base_collection_v1.rs | 4 +- .../src/generated/accounts/hashed_asset_v1.rs | 4 +- .../generated/accounts/plugin_header_v1.rs | 4 +- .../generated/accounts/plugin_registry_v1.rs | 4 +- .../instructions/add_collection_plugin_v1.rs | 4 +- .../generated/instructions/add_plugin_v1.rs | 4 +- .../approve_collection_plugin_authority_v1.rs | 4 +- .../approve_plugin_authority_v1.rs | 4 +- .../instructions/burn_collection_v1.rs | 4 +- .../src/generated/instructions/burn_v1.rs | 4 +- .../src/generated/instructions/collect.rs | 2 - .../src/generated/instructions/compress_v1.rs | 2 - .../instructions/create_collection_v1.rs | 4 +- .../src/generated/instructions/create_v1.rs | 4 +- .../generated/instructions/decompress_v1.rs | 4 +- .../remove_collection_plugin_v1.rs | 4 +- .../instructions/remove_plugin_v1.rs | 4 +- .../revoke_collection_plugin_authority_v1.rs | 4 +- .../revoke_plugin_authority_v1.rs | 4 +- .../src/generated/instructions/transfer_v1.rs | 4 +- .../update_collection_plugin_v1.rs | 4 +- .../instructions/update_collection_v1.rs | 4 +- .../instructions/update_plugin_v1.rs | 4 +- .../src/generated/instructions/update_v1.rs | 4 +- clients/rust/src/generated/types/attribute.rs | 4 +- .../rust/src/generated/types/attributes.rs | 4 +- .../rust/src/generated/types/burn_delegate.rs | 4 +- .../src/generated/types/compression_proof.rs | 4 +- clients/rust/src/generated/types/creator.rs | 4 +- .../rust/src/generated/types/data_state.rs | 4 +- clients/rust/src/generated/types/edition.rs | 4 +- .../generated/types/external_plugin_record.rs | 4 +- .../src/generated/types/extra_accounts.rs | 4 +- .../src/generated/types/freeze_delegate.rs | 4 +- .../generated/types/hashable_plugin_schema.rs | 4 +- .../generated/types/hashed_asset_schema.rs | 4 +- clients/rust/src/generated/types/key.rs | 4 +- .../src/generated/types/master_edition.rs | 4 +- .../types/permanent_burn_delegate.rs | 4 +- .../types/permanent_freeze_delegate.rs | 4 +- .../types/permanent_transfer_delegate.rs | 4 +- clients/rust/src/generated/types/plugin.rs | 4 +- .../src/generated/types/plugin_authority.rs | 4 +- .../generated/types/plugin_authority_pair.rs | 4 +- .../rust/src/generated/types/plugin_type.rs | 4 +- .../src/generated/types/registry_record.rs | 4 +- clients/rust/src/generated/types/royalties.rs | 4 +- clients/rust/src/generated/types/rule_set.rs | 4 +- .../src/generated/types/transfer_delegate.rs | 4 +- .../src/generated/types/update_authority.rs | 4 +- .../src/generated/types/update_delegate.rs | 4 +- package.json | 2 +- pnpm-lock.yaml | 8 +- programs/mpl-core/Cargo.toml | 4 +- 56 files changed, 572 insertions(+), 622 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bdf53288..2c0f73a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -124,8 +124,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd7368e171b3a317885dc08ec0f74eed9d0ad6c726cc819593aed81440dca926" dependencies = [ "anchor-syn", - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -137,8 +137,8 @@ checksum = "f527df85a8cba3f2bea04e46ed71b66e525ea378c7fec538aa205f4520b73e31" dependencies = [ "anchor-syn", "bs58 0.5.1", - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -149,7 +149,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3eb1dc1845cf8636c2e046a274ca074dabd3884ac8ed11cc4ed64b7e8ef5a318" dependencies = [ "anchor-syn", - "quote 1.0.35", + "quote", "syn 1.0.109", ] @@ -160,7 +160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f382e41514c59a77ffa7bb1a47df9a0359564a749b6934485c742c11962e540" dependencies = [ "anchor-syn", - "quote 1.0.35", + "quote", "syn 1.0.109", ] @@ -171,8 +171,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "473a122aeed3f6b666438236338d2ef7833ee5fdc5688e1baa80185d61088a53" dependencies = [ "anchor-syn", - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -187,8 +187,8 @@ dependencies = [ "anyhow", "bs58 0.5.1", "heck 0.3.3", - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "serde_json", "syn 1.0.109", ] @@ -200,7 +200,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed9b97c99dcec135aae0ff908c14bcfcd3e78cfc16a0c6f245135038f0e6d390" dependencies = [ "anchor-syn", - "quote 1.0.35", + "quote", "syn 1.0.109", ] @@ -212,8 +212,8 @@ checksum = "bbece98f6ad9c37070edc0841326c9623a249346cd74f433e7cef69b14f7f31d" dependencies = [ "anchor-syn", "borsh-derive-internal 0.10.3", - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -223,8 +223,8 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8badbe2648bc99a85ee05a7a5f9512e5e2af8ffac71476a69350cb278057ac53" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -273,8 +273,8 @@ dependencies = [ "anyhow", "bs58 0.5.1", "heck 0.3.3", - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "serde", "serde_json", "sha2 0.10.8", @@ -366,7 +366,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" dependencies = [ - "quote 1.0.35", + "quote", "syn 1.0.109", ] @@ -378,8 +378,8 @@ checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" dependencies = [ "num-bigint 0.4.4", "num-traits", - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -414,8 +414,8 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -429,12 +429,6 @@ dependencies = [ "rand 0.8.5", ] -[[package]] -name = "array-bytes" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ad284aeb45c13f2fb4f084de4a420ebf447423bdf9386c0540ce33cb3ef4b8c" - [[package]] name = "arrayref" version = "0.3.7" @@ -475,8 +469,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", "synstructure", ] @@ -487,8 +481,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -538,8 +532,8 @@ version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.48", ] @@ -625,6 +619,9 @@ name = "bitflags" version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +dependencies = [ + "serde", +] [[package]] name = "bitmaps" @@ -703,7 +700,7 @@ dependencies = [ "borsh-derive-internal 0.9.3", "borsh-schema-derive-internal 0.9.3", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.76", + "proc-macro2", "syn 1.0.109", ] @@ -716,7 +713,7 @@ dependencies = [ "borsh-derive-internal 0.10.3", "borsh-schema-derive-internal 0.10.3", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.76", + "proc-macro2", "syn 1.0.109", ] @@ -726,8 +723,8 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -737,8 +734,8 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -748,8 +745,8 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -759,8 +756,8 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -831,8 +828,8 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.48", ] @@ -1170,8 +1167,8 @@ checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "strsim 0.10.0", "syn 2.0.48", ] @@ -1183,7 +1180,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", - "quote 1.0.35", + "quote", "syn 2.0.48", ] @@ -1249,8 +1246,8 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -1301,32 +1298,32 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.48", ] [[package]] -name = "dlopen" -version = "0.1.8" +name = "dlopen2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e80ad39f814a9abe68583cd50a2d45c8a67561c3361ab8da240587dda80937" +checksum = "09b4f5f101177ff01b8ec4ecc81eead416a8aa42819a2869311b3420fa114ffa" dependencies = [ - "dlopen_derive", - "lazy_static", + "dlopen2_derive", "libc", + "once_cell", "winapi", ] [[package]] -name = "dlopen_derive" -version = "0.1.4" +name = "dlopen2_derive" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f236d9e1b1fbd81cea0f9cbdc8dcc7e8ebcd80e6659cd7cb2ad5f6c05946c581" +checksum = "a6cbae11b3de8fce2a456e8ea3dada226b35fe791f0dc1d360c0941f0bb681f3" dependencies = [ - "libc", - "quote 0.6.13", - "syn 0.15.44", + "proc-macro2", + "quote", + "syn 2.0.48", ] [[package]] @@ -1377,8 +1374,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0042ff8246a363dbe77d2ceedb073339e85a804b9a47636c6e016a9a32c05f" dependencies = [ "enum-ordinalize", - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -1418,8 +1415,8 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.48", ] @@ -1431,8 +1428,8 @@ checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" dependencies = [ "num-bigint 0.4.4", "num-traits", - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.48", ] @@ -1520,6 +1517,15 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs-err" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" +dependencies = [ + "autocfg", +] + [[package]] name = "futures" version = "0.3.30" @@ -1574,8 +1580,8 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.48", ] @@ -1863,7 +1869,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.5", + "socket2", "tokio", "tower-service", "tracing", @@ -1879,9 +1885,9 @@ dependencies = [ "futures-util", "http", "hyper", - "rustls 0.21.10", + "rustls", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", ] [[package]] @@ -2112,6 +2118,18 @@ dependencies = [ "libsecp256k1-core", ] +[[package]] +name = "light-poseidon" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c9a85a9752c549ceb7578064b4ed891179d20acd85f27318573b64d2d7ee7ee" +dependencies = [ + "ark-bn254", + "ark-ff", + "num-bigint 0.4.4", + "thiserror", +] + [[package]] name = "linux-raw-sys" version = "0.4.13" @@ -2256,8 +2274,8 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -2298,9 +2316,7 @@ dependencies = [ [[package]] name = "mpl-utils" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5487a93ce5e3d1e0b5857772f0e605b1ba83d2fc776988f8b8aaffd360f016f7" +version = "0.3.4" dependencies = [ "arrayref", "solana-program", @@ -2382,8 +2398,8 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -2393,8 +2409,8 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.48", ] @@ -2475,8 +2491,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.48", ] @@ -2487,8 +2503,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ "proc-macro-crate 3.1.0", - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.48", ] @@ -2577,8 +2593,8 @@ checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" dependencies = [ "Inflector", "proc-macro-error", - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -2668,8 +2684,8 @@ version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.48", ] @@ -2782,8 +2798,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", "version_check", ] @@ -2794,20 +2810,11 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "version_check", ] -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - [[package]] name = "proc-macro2" version = "1.0.76" @@ -2826,63 +2833,63 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "qualifier_attr" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e2e25ee72f5b24d773cae88422baddefff7714f97aab68d96fe2b6fc4a28fb2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "quinn" -version = "0.9.4" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e" +checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.20.9", + "rustls", "thiserror", "tokio", "tracing", - "webpki", ] [[package]] name = "quinn-proto" -version = "0.9.6" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863" +checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" dependencies = [ "bytes", "rand 0.8.5", "ring 0.16.20", "rustc-hash", - "rustls 0.20.9", + "rustls", "rustls-native-certs", "slab", "thiserror", "tinyvec", "tracing", - "webpki", ] [[package]] name = "quinn-udp" -version = "0.3.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" +checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" dependencies = [ + "bytes", "libc", - "quinn-proto", - "socket2 0.4.10", + "socket2", "tracing", - "windows-sys 0.42.0", -] - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", + "windows-sys 0.48.0", ] [[package]] @@ -2891,7 +2898,7 @@ version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2", ] [[package]] @@ -3068,14 +3075,14 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.10", + "rustls", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "system-configuration", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-util 0.7.10", "tower-service", "url", @@ -3179,18 +3186,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" -dependencies = [ - "log", - "ring 0.16.20", - "sct", - "webpki", -] - [[package]] name = "rustls" version = "0.21.10" @@ -3285,8 +3280,8 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.48", ] @@ -3353,8 +3348,8 @@ version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.48", ] @@ -3415,8 +3410,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ "darling", - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.48", ] @@ -3427,16 +3422,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" dependencies = [ "darling", - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.48", ] [[package]] -name = "sha-1" -version = "0.10.1" +name = "sha1" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -3504,8 +3499,8 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9bf2645f8eebde043da69200195058e7b59806705104f908a31d05ca82844ce" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "shank_macro_impl", "shank_render", "syn 1.0.109", @@ -3518,8 +3513,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93d0593f48acb0a722906416b1f6b8926f6571eb9af16d566a7c65427f269f50" dependencies = [ "anyhow", - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "serde", "syn 1.0.109", ] @@ -3530,8 +3525,8 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "121175ba61809189f888dc5822ebfd30fa0d91e1e1f61d25a4d40b0847b3075e" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "shank_macro_impl", ] @@ -3565,6 +3560,12 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + [[package]] name = "sized-chunks" version = "0.6.5" @@ -3590,16 +3591,6 @@ version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "socket2" version = "0.5.5" @@ -3612,9 +3603,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5763ba7519b166b152ca2c6f8defa22cd07d3aea42a3a86b74519857fc3d464" +checksum = "21ed570fba6f909f69c888b48b39c7e61b454e3594e448d0dad9d973f27f5668" dependencies = [ "Inflector", "base64 0.21.7", @@ -3625,21 +3616,80 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "solana-address-lookup-table-program", "solana-config-program", "solana-sdk", "spl-token", - "spl-token-2022 0.9.0", + "spl-token-2022 1.0.0", + "spl-token-group-interface", "spl-token-metadata-interface", "thiserror", "zstd", ] +[[package]] +name = "solana-accounts-db" +version = "1.17.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c457b335c3b13b0df99ffee59cf8b3d92e861abbddd0de93993367f449a76c" +dependencies = [ + "arrayref", + "bincode", + "blake3", + "bv", + "bytemuck", + "byteorder", + "bzip2", + "crossbeam-channel", + "dashmap", + "flate2", + "fnv", + "fs-err", + "im", + "index_list", + "itertools", + "lazy_static", + "log", + "lz4", + "memmap2", + "modular-bitfield", + "num-derive 0.3.3", + "num-traits", + "num_cpus", + "num_enum 0.6.1", + "ouroboros", + "percentage", + "qualifier_attr", + "rand 0.8.5", + "rayon", + "regex", + "rustc_version", + "serde", + "serde_derive", + "solana-bucket-map", + "solana-config-program", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-measure", + "solana-metrics", + "solana-program-runtime", + "solana-rayon-threadlimit", + "solana-sdk", + "solana-stake-program", + "solana-system-program", + "solana-vote-program", + "static_assertions", + "strum 0.24.1", + "strum_macros 0.24.3", + "tar", + "tempfile", + "thiserror", +] + [[package]] name = "solana-address-lookup-table-program" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a216474b9d25153d629aa7f4fb2246bc875ebe90e1155380e0436c209e62d5" +checksum = "dba35ca5c434b2479a2a55b831461bd8cfdf2c389ee3ae4a0fc51918fbe17d88" dependencies = [ "bincode", "bytemuck", @@ -3658,9 +3708,9 @@ dependencies = [ [[package]] name = "solana-banks-client" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7f5b9262637ec61f0755d0a657332c61d8d7b6a1fa63c64664391b469a6282" +checksum = "9f22c7a0b5d1a81193875dded16ed189666fab0b753d46faec311c2798e0af34" dependencies = [ "borsh 0.10.3", "futures", @@ -3675,9 +3725,9 @@ dependencies = [ [[package]] name = "solana-banks-interface" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0610d7fee589a2ab66c0f7d08866fa8be7c3851b8e3361948134cd6116b1d077" +checksum = "7c2652008dcd55d163e08e4d94c2b7592cb8562b33e168ac86462ddac4dca143" dependencies = [ "serde", "solana-sdk", @@ -3686,13 +3736,14 @@ dependencies = [ [[package]] name = "solana-banks-server" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2209441a76b00a9b8368df8af84fbba695ef08c70fc66e885c5cb533ee4a85b" +checksum = "5a01440c39a08f90f8016013918491f8ffe16d066efe0508f9cb12e2863f6eaf" dependencies = [ "bincode", "crossbeam-channel", "futures", + "solana-accounts-db", "solana-banks-interface", "solana-client", "solana-runtime", @@ -3705,15 +3756,15 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c23c74148a75c1e5f8bb26113306198be1f030e75f3e23f8335470d9e014227" +checksum = "571e8ef9d82bec9d32dd2d54b00e1572a85c967ed996cf737f3a52946d760623" dependencies = [ "bincode", "byteorder", "libsecp256k1", "log", - "rand 0.7.3", + "scopeguard", "solana-measure", "solana-program-runtime", "solana-sdk", @@ -3724,16 +3775,17 @@ dependencies = [ [[package]] name = "solana-bucket-map" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dae145ef8145f850fc3fb832802ebed13dd91a51fff457d5f06f5c31a62efee" +checksum = "109fdb52669846283bc6ef2ed87c832295af6f7e3c4e7888127b3d506054d651" dependencies = [ "bv", + "bytemuck", "log", "memmap2", "modular-bitfield", "num_enum 0.6.1", - "rand 0.7.3", + "rand 0.8.5", "solana-measure", "solana-sdk", "tempfile", @@ -3741,14 +3793,13 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef7e2234cf1179b8ceadfae922d38d79f82932a762ff62b0051e0b3205984f" +checksum = "b4729fec3c2ac37b7daaf24c1ef879bbedbff3495b1ac728d9b627282d878753" dependencies = [ "chrono", "clap 2.34.0", "rpassword", - "solana-perf", "solana-remote-wallet", "solana-sdk", "thiserror", @@ -3759,19 +3810,19 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2644f5a0c91f8c44db175d35d52bf772799597dbedf6a5d9f138d61e2b52b826" +checksum = "2da13019a833940af2edebda969db4337ab11c6fb220eb0d4c02d79c83ae8034" dependencies = [ "async-trait", "bincode", + "dashmap", "futures", "futures-util", - "indexmap 1.9.3", + "indexmap 2.1.0", "indicatif", "log", "quinn", - "rand 0.7.3", "rayon", "solana-connection-cache", "solana-measure", @@ -3792,9 +3843,9 @@ dependencies = [ [[package]] name = "solana-compute-budget-program" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61fe4b2d4e756c32139444cc3f8ee32fdc9b9aceb02e82216694fd36141dd126" +checksum = "0ba64641b22efb6332088dc5892369a2f2049f83e66459ea300a4fc74a7a9f84" dependencies = [ "solana-program-runtime", "solana-sdk", @@ -3802,9 +3853,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bb9b6d2c575e1eecd85380cb6442525a0d2639afa627552264eaa7050f47fb3" +checksum = "04b91ca968a63946e7513a1de20188e6e917f09136339ee3bec247aa0e985d36" dependencies = [ "bincode", "chrono", @@ -3816,16 +3867,17 @@ dependencies = [ [[package]] name = "solana-connection-cache" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcd27f413c3702ee20bbf1152e928f9adff0a37fef0f36b956d4eb34aae2be71" +checksum = "49a850c0122f094efb83df00ab080ab6ace0dcd8dbf91240f91832157ee6d460" dependencies = [ "async-trait", "bincode", + "crossbeam-channel", "futures-util", - "indexmap 1.9.3", + "indexmap 2.1.0", "log", - "rand 0.7.3", + "rand 0.8.5", "rayon", "rcgen", "solana-measure", @@ -3835,11 +3887,35 @@ dependencies = [ "tokio", ] +[[package]] +name = "solana-cost-model" +version = "1.17.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c6e08e5be41ab19c7906a6b6adf58172fd49ee042f8511a6c4e0155daa1b7c" +dependencies = [ + "lazy_static", + "log", + "rustc_version", + "solana-address-lookup-table-program", + "solana-bpf-loader-program", + "solana-compute-budget-program", + "solana-config-program", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-loader-v4-program", + "solana-metrics", + "solana-program-runtime", + "solana-sdk", + "solana-stake-program", + "solana-system-program", + "solana-vote-program", +] + [[package]] name = "solana-frozen-abi" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7077f6495ccc313dff49c3e3f3ed03e49058258bae7fee77ac29ba0a474ba82" +checksum = "8e2c5e5dde22cac045d29675b3fefa84817e1f63b0b911d094c599e80c0c07d9" dependencies = [ "ahash 0.8.6", "blake3", @@ -3850,13 +3926,10 @@ dependencies = [ "cc", "either", "generic-array", - "getrandom 0.1.16", "im", "lazy_static", "log", "memmap2", - "once_cell", - "rand_core 0.6.4", "rustc_version", "serde", "serde_bytes", @@ -3870,24 +3943,23 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f516f992211a2ab70de5c367190575c97e02d156f9f1d8b76886d673f30e88a2" +checksum = "296e4cf0e2479e4c21afe4d17e32526f71f1bcd93b1c7c660900bc3e4233447a" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "rustc_version", "syn 2.0.48", ] [[package]] name = "solana-loader-v4-program" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb13799b6df3e8ebd19862dabbb51781774d300405cbab244b35c482edc700ca" +checksum = "a902445f0bdf610e7eec94dab7f4a8e756d001c17651647730f1efcb9d7af6fe" dependencies = [ "log", - "rand 0.7.3", "solana-measure", "solana-program-runtime", "solana-sdk", @@ -3896,9 +3968,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b64def674bfaa4a3f8be7ba19c03c9caec4ec028ba62b9a427ec1bf608a2486" +checksum = "d37a1b1a383a01039afbc6447a1712fb2a1a73a5ba8916762e693e8e492fabf3" dependencies = [ "env_logger", "lazy_static", @@ -3907,9 +3979,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "932db6604bcf8ba3bba68e80564d7eaa0dd7b9667407e15c3557caa83203aee7" +checksum = "19831a93d760205f5c3e20d05a37b0e533caa1889e48041648ad0859e68ec336" dependencies = [ "log", "solana-sdk", @@ -3917,9 +3989,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d81931f224798c0e52062b0683a07eebe1c1904954c8765773c9802a28fbd0c" +checksum = "f63c23a8db755b2903262ad473e32cbf0093e2d3a0a7b8183d797a182c08326a" dependencies = [ "crossbeam-channel", "gethostname", @@ -3927,23 +3999,24 @@ dependencies = [ "log", "reqwest", "solana-sdk", + "thiserror", ] [[package]] name = "solana-net-utils" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea3420fa9da3789548f31b3c68e6a090bfd1320c735289851b711546d38e3b0" +checksum = "29ac1afc7feb590b45fd72bee0ca4c4f24b2386184d7e00d9f0d17913655bb4a" dependencies = [ "bincode", "clap 3.2.25", "crossbeam-channel", "log", "nix", - "rand 0.7.3", + "rand 0.8.5", "serde", "serde_derive", - "socket2 0.4.10", + "socket2", "solana-logger", "solana-sdk", "solana-version", @@ -3953,25 +4026,27 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5859de708bd12fb189f3c161cda03fdd341ffcf6be4fe787c7d730a30d589ac6" +checksum = "bfdf5a429e018e8ba693f4c43f833192db421fe97b88dfaf97041aa258e4b191" dependencies = [ "ahash 0.8.6", "bincode", "bv", "caps", "curve25519-dalek", - "dlopen", - "dlopen_derive", + "dlopen2", "fnv", "lazy_static", "libc", "log", "nix", - "rand 0.7.3", + "rand 0.8.5", "rayon", + "rustc_version", "serde", + "solana-frozen-abi", + "solana-frozen-abi-macro", "solana-metrics", "solana-rayon-threadlimit", "solana-sdk", @@ -3980,18 +4055,17 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e92350aa5b42564681655331e7e0b9d5c99a442de317ceeb4741efbbe9a6c05" +checksum = "8e3a3b9623f09e2c480b4e129c92d7a036f8614fd0fc7519791bd44e64061ce8" dependencies = [ "ark-bn254", "ark-ec", "ark-ff", "ark-serialize", - "array-bytes", "base64 0.21.7", "bincode", - "bitflags 1.3.2", + "bitflags 2.4.2", "blake3", "borsh 0.10.3", "borsh 0.9.3", @@ -4008,14 +4082,14 @@ dependencies = [ "lazy_static", "libc", "libsecp256k1", + "light-poseidon", "log", "memoffset 0.9.0", "num-bigint 0.4.4", "num-derive 0.3.3", "num-traits", "parking_lot", - "rand 0.7.3", - "rand_chacha 0.2.2", + "rand 0.8.5", "rustc_version", "rustversion", "serde", @@ -4035,9 +4109,9 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da0e9dd63326ded2055b42e54aa37baa6aeb8adaea658a0059c234af6d05c02" +checksum = "9d5dbb56d36cc15b4cf5a71c0ce6262a263212f7a312b0dbc41b226654329c37" dependencies = [ "base64 0.21.7", "bincode", @@ -4049,7 +4123,7 @@ dependencies = [ "num-derive 0.3.3", "num-traits", "percentage", - "rand 0.7.3", + "rand 0.8.5", "rustc_version", "serde", "solana-frozen-abi", @@ -4063,9 +4137,9 @@ dependencies = [ [[package]] name = "solana-program-test" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d72aaaabfc85bb6750c14ff6b69df500ed07749dbc2b775d4499f6b1eb5ceef7" +checksum = "61bbf119c35d4393702953e586b72053c3b80a92c781931cd412d53d2036475e" dependencies = [ "assert_matches", "async-trait", @@ -4075,6 +4149,7 @@ dependencies = [ "crossbeam-channel", "log", "serde", + "solana-accounts-db", "solana-banks-client", "solana-banks-interface", "solana-banks-server", @@ -4084,15 +4159,17 @@ dependencies = [ "solana-runtime", "solana-sdk", "solana-vote-program", + "solana_rbpf", + "test-case", "thiserror", "tokio", ] [[package]] name = "solana-pubsub-client" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d1ad6fa8f0e154b91e67969fdf5478e74b75a87d5e3dce14ab83f4cb2f60f1" +checksum = "2c22290c0d296a6a250a8d5b680797f12138a81af9c403a6ce62bd3ddad307e6" dependencies = [ "crossbeam-channel", "futures-util", @@ -4115,9 +4192,9 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de9426ee9c0f98522242d6656db18175a022959af0b8ed3f170729e29933cf08" +checksum = "f924d8722f9e910d790678a79c2a0bfed786dffe1aefa5d769f8548679794263" dependencies = [ "async-mutex", "async-trait", @@ -4127,9 +4204,8 @@ dependencies = [ "log", "quinn", "quinn-proto", - "quinn-udp", "rcgen", - "rustls 0.20.9", + "rustls", "solana-connection-cache", "solana-measure", "solana-metrics", @@ -4143,9 +4219,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e6c7a43e34d7db0ad158690b331df15b92f6996e3b9b03629591a54fc3e97f" +checksum = "bc0a2e484e5b272690ac1431a6821f2b5180149d67c56934d9e007224ced15d0" dependencies = [ "lazy_static", "num_cpus", @@ -4153,9 +4229,9 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed87a28ede1536be71352e13965b1fe7a2cf205e3e4fae2eef8a3407219ba1cd" +checksum = "fb9a96d1c001d07a0abb08e05b92ff6528b2d9239d03c57f99f738527839eb12" dependencies = [ "console", "dialoguer", @@ -4172,9 +4248,9 @@ dependencies = [ [[package]] name = "solana-rpc-client" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f273acbce4493bc1de8174b94cfaee112b72263ae1684a6e13890f5004be53fb" +checksum = "91503edfdb2ba9c5e0127048e7795f22e050cf2bcee1259361af113d533b4b26" dependencies = [ "async-trait", "base64 0.21.7", @@ -4198,9 +4274,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4462198830687b83870985db945c5d49c720d83abf516c8206fefba12cca689d" +checksum = "131662e5eea4fa5fc88b01f07d9e430315c0976be848ba3994244249c5fb033a" dependencies = [ "base64 0.21.7", "bs58 0.4.0", @@ -4214,15 +4290,15 @@ dependencies = [ "solana-sdk", "solana-transaction-status", "solana-version", - "spl-token-2022 0.9.0", + "spl-token-2022 1.0.0", "thiserror", ] [[package]] name = "solana-rpc-client-nonce-utils" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b3abad7b1ffd4b29d33b7525ebbc2ec8d0ca5928e4d8f28e364928d68a8dd9" +checksum = "f67cdff955b9994ae240f6f287420c6727a581120c02ccc4f2fa535886732a1d" dependencies = [ "clap 2.34.0", "solana-clap-utils", @@ -4233,9 +4309,9 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c014aff6ce20b28f1e5057a3f78081821d4b62eccd9dc3b6a7e756be85f8bc4" +checksum = "cf63159e669f29065c9ff280c09f5b96139b00258502ee401338150fce78fed7" dependencies = [ "arrayref", "base64 0.21.7", @@ -4250,6 +4326,7 @@ dependencies = [ "dir-diff", "flate2", "fnv", + "fs-err", "im", "index_list", "itertools", @@ -4263,21 +4340,24 @@ dependencies = [ "num-traits", "num_cpus", "num_enum 0.6.1", - "once_cell", "ouroboros", "percentage", - "rand 0.7.3", + "qualifier_attr", + "rand 0.8.5", "rayon", "regex", "rustc_version", "serde", "serde_derive", "serde_json", + "siphasher", + "solana-accounts-db", "solana-address-lookup-table-program", "solana-bpf-loader-program", "solana-bucket-map", "solana-compute-budget-program", "solana-config-program", + "solana-cost-model", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-loader-v4-program", @@ -4290,6 +4370,7 @@ dependencies = [ "solana-stake-program", "solana-system-program", "solana-version", + "solana-vote", "solana-vote-program", "solana-zk-token-proof-program", "solana-zk-token-sdk", @@ -4305,14 +4386,14 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2087e15c92d4d6b3f085dc12fbe9614141c811f90a54cc418240ac30b608133f" +checksum = "cb34583922c5e79004ad8d8d69f333d274d21b614f0e1a575f325fc29a104ec2" dependencies = [ "assert_matches", "base64 0.21.7", "bincode", - "bitflags 1.3.2", + "bitflags 2.4.2", "borsh 0.10.3", "bs58 0.4.0", "bytemuck", @@ -4335,8 +4416,9 @@ dependencies = [ "num_enum 0.6.1", "pbkdf2 0.11.0", "qstring", + "qualifier_attr", "rand 0.7.3", - "rand_chacha 0.2.2", + "rand 0.8.5", "rustc_version", "rustversion", "serde", @@ -4358,22 +4440,28 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e0e0e7ee984b0f9179a1d4f4e9e67ce675de2324b5a98b61d2bdb61be3c19bb" +checksum = "60f58786e949f43b8c9b826fdfa5ad8586634b077ab04f989fb8e30535786712" dependencies = [ "bs58 0.4.0", - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "rustversion", "syn 2.0.48", ] +[[package]] +name = "solana-security-txt" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" + [[package]] name = "solana-send-transaction-service" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1afb10d881ba8eecf2edbfffe7d51b7f27b953f1ab2148cb3ba0157e4bf6c75" +checksum = "9987eccfe96b38785d95840277da4238de4f01166d0c32ec9bbfc5a319f4a530" dependencies = [ "crossbeam-channel", "log", @@ -4387,9 +4475,9 @@ dependencies = [ [[package]] name = "solana-stake-program" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a543a3de0eb703e856dca5b92b4fe461bac5aa12080bd8486105acf265cbb68d" +checksum = "5ab247c866dab350bf610df8e1fab97ae0a0519cb81914348d382eac9e80940d" dependencies = [ "bincode", "log", @@ -4402,16 +4490,16 @@ dependencies = [ [[package]] name = "solana-streamer" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a868a782cab696677cd12deacda1862dbeeba903a4a8d8404a4d6bf45e8a556c" +checksum = "efe4c33e0f68ea7a3701650badf6753b85fef2100cac6bc187c8e443e61c53da" dependencies = [ "async-channel", "bytes", "crossbeam-channel", "futures-util", "histogram", - "indexmap 1.9.3", + "indexmap 2.1.0", "itertools", "libc", "log", @@ -4421,10 +4509,9 @@ dependencies = [ "pkcs8", "quinn", "quinn-proto", - "quinn-udp", - "rand 0.7.3", + "rand 0.8.5", "rcgen", - "rustls 0.20.9", + "rustls", "solana-metrics", "solana-perf", "solana-sdk", @@ -4435,9 +4522,9 @@ dependencies = [ [[package]] name = "solana-system-program" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf47ccfe21b717fa4a3d6c26d8d77a039648c456d3fc37ebf3e0c8ea95c5f37b" +checksum = "24147d17f13bef6548d15a7fc63eb8a3271523f7ffc91f13032944b0dc34f974" dependencies = [ "bincode", "log", @@ -4449,9 +4536,9 @@ dependencies = [ [[package]] name = "solana-thin-client" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222f5539a4b01a5374c919e78aca5d4472fa5af6e551bf9f4ddd97ca59374f6d" +checksum = "54e782aabf9443a36d65e74d70ce732cc844707a5fec5a498bcbd81d3de7598c" dependencies = [ "bincode", "log", @@ -4464,17 +4551,16 @@ dependencies = [ [[package]] name = "solana-tpu-client" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c0f954b48dda0a907dbdb54387459c8eb7e9c702f278bf70a2caf3ebc417c88" +checksum = "980bee30cbfe3c51f973da7fdcccb9df2c2d9b9175c06066b293499e02108fd4" dependencies = [ "async-trait", "bincode", "futures-util", - "indexmap 1.9.3", + "indexmap 2.1.0", "indicatif", "log", - "rand 0.7.3", "rayon", "solana-connection-cache", "solana-measure", @@ -4489,9 +4575,9 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7992d9605a65967b5e40e6ef8e285a953888e4789f0f5e3fb7339bf018cbb677" +checksum = "4c180013e406418d593ce7b51da7007a638ace18261de14901b090e53a1d7025" dependencies = [ "Inflector", "base64 0.21.7", @@ -4504,20 +4590,19 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder", - "solana-address-lookup-table-program", "solana-sdk", "spl-associated-token-account", "spl-memo", "spl-token", - "spl-token-2022 0.9.0", + "spl-token-2022 1.0.0", "thiserror", ] [[package]] name = "solana-udp-client" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4329dfe364cb276c7137b459e3737a27d6ae180f60d0aa2274d8be86cac3472c" +checksum = "ab995970a424c89b7966a01aec90cdf1685c49aacf38a5f463200fc273a7d86b" dependencies = [ "async-trait", "solana-connection-cache", @@ -4530,9 +4615,9 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1931390daf0938c072c167611a263a8b95c13476d7fff7c8eb12789a981685b3" +checksum = "b32cc394aa7132ab7f270801b98bf47fa585ab93f1038e5be27e480d7b5b2dca" dependencies = [ "log", "rustc_version", @@ -4544,11 +4629,30 @@ dependencies = [ "solana-sdk", ] +[[package]] +name = "solana-vote" +version = "1.17.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6092058284f0e02274177c45a22032eb7288aa4f6f8003ed469b1a562cac3bd" +dependencies = [ + "crossbeam-channel", + "itertools", + "log", + "rustc_version", + "serde", + "serde_derive", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-sdk", + "solana-vote-program", + "thiserror", +] + [[package]] name = "solana-vote-program" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25669860e2c5e821a8caa5372589289fbb6ac3084096133fdd1c6af6546536a2" +checksum = "589cad4dccb4392e23f5ae4ccdd1f0aaa10f2823b264b27c4feb6382f40f4fd4" dependencies = [ "bincode", "log", @@ -4568,12 +4672,11 @@ dependencies = [ [[package]] name = "solana-zk-token-proof-program" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a6a21efae8933fbdafef2f913a1a5791b061fa3e902c145173d444d09fe31e" +checksum = "cc6b02ddeb2ab414b513b523aa678fac81109214f08d5c080165c15483a22cce" dependencies = [ "bytemuck", - "getrandom 0.1.16", "num-derive 0.3.3", "num-traits", "solana-program-runtime", @@ -4583,9 +4686,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.16.25" +version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1457c85ab70a518438b9ac2b0c56037b9f6693060dfb617bbb93c7116e4f0c22" +checksum = "03d932d7b13a223a6c1068d7061df7e9d2de14bfc0a874350eef19d59086b04a" dependencies = [ "aes-gcm-siv", "base64 0.21.7", @@ -4612,9 +4715,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.6.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17d4ba1e58947346e360fabde0697029d36ba83c42f669199b16a8931313cf29" +checksum = "3d457cc2ba742c120492a64b7fa60e22c575e891f6b55039f4d736568fb112a3" dependencies = [ "byteorder", "combine", @@ -4653,9 +4756,9 @@ dependencies = [ [[package]] name = "spl-associated-token-account" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385e31c29981488f2820b2022d8e731aae3b02e6e18e2fd854e4c9a94dc44fc3" +checksum = "992d9c64c2564cc8f63a4b508bf3ebcdf2254b0429b13cd1d31adb6162432a5f" dependencies = [ "assert_matches", "borsh 0.10.3", @@ -4663,7 +4766,7 @@ dependencies = [ "num-traits", "solana-program", "spl-token", - "spl-token-2022 0.9.0", + "spl-token-2022 1.0.0", "thiserror", ] @@ -4684,7 +4787,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fadbefec4f3c678215ca72bd71862697bb06b41fd77c0088902dd3203354387b" dependencies = [ - "quote 1.0.35", + "quote", "spl-discriminator-syn", "syn 2.0.48", ] @@ -4695,8 +4798,8 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e5f2044ca42c8938d54d1255ce599c79a1ffd86b677dfab695caa20f9ffc3f2" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "sha2 0.10.8", "syn 2.0.48", "thiserror", @@ -4752,8 +4855,8 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5269c8e868da17b6552ef35a51355a017bd8e0eae269c201fef830d35fa52c" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "sha2 0.10.8", "syn 2.0.48", ] @@ -4774,9 +4877,9 @@ dependencies = [ [[package]] name = "spl-tlv-account-resolution" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062e148d3eab7b165582757453632ffeef490c02c86a48bfdb4988f63eefb3b9" +checksum = "615d381f48ddd2bb3c57c7f7fb207591a2a05054639b18a62e785117dd7a8683" dependencies = [ "bytemuck", "solana-program", @@ -4825,9 +4928,9 @@ dependencies = [ [[package]] name = "spl-token-2022" -version = "0.9.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4abf34a65ba420584a0c35f3903f8d727d1f13ababbdc3f714c6b065a686e86" +checksum = "d697fac19fd74ff472dfcc13f0b442dd71403178ce1de7b5d16f83a33561c059" dependencies = [ "arrayref", "bytemuck", @@ -4835,16 +4938,31 @@ dependencies = [ "num-traits", "num_enum 0.7.2", "solana-program", + "solana-security-txt", "solana-zk-token-sdk", "spl-memo", "spl-pod", "spl-token", + "spl-token-group-interface", "spl-token-metadata-interface", - "spl-transfer-hook-interface 0.3.0", + "spl-transfer-hook-interface 0.4.1", "spl-type-length-value", "thiserror", ] +[[package]] +name = "spl-token-group-interface" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b889509d49fa74a4a033ca5dae6c2307e9e918122d97e58562f5c4ffa795c75d" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", +] + [[package]] name = "spl-token-metadata-interface" version = "0.2.0" @@ -4877,9 +4995,9 @@ dependencies = [ [[package]] name = "spl-transfer-hook-interface" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "051d31803f873cabe71aec3c1b849f35248beae5d19a347d93a5c9cccc5d5a9b" +checksum = "7aabdb7c471566f6ddcee724beb8618449ea24b399e58d464d6b5bc7db550259" dependencies = [ "arrayref", "bytemuck", @@ -4887,7 +5005,7 @@ dependencies = [ "spl-discriminator", "spl-pod", "spl-program-error", - "spl-tlv-account-resolution 0.4.0", + "spl-tlv-account-resolution 0.5.1", "spl-type-length-value", ] @@ -4947,8 +5065,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "rustversion", "syn 1.0.109", ] @@ -4960,8 +5078,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "rustversion", "syn 2.0.48", ] @@ -4978,25 +5096,14 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a" -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - [[package]] name = "syn" version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "unicode-ident", ] @@ -5006,8 +5113,8 @@ version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "unicode-ident", ] @@ -5017,10 +5124,10 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", - "unicode-xid 0.2.4", + "unicode-xid", ] [[package]] @@ -5085,8 +5192,8 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -5112,6 +5219,39 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "test-case" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8" +dependencies = [ + "test-case-macros", +] + +[[package]] +name = "test-case-core" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "test-case-macros" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", + "test-case-core", +] + [[package]] name = "textwrap" version = "0.11.0" @@ -5142,8 +5282,8 @@ version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.48", ] @@ -5234,7 +5374,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] @@ -5245,29 +5385,18 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.48", ] -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.9", - "tokio", - "webpki", -] - [[package]] name = "tokio-rustls" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.10", + "rustls", "tokio", ] @@ -5300,18 +5429,17 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.17.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", - "rustls 0.20.9", + "rustls", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls", "tungstenite", - "webpki", - "webpki-roots 0.22.6", + "webpki-roots 0.25.3", ] [[package]] @@ -5404,8 +5532,8 @@ version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.48", ] @@ -5451,24 +5579,23 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" -version = "0.17.3" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ - "base64 0.13.1", "byteorder", "bytes", + "data-encoding", "http", "httparse", "log", "rand 0.8.5", - "rustls 0.20.9", - "sha-1", + "rustls", + "sha1", "thiserror", "url", "utf-8", - "webpki", - "webpki-roots 0.22.6", + "webpki-roots 0.24.0", ] [[package]] @@ -5510,12 +5637,6 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - [[package]] name = "unicode-xid" version = "0.2.4" @@ -5654,8 +5775,8 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.48", "wasm-bindgen-shared", ] @@ -5678,7 +5799,7 @@ version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" dependencies = [ - "quote 1.0.35", + "quote", "wasm-bindgen-macro-support", ] @@ -5688,8 +5809,8 @@ version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", @@ -5711,23 +5832,13 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -dependencies = [ - "ring 0.17.7", - "untrusted 0.9.0", -] - [[package]] name = "webpki-roots" -version = "0.22.6" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "webpki", + "rustls-webpki", ] [[package]] @@ -5776,21 +5887,6 @@ dependencies = [ "windows-targets 0.52.0", ] -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -5839,12 +5935,6 @@ dependencies = [ "windows_x86_64_msvc 0.52.0", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -5857,12 +5947,6 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -5875,12 +5959,6 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -5893,12 +5971,6 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -5911,12 +5983,6 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -5929,12 +5995,6 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -5947,12 +6007,6 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -6037,8 +6091,8 @@ version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.48", ] @@ -6057,8 +6111,8 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "syn 2.0.48", ] diff --git a/clients/rust/src/generated/accounts/base_asset_v1.rs b/clients/rust/src/generated/accounts/base_asset_v1.rs index ed0a74de..ddf2ebb0 100644 --- a/clients/rust/src/generated/accounts/base_asset_v1.rs +++ b/clients/rust/src/generated/accounts/base_asset_v1.rs @@ -11,11 +11,9 @@ use crate::generated::types::UpdateAuthority; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; use solana_program::pubkey::Pubkey; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/accounts/base_collection_v1.rs b/clients/rust/src/generated/accounts/base_collection_v1.rs index 08dbbf79..ec75e71d 100644 --- a/clients/rust/src/generated/accounts/base_collection_v1.rs +++ b/clients/rust/src/generated/accounts/base_collection_v1.rs @@ -10,11 +10,9 @@ use crate::generated::types::Key; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; use solana_program::pubkey::Pubkey; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/accounts/hashed_asset_v1.rs b/clients/rust/src/generated/accounts/hashed_asset_v1.rs index d82e8ff1..6237c78b 100644 --- a/clients/rust/src/generated/accounts/hashed_asset_v1.rs +++ b/clients/rust/src/generated/accounts/hashed_asset_v1.rs @@ -10,10 +10,8 @@ use crate::generated::types::Key; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/accounts/plugin_header_v1.rs b/clients/rust/src/generated/accounts/plugin_header_v1.rs index 6ef5cce2..f8928370 100644 --- a/clients/rust/src/generated/accounts/plugin_header_v1.rs +++ b/clients/rust/src/generated/accounts/plugin_header_v1.rs @@ -10,10 +10,8 @@ use crate::generated::types::Key; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/accounts/plugin_registry_v1.rs b/clients/rust/src/generated/accounts/plugin_registry_v1.rs index ea36feb3..dee2a2b6 100644 --- a/clients/rust/src/generated/accounts/plugin_registry_v1.rs +++ b/clients/rust/src/generated/accounts/plugin_registry_v1.rs @@ -12,10 +12,8 @@ use crate::generated::types::RegistryRecord; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] 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 069c7568..bc2ac73b 100644 --- a/clients/rust/src/generated/instructions/add_collection_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/add_collection_plugin_v1.rs @@ -11,8 +11,6 @@ use crate::generated::types::PluginAuthority; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; /// Accounts. pub struct AddCollectionPluginV1 { @@ -103,7 +101,7 @@ impl AddCollectionPluginV1InstructionData { #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct AddCollectionPluginV1InstructionArgs { pub plugin: Plugin, diff --git a/clients/rust/src/generated/instructions/add_plugin_v1.rs b/clients/rust/src/generated/instructions/add_plugin_v1.rs index b95921ed..41f5ad6c 100644 --- a/clients/rust/src/generated/instructions/add_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/add_plugin_v1.rs @@ -11,8 +11,6 @@ use crate::generated::types::PluginAuthority; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; /// Accounts. pub struct AddPluginV1 { @@ -112,7 +110,7 @@ impl AddPluginV1InstructionData { #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct AddPluginV1InstructionArgs { pub plugin: Plugin, 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 8f8d5a44..673bcfe0 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 @@ -11,8 +11,6 @@ use crate::generated::types::PluginType; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; /// Accounts. pub struct ApproveCollectionPluginAuthorityV1 { @@ -103,7 +101,7 @@ impl ApproveCollectionPluginAuthorityV1InstructionData { #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct ApproveCollectionPluginAuthorityV1InstructionArgs { pub plugin_type: PluginType, 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 b8f2fab9..d8277e68 100644 --- a/clients/rust/src/generated/instructions/approve_plugin_authority_v1.rs +++ b/clients/rust/src/generated/instructions/approve_plugin_authority_v1.rs @@ -11,8 +11,6 @@ use crate::generated::types::PluginType; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; /// Accounts. pub struct ApprovePluginAuthorityV1 { @@ -114,7 +112,7 @@ impl ApprovePluginAuthorityV1InstructionData { #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct ApprovePluginAuthorityV1InstructionArgs { pub plugin_type: PluginType, diff --git a/clients/rust/src/generated/instructions/burn_collection_v1.rs b/clients/rust/src/generated/instructions/burn_collection_v1.rs index 69fb7d76..e749e05a 100644 --- a/clients/rust/src/generated/instructions/burn_collection_v1.rs +++ b/clients/rust/src/generated/instructions/burn_collection_v1.rs @@ -10,8 +10,6 @@ use crate::generated::types::CompressionProof; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; /// Accounts. pub struct BurnCollectionV1 { @@ -94,7 +92,7 @@ impl BurnCollectionV1InstructionData { #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct BurnCollectionV1InstructionArgs { pub compression_proof: Option, diff --git a/clients/rust/src/generated/instructions/burn_v1.rs b/clients/rust/src/generated/instructions/burn_v1.rs index f0c065d6..a58d762b 100644 --- a/clients/rust/src/generated/instructions/burn_v1.rs +++ b/clients/rust/src/generated/instructions/burn_v1.rs @@ -10,8 +10,6 @@ use crate::generated::types::CompressionProof; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; /// Accounts. pub struct BurnV1 { @@ -118,7 +116,7 @@ impl BurnV1InstructionData { #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct BurnV1InstructionArgs { pub compression_proof: Option, diff --git a/clients/rust/src/generated/instructions/collect.rs b/clients/rust/src/generated/instructions/collect.rs index a276a0a8..ba986da7 100644 --- a/clients/rust/src/generated/instructions/collect.rs +++ b/clients/rust/src/generated/instructions/collect.rs @@ -9,8 +9,6 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; /// Accounts. pub struct Collect { diff --git a/clients/rust/src/generated/instructions/compress_v1.rs b/clients/rust/src/generated/instructions/compress_v1.rs index e984e44e..2608e7fc 100644 --- a/clients/rust/src/generated/instructions/compress_v1.rs +++ b/clients/rust/src/generated/instructions/compress_v1.rs @@ -9,8 +9,6 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; /// Accounts. pub struct CompressV1 { diff --git a/clients/rust/src/generated/instructions/create_collection_v1.rs b/clients/rust/src/generated/instructions/create_collection_v1.rs index c3e7fe5b..612c1d3b 100644 --- a/clients/rust/src/generated/instructions/create_collection_v1.rs +++ b/clients/rust/src/generated/instructions/create_collection_v1.rs @@ -10,8 +10,6 @@ use crate::generated::types::PluginAuthorityPair; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; /// Accounts. pub struct CreateCollectionV1 { @@ -90,7 +88,7 @@ impl CreateCollectionV1InstructionData { #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct CreateCollectionV1InstructionArgs { pub name: String, diff --git a/clients/rust/src/generated/instructions/create_v1.rs b/clients/rust/src/generated/instructions/create_v1.rs index 86609249..c3aec2ef 100644 --- a/clients/rust/src/generated/instructions/create_v1.rs +++ b/clients/rust/src/generated/instructions/create_v1.rs @@ -11,8 +11,6 @@ use crate::generated::types::PluginAuthorityPair; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; /// Accounts. pub struct CreateV1 { @@ -137,7 +135,7 @@ impl CreateV1InstructionData { #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct CreateV1InstructionArgs { pub data_state: DataState, diff --git a/clients/rust/src/generated/instructions/decompress_v1.rs b/clients/rust/src/generated/instructions/decompress_v1.rs index 722d7bc2..b0d20eb1 100644 --- a/clients/rust/src/generated/instructions/decompress_v1.rs +++ b/clients/rust/src/generated/instructions/decompress_v1.rs @@ -10,8 +10,6 @@ use crate::generated::types::CompressionProof; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; /// Accounts. pub struct DecompressV1 { @@ -111,7 +109,7 @@ impl DecompressV1InstructionData { #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct DecompressV1InstructionArgs { pub compression_proof: CompressionProof, 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 5b1349c3..beff3b2d 100644 --- a/clients/rust/src/generated/instructions/remove_collection_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/remove_collection_plugin_v1.rs @@ -10,8 +10,6 @@ use crate::generated::types::PluginType; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; /// Accounts. pub struct RemoveCollectionPluginV1 { @@ -102,7 +100,7 @@ impl RemoveCollectionPluginV1InstructionData { #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct RemoveCollectionPluginV1InstructionArgs { pub plugin_type: PluginType, diff --git a/clients/rust/src/generated/instructions/remove_plugin_v1.rs b/clients/rust/src/generated/instructions/remove_plugin_v1.rs index b740e43a..0b069144 100644 --- a/clients/rust/src/generated/instructions/remove_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/remove_plugin_v1.rs @@ -10,8 +10,6 @@ use crate::generated::types::PluginType; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; /// Accounts. pub struct RemovePluginV1 { @@ -111,7 +109,7 @@ impl RemovePluginV1InstructionData { #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct RemovePluginV1InstructionArgs { pub plugin_type: PluginType, 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 a5184c3b..3b6c7fce 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 @@ -10,8 +10,6 @@ use crate::generated::types::PluginType; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; /// Accounts. pub struct RevokeCollectionPluginAuthorityV1 { @@ -102,7 +100,7 @@ impl RevokeCollectionPluginAuthorityV1InstructionData { #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct RevokeCollectionPluginAuthorityV1InstructionArgs { pub plugin_type: PluginType, 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 8303e711..9b194290 100644 --- a/clients/rust/src/generated/instructions/revoke_plugin_authority_v1.rs +++ b/clients/rust/src/generated/instructions/revoke_plugin_authority_v1.rs @@ -10,8 +10,6 @@ use crate::generated::types::PluginType; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; /// Accounts. pub struct RevokePluginAuthorityV1 { @@ -113,7 +111,7 @@ impl RevokePluginAuthorityV1InstructionData { #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct RevokePluginAuthorityV1InstructionArgs { pub plugin_type: PluginType, diff --git a/clients/rust/src/generated/instructions/transfer_v1.rs b/clients/rust/src/generated/instructions/transfer_v1.rs index 97bd5749..35eb244c 100644 --- a/clients/rust/src/generated/instructions/transfer_v1.rs +++ b/clients/rust/src/generated/instructions/transfer_v1.rs @@ -10,8 +10,6 @@ use crate::generated::types::CompressionProof; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; /// Accounts. pub struct TransferV1 { @@ -124,7 +122,7 @@ impl TransferV1InstructionData { #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct TransferV1InstructionArgs { pub compression_proof: Option, 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 f1fc17b8..dcdceea4 100644 --- a/clients/rust/src/generated/instructions/update_collection_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/update_collection_plugin_v1.rs @@ -10,8 +10,6 @@ use crate::generated::types::Plugin; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; /// Accounts. pub struct UpdateCollectionPluginV1 { @@ -102,7 +100,7 @@ impl UpdateCollectionPluginV1InstructionData { #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct UpdateCollectionPluginV1InstructionArgs { pub plugin: Plugin, diff --git a/clients/rust/src/generated/instructions/update_collection_v1.rs b/clients/rust/src/generated/instructions/update_collection_v1.rs index 3fb37df5..7213b870 100644 --- a/clients/rust/src/generated/instructions/update_collection_v1.rs +++ b/clients/rust/src/generated/instructions/update_collection_v1.rs @@ -9,8 +9,6 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; /// Accounts. pub struct UpdateCollectionV1 { @@ -114,7 +112,7 @@ impl UpdateCollectionV1InstructionData { #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct UpdateCollectionV1InstructionArgs { pub new_name: Option, diff --git a/clients/rust/src/generated/instructions/update_plugin_v1.rs b/clients/rust/src/generated/instructions/update_plugin_v1.rs index 2bf2456b..c8201f28 100644 --- a/clients/rust/src/generated/instructions/update_plugin_v1.rs +++ b/clients/rust/src/generated/instructions/update_plugin_v1.rs @@ -10,8 +10,6 @@ use crate::generated::types::Plugin; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; /// Accounts. pub struct UpdatePluginV1 { @@ -111,7 +109,7 @@ impl UpdatePluginV1InstructionData { #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct UpdatePluginV1InstructionArgs { pub plugin: Plugin, diff --git a/clients/rust/src/generated/instructions/update_v1.rs b/clients/rust/src/generated/instructions/update_v1.rs index 6864f8d0..67de196b 100644 --- a/clients/rust/src/generated/instructions/update_v1.rs +++ b/clients/rust/src/generated/instructions/update_v1.rs @@ -10,8 +10,6 @@ use crate::generated::types::UpdateAuthority; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; /// Accounts. pub struct UpdateV1 { @@ -111,7 +109,7 @@ impl UpdateV1InstructionData { #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[derive(Clone, Debug, Eq, PartialEq)] pub struct UpdateV1InstructionArgs { pub new_name: Option, diff --git a/clients/rust/src/generated/types/attribute.rs b/clients/rust/src/generated/types/attribute.rs index 3bf08958..76fb96b6 100644 --- a/clients/rust/src/generated/types/attribute.rs +++ b/clients/rust/src/generated/types/attribute.rs @@ -9,10 +9,8 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/attributes.rs b/clients/rust/src/generated/types/attributes.rs index 4ab9141d..00391279 100644 --- a/clients/rust/src/generated/types/attributes.rs +++ b/clients/rust/src/generated/types/attributes.rs @@ -10,10 +10,8 @@ use crate::generated::types::Attribute; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/burn_delegate.rs b/clients/rust/src/generated/types/burn_delegate.rs index 0b8e8317..483e8077 100644 --- a/clients/rust/src/generated/types/burn_delegate.rs +++ b/clients/rust/src/generated/types/burn_delegate.rs @@ -9,10 +9,8 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/compression_proof.rs b/clients/rust/src/generated/types/compression_proof.rs index d66a6b45..117ae310 100644 --- a/clients/rust/src/generated/types/compression_proof.rs +++ b/clients/rust/src/generated/types/compression_proof.rs @@ -11,11 +11,9 @@ use crate::generated::types::UpdateAuthority; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; use solana_program::pubkey::Pubkey; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/creator.rs b/clients/rust/src/generated/types/creator.rs index 4355e1ba..38cad3fa 100644 --- a/clients/rust/src/generated/types/creator.rs +++ b/clients/rust/src/generated/types/creator.rs @@ -9,11 +9,9 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; use solana_program::pubkey::Pubkey; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/data_state.rs b/clients/rust/src/generated/types/data_state.rs index 7a41c5ea..76276ed1 100644 --- a/clients/rust/src/generated/types/data_state.rs +++ b/clients/rust/src/generated/types/data_state.rs @@ -10,10 +10,8 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; use num_derive::FromPrimitive; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Hash, FromPrimitive)] diff --git a/clients/rust/src/generated/types/edition.rs b/clients/rust/src/generated/types/edition.rs index 0bd88faf..c0ab58b3 100644 --- a/clients/rust/src/generated/types/edition.rs +++ b/clients/rust/src/generated/types/edition.rs @@ -9,10 +9,8 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/external_plugin_record.rs b/clients/rust/src/generated/types/external_plugin_record.rs index 1fef9049..cd74fa76 100644 --- a/clients/rust/src/generated/types/external_plugin_record.rs +++ b/clients/rust/src/generated/types/external_plugin_record.rs @@ -10,10 +10,8 @@ use crate::generated::types::PluginAuthority; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/extra_accounts.rs b/clients/rust/src/generated/types/extra_accounts.rs index 09802baf..146d5b4b 100644 --- a/clients/rust/src/generated/types/extra_accounts.rs +++ b/clients/rust/src/generated/types/extra_accounts.rs @@ -9,11 +9,9 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; use solana_program::pubkey::Pubkey; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/freeze_delegate.rs b/clients/rust/src/generated/types/freeze_delegate.rs index 7546a994..288cb267 100644 --- a/clients/rust/src/generated/types/freeze_delegate.rs +++ b/clients/rust/src/generated/types/freeze_delegate.rs @@ -9,10 +9,8 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/hashable_plugin_schema.rs b/clients/rust/src/generated/types/hashable_plugin_schema.rs index 585c8d6f..20285757 100644 --- a/clients/rust/src/generated/types/hashable_plugin_schema.rs +++ b/clients/rust/src/generated/types/hashable_plugin_schema.rs @@ -11,10 +11,8 @@ use crate::generated::types::PluginAuthority; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/hashed_asset_schema.rs b/clients/rust/src/generated/types/hashed_asset_schema.rs index 14170eb7..032abbbf 100644 --- a/clients/rust/src/generated/types/hashed_asset_schema.rs +++ b/clients/rust/src/generated/types/hashed_asset_schema.rs @@ -9,10 +9,8 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/key.rs b/clients/rust/src/generated/types/key.rs index b39e6f42..b6e4313d 100644 --- a/clients/rust/src/generated/types/key.rs +++ b/clients/rust/src/generated/types/key.rs @@ -10,10 +10,8 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; use num_derive::FromPrimitive; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Hash, FromPrimitive)] diff --git a/clients/rust/src/generated/types/master_edition.rs b/clients/rust/src/generated/types/master_edition.rs index ba590ff8..e39ebeb2 100644 --- a/clients/rust/src/generated/types/master_edition.rs +++ b/clients/rust/src/generated/types/master_edition.rs @@ -9,10 +9,8 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/permanent_burn_delegate.rs b/clients/rust/src/generated/types/permanent_burn_delegate.rs index 2af45fbd..5bd0f153 100644 --- a/clients/rust/src/generated/types/permanent_burn_delegate.rs +++ b/clients/rust/src/generated/types/permanent_burn_delegate.rs @@ -9,10 +9,8 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/permanent_freeze_delegate.rs b/clients/rust/src/generated/types/permanent_freeze_delegate.rs index 498ce634..58d4270d 100644 --- a/clients/rust/src/generated/types/permanent_freeze_delegate.rs +++ b/clients/rust/src/generated/types/permanent_freeze_delegate.rs @@ -9,10 +9,8 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/permanent_transfer_delegate.rs b/clients/rust/src/generated/types/permanent_transfer_delegate.rs index 2d156e0b..927e548d 100644 --- a/clients/rust/src/generated/types/permanent_transfer_delegate.rs +++ b/clients/rust/src/generated/types/permanent_transfer_delegate.rs @@ -9,10 +9,8 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/plugin.rs b/clients/rust/src/generated/types/plugin.rs index 91d4977d..74c9c608 100644 --- a/clients/rust/src/generated/types/plugin.rs +++ b/clients/rust/src/generated/types/plugin.rs @@ -20,10 +20,8 @@ use crate::generated::types::UpdateDelegate; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/plugin_authority.rs b/clients/rust/src/generated/types/plugin_authority.rs index b4f63c4f..2a771e0a 100644 --- a/clients/rust/src/generated/types/plugin_authority.rs +++ b/clients/rust/src/generated/types/plugin_authority.rs @@ -9,11 +9,9 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; use solana_program::pubkey::Pubkey; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/plugin_authority_pair.rs b/clients/rust/src/generated/types/plugin_authority_pair.rs index 21053be7..77569fa0 100644 --- a/clients/rust/src/generated/types/plugin_authority_pair.rs +++ b/clients/rust/src/generated/types/plugin_authority_pair.rs @@ -11,10 +11,8 @@ use crate::generated::types::PluginAuthority; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/plugin_type.rs b/clients/rust/src/generated/types/plugin_type.rs index 0ec26c73..70c2bfcb 100644 --- a/clients/rust/src/generated/types/plugin_type.rs +++ b/clients/rust/src/generated/types/plugin_type.rs @@ -10,10 +10,8 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; use num_derive::FromPrimitive; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Hash, FromPrimitive)] diff --git a/clients/rust/src/generated/types/registry_record.rs b/clients/rust/src/generated/types/registry_record.rs index ab60b36b..007c8831 100644 --- a/clients/rust/src/generated/types/registry_record.rs +++ b/clients/rust/src/generated/types/registry_record.rs @@ -11,10 +11,8 @@ use crate::generated::types::PluginType; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/royalties.rs b/clients/rust/src/generated/types/royalties.rs index cf9122b4..4635b556 100644 --- a/clients/rust/src/generated/types/royalties.rs +++ b/clients/rust/src/generated/types/royalties.rs @@ -11,10 +11,8 @@ use crate::generated::types::RuleSet; use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/rule_set.rs b/clients/rust/src/generated/types/rule_set.rs index ed602d36..584d719a 100644 --- a/clients/rust/src/generated/types/rule_set.rs +++ b/clients/rust/src/generated/types/rule_set.rs @@ -9,11 +9,9 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; use solana_program::pubkey::Pubkey; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/transfer_delegate.rs b/clients/rust/src/generated/types/transfer_delegate.rs index a9420d5a..282bb2da 100644 --- a/clients/rust/src/generated/types/transfer_delegate.rs +++ b/clients/rust/src/generated/types/transfer_delegate.rs @@ -9,10 +9,8 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/update_authority.rs b/clients/rust/src/generated/types/update_authority.rs index c04e0b9c..97032a2f 100644 --- a/clients/rust/src/generated/types/update_authority.rs +++ b/clients/rust/src/generated/types/update_authority.rs @@ -9,11 +9,9 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; use solana_program::pubkey::Pubkey; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/clients/rust/src/generated/types/update_delegate.rs b/clients/rust/src/generated/types/update_delegate.rs index 75de48c0..1e19c5d0 100644 --- a/clients/rust/src/generated/types/update_delegate.rs +++ b/clients/rust/src/generated/types/update_delegate.rs @@ -9,11 +9,9 @@ use anchor_lang::prelude::{AnchorDeserialize, AnchorSerialize}; #[cfg(not(feature = "anchor"))] use borsh::{BorshDeserialize, BorshSerialize}; -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; use solana_program::pubkey::Pubkey; -#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(not(feature = "anchor"), derive(BorshSerialize, BorshDeserialize))] #[cfg_attr(feature = "anchor", derive(AnchorSerialize, AnchorDeserialize))] #[derive(Clone, Debug, Eq, PartialEq)] diff --git a/package.json b/package.json index 186d2a64..ae48530c 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ }, "devDependencies": { "@metaplex-foundation/amman": "^0.12.1", - "@metaplex-foundation/kinobi": "0.18.7-alpha.0", + "@metaplex-foundation/kinobi": "0.18.8-alpha.0", "@metaplex-foundation/shank-js": "^0.1.7", "typescript": "^4.9.4" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3de6a452..890ec97b 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.7-alpha.0 - version: 0.18.7-alpha.0(fastestsmallesttextencoderdecoder@1.0.22) + specifier: 0.18.8-alpha.0 + version: 0.18.8-alpha.0(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.7-alpha.0(fastestsmallesttextencoderdecoder@1.0.22): - resolution: {integrity: sha512-eRIFlMBoYfk7beuJIZr2+kH1mUdE8X+D9XV0d+JGFCr0Pom/0eo6zFWxx3ghMyhQeHHjkoLP+uCHpDAv5mIZxQ==} + /@metaplex-foundation/kinobi@0.18.8-alpha.0(fastestsmallesttextencoderdecoder@1.0.22): + resolution: {integrity: sha512-0ghdmyGnz1j6yDX52lWJOY63AvkSnxbNSYsHgn1sFnMrnnAK3O3EuaFpZdj5j0C2dRB1a+dGw2Kte7GkuPZL2A==} dependencies: '@noble/hashes': 1.4.0 '@prettier/sync': 0.5.2(prettier@3.2.5) diff --git a/programs/mpl-core/Cargo.toml b/programs/mpl-core/Cargo.toml index 220509d3..76a76ead 100644 --- a/programs/mpl-core/Cargo.toml +++ b/programs/mpl-core/Cargo.toml @@ -14,10 +14,10 @@ borsh = "^0.10" shank = "0.4.2" num-derive = "^0.3" num-traits = "^0.2" -solana-program = "^1.16" +solana-program = "^1.17" thiserror = "^1.0" bytemuck = "1.14.1" -mpl-utils = "0.3.3" +mpl-utils = { path = "../../../mpl/metaplex-program-library/core/rust/utils" } spl-noop = { version = "0.2.0", features = ["cpi"] } podded = "0.5.1" strum = { version = "0.26.1", features = ["derive"] } From 708976f0782b44ae29f9121e3dbf755c6f422d9f Mon Sep 17 00:00:00 2001 From: blockiosaurus Date: Tue, 7 May 2024 21:28:07 -0400 Subject: [PATCH 6/6] Fixing mpl-utils version. --- Cargo.lock | 4 +++- programs/mpl-core/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2c0f73a5..1ee6bfbb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2316,7 +2316,9 @@ dependencies = [ [[package]] name = "mpl-utils" -version = "0.3.4" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ee1b830bfd014504a11b2234e2e7d6af535adda601f224cd519b923f593c91b" dependencies = [ "arrayref", "solana-program", diff --git a/programs/mpl-core/Cargo.toml b/programs/mpl-core/Cargo.toml index 76a76ead..7a2d168c 100644 --- a/programs/mpl-core/Cargo.toml +++ b/programs/mpl-core/Cargo.toml @@ -17,7 +17,7 @@ num-traits = "^0.2" solana-program = "^1.17" thiserror = "^1.0" bytemuck = "1.14.1" -mpl-utils = { path = "../../../mpl/metaplex-program-library/core/rust/utils" } +mpl-utils = "0.3.5" spl-noop = { version = "0.2.0", features = ["cpi"] } podded = "0.5.1" strum = { version = "0.26.1", features = ["derive"] }