Improve swap status poller and error reporting wrt context errors

pkg/code/server/grpc/transaction/v2/errors.go

@@ -1,6 +1,7 @@
 package transaction_v2
 
 import (
+	"context"
 	"errors"
 	"fmt"
 
@@ -226,8 +227,10 @@ func handleSubmitIntentError(streamer transactionpb.Transaction_SubmitIntentServ
 
 	// Case 2: Errors that map to gRPC status errors
 	switch err {
-	case ErrTimedOutReceivingRequest:
+	case ErrTimedOutReceivingRequest, context.DeadlineExceeded:
 		return status.Error(codes.DeadlineExceeded, err.Error())
+	case context.Canceled:
+		return status.Error(codes.Canceled, err.Error())
 	case transaction.ErrNoAvailableNonces:
 		return status.Error(codes.Unavailable, "")
 	}
@@ -281,8 +284,10 @@ func handleSwapError(streamer transactionpb.Transaction_SwapServer, err error) e
 
 	// Case 2: Errors that map to gRPC status errors
 	switch err {
-	case ErrTimedOutReceivingRequest:
+	case ErrTimedOutReceivingRequest, context.DeadlineExceeded:
 		return status.Error(codes.DeadlineExceeded, err.Error())
+	case context.Canceled:
+		return status.Error(codes.Canceled, err.Error())
 	}
 	return status.Error(codes.Internal, "rpc server failure")
 }

pkg/code/server/grpc/transaction/v2/swap.go

@@ -380,32 +380,35 @@ func (s *transactionServer) Swap(streamer transactionpb.Transaction_SwapServer)
 	}
 
 	for {
-		time.Sleep(time.Second)
-
-		statuses, err := s.data.GetBlockchainSignatureStatuses(ctx, []solana.Signature{solana.Signature(txn.Signature())})
-		if err != nil {
-			continue
-		}
+		select {
+		case <-time.After(time.Second):
+			statuses, err := s.data.GetBlockchainSignatureStatuses(ctx, []solana.Signature{solana.Signature(txn.Signature())})
+			if err != nil {
+				continue
+			}
 
-		if len(statuses) == 0 || statuses[0] == nil {
-			continue
-		}
+			if len(statuses) == 0 || statuses[0] == nil {
+				continue
+			}
 
-		if statuses[0].ErrorResult != nil {
-			log.WithError(statuses[0].ErrorResult).Warn("transaction failed")
-			return handleSwapStructuredError(streamer, transactionpb.SwapResponse_Error_SWAP_FAILED)
-		}
+			if statuses[0].ErrorResult != nil {
+				log.WithError(statuses[0].ErrorResult).Warn("transaction failed")
+				return handleSwapStructuredError(streamer, transactionpb.SwapResponse_Error_SWAP_FAILED)
+			}
 
-		if statuses[0].Finalized() {
-			log.Debug("transaction succeeded and is finalized")
-			err = streamer.Send(&transactionpb.SwapResponse{
-				Response: &transactionpb.SwapResponse_Success_{
-					Success: &transactionpb.SwapResponse_Success{
-						Code: transactionpb.SwapResponse_Success_SWAP_FINALIZED,
+			if statuses[0].Finalized() {
+				log.Debug("transaction succeeded and is finalized")
+				err = streamer.Send(&transactionpb.SwapResponse{
+					Response: &transactionpb.SwapResponse_Success_{
+						Success: &transactionpb.SwapResponse_Success{
+							Code: transactionpb.SwapResponse_Success_SWAP_FINALIZED,
+						},
 					},
-				},
-			})
-			return handleSwapError(streamer, err)
+				})
+				return handleSwapError(streamer, err)
+			}
+		case <-ctx.Done():
+			return handleSwapError(streamer, ctx.Err())
 		}
 	}
 }