metaplex-foundation · blockiosaurus · Nov 30, 2024
diff --git a/clients/js/baseline.json b/clients/js/baseline.json
@@ -0,0 +1,92 @@
+[
+  {
+    "name": "CU: create a new, empty asset",
+    "unit": "Compute Units",
+    "value": 9805
+  },
+  {
+    "name": "Space: create a new, empty asset",
+    "unit": "Bytes",
+    "value": 91
+  },
+  {
+    "name": "CU: create a new, empty asset with empty collection",
+    "unit": "Compute Units",
+    "value": 21421
+  },
+  {
+    "name": "Space: create a new, empty asset with empty collection",
+    "unit": "Bytes",
+    "value": 91
+  },
+  {
+    "name": "CU: create a new asset with plugins",
+    "unit": "Compute Units",
+    "value": 32680
+  },
+  {
+    "name": "Space: create a new asset with plugins",
+    "unit": "Bytes",
+    "value": 198
+  },
+  {
+    "name": "CU: create a new asset with plugins and empty collection",
+    "unit": "Compute Units",
+    "value": 38466
+  },
+  {
+    "name": "Space: create a new asset with plugins and empty collection",
+    "unit": "Bytes",
+    "value": 198
+  },
+  {
+    "name": "CU: list an asset",
+    "unit": "Compute Units",
+    "value": 27622
+  },
+  {
+    "name": "CU: sell an asset",
+    "unit": "Compute Units",
+    "value": 37792
+  },
+  {
+    "name": "CU: list an asset with empty collection",
+    "unit": "Compute Units",
+    "value": 35791
+  },
+  {
+    "name": "CU: sell an asset with empty collection",
+    "unit": "Compute Units",
+    "value": 51043
+  },
+  {
+    "name": "CU: list an asset with collection royalties",
+    "unit": "Compute Units",
+    "value": 37047
+  },
+  {
+    "name": "CU: sell an asset with collection royalties",
+    "unit": "Compute Units",
+    "value": 56560
+  },
+  {
+    "name": "CU: transfer an empty asset",
+    "unit": "Compute Units",
+    "value": 5261
+  },
+  {
+    "name": "CU: transfer an empty asset with empty collection",
+    "unit": "Compute Units",
+    "value": 8035
+  },
+  {
+    "name": "CU: transfer an asset with plugins",
+    "unit": "Compute Units",
+    "value": 11386
+  },
+  {
+    "name": "CU: transfer an asset with plugins and empty collection",
+    "unit": "Compute Units",
+    "value": 14160
+  }
+]
diff --git a/programs/mpl-core/src/plugins/external/app_data.rs b/programs/mpl-core/src/plugins/external/app_data.rs
@@ -1,7 +1,7 @@
 use borsh::{BorshDeserialize, BorshSerialize};
 use solana_program::program_error::ProgramError;
 
