Use a data push to execute the Swap RPC (#120)

Author: jeffyanta

pkg/code/async/geyser/external_deposit.go

@@ -327,16 +327,31 @@ func processPotentialExternalDeposit(ctx context.Context, conf *conf, data code_
 	case commonpb.AccountType_SWAP:
 		bestEffortCacheExternalAccountBalance(ctx, data, tokenAccount, tokenBalances)
 
-		go delayedUsdcDepositProcessing(
+		//		go delayedUsdcDepositProcessing(
+		//			ctx,
+		//			conf,
+		//			data,
+		//			pusher,
+		//			chatMessageReceiver,
+		//			tokenAccount,
+		//			signature,
+		//			blockTime,
+		//		)
+
+		owner, err := common.NewAccountFromPublicKeyString(accountInfoRecord.OwnerAccount)
+		if err != nil {
+			return errors.Wrap(err, "invalid owner account")
+		}
+
+		err = push.SendTriggerSwapRpcPushNotification(
 			ctx,
-			conf,
 			data,
 			pusher,
-			chatMessageReceiver,
-			tokenAccount,
-			signature,
-			blockTime,
+			owner,
 		)
+		if err != nil {
+			return errors.Wrap(err, "error sending push to trigger swap rpc on client")
+		}
 
 		syncedDepositCache.Insert(cacheKey, true, 1)
 

pkg/code/push/data.go

@@ -17,6 +17,7 @@ const (
 	dataPushTypeKey = "code_notification_type"
 
 	chatMessageDataPush dataPushType = "ChatMessage"
+	executeSwapDataPush dataPushType = "ExecuteSwap"
 )
 
 // sendRawDataPushNotificationToOwner is a generic utility for sending raw data push

pkg/code/push/notifications.go

@@ -241,6 +241,34 @@ func SendTwitterAccountConnectedPushNotification(
 	)
 }
 
+// SendTriggerSwapRpcPushNotification sends a data push to trigger the Swap RPC
+func SendTriggerSwapRpcPushNotification(
+	ctx context.Context,
+	data code_data.Provider,
+	pusher push_lib.Provider,
+	owner *common.Account,
+) error {
+	log := logrus.StandardLogger().WithFields(logrus.Fields{
+		"method": "SendTriggerSwapRpcPushNotification",
+		"owner":  owner.PublicKey().ToBase58(),
+	})
+
+	err := sendRawDataPushNotificationToOwner(
+		ctx,
+		data,
+		pusher,
+		owner,
+		executeSwapDataPush,
+		make(map[string]string),
+	)
+	if err != nil {
+		log.WithError(err).Warn("failure sending data push notification")
+		return err
+	}
+
+	return nil
+}
+
 // SendChatMessagePushNotification sends a push notification for chat messages
 func SendChatMessagePushNotification(
 	ctx context.Context,

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

@@ -372,7 +372,7 @@ func (s *transactionServer) Swap(streamer transactionpb.Transaction_SwapServer)
 	// Section: Transaction submission
 	//
 
-	chatMessageTs := time.Now()
+	// chatMessageTs := time.Now()
 
 	_, err = s.data.SubmitBlockchainTransaction(ctx, &txn)
 	if err != nil {
@@ -386,10 +386,10 @@ func (s *transactionServer) Swap(streamer transactionpb.Transaction_SwapServer)
 
 	log.WithField("txn", base64.StdEncoding.EncodeToString(txn.Marshal())).Info("transaction submitted")
 
-	err = s.bestEffortNotifyUserOfSwapInProgress(ctx, owner, chatMessageTs)
-	if err != nil {
-		log.WithError(err).Warn("failure notifying user of swap in progress")
-	}
+	//	err = s.bestEffortNotifyUserOfSwapInProgress(ctx, owner, chatMessageTs)
+	//	if err != nil {
+	//		log.WithError(err).Warn("failure notifying user of swap in progress")
+	//	}
 
 	if !initiateReq.WaitForBlockchainStatus {
 		err = streamer.Send(&transactionpb.SwapResponse{