feat(core): add transaction to send mutations and myupdates (#3619)

* feat(core): add transaction to send mutations and myupdates * chore(core): update graphql schemas * fix: integration tests * fix: legacy integration tests --------- Co-authored-by: vindard <[email protected]>
GaloyMoney · Nov 30, 2023 · 81e1678 · 81e1678
1 parent 16e01b6
commit 81e1678
Show file tree

Hide file tree

Showing 26 changed files with 544 additions and 134 deletions.
diff --git a/core/api/dev/apollo-federation/supergraph.graphql b/core/api/dev/apollo-federation/supergraph.graphql
@@ -621,11 +621,12 @@ input IntraLedgerPaymentSendInput
 type IntraLedgerUpdate
   @join__type(graph: PUBLIC)
 {
-  amount: SatAmount!
-  displayCurrencyPerSat: Float!
+  amount: SatAmount! @deprecated(reason: "Deprecated in favor of transaction")
+  displayCurrencyPerSat: Float! @deprecated(reason: "Deprecated in favor of transaction")
+  transaction: Transaction!
   txNotificationType: TxNotificationType!
   usdPerSat: Float! @deprecated(reason: "updated over displayCurrencyPerSat")
-  walletId: WalletId!
+  walletId: WalletId! @deprecated(reason: "Deprecated in favor of transaction")
 }
 
 input IntraLedgerUsdPaymentSendInput
@@ -917,9 +918,10 @@ scalar LnPaymentSecret
 type LnUpdate
   @join__type(graph: PUBLIC)
 {
-  paymentHash: PaymentHash!
+  paymentHash: PaymentHash! @deprecated(reason: "Deprecated in favor of transaction")
   status: InvoicePaymentStatus!
-  walletId: WalletId!
+  transaction: Transaction!
+  walletId: WalletId! @deprecated(reason: "Deprecated in favor of transaction")
 }
 
 input LnUsdInvoiceBtcDenominatedCreateOnBehalfOfRecipientInput
@@ -1240,12 +1242,13 @@ scalar OnChainTxHash
 type OnChainUpdate
   @join__type(graph: PUBLIC)
 {
-  amount: SatAmount!
-  displayCurrencyPerSat: Float!
-  txHash: OnChainTxHash!
+  amount: SatAmount! @deprecated(reason: "Deprecated in favor of transaction")
+  displayCurrencyPerSat: Float! @deprecated(reason: "Deprecated in favor of transaction")
+  transaction: Transaction!
+  txHash: OnChainTxHash! @deprecated(reason: "Deprecated in favor of transaction")
   txNotificationType: TxNotificationType!
   usdPerSat: Float! @deprecated(reason: "updated over displayCurrencyPerSat")
-  walletId: WalletId!
+  walletId: WalletId! @deprecated(reason: "Deprecated in favor of transaction")
 }
 
 input OnChainUsdPaymentSendAsBtcDenominatedInput
@@ -1321,6 +1324,7 @@ type PaymentSendPayload
 {
   errors: [Error!]!
   status: PaymentSendResult
+  transaction: Transaction
 }
 
 enum PaymentSendResult

diff --git a/core/api/src/app/payments/index.types.d.ts b/core/api/src/app/payments/index.types.d.ts
@@ -0,0 +1,4 @@
+type PaymentSendResult = {
+  status: PaymentSendStatus
+  transaction: WalletTransaction
+}
diff --git a/core/api/src/app/payments/send-intraledger.ts b/core/api/src/app/payments/send-intraledger.ts
@@ -51,7 +51,7 @@ const intraledgerPaymentSendWalletId = async ({
   amount: uncheckedAmount,
   memo,
   senderWalletId: uncheckedSenderWalletId,
-}: IntraLedgerPaymentSendWalletIdArgs): Promise<PaymentSendStatus | ApplicationError> => {
+}: IntraLedgerPaymentSendWalletIdArgs): Promise<PaymentSendResult | ApplicationError> => {
   const validatedPaymentInputs = await validateIntraledgerPaymentInputs({
     uncheckedSenderWalletId,
     uncheckedRecipientWalletId,
@@ -117,15 +117,15 @@ const intraledgerPaymentSendWalletId = async ({
     "payment.finalRecipient": JSON.stringify(paymentFlow.recipientWalletDescriptor()),
   })
 
-  const paymentSendStatus = await executePaymentViaIntraledger({
+  const paymentSendResult = await executePaymentViaIntraledger({
     paymentFlow,
     senderAccount,
     senderWallet,
     recipientAccount,
     recipientWallet,
     memo,
   })
-  if (paymentSendStatus instanceof Error) return paymentSendStatus
+  if (paymentSendResult instanceof Error) return paymentSendResult
 
   if (senderAccount.id !== recipientAccount.id) {
     const addContactResult = await addContactsAfterSend({
@@ -137,19 +137,19 @@ const intraledgerPaymentSendWalletId = async ({
     }
   }
 
-  return paymentSendStatus
+  return paymentSendResult
 }
 
 export const intraledgerPaymentSendWalletIdForBtcWallet = async (
   args: IntraLedgerPaymentSendWalletIdArgs,
-): Promise<PaymentSendStatus | ApplicationError> => {
+): Promise<PaymentSendResult | ApplicationError> => {
   const validated = await validateIsBtcWallet(args.senderWalletId)
   return validated instanceof Error ? validated : intraledgerPaymentSendWalletId(args)
 }
 
 export const intraledgerPaymentSendWalletIdForUsdWallet = async (
   args: IntraLedgerPaymentSendWalletIdArgs,
-): Promise<PaymentSendStatus | ApplicationError> => {
+): Promise<PaymentSendResult | ApplicationError> => {
   const validated = await validateIsUsdWallet(args.senderWalletId)
   return validated instanceof Error ? validated : intraledgerPaymentSendWalletId(args)
 }
@@ -219,7 +219,7 @@ const executePaymentViaIntraledger = async <
   recipientAccount: Account
   recipientWallet: WalletDescriptor<R>
   memo: string | null
-}): Promise<PaymentSendStatus | ApplicationError> => {
+}): Promise<PaymentSendResult | ApplicationError> => {
   addAttributesToCurrentSpan({
     "payment.settlement_method": SettlementMethod.IntraLedger,
   })
@@ -398,6 +398,9 @@ const executePaymentViaIntraledger = async <
       })
     }
 
-    return PaymentSendStatus.Success
+    return {
+      status: PaymentSendStatus.Success,
+      transaction: senderWalletTransaction,
+    }
   })
 }