Remove extra accounts type (#68)

metaplex-foundation · Apr 12, 2024 · 41c7872 · 41c7872
1 parent c4407ab
commit 41c7872
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 188 deletions.
diff --git a/clients/js/src/generated/types/extraAccounts.ts b/clients/js/src/generated/types/extraAccounts.ts
diff --git a/clients/js/src/generated/types/index.ts b/clients/js/src/generated/types/index.ts
@@ -24,7 +24,6 @@ export * from './externalPluginSchema';
 export * from './externalPluginUpdateInfo';
 export * from './externalRegistryRecord';
 export * from './extraAccount';
-export * from './extraAccounts';
 export * from './freezeDelegate';
 export * from './hashablePluginSchema';
 export * from './hashedAssetSchema';

diff --git a/clients/rust/src/generated/types/extra_accounts.rs b/clients/rust/src/generated/types/extra_accounts.rs
diff --git a/clients/rust/src/generated/types/mod.rs b/clients/rust/src/generated/types/mod.rs
@@ -23,7 +23,6 @@ pub(crate) mod r#external_plugin_schema;
 pub(crate) mod r#external_plugin_update_info;
 pub(crate) mod r#external_registry_record;
 pub(crate) mod r#extra_account;
-pub(crate) mod r#extra_accounts;
 pub(crate) mod r#freeze_delegate;
 pub(crate) mod r#hashable_plugin_schema;
 pub(crate) mod r#hashed_asset_schema;
@@ -69,7 +68,6 @@ pub use self::r#external_plugin_schema::*;
 pub use self::r#external_plugin_update_info::*;
 pub use self::r#external_registry_record::*;
 pub use self::r#extra_account::*;
-pub use self::r#extra_accounts::*;
 pub use self::r#freeze_delegate::*;
 pub use self::r#hashable_plugin_schema::*;
 pub use self::r#hashed_asset_schema::*;

diff --git a/idls/mpl_core.json b/idls/mpl_core.json
@@ -3601,49 +3601,6 @@
         ]
       }
     },
-    {
-      "name": "ExtraAccounts",
-      "type": {
-        "kind": "enum",
-        "variants": [
-          {
-            "name": "None"
-          },
-          {
-            "name": "SplHook",
-            "fields": [
-              {
-                "name": "extra_account_metas",
-                "type": "publicKey"
-              }
-            ]
-          },
-          {
-            "name": "MplHook",
-            "fields": [
-              {
-                "name": "mint_pda",
-                "type": {
-                  "option": "publicKey"
-                }
-              },
-              {
-                "name": "collection_pda",
-                "type": {
-                  "option": "publicKey"
-                }
-              },
-              {
-                "name": "owner_pda",
-                "type": {
-                  "option": "publicKey"
-                }
-              }
-            ]
-          }
-        ]
-      }
-    },
     {
       "name": "Key",
       "type": {

diff --git a/programs/mpl-core/src/state/mod.rs b/programs/mpl-core/src/state/mod.rs
@@ -56,28 +56,6 @@ pub enum Authority {
     },
 }
 
-/// Different types of extra accounts that can be passed in for lifecycle hooks.
-#[repr(C)]
-#[derive(Clone, BorshSerialize, BorshDeserialize, Debug, Eq, PartialEq)]
-pub enum ExtraAccounts {
-    /// No extra accounts.
-    None,
-    /// Compatible with spl-token-2022 transfer hooks.
-    SplHook {
-        /// An account meta accounts derived from the account pubkey.
-        extra_account_metas: Pubkey,
-    },
-    /// A simpler method of passing in extra accounts using deterministic PDAs.
-    MplHook {
-        /// The PDA derived from the account pubkey.
-        mint_pda: Option<Pubkey>,
-        /// The PDA derived from the collection pubkey.
-        collection_pda: Option<Pubkey>,
-        /// The PDA derived from the asset owner pubkey.
-        owner_pda: Option<Pubkey>,
-    },
-}
-
 /// An enum representing account discriminators.
 #[derive(
     Clone, Copy, BorshSerialize, BorshDeserialize, Debug, PartialEq, Eq, ToPrimitive, FromPrimitive,