Danenbm/no init data (#66)

* Do not allow data init on 3P plugins * Also no lifecycle checks for data store. * Regenerate IDL and clients
metaplex-foundation · Apr 12, 2024 · b06195f · b06195f
1 parent e5fb23b
commit b06195f
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 125 deletions.
diff --git 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<PluginAuthority>;
-  lifecycleChecks: Option<Array<[HookableLifecycleEvent, ExternalCheckResult]>>;
   schema: Option<ExternalPluginSchema>;
-  data: Option<Uint8Array>;
 };
 
 export type DataStoreInitInfoArgs = {
   dataAuthority: PluginAuthorityArgs;
   initPluginAuthority: OptionOrNullable<PluginAuthorityArgs>;
-  lifecycleChecks: OptionOrNullable<
-    Array<[HookableLifecycleEventArgs, ExternalCheckResultArgs]>
-  >;
   schema: OptionOrNullable<ExternalPluginSchemaArgs>;
-  data: OptionOrNullable<Uint8Array>;
 };
 
 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<DataStoreInitInfoArgs, DataStoreInitInfo>;

diff --git 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<Array<[HookableLifecycleEvent, ExternalCheckResult]>>;
-  schema: Option<ExternalPluginSchema>;
-};
+export type DataStoreUpdateInfo = { schema: Option<ExternalPluginSchema> };
 
 export type DataStoreUpdateInfoArgs = {
-  lifecycleChecks: OptionOrNullable<
-    Array<[HookableLifecycleEventArgs, ExternalCheckResultArgs]>
-  >;
   schema: OptionOrNullable<ExternalPluginSchemaArgs>;
 };
 
@@ -43,20 +29,7 @@ export function getDataStoreUpdateInfoSerializer(): Serializer<
   DataStoreUpdateInfo
 > {
   return struct<DataStoreUpdateInfo>(
-    [
-      [
-        'lifecycleChecks',
-        option(
-          array(
-            tuple([
-              getHookableLifecycleEventSerializer(),
-              getExternalCheckResultSerializer(),
-            ])
-          )
-        ),
-      ],
-      ['schema', option(getExternalPluginSchemaSerializer())],
-    ],
+    [['schema', option(getExternalPluginSchemaSerializer())]],
     { description: 'DataStoreUpdateInfo' }
   ) as Serializer<DataStoreUpdateInfoArgs, DataStoreUpdateInfo>;
 }
diff --git 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<Array<[HookableLifecycleEvent, ExternalCheckResult]>>;
   extraAccounts: Option<Array<ExtraAccount>>;
   schema: Option<ExternalPluginSchema>;
-  data: Option<Uint8Array>;
 };
 
 export type LifecycleHookInitInfoArgs = {
@@ -52,7 +49,6 @@ export type LifecycleHookInitInfoArgs = {
   >;
   extraAccounts: OptionOrNullable<Array<ExtraAccountArgs>>;
   schema: OptionOrNullable<ExternalPluginSchemaArgs>;
-  data: OptionOrNullable<Uint8Array>;
 };
 
 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<LifecycleHookInitInfoArgs, LifecycleHookInitInfo>;

diff --git 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<PluginAuthority>,
-    pub lifecycle_checks: Option<Vec<(HookableLifecycleEvent, ExternalCheckResult)>>,
     pub schema: Option<ExternalPluginSchema>,
-    pub data: Option<Vec<u8>>,
 }
diff --git 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<Vec<(HookableLifecycleEvent, ExternalCheckResult)>>,
     pub schema: Option<ExternalPluginSchema>,
 }
diff --git 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<Vec<(HookableLifecycleEvent, ExternalCheckResult)>>,
     pub extra_accounts: Option<Vec<ExtraAccount>>,
     pub schema: Option<ExternalPluginSchema>,
-    pub data: Option<Vec<u8>>,
 }
diff --git a/idls/mpl_core.json b/idls/mpl_core.json
@@ -2034,36 +2034,13 @@
               }
             }
           },
-          {
-            "name": "lifecycleChecks",
-            "type": {
-              "option": {
-                "vec": {
-                  "tuple": [
-                    {
-                      "defined": "HookableLifecycleEvent"
-                    },
-                    {
-                      "defined": "ExternalCheckResult"
-                    }
-                  ]
-                }
-              }
-            }
-          },
           {
             "name": "schema",
             "type": {
               "option": {
                 "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
@@ -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<Authority>,
-    /// The lifecyle events for which the the external plugin is active.
-    pub lifecycle_checks: Option<Vec<(HookableLifecycleEvent, ExternalCheckResult)>>,
     /// Schema for the data used by the plugin.
     pub schema: Option<ExternalPluginSchema>,
-    /// External plugin initial data.
-    pub data: Option<Vec<u8>>,
 }
 
 /// 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<Vec<(HookableLifecycleEvent, ExternalCheckResult)>>,
     /// Schema for the data used by the plugin.
     pub schema: Option<ExternalPluginSchema>,
 }
diff --git 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<Vec<ExtraAccount>>,
     /// Schema for the data used by the plugin.
     pub schema: Option<ExternalPluginSchema>,
-    /// External plugin initial data.
-    pub data: Option<Vec<u8>>,
 }
 
 /// Lifecycle hook update info.