feat: sendAndConfirmTransaction handle signing

solana-foundation · Feb 26, 2025 · e58ed47 · e58ed47
1 parent 2658159
commit e58ed47
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.changeset/nervous-rivers-move.md b/.changeset/nervous-rivers-move.md
@@ -0,0 +1,5 @@
+---
+"gill": minor
+---
+
+allow `sendAndConfirmTransaction` to also handle signing
diff --git a/packages/gill/src/kit/send-and-confirm-transaction.ts b/packages/gill/src/kit/send-and-confirm-transaction.ts
@@ -6,12 +6,14 @@ import {
     createRecentSignatureConfirmationPromiseFactory,
     waitForRecentTransactionConfirmation,
 } from '@solana/transaction-confirmation';
-import type { FullySignedTransaction, TransactionWithBlockhashLifetime } from '@solana/transactions';
+import { type FullySignedTransaction, type TransactionWithBlockhashLifetime } from '@solana/transactions';
 
 import { sendAndConfirmTransactionWithBlockhashLifetime_INTERNAL_ONLY_DO_NOT_EXPORT } from './send-transaction-internal';
+import type { CompilableTransactionMessage } from '@solana/transaction-messages';
+import { signTransactionMessageWithSigners } from '@solana/signers';
 
 export type SendAndConfirmTransactionWithBlockhashLifetimeFunction = (
-    transaction: FullySignedTransaction & TransactionWithBlockhashLifetime,
+    transaction: (FullySignedTransaction & TransactionWithBlockhashLifetime) | CompilableTransactionMessage,
     config?: Omit<
         Parameters<typeof sendAndConfirmTransactionWithBlockhashLifetime_INTERNAL_ONLY_DO_NOT_EXPORT>[0],
         'confirmRecentTransaction' | 'rpc' | 'transaction'
@@ -65,6 +67,9 @@ export function sendAndConfirmTransactionFactory<TCluster extends 'devnet' | 'ma
     }
 
     return async function sendAndConfirmTransaction(transaction, config = { commitment: "confirmed" }) {
+        if ("messageBytes" in transaction == false){
+            transaction = await signTransactionMessageWithSigners(transaction) as Readonly<FullySignedTransaction & TransactionWithBlockhashLifetime>;
+        }
         return await sendAndConfirmTransactionWithBlockhashLifetime_INTERNAL_ONLY_DO_NOT_EXPORT({
             ...config,
             confirmRecentTransaction,