From fb239f1f739e05747c886100b4fde70f9088b596 Mon Sep 17 00:00:00 2001
From: Dharit Tantiviramanond <dharit.tan@gmail.com>
Date: Wed, 20 Mar 2024 16:45:25 -0400
Subject: [PATCH 1/2] Log retryTxId in TransactionHandler

---
 .../libs/src/services/solana/transactionHandler.ts     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/libs/src/services/solana/transactionHandler.ts b/packages/libs/src/services/solana/transactionHandler.ts
index 111a5fc26da..9c01e485e57 100644
--- a/packages/libs/src/services/solana/transactionHandler.ts
+++ b/packages/libs/src/services/solana/transactionHandler.ts
@@ -301,17 +301,23 @@ export class TransactionHandler {
 
     let done = false
 
-    // Start up resubmission loop
+    // Start up resubmission loop. It will run in the background and continue
+    // to send the transaction until it hits a timeout.
     let sendCount = 0
     const startTime = Date.now()
+    let retryTxId
     if (retry) {
       ;(async () => {
         let elapsed = Date.now() - startTime
         // eslint-disable-next-line no-unmodified-loop-condition
         while (!done && elapsed < this.retryTimeoutMs) {
           try {
-            sendRawTransaction()
+            retryTxId = sendRawTransaction()
+            logger.info(
+              `transactionHandler: retrying txId ${txid} with retryTxId ${retryTxId}, sendCount ${sendCount}`
+            )
           } catch (e) {
+            // Retry only after sendRawTransaction throws an error
             logger.error(
               `transactionHandler: error in send loop: ${e} for txId ${txid}`
             )

From 908d8a718e2f7860a82fdc112cd141bd214ed479 Mon Sep 17 00:00:00 2001
From: Dharit Tantiviramanond <dharit.tan@gmail.com>
Date: Wed, 20 Mar 2024 16:48:08 -0400
Subject: [PATCH 2/2] remove comment

---
 packages/libs/src/services/solana/transactionHandler.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/libs/src/services/solana/transactionHandler.ts b/packages/libs/src/services/solana/transactionHandler.ts
index 9c01e485e57..9dde00afb3f 100644
--- a/packages/libs/src/services/solana/transactionHandler.ts
+++ b/packages/libs/src/services/solana/transactionHandler.ts
@@ -317,7 +317,6 @@ export class TransactionHandler {
               `transactionHandler: retrying txId ${txid} with retryTxId ${retryTxId}, sendCount ${sendCount}`
             )
           } catch (e) {
-            // Retry only after sendRawTransaction throws an error
             logger.error(
               `transactionHandler: error in send loop: ${e} for txId ${txid}`
             )