feat(multisig_create): remove allow_external_execute

Squads-Protocol · Jan 25, 2023 · 7158f2c · 7158f2c
1 parent 76ece1f
commit 7158f2c
Show file tree

Hide file tree

Showing 12 changed files with 65 additions and 52 deletions.
diff --git a/programs/multisig/src/instructions/multisig_create.rs b/programs/multisig/src/instructions/multisig_create.rs
@@ -14,8 +14,6 @@ pub struct MultisigCreateArgs {
     pub members: Vec<Member>,
     /// Any key that is used to seed the multisig pda. Used solely as bytes for the seed, doesn't have any other meaning.
     pub create_key: Pubkey,
-    /// Whether to allow non-member keys to execute txs.
-    pub allow_external_execute: Option<bool>,
     /// Memo isn't used for anything, but is included in `CreatedEvent` that can later be parsed and indexed.
     pub memo: Option<String>,
 }
@@ -72,12 +70,11 @@ impl MultisigCreate<'_> {
         multisig.authority_index = 1; // Default vault is the first authority.
         multisig.transaction_index = 0;
         multisig.stale_transaction_index = 0;
-        multisig.allow_external_execute = args.allow_external_execute.unwrap_or(false);
         multisig.create_key = args.create_key;
         multisig.bump = *ctx.bumps.get("multisig").unwrap();
 
         emit!(MultisigCreated {
-            multisig: ctx.accounts.multisig.to_account_info().key.clone(),
+            multisig: ctx.accounts.multisig.to_account_info().key(),
             memo: args.memo,
         });
 

diff --git a/programs/multisig/src/instructions/transaction_execute.rs b/programs/multisig/src/instructions/transaction_execute.rs
@@ -31,8 +31,8 @@ pub struct TransactionExecute<'info> {
 
     #[account(
         mut,
-        constraint = multisig.is_member(member.key()).is_some() || multisig.allow_external_execute @ MultisigError::NotAMember,
-        constraint = multisig.member_has_permission(member.key(), Permission::Execute) || multisig.allow_external_execute @ MultisigError::Unauthorized,
+        constraint = multisig.is_member(member.key()).is_some() @ MultisigError::NotAMember,
+        constraint = multisig.member_has_permission(member.key(), Permission::Execute) @ MultisigError::Unauthorized,
     )]
     pub member: Signer<'info>,
     // `remaining_accounts` must include the following accounts in the exact order:
@@ -80,6 +80,7 @@ impl TransactionExecute<'_> {
 
         // Execute the transaction instructions one-by-one.
         for (ix, account_infos) in executable_message.to_instructions_and_accounts().iter() {
+            // FIXME: Prevent reentrancy.
             invoke_signed(ix, account_infos, &[authority_seeds])?;
         }
 

