Adding execute delegation capabilities (#262)

* Adding agent identity external plugin

* Fix AI feedback

* Fixig wrong flag and adding more tests

* Fixing init collection with plugin

* Fixing coderabbit comments

* Identity plugin should only be addable by ID program

* Switching to mollusk tests to pass

* Bump versions

* Feedback

* Adding execute delegation capabilities

* Pointing to crates

---------

Co-authored-by: Sarah Strange <16522636+stranzhay@users.noreply.github.com>

Author: blockiosaurus

Cargo.lock

@@ -23,8 +23,8 @@ mpl-utils = "0.4.1"
 spl-noop = { version = "1.0.0", features = ["cpi"] }
 podded = "0.5.1"
 strum = { version = "0.26.1", features = ["derive"] }
-mpl-agent-identity = "0.1.0"
-mpl-agent-tools = "0.1.0"
+mpl-agent-identity = "0.2.0"
+mpl-agent-tools = "0.2.0"
 
 [dev-dependencies]
 mollusk-svm = "0.5.0"

programs/mpl-core/Cargo.toml

@@ -1,4 +1,5 @@
 use borsh::{BorshDeserialize, BorshSerialize};
+use mpl_agent_tools::accounts::ExecutionDelegateRecordV1;
 use mpl_utils::{assert_derivation, assert_signer};
 use solana_program::{
     account_info::AccountInfo, entrypoint::ProgramResult, program_error::ProgramError,
@@ -8,8 +9,8 @@ use solana_program::{
 use crate::{
     error::MplCoreError,
     plugins::{
-        abstain, reject, Authority, ExternalCheckResult, HookableLifecycleEvent, PluginValidation,
-        PluginValidationContext, ValidationResult,
+        abstain, approve, reject, Authority, ExternalCheckResult, HookableLifecycleEvent,
+        PluginValidation, PluginValidationContext, ValidationResult,
     },
 };
 
@@ -45,6 +46,30 @@ impl AgentIdentity {
 
         Ok(())
     }
+
+    /// Verify that the Execution Delegate is valid for the asset.
+    pub fn verify_execution_delegate(
+        asset: &Pubkey,
+        authority: &Pubkey,
+        maybe_execution_delegate_record: &AccountInfo,
+    ) -> Result<ValidationResult, ProgramError> {
+        // If the account there is owned by the mpl-agent-tools program, then it's probably an execution delegate record.
+        if maybe_execution_delegate_record.owner == &mpl_agent_tools::ID
+            && maybe_execution_delegate_record.data_len() > 0
+            && maybe_execution_delegate_record.data.borrow()[0]
+                == mpl_agent_tools::types::Key::ExecutionDelegateRecordV1 as u8
+        {
+            let execution_delegate_record =
+                ExecutionDelegateRecordV1::try_from(maybe_execution_delegate_record)?;
+            if execution_delegate_record.agent_asset == *asset
+                && execution_delegate_record.authority == *authority
+            {
+                return approve!();
+            }
+        }
+
+        abstain!()
+    }
 }
 
 impl PluginValidation for AgentIdentity {
@@ -101,9 +126,17 @@ impl PluginValidation for AgentIdentity {
 
     fn validate_execute(
         &self,
-        _ctx: &PluginValidationContext,
+        ctx: &PluginValidationContext,
     ) -> Result<ValidationResult, ProgramError> {
-        abstain!()
+        if ctx.asset_info.is_some() && ctx.accounts.len() > 7 {
+            Self::verify_execution_delegate(
+                ctx.asset_info.unwrap().key,
+                ctx.authority_info.key,
+                ctx.accounts.get(7).unwrap(),
+            )
+        } else {
+            abstain!()
+        }
     }
 }
 

programs/mpl-core/src/plugins/external/agent_identity.rs

@@ -80,12 +80,28 @@ pub(crate) fn execute<'a>(accounts: &'a [AccountInfo<'a>], args: ExecuteV1Args)
         &[ctx.accounts.payer.clone(), ctx.accounts.asset.clone()],
     )?;
 
+    // If the first remaining account is an ExecutionDelegateRecordV1, strip it
+    // before passing to the CPI -- it was only needed for plugin validation.
+    let cpi_accounts = if let Some(first) = ctx.remaining_accounts.first() {
+        if first.owner == &mpl_agent_tools::ID
+            && first.data_len() > 0
+            && first.data.borrow()[0]
+                == mpl_agent_tools::types::Key::ExecutionDelegateRecordV1 as u8
+        {
+            &ctx.remaining_accounts[1..]
+        } else {
+            ctx.remaining_accounts
+        }
+    } else {
+        ctx.remaining_accounts
+    };
+
     process_execute(
         ctx.accounts.asset.key,
         ctx.accounts.asset_signer.key,
         ctx.accounts.program_id.key,
         args.instruction_data,
-        ctx.remaining_accounts,
+        cpi_accounts,
     )
 }