JS helper: Wrap multisig support

clients/js/package.json

@@ -27,7 +27,8 @@
     "lint:fix": "eslint --fix --ext js,ts,tsx src",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
-    "example:create-mint": "tsx src/example.ts"
+    "example:single-signer": "tsx src/examples/single-signer.ts",
+    "example:multisig": "tsx src/examples/multisig.ts"
   },
   "publishConfig": {
     "access": "public",
@@ -46,7 +47,8 @@
   "dependencies": {
     "@solana-program/system": "^0.7.0",
     "@solana-program/token": "^0.5.1",
-    "@solana-program/token-2022": "^0.4.0"
+    "@solana-program/token-2022": "^0.4.0",
+    "@solana/rpc-types": "^2.1.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.22.0",

clients/js/src/create-mint.ts

@@ -1,20 +1,18 @@
 import {
   Address,
   appendTransactionMessageInstructions,
+  CompilableTransactionMessage,
   createTransactionMessage,
   fetchEncodedAccount,
-  getSignatureFromTransaction,
+  GetAccountInfoApi,
+  GetMinimumBalanceForRentExemptionApi,
   IInstruction,
   KeyPairSigner,
   pipe,
   Rpc,
-  RpcSubscriptions,
-  sendAndConfirmTransactionFactory,
   setTransactionMessageFeePayerSigner,
   setTransactionMessageLifetimeUsingBlockhash,
-  signTransactionMessageWithSigners,
-  SolanaRpcApi,
-  SolanaRpcSubscriptionsApi,
+  TransactionMessageWithBlockhashLifetime,
 } from '@solana/kit';
 import { getMintSize } from '@solana-program/token-2022';
 import { getTransferSolInstruction } from '@solana-program/system';
@@ -24,22 +22,36 @@ import {
   getBackpointerSize,
   getCreateMintInstruction,
 } from './generated';
+import { Blockhash } from '@solana/rpc-types';
 
-export const executeCreateMint = async ({
+export interface CreateMintTxArgs {
+  rpc: Rpc<GetAccountInfoApi & GetMinimumBalanceForRentExemptionApi>;
+  blockhash: {
+    blockhash: Blockhash;
+    lastValidBlockHeight: bigint;
+  };
+  unwrappedMint: Address;
+  wrappedTokenProgram: Address;
+  payer: KeyPairSigner;
+  idempotent: boolean;
+}
+
+export interface CreateMintTxResult {
+  wrappedMint: Address;
+  backpointer: Address;
+  fundedWrappedMintLamports: bigint;
+  fundedBackpointerLamports: bigint;
+  tx: CompilableTransactionMessage & TransactionMessageWithBlockhashLifetime;
+}
+
+export async function createMintTx({
   rpc,
-  rpcSubscriptions,
+  blockhash,
   unwrappedMint,
   wrappedTokenProgram,
   payer,
   idempotent = false,
-}: {
-  rpc: Rpc<SolanaRpcApi>;
-  rpcSubscriptions: RpcSubscriptions<SolanaRpcSubscriptionsApi>;
-  unwrappedMint: Address;
-  wrappedTokenProgram: Address;
-  payer: KeyPairSigner;
-  idempotent: boolean;
-}) => {
+}: CreateMintTxArgs): Promise<CreateMintTxResult> {
   const [wrappedMint] = await findWrappedMintPda({
     unwrappedMint,
     wrappedTokenProgram: wrappedTokenProgram,
@@ -101,26 +113,18 @@ export const executeCreateMint = async ({
     }),
   );
 
-  const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
-
-  // Build transaction
   const tx = pipe(
     createTransactionMessage({ version: 0 }),
     tx => setTransactionMessageFeePayerSigner(payer, tx),
-    tx => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, tx),
+    tx => setTransactionMessageLifetimeUsingBlockhash(blockhash, tx),
     tx => appendTransactionMessageInstructions(instructions, tx),
   );
 
-  // Send tx
-  const signedTransaction = await signTransactionMessageWithSigners(tx);
-  const sendAndConfirm = sendAndConfirmTransactionFactory({ rpc, rpcSubscriptions });
-  await sendAndConfirm(signedTransaction, { commitment: 'confirmed' });
-
   return {
     wrappedMint,
     backpointer,
-    signature: getSignatureFromTransaction(signedTransaction),
+    tx,
     fundedWrappedMintLamports,
     fundedBackpointerLamports,
   };
-};
+}