diff --git a/programs/multisig/src/state.rs b/programs/multisig/src/state.rs
@@ -34,8 +34,8 @@ pub struct Multisig {
     /// Last stale transaction index. All transactions up until this index are stale.
     /// This index is updated when multisig config (members/threshold) changes.
     pub stale_transaction_index: u64,
-    /// Whether to allow non-member keys to execute txs.
-    pub allow_external_execute: bool,
+    /// Reserved for future use.
+    pub _reserved: u8,
     /// Key that is used to seed the multisig PDA.
     /// Used solely as bytes for the seed, doesn't have any other meaning or function.
     pub create_key: Pubkey,

diff --git a/programs/multisig/src/utils/small_vec.rs b/programs/multisig/src/utils/small_vec.rs
@@ -8,9 +8,9 @@ use anchor_lang::prelude::*;
 #[derive(Clone, Debug, Default)]
 pub struct SmallVec<L, T>(Vec<T>, PhantomData<L>);
 
-impl<L, T> Into<Vec<T>> for SmallVec<L, T> {
-    fn into(self) -> Vec<T> {
-        self.0
+impl<L, T> From<SmallVec<L, T>> for Vec<T> {
+    fn from(val: SmallVec<L, T>) -> Self {
+        val.0
     }
 }
 

diff --git a/sdk/multisig/idl/multisig.json b/sdk/multisig/idl/multisig.json
@@ -227,11 +227,11 @@
             "type": "u64"
           },
           {
-            "name": "allowExternalExecute",
+            "name": "reserved",
             "docs": [
-              "Whether to allow non-member keys to execute txs."
+              "Reserved for future use."
             ],
-            "type": "bool"
+            "type": "u8"
           },
           {
             "name": "createKey",
@@ -411,15 +411,6 @@
             ],
             "type": "publicKey"
           },
-          {
-            "name": "allowExternalExecute",
-            "docs": [
-              "Whether to allow non-member keys to execute txs."
-            ],
-            "type": {
-              "option": "bool"
-            }
-          },
           {
             "name": "memo",
             "docs": [

diff --git a/sdk/multisig/src/generated/accounts/Multisig.ts b/sdk/multisig/src/generated/accounts/Multisig.ts
@@ -22,7 +22,7 @@ export type MultisigArgs = {
   authorityIndex: number
   transactionIndex: beet.bignum
   staleTransactionIndex: beet.bignum
-  allowExternalExecute: boolean
+  reserved: number
   createKey: web3.PublicKey
   bump: number
 }
@@ -43,7 +43,7 @@ export class Multisig implements MultisigArgs {
     readonly authorityIndex: number,
     readonly transactionIndex: beet.bignum,
     readonly staleTransactionIndex: beet.bignum,
-    readonly allowExternalExecute: boolean,
+    readonly reserved: number,
     readonly createKey: web3.PublicKey,
     readonly bump: number
   ) {}
@@ -59,7 +59,7 @@ export class Multisig implements MultisigArgs {
       args.authorityIndex,
       args.transactionIndex,
       args.staleTransactionIndex,
-      args.allowExternalExecute,
+      args.reserved,
       args.createKey,
       args.bump
     )
@@ -196,7 +196,7 @@ export class Multisig implements MultisigArgs {
         }
         return x
       })(),
-      allowExternalExecute: this.allowExternalExecute,
+      reserved: this.reserved,
       createKey: this.createKey.toBase58(),
       bump: this.bump,
     }
@@ -221,7 +221,7 @@ export const multisigBeet = new beet.FixableBeetStruct<
     ['authorityIndex', beet.u8],
     ['transactionIndex', beet.u64],
     ['staleTransactionIndex', beet.u64],
-    ['allowExternalExecute', beet.bool],
+    ['reserved', beet.u8],
     ['createKey', beetSolana.publicKey],
     ['bump', beet.u8],
   ],

diff --git a/sdk/multisig/src/generated/types/MultisigCreateArgs.ts b/sdk/multisig/src/generated/types/MultisigCreateArgs.ts
@@ -14,7 +14,6 @@ export type MultisigCreateArgs = {
   threshold: number
   members: Member[]
   createKey: web3.PublicKey
-  allowExternalExecute: beet.COption<boolean>
   memo: beet.COption<string>
 }
 
@@ -29,7 +28,6 @@ export const multisigCreateArgsBeet =
       ['threshold', beet.u16],
       ['members', beet.array(memberBeet)],
       ['createKey', beetSolana.publicKey],
-      ['allowExternalExecute', beet.coption(beet.bool)],
       ['memo', beet.coption(beet.utf8String)],
     ],
     'MultisigCreateArgs'

diff --git a/sdk/multisig/src/index.ts b/sdk/multisig/src/index.ts
@@ -10,6 +10,8 @@ export * from "./pda.js";
 export * as rpc from "./rpc.js";
 /** Transactions for the multisig program. */
 export * as transactions from "./transactions.js";
+/** Instructions for the multisig program. */
+export * as instructions from "./instructions.js";
 /** Additional types */
 export * as types from "./types.js";
 /** Utils for the multisig program. */

