add sendAndConfirmTx fn when signing individual txs

convergence-rfq · Sep 11, 2023 · df69c67 · df69c67
1 parent 85aa453
commit df69c67
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/packages/js/src/plugins/psyoptionsEuropeanInstrumentModule/helpers.ts b/packages/js/src/plugins/psyoptionsEuropeanInstrumentModule/helpers.ts
@@ -46,8 +46,9 @@ export const initializeNewEuropeanOption = async (
   if (tx.instructions.length > 0) {
     tx.recentBlockhash = latestBlockHash.blockhash;
     tx.feePayer = convergence.rpc().getDefaultFeePayer().publicKey;
-    await convergence.identity().signTransaction(tx);
-    await convergence.rpc().serializeAndSendTransaction(tx, latestBlockHash);
+    await convergence
+      .rpc()
+      .sendAndConfirmTransaction(tx, [convergence.identity()]);
   }
 
   const strikePriceSize = addDecimals(strikePrice, stableMint.decimals);
@@ -79,10 +80,9 @@ export const initializeNewEuropeanOption = async (
     const createTx = new Transaction().add(createIx);
     createTx.recentBlockhash = latestBlockHash.blockhash;
     createTx.feePayer = convergence.rpc().getDefaultFeePayer().publicKey;
-    const signedTx = await convergence.identity().signTransaction(createTx);
     await convergence
       .rpc()
-      .serializeAndSendTransaction(signedTx, latestBlockHash);
+      .sendAndConfirmTransaction(createTx, [convergence.identity()]);
   }
 
   return {

diff --git a/packages/js/src/plugins/rpcModule/RpcClient.ts b/packages/js/src/plugins/rpcModule/RpcClient.ts
@@ -283,8 +283,8 @@ export class RpcClient {
 
   async sendAndConfirmTransaction(
     transaction: Transaction | TransactionBuilder,
-    confirmOptions?: ConfirmOptions,
-    signers: Signer[] = []
+    signers: Signer[] = [],
+    confirmOptions?: ConfirmOptions
   ): Promise<SendAndConfirmTransactionResponse> {
     const prepared = await this.prepareTransaction(transaction, signers);
     const { blockhashWithExpiryBlockHeight } = prepared;

diff --git a/packages/js/src/utils/TransactionBuilder.ts b/packages/js/src/utils/TransactionBuilder.ts
@@ -196,7 +196,7 @@ export class TransactionBuilder<C extends object = object> {
   ): Promise<{ response: SendAndConfirmTransactionResponse } & C> {
     const response = await convergence
       .rpc()
-      .sendAndConfirmTransaction(this, confirmOptions);
+      .sendAndConfirmTransaction(this, [], confirmOptions);
 
     return {
       response,