Merge pull request #284 from convergence-rfq/eng-1871-add-max-tries-a…

…rg-to-cli

Eng 1871 add max retries arg to cli

packages/cli/src/cvg.ts

@@ -1,14 +1,16 @@
 import { readFileSync } from 'fs';
 import { Connection, Keypair } from '@solana/web3.js';
 import { Convergence, keypairIdentity } from '@convergence-rfq/sdk';
-import { resolveTxPriorityArg } from './helpers';
+import { resolveMaxRetriesArg, resolveTxPriorityArg } from './helpers';
 
 export type Opts = any;
 
 export const createCvg = async (opts: Opts): Promise<Convergence> => {
   const buffer = JSON.parse(readFileSync(opts.keypairFile, 'utf8'));
   const user = Keypair.fromSecretKey(new Uint8Array(buffer));
   const txPriorityString: string = opts.txPriorityFee;
+  const maxRetriesString = opts.maxRetries;
+  const maxRetries = resolveMaxRetriesArg(maxRetriesString);
 
   const txPriority = resolveTxPriorityArg(txPriorityString);
   const cvg = new Convergence(
@@ -18,6 +20,7 @@ export const createCvg = async (opts: Opts): Promise<Convergence> => {
     {
       skipPreflight: opts.skipPreflight,
       transactionPriority: txPriority,
+      maxRetries,
     }
   );
   cvg.use(keypairIdentity(user));

packages/cli/src/helpers.ts

@@ -58,6 +58,11 @@ export const addDefaultArgs = (cmd: any) => {
     'transaction priority fee can be [none : 0 mcLamports , normal : 1 mcLamports, high : 10 mcLamports, turbo : 100 mcLamports, custom : <number> mcLamports]',
     'none'
   );
+  cmd.option(
+    '--max-retries <number>',
+    'maximum numbers of retries for sending failed txs',
+    0
+  );
   cmd.option('--keypair-file <string>', 'keypair file', DEFAULT_KEYPAIR_FILE);
   cmd.option('--verbose <boolean>', 'verbose', false);
   return cmd;
@@ -175,3 +180,11 @@ export const resolveTxPriorityArg = (
       }
   }
 };
+
+export const resolveMaxRetriesArg = (maxRetries: string): number => {
+  const maxRetriesInNumber = Number(maxRetries);
+  if (isNaN(maxRetriesInNumber) || maxRetriesInNumber < 0) {
+    return 0;
+  }
+  return maxRetriesInNumber;
+};

packages/js/src/Convergence.ts

@@ -11,19 +11,22 @@ export type ConvergenceOptions = {
   cluster?: Cluster;
   skipPreflight?: boolean;
   transactionPriority?: TransactionPriority;
+  maxRetries?: number;
 };
 
 export class Convergence {
   public readonly connection: Connection;
   public readonly cluster: Cluster;
   public readonly skipPreflight: boolean;
   public readonly transactionPriority: TransactionPriority;
+  public readonly maxRetries: number;
 
   constructor(connection: Connection, options: ConvergenceOptions = {}) {
     this.connection = connection;
     this.cluster = options.cluster ?? resolveClusterFromConnection(connection);
     this.skipPreflight = options.skipPreflight ?? false;
     this.transactionPriority = options.transactionPriority ?? 'none';
+    this.maxRetries = options.maxRetries ?? 0;
     this.use(corePlugins());
   }
 

packages/js/src/plugins/rpcModule/RpcClient.ts

@@ -232,6 +232,14 @@ export class RpcClient {
     }
 
     const rawTransaction = transaction.serialize();
+
+    const { maxRetries } = this.convergence;
+    if (maxRetries > 0) {
+      confirmOptions = {
+        ...confirmOptions,
+        maxRetries,
+      };
+    }
     const signature = await this.sendRawTransaction(
       rawTransaction,
       confirmOptions,

packages/js/src/utils/TransactionBuilder.ts

@@ -267,6 +267,14 @@ export class TransactionBuilder<C extends object = object> {
     convergence: Convergence,
     confirmOptions?: ConfirmOptions
   ): Promise<{ response: SendAndConfirmTransactionResponse } & C> {
+    const { maxRetries } = convergence;
+
+    if (maxRetries > 0) {
+      confirmOptions = {
+        ...confirmOptions,
+        maxRetries,
+      };
+    }
     const response = await convergence
       .rpc()
       .sendAndConfirmTransaction(this, [], confirmOptions);