diff --git a/sdk/multisig/src/instructions.ts b/sdk/multisig/src/instructions.ts
@@ -0,0 +1,36 @@
+import { PublicKey, TransactionInstruction } from "@solana/web3.js";
+import { createMultisigCreateInstruction, Member } from "./generated";
+
+export function multisigCreate({
+  creator,
+  multisigPda,
+  configAuthority,
+  threshold,
+  members,
+  createKey,
+  memo,
+}: {
+  creator: PublicKey;
+  multisigPda: PublicKey;
+  configAuthority: PublicKey;
+  threshold: number;
+  members: Member[];
+  createKey: PublicKey;
+  memo?: string;
+}): TransactionInstruction {
+  return createMultisigCreateInstruction(
+    {
+      creator,
+      multisig: multisigPda,
+    },
+    {
+      args: {
+        configAuthority,
+        threshold,
+        members,
+        createKey,
+        memo: memo ?? null,
+      },
+    }
+  );
+}
diff --git a/sdk/multisig/src/rpc.ts b/sdk/multisig/src/rpc.ts
@@ -20,7 +20,6 @@ export async function multisigCreate({
   threshold,
   members,
   createKey,
-  allowExternalExecute,
   memo,
   sendOptions,
 }: {
@@ -31,7 +30,6 @@ export async function multisigCreate({
   threshold: number;
   members: Member[];
   createKey: PublicKey;
-  allowExternalExecute?: boolean;
   memo?: string;
   sendOptions?: SendOptions;
 }): Promise<TransactionSignature> {
@@ -45,7 +43,6 @@ export async function multisigCreate({
     threshold,
     members,
     createKey,
-    allowExternalExecute,
     memo,
   });
 

diff --git a/sdk/multisig/src/transactions.ts b/sdk/multisig/src/transactions.ts
@@ -19,6 +19,7 @@ import {
 import { getAuthorityPda, getTransactionPda } from "./pda";
 import { transactionMessageBeet } from "./types";
 import { isSignerIndex, isStaticWritableIndex } from "./utils";
+import * as instructions from "./instructions.js";
 
 /** Returns unsigned `VersionedTransaction` that needs to be signed by `creator` before sending it. */
 export function multisigCreate({
@@ -29,7 +30,6 @@ export function multisigCreate({
   threshold,
   members,
   createKey,
-  allowExternalExecute,
   memo,
 }: {
   blockhash: string;
@@ -39,29 +39,21 @@ export function multisigCreate({
   threshold: number;
   members: Member[];
   createKey: PublicKey;
-  allowExternalExecute?: boolean;
   memo?: string;
 }): VersionedTransaction {
   const message = new TransactionMessage({
     payerKey: creator,
     recentBlockhash: blockhash,
     instructions: [
-      createMultisigCreateInstruction(
-        {
-          creator,
-          multisig: multisigPda,
-        },
-        {
-          args: {
-            configAuthority,
-            threshold,
-            members,
-            createKey,
-            allowExternalExecute: allowExternalExecute ?? null,
-            memo: memo ?? null,
-          },
-        }
-      ),
+      instructions.multisigCreate({
+        creator,
+        multisigPda,
+        configAuthority,
+        threshold,
+        members,
+        createKey,
+        memo,
+      }),
     ],
   }).compileToV0Message();
 

diff --git a/tests/multisig.ts b/tests/multisig.ts
@@ -268,7 +268,6 @@ describe("multisig", () => {
       assert.strictEqual(multisigAccount.authorityIndex, 1);
       assert.strictEqual(multisigAccount.transactionIndex.toString(), "0");
       assert.strictEqual(multisigAccount.staleTransactionIndex.toString(), "0");
-      assert.strictEqual(multisigAccount.allowExternalExecute, false);
       assert.strictEqual(
         multisigAccount.createKey.toBase58(),
         autonomousMultisigCreateKey.toBase58()