feat(multisig_create): make createKey a signer

Author: vovacodes

programs/multisig/src/instructions/multisig_create.rs

@@ -12,8 +12,6 @@ pub struct MultisigCreateArgs {
     pub threshold: u16,
     /// The members of the multisig.
     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,
     /// Memo isn't used for anything, but is included in `CreatedEvent` that can later be parsed and indexed.
     pub memo: Option<String>,
 }
@@ -25,11 +23,15 @@ pub struct MultisigCreate<'info> {
         init,
         payer = creator,
         space = Multisig::size(args.members.len()),
-        seeds = [SEED_PREFIX, args.create_key.as_ref(), SEED_MULTISIG],
+        seeds = [SEED_PREFIX, create_key.key().as_ref(), SEED_MULTISIG],
         bump
     )]
     pub multisig: Account<'info, Multisig>,
 
+    /// An ephemeral signer that is used as a seed for the Multisig PDA.
+    /// Must be a signer to prevent the Multisig account from re-initialization by someone else but the original creator.
+    pub create_key: Signer<'info>,
+
     /// The creator of the multisig.
     #[account(mut)]
     pub creator: Signer<'info>,
@@ -71,7 +73,7 @@ impl MultisigCreate<'_> {
         multisig.authority_index = 1; // Default vault is the first authority.
         multisig.transaction_index = 0;
         multisig.stale_transaction_index = 0;
-        multisig.create_key = args.create_key;
+        multisig.create_key = ctx.accounts.create_key.to_account_info().key();
         multisig.bump = *ctx.bumps.get("multisig").unwrap();
 
         multisig.invariant()?;

sdk/multisig/idl/multisig.json

@@ -13,6 +13,15 @@
           "isMut": true,
           "isSigner": false
         },
+        {
+          "name": "createKey",
+          "isMut": false,
+          "isSigner": true,
+          "docs": [
+            "An ephemeral signer that is used as a seed for the Multisig PDA.",
+            "Must be a signer to prevent the Multisig account from re-initialization by someone else but the original creator."
+          ]
+        },
         {
           "name": "creator",
           "isMut": true,
@@ -520,13 +529,6 @@
               }
             }
           },
-          {
-            "name": "createKey",
-            "docs": [
-              "Any key that is used to seed the multisig pda. Used solely as bytes for the seed, doesn't have any other meaning."
-            ],
-            "type": "publicKey"
-          },
           {
             "name": "memo",
             "docs": [

sdk/multisig/src/generated/instructions/multisigCreate.ts

@@ -38,14 +38,14 @@ export function multisigCreate({
   return createMultisigCreateInstruction(
     {
       creator,
+      createKey,
       multisig: multisigPda,
     },
     {
       args: {
         configAuthority,
         threshold,
         members,
-        createKey,
         memo: memo ?? null,
       },
     }

sdk/multisig/src/generated/types/MultisigCreateArgs.ts

@@ -14,39 +14,39 @@ import { translateAndThrowAnchorError } from "./errors";
 /** Creates a new multisig. */
 export async function multisigCreate({
   connection,
+  createKey,
   creator,
   multisigPda,
   configAuthority,
   threshold,
   members,
-  createKey,
   memo,
   sendOptions,
 }: {
   connection: Connection;
+  createKey: Signer;
   creator: Signer;
   multisigPda: PublicKey;
   configAuthority: PublicKey;
   threshold: number;
   members: Member[];
-  createKey: PublicKey;
   memo?: string;
   sendOptions?: SendOptions;
 }): Promise<TransactionSignature> {
   const blockhash = (await connection.getLatestBlockhash()).blockhash;
 
   const tx = transactions.multisigCreate({
     blockhash,
+    createKey: createKey.publicKey,
     creator: creator.publicKey,
     multisigPda,
     configAuthority,
     threshold,
     members,
-    createKey,
     memo,
   });
 
-  tx.sign([creator]);
+  tx.sign([creator, createKey]);
 
   try {
     return await connection.sendTransaction(tx, sendOptions);

sdk/multisig/src/instructions.ts

@@ -16,24 +16,24 @@ import { getAuthorityPda, getTransactionPda } from "./pda";
 import { transactionMessageBeet } from "./types";
 import * as instructions from "./instructions.js";
 
-/** Returns unsigned `VersionedTransaction` that needs to be signed by `creator` before sending it. */
+/** Returns unsigned `VersionedTransaction` that needs to be signed by `creator` and `createKey` before sending it. */
 export function multisigCreate({
   blockhash,
   configAuthority,
+  createKey,
   creator,
   multisigPda,
   threshold,
   members,
-  createKey,
   memo,
 }: {
   blockhash: string;
+  createKey: PublicKey;
   creator: PublicKey;
   multisigPda: PublicKey;
   configAuthority: PublicKey;
   threshold: number;
   members: Member[];
-  createKey: PublicKey;
   memo?: string;
 }): VersionedTransaction {
   const ix = instructions.multisigCreate({