tests + check to save rpc calls

pkg/solana/txm/pendingtx.go

@@ -30,6 +30,8 @@ type PendingTxContext interface {
 	ListAll() []solana.Signature
 	// ListAllExpiredBroadcastedTxs returns all the txes that are in broadcasted state and have expired for given slot height compared against their lastValidBlockHeight.
 	ListAllExpiredBroadcastedTxs(currHeight uint64) []pendingTx
+	// ListAllBroadcastedTxs returns all the txes that are in broadcasted state.
+	ListAllBroadcastedTxs() []pendingTx
 	// Expired returns whether or not confirmation timeout amount of time has passed since creation
 	Expired(sig solana.Signature, confirmationTimeout time.Duration) bool
 	// OnProcessed marks transactions as Processed
@@ -215,7 +217,7 @@ func (c *pendingTxContext) ListAll() []solana.Signature {
 	return maps.Keys(c.sigToID)
 }
 
-// ListAllExpiredBroadcastedTxs returns all the expired broadcasted that are in broadcasted state and have expired for given slot height.
+// ListAllExpiredBroadcastedTxs returns all the txes that are in broadcasted state and have expired for given slot height compared against their lastValidBlockHeight.
 func (c *pendingTxContext) ListAllExpiredBroadcastedTxs(currHeight uint64) []pendingTx {
 	c.lock.RLock()
 	defer c.lock.RUnlock()
@@ -228,6 +230,19 @@ func (c *pendingTxContext) ListAllExpiredBroadcastedTxs(currHeight uint64) []pen
 	return broadcastedTxes
 }
 
+// ListAllBroadcastedTxs returns all the txes that are in broadcasted state.
+func (c *pendingTxContext) ListAllBroadcastedTxs() []pendingTx {
+	c.lock.RLock()
+	defer c.lock.RUnlock()
+	broadcastedTxes := make([]pendingTx, 0, len(c.broadcastedProcessedTxs)) // worst case, all of them
+	for _, tx := range c.broadcastedProcessedTxs {
+		if tx.state == Broadcasted {
+			broadcastedTxes = append(broadcastedTxes, tx)
+		}
+	}
+	return broadcastedTxes
+}
+
 // Expired returns if the timeout for trying to confirm a signature has been reached
 func (c *pendingTxContext) Expired(sig solana.Signature, confirmationTimeout time.Duration) bool {
 	c.lock.RLock()
@@ -638,3 +653,7 @@ func (c *pendingTxContextWithProm) TrimFinalizedErroredTxs() {
 func (c *pendingTxContextWithProm) GetTxRebroadcastCount(id string) (int, error) {
 	return c.pendingTx.GetTxRebroadcastCount(id)
 }
+
+func (c *pendingTxContextWithProm) ListAllBroadcastedTxs() []pendingTx {
+	return c.pendingTx.ListAllBroadcastedTxs()
+}

pkg/solana/txm/txm.go

@@ -392,6 +392,12 @@ func (txm *Txm) confirm() {
 				break
 			}
 			txm.processConfirmations(ctx, client)
+
+			// In case all txes where confirmed and there's nothing to rebroadcast.
+			// This check saves making 2 RPC calls (slot height + blockhash) when there's nothing to process.
+			if len(txm.txs.ListAllBroadcastedTxs()) == 0 {
+				break
+			}
 			if txm.cfg.TxExpirationRebroadcast() {
 				txm.rebroadcastExpiredTxs(ctx, client)
 			}