Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused ExtraAccounts type #68

Merged
merged 1 commit into from
Apr 12, 2024
Merged

Remove unused ExtraAccounts type #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 0 additions & 92 deletions clients/js/src/generated/types/extraAccounts.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion clients/js/src/generated/types/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ export * from './externalPluginRecord';
export * from './externalPluginSchema';
export * from './externalPluginUpdateInfo';
export * from './extraAccount';
export * from './extraAccounts';
export * from './freezeDelegate';
export * from './hashablePluginSchema';
export * from './hashedAssetSchema';
Expand Down
28 changes: 0 additions & 28 deletions clients/rust/src/generated/types/extra_accounts.rs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions clients/rust/src/generated/types/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ pub(crate) mod r#external_plugin_record;
pub(crate) mod r#external_plugin_schema;
pub(crate) mod r#external_plugin_update_info;
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;
Expand Down Expand Up @@ -69,7 +68,6 @@ pub use self::r#external_plugin_record::*;
pub use self::r#external_plugin_schema::*;
pub use self::r#external_plugin_update_info::*;
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::*;
Expand Down
43 changes: 0 additions & 43 deletions idls/mpl_core.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
22 changes: 0 additions & 22 deletions programs/mpl-core/src/state/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down