diff --git a/clients/js/src/generated/types/dataStoreInitInfo.ts b/clients/js/src/generated/types/dataStoreInitInfo.ts index df601b13..cbcba417 100644 --- a/clients/js/src/generated/types/dataStoreInitInfo.ts +++ b/clients/js/src/generated/types/dataStoreInitInfo.ts @@ -9,44 +9,28 @@ import { Option, OptionOrNullable } from '@metaplex-foundation/umi'; import { Serializer, - array, - bytes, option, struct, - tuple, - u32, } from '@metaplex-foundation/umi/serializers'; import { - ExternalCheckResult, - ExternalCheckResultArgs, ExternalPluginSchema, ExternalPluginSchemaArgs, - HookableLifecycleEvent, - HookableLifecycleEventArgs, PluginAuthority, PluginAuthorityArgs, - getExternalCheckResultSerializer, getExternalPluginSchemaSerializer, - getHookableLifecycleEventSerializer, getPluginAuthoritySerializer, } from '.'; export type DataStoreInitInfo = { dataAuthority: PluginAuthority; initPluginAuthority: Option; - lifecycleChecks: Option>; schema: Option; - data: Option; }; export type DataStoreInitInfoArgs = { dataAuthority: PluginAuthorityArgs; initPluginAuthority: OptionOrNullable; - lifecycleChecks: OptionOrNullable< - Array<[HookableLifecycleEventArgs, ExternalCheckResultArgs]> - >; schema: OptionOrNullable; - data: OptionOrNullable; }; export function getDataStoreInitInfoSerializer(): Serializer< @@ -57,19 +41,7 @@ export function getDataStoreInitInfoSerializer(): Serializer< [ ['dataAuthority', getPluginAuthoritySerializer()], ['initPluginAuthority', option(getPluginAuthoritySerializer())], - [ - 'lifecycleChecks', - option( - array( - tuple([ - getHookableLifecycleEventSerializer(), - getExternalCheckResultSerializer(), - ]) - ) - ), - ], ['schema', option(getExternalPluginSchemaSerializer())], - ['data', option(bytes({ size: u32() }))], ], { description: 'DataStoreInitInfo' } ) as Serializer; diff --git a/clients/js/src/generated/types/dataStoreUpdateInfo.ts b/clients/js/src/generated/types/dataStoreUpdateInfo.ts index 62a55961..40528495 100644 --- a/clients/js/src/generated/types/dataStoreUpdateInfo.ts +++ b/clients/js/src/generated/types/dataStoreUpdateInfo.ts @@ -9,32 +9,18 @@ import { Option, OptionOrNullable } from '@metaplex-foundation/umi'; import { Serializer, - array, option, struct, - tuple, } from '@metaplex-foundation/umi/serializers'; import { - ExternalCheckResult, - ExternalCheckResultArgs, ExternalPluginSchema, ExternalPluginSchemaArgs, - HookableLifecycleEvent, - HookableLifecycleEventArgs, - getExternalCheckResultSerializer, getExternalPluginSchemaSerializer, - getHookableLifecycleEventSerializer, } from '.'; -export type DataStoreUpdateInfo = { - lifecycleChecks: Option>; - schema: Option; -}; +export type DataStoreUpdateInfo = { schema: Option }; export type DataStoreUpdateInfoArgs = { - lifecycleChecks: OptionOrNullable< - Array<[HookableLifecycleEventArgs, ExternalCheckResultArgs]> - >; schema: OptionOrNullable; }; @@ -43,20 +29,7 @@ export function getDataStoreUpdateInfoSerializer(): Serializer< DataStoreUpdateInfo > { return struct( - [ - [ - 'lifecycleChecks', - option( - array( - tuple([ - getHookableLifecycleEventSerializer(), - getExternalCheckResultSerializer(), - ]) - ) - ), - ], - ['schema', option(getExternalPluginSchemaSerializer())], - ], + [['schema', option(getExternalPluginSchemaSerializer())]], { description: 'DataStoreUpdateInfo' } ) as Serializer; } diff --git a/clients/js/src/generated/types/lifecycleHookInitInfo.ts b/clients/js/src/generated/types/lifecycleHookInitInfo.ts index ac2d3670..789aa1ec 100644 --- a/clients/js/src/generated/types/lifecycleHookInitInfo.ts +++ b/clients/js/src/generated/types/lifecycleHookInitInfo.ts @@ -10,12 +10,10 @@ import { Option, OptionOrNullable, PublicKey } from '@metaplex-foundation/umi'; import { Serializer, array, - bytes, option, publicKey as publicKeySerializer, struct, tuple, - u32, } from '@metaplex-foundation/umi/serializers'; import { ExternalCheckResult, @@ -41,7 +39,6 @@ export type LifecycleHookInitInfo = { lifecycleChecks: Option>; extraAccounts: Option>; schema: Option; - data: Option; }; export type LifecycleHookInitInfoArgs = { @@ -52,7 +49,6 @@ export type LifecycleHookInitInfoArgs = { >; extraAccounts: OptionOrNullable>; schema: OptionOrNullable; - data: OptionOrNullable; }; export function getLifecycleHookInitInfoSerializer(): Serializer< @@ -76,7 +72,6 @@ export function getLifecycleHookInitInfoSerializer(): Serializer< ], ['extraAccounts', option(array(getExtraAccountSerializer()))], ['schema', option(getExternalPluginSchemaSerializer())], - ['data', option(bytes({ size: u32() }))], ], { description: 'LifecycleHookInitInfo' } ) as Serializer; diff --git a/clients/rust/src/generated/types/data_store_init_info.rs b/clients/rust/src/generated/types/data_store_init_info.rs index 4daba987..8704d8fa 100644 --- a/clients/rust/src/generated/types/data_store_init_info.rs +++ b/clients/rust/src/generated/types/data_store_init_info.rs @@ -5,9 +5,7 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use crate::generated::types::ExternalCheckResult; use crate::generated::types::ExternalPluginSchema; -use crate::generated::types::HookableLifecycleEvent; use crate::generated::types::PluginAuthority; use borsh::BorshDeserialize; use borsh::BorshSerialize; @@ -17,7 +15,5 @@ use borsh::BorshSerialize; pub struct DataStoreInitInfo { pub data_authority: PluginAuthority, pub init_plugin_authority: Option, - pub lifecycle_checks: Option>, pub schema: Option, - pub data: Option>, } diff --git a/clients/rust/src/generated/types/data_store_update_info.rs b/clients/rust/src/generated/types/data_store_update_info.rs index 2860b9c2..7a1b3e2e 100644 --- a/clients/rust/src/generated/types/data_store_update_info.rs +++ b/clients/rust/src/generated/types/data_store_update_info.rs @@ -5,15 +5,12 @@ //! [https://github.com/metaplex-foundation/kinobi] //! -use crate::generated::types::ExternalCheckResult; use crate::generated::types::ExternalPluginSchema; -use crate::generated::types::HookableLifecycleEvent; use borsh::BorshDeserialize; use borsh::BorshSerialize; #[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct DataStoreUpdateInfo { - pub lifecycle_checks: Option>, pub schema: Option, } diff --git a/clients/rust/src/generated/types/lifecycle_hook_init_info.rs b/clients/rust/src/generated/types/lifecycle_hook_init_info.rs index 2972ebce..1c333f80 100644 --- a/clients/rust/src/generated/types/lifecycle_hook_init_info.rs +++ b/clients/rust/src/generated/types/lifecycle_hook_init_info.rs @@ -26,5 +26,4 @@ pub struct LifecycleHookInitInfo { pub lifecycle_checks: Option>, pub extra_accounts: Option>, pub schema: Option, - pub data: Option>, } diff --git a/idls/mpl_core.json b/idls/mpl_core.json index f396fd76..7b84fca1 100644 --- a/idls/mpl_core.json +++ b/idls/mpl_core.json @@ -2034,23 +2034,6 @@ } } }, - { - "name": "lifecycleChecks", - "type": { - "option": { - "vec": { - "tuple": [ - { - "defined": "HookableLifecycleEvent" - }, - { - "defined": "ExternalCheckResult" - } - ] - } - } - } - }, { "name": "schema", "type": { @@ -2058,12 +2041,6 @@ "defined": "ExternalPluginSchema" } } - }, - { - "name": "data", - "type": { - "option": "bytes" - } } ] } @@ -2073,23 +2050,6 @@ "type": { "kind": "struct", "fields": [ - { - "name": "lifecycleChecks", - "type": { - "option": { - "vec": { - "tuple": [ - { - "defined": "HookableLifecycleEvent" - }, - { - "defined": "ExternalCheckResult" - } - ] - } - } - } - }, { "name": "schema", "type": { @@ -2208,12 +2168,6 @@ "defined": "ExternalPluginSchema" } } - }, - { - "name": "data", - "type": { - "option": "bytes" - } } ] } diff --git a/programs/mpl-core/src/plugins/data_store.rs b/programs/mpl-core/src/plugins/data_store.rs index 4e71045a..5884fc60 100644 --- a/programs/mpl-core/src/plugins/data_store.rs +++ b/programs/mpl-core/src/plugins/data_store.rs @@ -1,6 +1,6 @@ use borsh::{BorshDeserialize, BorshSerialize}; -use super::{Authority, ExternalCheckResult, ExternalPluginSchema, HookableLifecycleEvent}; +use super::{Authority, ExternalPluginSchema}; /// The data store third party plugin contains arbitrary data that can be written to by the /// authority specified in the `ExternalPluginKey`. Note this is different then the plugin @@ -23,19 +23,13 @@ pub struct DataStoreInitInfo { pub data_authority: Authority, /// Initial plugin authority who can update plugin properties. pub init_plugin_authority: Option, - /// The lifecyle events for which the the external plugin is active. - pub lifecycle_checks: Option>, /// Schema for the data used by the plugin. pub schema: Option, - /// External plugin initial data. - pub data: Option>, } /// Data store update info. #[derive(Clone, Debug, BorshSerialize, BorshDeserialize, Eq, PartialEq)] pub struct DataStoreUpdateInfo { - /// The lifecyle events for which the the external plugin is active. - pub lifecycle_checks: Option>, /// Schema for the data used by the plugin. pub schema: Option, } diff --git a/programs/mpl-core/src/plugins/lifecycle_hook.rs b/programs/mpl-core/src/plugins/lifecycle_hook.rs index 9a84ae06..ca0a0bdb 100644 --- a/programs/mpl-core/src/plugins/lifecycle_hook.rs +++ b/programs/mpl-core/src/plugins/lifecycle_hook.rs @@ -37,8 +37,6 @@ pub struct LifecycleHookInitInfo { pub extra_accounts: Option>, /// Schema for the data used by the plugin. pub schema: Option, - /// External plugin initial data. - pub data: Option>, } /// Lifecycle hook update info.