-use crate::plugins::abstain;
+use crate::plugins::{abstain, AssetValidationCommon, AssetValidationContext};
 
 use crate::plugins::{
     Authority, ExternalPluginAdapterSchema, PluginValidation, PluginValidationContext,
@@ -34,14 +34,18 @@ impl AppData {
 impl PluginValidation for AppData {
     fn validate_add_external_plugin_adapter(
         &self,
-        _ctx: &PluginValidationContext,
+        _plugin_ctx: &PluginValidationContext,
+        _common: &AssetValidationCommon,
+        _asset_ctx: &AssetValidationContext,
     ) -> Result<ValidationResult, ProgramError> {
         abstain!()
     }
 
     fn validate_transfer(
         &self,
-        _ctx: &PluginValidationContext,
+        _plugin_ctx: &PluginValidationContext,
+        _common: &AssetValidationCommon,
+        _asset_ctx: &AssetValidationContext,
     ) -> Result<ValidationResult, ProgramError> {
         abstain!()
     }

diff --git a/programs/mpl-core/src/plugins/external/lifecycle_hook.rs b/programs/mpl-core/src/plugins/external/lifecycle_hook.rs
@@ -2,8 +2,9 @@ use borsh::{BorshDeserialize, BorshSerialize};
 use solana_program::{program_error::ProgramError, pubkey::Pubkey};
 
 use crate::plugins::{
-    abstain, Authority, ExternalCheckResult, ExternalPluginAdapterSchema, ExtraAccount,
-    HookableLifecycleEvent, PluginValidation, PluginValidationContext, ValidationResult,
+    abstain, AssetValidationCommon, AssetValidationContext, Authority, ExternalCheckResult,
+    ExternalPluginAdapterSchema, ExtraAccount, HookableLifecycleEvent, PluginValidation,
+    PluginValidationContext, ValidationResult,
 };
 
 /// Lifecycle hook that CPIs into the `hooked_program`.  This hook is used for any lifecycle events
@@ -41,14 +42,18 @@ impl LifecycleHook {
 impl PluginValidation for LifecycleHook {
     fn validate_add_external_plugin_adapter(
         &self,
-        _ctx: &PluginValidationContext,
+        _plugin_ctx: &PluginValidationContext,
+        _common: &AssetValidationCommon,
+        _asset_ctx: &AssetValidationContext,
     ) -> Result<ValidationResult, ProgramError> {
         abstain!()
     }
 
     fn validate_transfer(
         &self,
-        _ctx: &PluginValidationContext,
+        _plugin_ctx: &PluginValidationContext,
+        _common: &AssetValidationCommon,
+        _asset_ctx: &AssetValidationContext,
     ) -> Result<ValidationResult, ProgramError> {
         abstain!()
     }

diff --git a/programs/mpl-core/src/plugins/external/linked_app_data.rs b/programs/mpl-core/src/plugins/external/linked_app_data.rs
@@ -1,8 +1,12 @@
 use borsh::{BorshDeserialize, BorshSerialize};
 
-use crate::plugins::{
-    Authority, ExternalPluginAdapterSchema, PluginValidation, PluginValidationContext,
-    ValidationResult,
+use crate::{
+    plugins::{
+        AssetValidationCommon, AssetValidationContext, Authority, ExternalPluginAdapterSchema,
+        PluginValidation, PluginValidationContext, ValidationResult,
+    },
+    state::Key,
+    utils::load_key,
 };
 
 /// The app data third party plugin contains arbitrary data that can be written to by the
@@ -31,10 +35,12 @@ impl LinkedAppData {
 impl PluginValidation for LinkedAppData {
     fn validate_create(
         &self,
-        ctx: &PluginValidationContext,
+        _plugin_ctx: &PluginValidationContext,
+        common: &AssetValidationCommon,
+        _asset_ctx: &AssetValidationContext,
     ) -> Result<ValidationResult, solana_program::program_error::ProgramError> {
         solana_program::msg!("LinkedAppData::validate_create");
-        if ctx.asset_info.is_some() {
+        if load_key(common.asset_info, 0)? == Key::AssetV1 {
             Ok(ValidationResult::Rejected)
         } else {
             Ok(ValidationResult::Pass)

diff --git a/programs/mpl-core/src/plugins/external/linked_lifecycle_hook.rs b/programs/mpl-core/src/plugins/external/linked_lifecycle_hook.rs
@@ -2,8 +2,9 @@ use borsh::{BorshDeserialize, BorshSerialize};
 use solana_program::{program_error::ProgramError, pubkey::Pubkey};
 
 use crate::plugins::{
-    Authority, ExternalCheckResult, ExternalPluginAdapterSchema, ExtraAccount,
-    HookableLifecycleEvent, PluginValidation, PluginValidationContext, ValidationResult,
+    AssetValidationCommon, AssetValidationContext, Authority, ExternalCheckResult,
+    ExternalPluginAdapterSchema, ExtraAccount, HookableLifecycleEvent, PluginValidation,
+    PluginValidationContext, ValidationResult,
 };
 
 /// Lifecycle hook that CPIs into the `hooked_program`.  This hook is used for any lifecycle events
@@ -41,14 +42,18 @@ impl LinkedLifecycleHook {
 impl PluginValidation for LinkedLifecycleHook {
     fn validate_add_external_plugin_adapter(
         &self,
-        _ctx: &PluginValidationContext,
+        _plugin_ctx: &PluginValidationContext,
+        _common: &AssetValidationCommon,
+        _asset_ctx: &AssetValidationContext,
     ) -> Result<ValidationResult, ProgramError> {
         Ok(ValidationResult::Pass)
     }
 
     fn validate_transfer(
         &self,
-        _ctx: &PluginValidationContext,
+        _plugin_ctx: &PluginValidationContext,
+        _common: &AssetValidationCommon,
+        _asset_ctx: &AssetValidationContext,
     ) -> Result<ValidationResult, ProgramError> {
         Ok(ValidationResult::Pass)
     }

diff --git a/programs/mpl-core/src/plugins/external/oracle.rs b/programs/mpl-core/src/plugins/external/oracle.rs
@@ -4,8 +4,9 @@ use solana_program::{program_error::ProgramError, pubkey::Pubkey};
 use crate::error::MplCoreError;
 
 use crate::plugins::{
-    abstain, Authority, ExternalCheckResult, ExternalValidationResult, ExtraAccount,
-    HookableLifecycleEvent, PluginValidation, PluginValidationContext, ValidationResult,
+    abstain, AssetValidationCommon, AssetValidationContext, Authority, ExternalCheckResult,
+    ExternalValidationResult, ExtraAccount, HookableLifecycleEvent, PluginValidation,
+    PluginValidationContext, ValidationResult,
 };
 
 /// Oracle plugin that allows getting a `ValidationResult` for a lifecycle event from an arbitrary
@@ -39,56 +40,92 @@ impl Oracle {
 impl PluginValidation for Oracle {
     fn validate_add_external_plugin_adapter(
         &self,
-        _ctx: &PluginValidationContext,
+        _plugin_ctx: &PluginValidationContext,
+        _common: &AssetValidationCommon,
+        _asset_ctx: &AssetValidationContext,
     ) -> Result<ValidationResult, ProgramError> {
         abstain!()
     }
 
     fn validate_create(
         &self,
-        ctx: &PluginValidationContext,
+        plugin_ctx: &PluginValidationContext,
+        common: &AssetValidationCommon,
+        asset_ctx: &AssetValidationContext,
     ) -> Result<ValidationResult, ProgramError> {
-        self.validate_helper(ctx, HookableLifecycleEvent::Create)
+        self.validate_helper(
+            plugin_ctx,
+            common,
+            asset_ctx,
+            HookableLifecycleEvent::Create,
+        )
     }
 
     fn validate_transfer(
         &self,
-        ctx: &PluginValidationContext,
+        plugin_ctx: &PluginValidationContext,
+        common: &AssetValidationCommon,
+        asset_ctx: &AssetValidationContext,
     ) -> Result<ValidationResult, ProgramError> {
-        self.validate_helper(ctx, HookableLifecycleEvent::Transfer)
+        self.validate_helper(
+            plugin_ctx,
+            common,
+            asset_ctx,
+            HookableLifecycleEvent::Transfer,
+        )
     }
 
     fn validate_burn(
         &self,
-        ctx: &PluginValidationContext,
+        plugin_ctx: &PluginValidationContext,
+        common: &AssetValidationCommon,
+        asset_ctx: &AssetValidationContext,
     ) -> Result<ValidationResult, ProgramError> {
-        self.validate_helper(ctx, HookableLifecycleEvent::Burn)
+        self.validate_helper(plugin_ctx, common, asset_ctx, HookableLifecycleEvent::Burn)
     }
 
     fn validate_update(
         &self,
-        ctx: &PluginValidationContext,
+        plugin_ctx: &PluginValidationContext,
+        common: &AssetValidationCommon,
+        asset_ctx: &AssetValidationContext,
     ) -> Result<ValidationResult, ProgramError> {
-        self.validate_helper(ctx, HookableLifecycleEvent::Update)
+        self.validate_helper(
+            plugin_ctx,
+            common,
+            asset_ctx,
+            HookableLifecycleEvent::Update,
+        )
     }
 }
 
 impl Oracle {
     fn validate_helper(
         &self,
-        ctx: &PluginValidationContext,
+        plugin_ctx: &PluginValidationContext,
+        common: &AssetValidationCommon,
+        asset_ctx: &AssetValidationContext,
         event: HookableLifecycleEvent,
     ) -> Result<ValidationResult, ProgramError> {
         let oracle_account = match &self.base_address_config {
             None => self.base_address,
-            Some(extra_account) => extra_account.derive(&self.base_address, ctx)?,
+            Some(extra_account) => {
+                extra_account.derive(&self.base_address, plugin_ctx, common, asset_ctx)?
+            }
         };
 
-        let oracle_account = ctx
-            .accounts
-            .iter()
-            .find(|account| *account.key == oracle_account)
-            .ok_or(MplCoreError::MissingExternalPluginAdapterAccount)?;
+        let oracle_account = if let AssetValidationContext::Create { accounts }
+        | AssetValidationContext::Transfer { accounts, .. }
+        | AssetValidationContext::Burn { accounts, .. }
+        | AssetValidationContext::Update { accounts, .. } = asset_ctx
+        {
+            accounts
+                .iter()
+                .find(|account| *account.key == oracle_account)
+                .ok_or(MplCoreError::MissingExternalPluginAdapterAccount)?
+        } else {
+            return Err(MplCoreError::InvalidPlugin.into());
+        };
 
         let offset = self.results_offset.to_offset_usize();