fix_: properly check type casts in activity service

status-im · Jan 23, 2025 · c963ccf · c963ccf
1 parent e4d5622
commit c963ccf
Showing 1 changed file with 28 additions and 16 deletions.
diff --git a/services/wallet/activity/service.go b/services/wallet/activity/service.go
@@ -136,11 +136,13 @@ func (s *Service) FilterActivityAsync(requestID int32, addresses []common.Addres
 		if errors.Is(err, context.Canceled) || errors.Is(err, async.ErrTaskOverwritten) {
 			res.ErrorCode = ErrorCodeTaskCanceled
 		} else if err == nil {
-			activities := result.([]Entry)
-			res.Activities = activities
-			res.Offset = offset
-			res.HasMore = len(activities) == limit
-			res.ErrorCode = ErrorCodeSuccess
+			activities, ok := result.([]Entry)
+			if ok {
+				res.Activities = activities
+				res.Offset = offset
+				res.HasMore = len(activities) == limit
+				res.ErrorCode = ErrorCodeSuccess
+			}
 		}
 
 		sendResponseEvent(s.eventFeed, &requestID, EventActivityFilteringDone, res, err)
@@ -196,11 +198,13 @@ func (s *Service) GetActivityCollectiblesAsync(requestID int32, chainIDs []w_com
 		if errors.Is(err, context.Canceled) || errors.Is(err, async.ErrTaskOverwritten) {
 			res.ErrorCode = ErrorCodeTaskCanceled
 		} else if err == nil {
-			collectibles := result.([]CollectibleHeader)
-			res.Collectibles = collectibles
-			res.Offset = offset
-			res.HasMore = len(collectibles) == limit
-			res.ErrorCode = ErrorCodeSuccess
+			collectibles, ok := result.([]CollectibleHeader)
+			if ok {
+				res.Collectibles = collectibles
+				res.Offset = offset
+				res.HasMore = len(collectibles) == limit
+				res.ErrorCode = ErrorCodeSuccess
+			}
 		}
 
 		sendResponseEvent(s.eventFeed, &requestID, EventActivityGetCollectibles, res, err)
@@ -316,14 +320,19 @@ func (s *Service) GetRecipientsAsync(requestID int32, chainIDs []w_common.ChainI
 		result.Addresses, result.HasMore, err = GetRecipients(ctx, s.db, chainIDs, addresses, offset, limit)
 		return result, err
 	}, func(result interface{}, taskType async.TaskType, err error) {
-		res := result.(*GetRecipientsResponse)
+		res := &GetRecipientsResponse{
+			ErrorCode: ErrorCodeFailed,
+		}
 		if errors.Is(err, context.Canceled) || errors.Is(err, async.ErrTaskOverwritten) {
 			res.ErrorCode = ErrorCodeTaskCanceled
-		} else if err != nil {
-			res.ErrorCode = ErrorCodeFailed
+		} else if err == nil {
+			recipientsResponse, ok := result.(*GetRecipientsResponse)
+			if ok {
+				res = recipientsResponse
+			}
 		}
 
-		sendResponseEvent(s.eventFeed, &requestID, EventActivityGetRecipientsDone, result, err)
+		sendResponseEvent(s.eventFeed, &requestID, EventActivityGetRecipientsDone, res, err)
 	})
 }
 
@@ -344,8 +353,11 @@ func (s *Service) GetOldestTimestampAsync(requestID int32, addresses []common.Ad
 		if errors.Is(err, context.Canceled) || errors.Is(err, async.ErrTaskOverwritten) {
 			res.ErrorCode = ErrorCodeTaskCanceled
 		} else if err == nil {
-			res.Timestamp = int64(result.(uint64))
-			res.ErrorCode = ErrorCodeSuccess
+			timestamp, ok := result.(uint64)
+			if ok {
+				res.Timestamp = int64(timestamp)
+				res.ErrorCode = ErrorCodeSuccess
+			}
 		}
 
 		sendResponseEvent(s.eventFeed, &requestID, EventActivityGetOldestTimestampDone, res, err)