feat(config_transaction_create): implement sdk and tests

programs/multisig/src/errors.rs

@@ -30,16 +30,18 @@ pub enum MultisigError {
     InvalidNumberOfAccounts,
     #[msg("Invalid account provided")]
     InvalidAccount,
-    #[msg("transaction_execute reentrancy is forbidden")]
+    #[msg("`transaction_execute` reentrancy is forbidden")]
     ExecuteReentrancy,
     #[msg("Cannot remove last member")]
     RemoveLastMember,
     #[msg("Members don't include any voters")]
     NoVoters,
     #[msg("`stale_transaction_index` must be <= `transaction_index`")]
     InvalidStaleTransactionIndex,
-    #[msg("instruction not supported for controlled multisig")]
+    #[msg("Instruction not supported for controlled multisig")]
     NotSupportedForControlled,
-    #[msg("transaction time lock has not been released")]
+    #[msg("Transaction time lock has not been released")]
     TimeLockNotReleased,
+    #[msg("Config transaction must have at least one action")]
+    NoActions,
 }

programs/multisig/src/instructions/config_transaction_create.rs

@@ -15,9 +15,9 @@ pub struct ConfigTransactionCreateArgs {
 pub struct ConfigTransactionCreate<'info> {
     #[account(
         mut,
-        seeds = [SEED_PREFIX, multisig.create_key.as_ref(), SEED_MULTISIG],
+        seeds = [SEED_PREFIX, SEED_MULTISIG, multisig.create_key.as_ref()],
         bump = multisig.bump,
-        constraint = multisig.config_authority != Pubkey::default() @ MultisigError::NotSupportedForControlled,
+        constraint = multisig.config_authority == Pubkey::default() @ MultisigError::NotSupportedForControlled,
     )]
     pub multisig: Account<'info, Multisig>,
 
