fix(external-execute): removed constraint from pm, no op

Squads-Protocol · Jan 27, 2023 · 3143f02 · 3143f02
1 parent 17f5047
commit 3143f02
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/programs/program-manager/src/lib.rs b/programs/program-manager/src/lib.rs
@@ -103,7 +103,7 @@ pub mod program_manager {
 pub struct CreateManager<'info> {
     #[account(
         owner = squads_mpl::ID,
-        constraint = matches!(multisig.is_member(creator.key()), Some(..)) || multisig.allow_external_execute @MsError::KeyNotInMultisig,
+        constraint = matches!(multisig.is_member(creator.key()), Some(..)) @MsError::KeyNotInMultisig,
     )]
     pub multisig: Account<'info, Ms>,
 
@@ -131,7 +131,7 @@ pub struct CreateManager<'info> {
 pub struct CreateManagedProgram<'info> {
     #[account(
         owner = squads_mpl::ID,
-        constraint = matches!(multisig.is_member(creator.key()), Some(..)) || multisig.allow_external_execute @MsError::KeyNotInMultisig,
+        constraint = matches!(multisig.is_member(creator.key()), Some(..)) @MsError::KeyNotInMultisig,
     )]
     pub multisig: Account<'info, Ms>,
 
@@ -171,7 +171,7 @@ pub struct CreateManagedProgram<'info> {
 pub struct CreateProgramUpgrade<'info> {
     #[account(
         owner = squads_mpl::ID,
-        constraint = matches!(multisig.is_member(creator.key()), Some(..)) || multisig.allow_external_execute @MsError::KeyNotInMultisig,
+        constraint = matches!(multisig.is_member(creator.key()), Some(..)) @MsError::KeyNotInMultisig,
     )]
     pub multisig: Account<'info, Ms>,
 

diff --git a/programs/squads-mpl/src/lib.rs b/programs/squads-mpl/src/lib.rs
@@ -213,7 +213,7 @@ pub mod squads_mpl {
     // non-members or programs to execute a transaction.
     pub fn set_external_execute(ctx: Context<MsAuth>, setting: bool) -> Result<()> {
         let ms = &mut ctx.accounts.multisig;
-        ms.allow_external_execute = setting;
+        // ms.allow_external_execute = setting;  // no op
         Ok(())
     }