feat(sdk): use lookup tables for vault_transaction_execute and batch_…

…execute_transaction transactions

sdk/multisig/src/instructions/batchExecuteTransaction.ts

@@ -1,4 +1,9 @@
-import { Connection, PublicKey } from "@solana/web3.js";
+import {
+  AddressLookupTableAccount,
+  Connection,
+  PublicKey,
+  TransactionInstruction,
+} from "@solana/web3.js";
 import {
   Batch,
   createBatchExecuteTransactionInstruction,
@@ -10,7 +15,7 @@ import {
   getTransactionPda,
   getVaultPda,
 } from "../pda";
-import { remainingAccountsForTransactionExecute } from "../utils";
+import { accountsForTransactionExecute } from "../utils";
 
 export async function batchExecuteTransaction({
   connection,
@@ -24,7 +29,10 @@ export async function batchExecuteTransaction({
   member: PublicKey;
   batchIndex: bigint;
   transactionIndex: number;
-}) {
+}): Promise<{
+  instruction: TransactionInstruction;
+  lookupTableAccounts: AddressLookupTableAccount[];
+}> {
   const [proposalPda] = getProposalPda({
     multisigPda,
     transactionIndex: batchIndex,
@@ -51,20 +59,24 @@ export async function batchExecuteTransaction({
       batchTransactionPda
     );
 
-  const remainingAccounts = await remainingAccountsForTransactionExecute({
-    connection,
-    message: batchTransactionAccount.message,
-    ephemeralSignerBumps: [...batchTransactionAccount.ephemeralSignerBumps],
-    vaultPda,
-    transactionPda: batchPda,
-  });
+  const { accountMetas, lookupTableAccounts } =
+    await accountsForTransactionExecute({
+      connection,
+      message: batchTransactionAccount.message,
+      ephemeralSignerBumps: [...batchTransactionAccount.ephemeralSignerBumps],
+      vaultPda,
+      transactionPda: batchPda,
+    });
 
-  return createBatchExecuteTransactionInstruction({
-    multisig: multisigPda,
-    member,
-    proposal: proposalPda,
-    batch: batchPda,
-    transaction: batchTransactionPda,
-    anchorRemainingAccounts: remainingAccounts,
-  });
+  return {
+    instruction: createBatchExecuteTransactionInstruction({
+      multisig: multisigPda,
+      member,
+      proposal: proposalPda,
+      batch: batchPda,
+      transaction: batchTransactionPda,
+      anchorRemainingAccounts: accountMetas,
+    }),
+    lookupTableAccounts,
+  };
 }

sdk/multisig/src/instructions/vaultTransactionExecute.ts

@@ -1,10 +1,15 @@
-import { Connection, PublicKey } from "@solana/web3.js";
+import {
+  AddressLookupTableAccount,
+  Connection,
+  PublicKey,
+  TransactionInstruction,
+} from "@solana/web3.js";
 import { getProposalPda, getTransactionPda, getVaultPda } from "../pda";
 import {
   createVaultTransactionExecuteInstruction,
   VaultTransaction,
 } from "../generated";
-import { remainingAccountsForTransactionExecute } from "../utils";
+import { accountsForTransactionExecute } from "../utils";
 
 export async function vaultTransactionExecute({
   connection,
@@ -16,7 +21,10 @@ export async function vaultTransactionExecute({
   multisigPda: PublicKey;
   transactionIndex: bigint;
   member: PublicKey;
-}) {
+}): Promise<{
+  instruction: TransactionInstruction;
+  lookupTableAccounts: AddressLookupTableAccount[];
+}> {
   const [proposalPda] = getProposalPda({
     multisigPda,
     transactionIndex,
@@ -35,19 +43,23 @@ export async function vaultTransactionExecute({
     index: transactionAccount.vaultIndex,
   });
 
-  const remainingAccounts = await remainingAccountsForTransactionExecute({
-    connection,
-    message: transactionAccount.message,
-    ephemeralSignerBumps: [...transactionAccount.ephemeralSignerBumps],
-    vaultPda,
-    transactionPda,
-  });
+  const { accountMetas, lookupTableAccounts } =
+    await accountsForTransactionExecute({
+      connection,
+      message: transactionAccount.message,
+      ephemeralSignerBumps: [...transactionAccount.ephemeralSignerBumps],
+      vaultPda,
+      transactionPda,
+    });
 
-  return createVaultTransactionExecuteInstruction({
-    multisig: multisigPda,
-    member,
-    proposal: proposalPda,
-    transaction: transactionPda,
-    anchorRemainingAccounts: remainingAccounts,
-  });
+  return {
+    instruction: createVaultTransactionExecuteInstruction({
+      multisig: multisigPda,
+      member,
+      proposal: proposalPda,
+      transaction: transactionPda,
+      anchorRemainingAccounts: accountMetas,
+    }),
+    lookupTableAccounts,
+  };
 }

sdk/multisig/src/transactions/batchExecuteTransaction.ts

@@ -27,19 +27,20 @@ export async function batchExecuteTransaction({
   batchIndex: bigint;
   transactionIndex: number;
 }): Promise<VersionedTransaction> {
+  const { instruction, lookupTableAccounts } =
+    await instructions.batchExecuteTransaction({
+      connection,
+      multisigPda,
+      member,
+      batchIndex,
+      transactionIndex,
+    });
+
   const message = new TransactionMessage({
     payerKey: feePayer,
     recentBlockhash: blockhash,
-    instructions: [
-      await instructions.batchExecuteTransaction({
-        connection,
-        multisigPda,
-        member,
-        batchIndex,
-        transactionIndex,
-      }),
-    ],
-  }).compileToV0Message();
+    instructions: [instruction],
+  }).compileToV0Message(lookupTableAccounts);
 
   return new VersionedTransaction(message);
 }

sdk/multisig/src/transactions/vaultTransactionExecute.ts

@@ -25,18 +25,19 @@ export async function vaultTransactionExecute({
   transactionIndex: bigint;
   member: PublicKey;
 }): Promise<VersionedTransaction> {
-  const ix = await instructions.vaultTransactionExecute({
-    connection,
-    multisigPda,
-    member,
-    transactionIndex,
-  });
+  const { instruction, lookupTableAccounts } =
+    await instructions.vaultTransactionExecute({
+      connection,
+      multisigPda,
+      member,
+      transactionIndex,
+    });
 
   const message = new TransactionMessage({
     payerKey: feePayer,
     recentBlockhash: blockhash,
-    instructions: [ix],
-  }).compileToV0Message();
+    instructions: [instruction],
+  }).compileToV0Message(lookupTableAccounts);
 
   return new VersionedTransaction(message);
 }

sdk/multisig/src/utils.ts

@@ -133,7 +133,7 @@ export function transactionMessageToMultisigTransactionMessageBytes({
 }
 
 /** Populate remaining accounts required for execution of the transaction. */
-export async function remainingAccountsForTransactionExecute({
+export async function accountsForTransactionExecute({
   connection,
   transactionPda,
   vaultPda,
@@ -145,7 +145,12 @@ export async function remainingAccountsForTransactionExecute({
   ephemeralSignerBumps: number[];
   vaultPda: PublicKey;
   transactionPda: PublicKey;
-}): Promise<AccountMeta[]> {
+}): Promise<{
+  /** Account metas used in the `message`. */
+  accountMetas: AccountMeta[];
+  /** Address lookup table accounts used in the `message`. */
+  lookupTableAccounts: AddressLookupTableAccount[];
+}> {
   const ephemeralSignerPdas = ephemeralSignerBumps.map(
     (_, additionalSignerIndex) => {
       return getEphemeralSignerPda({
@@ -172,17 +177,17 @@ export async function remainingAccountsForTransactionExecute({
     )
   );
 
-  // Populate remaining accounts required for execution of the transaction.
-  const remainingAccounts: AccountMeta[] = [];
+  // Populate account metas required for execution of the transaction.
+  const accountMetas: AccountMeta[] = [];
   // First add the lookup table accounts used by the transaction. They are needed for on-chain validation.
-  remainingAccounts.push(
+  accountMetas.push(
     ...addressLookupTableKeys.map((key) => {
       return { pubkey: key, isSigner: false, isWritable: false };
     })
   );
   // Then add static account keys included into the message.
   for (const [accountIndex, accountKey] of message.accountKeys.entries()) {
-    remainingAccounts.push({
+    accountMetas.push({
       pubkey: accountKey,
       isWritable: isStaticWritableIndex(message, accountIndex),
       // NOTE: vaultPda and ephemeralSignerPdas cannot be marked as signers,
@@ -210,7 +215,7 @@ export async function remainingAccountsForTransactionExecute({
         pubkey,
         `Address lookup table account ${lookup.accountKey.toBase58()} does not contain address at index ${accountIndex}`
       );
-      remainingAccounts.push({
+      accountMetas.push({
         pubkey,
         isWritable: true,
         // Accounts in address lookup tables can not be signers.
@@ -224,7 +229,7 @@ export async function remainingAccountsForTransactionExecute({
         pubkey,
         `Address lookup table account ${lookup.accountKey.toBase58()} does not contain address at index ${accountIndex}`
       );
-      remainingAccounts.push({
+      accountMetas.push({
         pubkey,
         isWritable: false,
         // Accounts in address lookup tables can not be signers.
@@ -233,5 +238,8 @@ export async function remainingAccountsForTransactionExecute({
     }
   }
 
-  return remainingAccounts;
+  return {
+    accountMetas,
+    lookupTableAccounts: [...addressLookupTableAccounts.values()],
+  };
 }

tests/multisig.ts

@@ -2264,19 +2264,14 @@ describe("multisig", () => {
 
       // Execute the transactions from the batch sequentially one-by-one.
       for (const transactionIndex of range(1, testTransactionMessages.length)) {
-        signature = await multisig.rpc
-          .batchExecuteTransaction({
-            connection,
-            feePayer: feePayer,
-            multisigPda,
-            member: members.executor,
-            batchIndex,
-            transactionIndex,
-          })
-          .catch((err: any) => {
-            console.error(err.logs);
-            throw err;
-          });
+        signature = await multisig.rpc.batchExecuteTransaction({
+          connection,
+          feePayer: feePayer,
+          multisigPda,
+          member: members.executor,
+          batchIndex,
+          transactionIndex,
+        });
         await connection.confirmTransaction(signature);
       }