@@ -51,6 +51,8 @@ impl ConfigTransactionCreate<'_> {
         ctx: Context<Self>,
         args: ConfigTransactionCreateArgs,
     ) -> Result<()> {
+        require!(!args.actions.is_empty(), MultisigError::NoActions);
+
         let multisig = &mut ctx.accounts.multisig;
         let transaction = &mut ctx.accounts.transaction;
         let creator = &mut ctx.accounts.creator;

sdk/multisig/idl/multisig.json

@@ -1368,7 +1368,7 @@
     {
       "code": 6014,
       "name": "ExecuteReentrancy",
-      "msg": "transaction_execute reentrancy is forbidden"
+      "msg": "`transaction_execute` reentrancy is forbidden"
     },
     {
       "code": 6015,
@@ -1388,12 +1388,17 @@
     {
       "code": 6018,
       "name": "NotSupportedForControlled",
-      "msg": "instruction not supported for controlled multisig"
+      "msg": "Instruction not supported for controlled multisig"
     },
     {
       "code": 6019,
       "name": "TimeLockNotReleased",
-      "msg": "transaction time lock has not been released"
+      "msg": "Transaction time lock has not been released"
+    },
+    {
+      "code": 6020,
+      "name": "NoActions",
+      "msg": "Config transaction must have at least one action"
     }
   ],
   "metadata": {

sdk/multisig/src/index.ts

@@ -11,7 +11,7 @@ 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";
+export * as instructions from "./instructions/index.js";
 /** Additional types */
 export * as types from "./types.js";
 /** Utils for the multisig program. */

sdk/multisig/src/instructions/configTransactionCreate.ts

@@ -0,0 +1,30 @@
+import { PublicKey } from "@solana/web3.js";
+import {
+  ConfigAction,
+  createConfigTransactionCreateInstruction,
+} from "../generated";
+import { getTransactionPda } from "../pda";
+
+export function configTransactionCreate({
+  multisigPda,
+  creator,
+  transactionIndex,
+  actions,
+  memo,
+}: {
+  multisigPda: PublicKey;
+  creator: PublicKey;
+  transactionIndex: bigint;
+  actions: ConfigAction[];
+  memo?: string;
+}) {
+  const [transactionPda] = getTransactionPda({
+    multisigPda,
+    index: transactionIndex,
+  });
+
+  return createConfigTransactionCreateInstruction(
+    { creator, multisig: multisigPda, transaction: transactionPda },
+    { args: { actions, memo: memo ?? null } }
+  );
+}

sdk/multisig/src/instructions/index.ts

@@ -0,0 +1,3 @@
+export * from "./configTransactionCreate.js";
+export * from "./multisigCreate.js";
+export * from "./vaultTransactionExecute.js";

sdk/multisig/src/instructions/multisigCreate.ts

@@ -0,0 +1,39 @@
+import { PublicKey, TransactionInstruction } from "@solana/web3.js";
+import { createMultisigCreateInstruction, Member } from "../generated";
+
+export function multisigCreate({
+  creator,
+  multisigPda,
+  configAuthority,
+  threshold,
+  members,
+  timeLock,
+  createKey,
+  memo,
+}: {
+  creator: PublicKey;
+  multisigPda: PublicKey;
+  configAuthority: PublicKey | null;
+  threshold: number;
+  members: Member[];
+  timeLock: number;
+  createKey: PublicKey;
+  memo?: string;
+}): TransactionInstruction {
+  return createMultisigCreateInstruction(
+    {
+      creator,
+      createKey,
+      multisig: multisigPda,
+    },
+    {
+      args: {
+        configAuthority,
+        threshold,
+        members,
+        timeLock,
+        memo: memo ?? null,
+      },
+    }
+  );
+}

sdk/multisig/src/instructions.ts → sdk/multisig/src/instructions/vaultTransactionExecute.ts

@@ -1,57 +1,11 @@
+import { AccountMeta, Connection, PublicKey } from "@solana/web3.js";
+import { getEphemeralSignerPda, getTransactionPda, getVaultPda } from "../pda";
 import {
-  AccountMeta,
-  Connection,
-  PublicKey,
-  TransactionInstruction,
-} from "@solana/web3.js";
-import invariant from "invariant";
-import {
-  createMultisigCreateInstruction,
   createVaultTransactionExecuteInstruction,
-  createConfigTransactionExecuteInstruction,
-  Member,
   VaultTransaction,
-  ConfigTransaction,
-} from "./generated";
-import { getEphemeralSignerPda, getVaultPda, getTransactionPda } from "./pda";
-import { isSignerIndex, isStaticWritableIndex } from "./utils";
-
-export function multisigCreate({
-  creator,
-  multisigPda,
-  configAuthority,
-  threshold,
-  members,
-  timeLock,
-  createKey,
-  memo,
-}: {
-  creator: PublicKey;
-  multisigPda: PublicKey;
-  configAuthority: PublicKey | null;
-  threshold: number;
-  members: Member[];
-  timeLock: number;
-  createKey: PublicKey;
-  memo?: string;
-}): TransactionInstruction {
-  return createMultisigCreateInstruction(
-    {
-      creator,
-      createKey,
-      multisig: multisigPda,
-    },
-    {
-      args: {
-        configAuthority,
-        threshold,
-        members,
-        timeLock,
-        memo: memo ?? null,
-      },
-    }
-  );
-}
+} from "../generated";
+import { isSignerIndex, isStaticWritableIndex } from "../utils";
+import invariant from "invariant";
 
 export async function vaultTransactionExecute({
   connection,

sdk/multisig/src/rpc.ts

@@ -8,7 +8,7 @@ import {
   TransactionSignature,
 } from "@solana/web3.js";
 import * as transactions from "./transactions.js";
-import { Member } from "./generated";
+import { ConfigAction, Member } from "./generated";
 import { translateAndThrowAnchorError } from "./errors";
 
 /** Creates a new multisig. */
@@ -101,7 +101,50 @@ export async function multisigAddMember({
   }
 }
 
-/** Create a new transaction. */
+/** Create a new config transaction. */
+export async function configTransactionCreate({
+  connection,
+  feePayer,
+  multisigPda,
+  transactionIndex,
+  creator,
+  actions,
+  memo,
+  signers,
+  sendOptions,
+}: {
+  connection: Connection;
+  feePayer: Signer;
+  multisigPda: PublicKey;
+  transactionIndex: bigint;
+  creator: PublicKey;
+  actions: ConfigAction[];
+  memo?: string;
+  signers?: Signer[];
+  sendOptions?: SendOptions;
+}): Promise<TransactionSignature> {
+  const blockhash = (await connection.getLatestBlockhash()).blockhash;
+
+  const tx = transactions.configTransactionCreate({
+    blockhash,
+    feePayer: feePayer.publicKey,
+    multisigPda,
+    transactionIndex,
+    creator,
+    actions,
+    memo,
+  });
+
+  tx.sign([feePayer, ...(signers ?? [])]);
+
+  try {
+    return await connection.sendTransaction(tx, sendOptions);
+  } catch (err) {
+    translateAndThrowAnchorError(err);
+  }
+}
+
+/** Create a new vault transaction. */
 export async function vaultTransactionCreate({
   connection,
   feePayer,