event identifier

proto/autogenerated/client.md

@@ -95,9 +95,9 @@ The nostr server will send back a message response, and inside the body there wi
 
 - __User__:
   - expected context content
+    - __app_user_id__: _string_
     - __user_id__: _string_
     - __app_id__: _string_
-    - __app_user_id__: _string_
 
 - __Admin__:
   - expected context content
@@ -372,12 +372,139 @@ The nostr server will send back a message response, and inside the body there wi
 ## Messages
 ### The content of requests and response from the methods
 
-### LndGetInfoResponse
+### GetAppUserLNURLInfoRequest
-  - __alias__: _string_
+  - __user_identifier__: _string_
+  - __base_url_override__: _string_
 
-### SendAppUserToAppUserPaymentRequest
+### SetMockAppBalanceRequest
+  - __amount__: _number_
+
+### PayAddressResponse
+  - __txId__: _string_
+
+### DecodeInvoiceRequest
+  - __invoice__: _string_
+
+### OpenChannelResponse
+  - __channelId__: _string_
+
+### UserInfo
+  - __userId__: _string_
+  - __balance__: _number_
+
+### GetUserOperationsResponse
+  - __latestOutgoingInvoiceOperations__: _[UserOperations](#UserOperations)_
+  - __latestIncomingInvoiceOperations__: _[UserOperations](#UserOperations)_
+  - __latestOutgoingTxOperations__: _[UserOperations](#UserOperations)_
+  - __latestIncomingTxOperations__: _[UserOperations](#UserOperations)_
+  - __latestOutgoingUserToUserPayemnts__: _[UserOperations](#UserOperations)_
+  - __latestIncomingUserToUserPayemnts__: _[UserOperations](#UserOperations)_
+
+### Product
+  - __id__: _string_
+  - __name__: _string_
+  - __price_sats__: _number_
+
+### Empty
+
+### AuthAppRequest
+  - __name__: _string_
+  - __allow_user_creation__: _boolean_ *this field is optional
+
+### AddAppInvoiceRequest
+  - __payer_identifier__: _string_
+  - __http_callback_url__: _string_
+  - __invoice_req__: _[NewInvoiceRequest](#NewInvoiceRequest)_
+
+### PayAppUserInvoiceResponse
+  - __preimage__: _string_
+  - __amount_paid__: _number_
+
+### NewAddressRequest
+  - __addressType__: _[AddressType](#AddressType)_
+
+### PayInvoiceResponse
+  - __preimage__: _string_
+  - __amount_paid__: _number_
+
+### UserOperation
+  - __paidAtUnix__: _number_
+  - __type__: _[UserOperationType](#UserOperationType)_
+  - __inbound__: _boolean_
+  - __amount__: _number_
+  - __identifier__: _string_
+
+### UserOperations
+  - __fromIndex__: _number_
+  - __toIndex__: _number_
+  - __operations__: ARRAY of: _[UserOperation](#UserOperation)_
+
+### SetMockAppUserBalanceRequest
+  - __user_identifier__: _string_
+  - __amount__: _number_
+
+### NewInvoiceRequest
+  - __amountSats__: _number_
+  - __memo__: _string_
+
+### OpenChannelRequest
+  - __destination__: _string_
+  - __fundingAmount__: _number_
+  - __pushAmount__: _number_
+  - __closeAddress__: _string_
+
+### HandleLnurlPayResponse
+  - __pr__: _string_
+  - __routes__: ARRAY of: _[Empty](#Empty)_
+
+### GetUserOperationsRequest
+  - __latestIncomingInvoice__: _number_
+  - __latestOutgoingInvoice__: _number_
+  - __latestIncomingTx__: _number_
+  - __latestOutgoingTx__: _number_
+  - __latestIncomingUserToUserPayment__: _number_
+  - __latestOutgoingUserToUserPayment__: _number_
+
+### AddAppRequest
+  - __name__: _string_
+  - __allow_user_creation__: _boolean_
+
+### AppUser
+  - __identifier__: _string_
+  - __info__: _[UserInfo](#UserInfo)_
+  - __max_withdrawable__: _number_
+
+### AddAppUserInvoiceRequest
+  - __receiver_identifier__: _string_
+  - __payer_identifier__: _string_
+  - __http_callback_url__: _string_
+  - __invoice_req__: _[NewInvoiceRequest](#NewInvoiceRequest)_
+
+### NewAddressResponse
+  - __address__: _string_
+
+### PayInvoiceRequest
+  - __invoice__: _string_
+  - __amount__: _number_
+
+### GetProductBuyLinkResponse
+  - __link__: _string_
+
+### LndGetInfoRequest
+  - __nodeId__: _number_
+
+### SetMockInvoiceAsPaidRequest
+  - __invoice__: _string_
+  - __amount__: _number_
+
+### Application
+  - __name__: _string_
+  - __id__: _string_
+  - __balance__: _number_
+  - __npub__: _string_
+
+### SendAppUserToAppPaymentRequest
   - __from_user_identifier__: _string_
-  - __to_user_identifier__: _string_
   - __amount__: _number_
 
 ### LnurlPayInfoResponse
@@ -387,8 +514,26 @@ The nostr server will send back a message response, and inside the body there wi
   - __minSendable__: _number_
   - __metadata__: _string_
 
-### NewAddressRequest
+### LndGetInfoResponse
-  - __addressType__: _[AddressType](#AddressType)_
+  - __alias__: _string_
+
+### AddAppUserRequest
+  - __identifier__: _string_
+  - __fail_if_exists__: _boolean_
+  - __balance__: _number_
+
+### SendAppUserToAppUserPaymentRequest
+  - __from_user_identifier__: _string_
+  - __to_user_identifier__: _string_
+  - __amount__: _number_
+
+### PayAddressRequest
+  - __address__: _string_
+  - __amoutSats__: _number_
+  - __satsPerVByte__: _number_
+
+### NewInvoiceResponse
+  - __invoice__: _string_
 
 ### LnurlLinkResponse
   - __lnurl__: _string_
@@ -404,176 +549,32 @@ The nostr server will send back a message response, and inside the body there wi
   - __balanceCheck__: _string_
   - __payLink__: _string_
 
-### UserInfo
+### LiveUserOperation
-  - __userId__: _string_
-  - __balance__: _number_
-
-### GetUserOperationsResponse
-  - __latestOutgoingInvoiceOperations__: _[UserOperations](#UserOperations)_
-  - __latestIncomingInvoiceOperations__: _[UserOperations](#UserOperations)_
-  - __latestOutgoingTxOperations__: _[UserOperations](#UserOperations)_
-  - __latestIncomingTxOperations__: _[UserOperations](#UserOperations)_
-  - __latestOutgoingUserToUserPayemnts__: _[UserOperations](#UserOperations)_
-  - __latestIncomingUserToUserPayemnts__: _[UserOperations](#UserOperations)_
-
-### Application
-  - __name__: _string_
   - __id__: _string_
-  - __balance__: _number_
+  - __operation__: _[UserOperation](#UserOperation)_
-  - __npub__: _string_
-
-### NewInvoiceResponse
-  - __invoice__: _string_
-
-### PayInvoiceResponse
-  - __preimage__: _string_
-  - __amount_paid__: _number_
-
-### UserOperation
-  - __paidAtUnix__: _number_
-  - __type__: _[UserOperationType](#UserOperationType)_
-  - __inbound__: _boolean_
-  - __amount__: _number_
-
-### GetAppUserRequest
-  - __user_identifier__: _string_
-
-### OpenChannelRequest
-  - __destination__: _string_
-  - __fundingAmount__: _number_
-  - __pushAmount__: _number_
-  - __closeAddress__: _string_
-
-### GetProductBuyLinkResponse
-  - __link__: _string_
-
-### LndGetInfoRequest
-  - __nodeId__: _number_
-
-### AuthAppRequest
-  - __name__: _string_
-  - __allow_user_creation__: _boolean_ *this field is optional
-
-### AuthApp
-  - __app__: _[Application](#Application)_
-  - __auth_token__: _string_
-
-### PayInvoiceRequest
-  - __invoice__: _string_
-  - __amount__: _number_
-
-### AddProductRequest
-  - __name__: _string_
-  - __price_sats__: _number_
 
 ### EncryptionExchangeRequest
   - __publicKey__: _string_
   - __deviceId__: _string_
 
-### AddAppUserInvoiceRequest
+### AuthApp
-  - __receiver_identifier__: _string_
+  - __app__: _[Application](#Application)_
-  - __payer_identifier__: _string_
+  - __auth_token__: _string_
-  - __http_callback_url__: _string_
+
-  - __invoice_req__: _[NewInvoiceRequest](#NewInvoiceRequest)_
+### GetAppUserRequest
+  - __user_identifier__: _string_
 
 ### PayAppUserInvoiceRequest
   - __user_identifier__: _string_
   - __invoice__: _string_
   - __amount__: _number_
 
-### SendAppUserToAppPaymentRequest
-  - __from_user_identifier__: _string_
-  - __amount__: _number_
-
-### SetMockAppUserBalanceRequest
-  - __user_identifier__: _string_
-  - __amount__: _number_
-
-### PayAddressRequest
-  - __address__: _string_
-  - __amoutSats__: _number_
-  - __satsPerVByte__: _number_
-
-### GetUserOperationsRequest
-  - __latestIncomingInvoice__: _number_
-  - __latestOutgoingInvoice__: _number_
-  - __latestIncomingTx__: _number_
-  - __latestOutgoingTx__: _number_
-  - __latestIncomingUserToUserPayment__: _number_
-  - __latestOutgoingUserToUserPayment__: _number_
-
-### SetMockInvoiceAsPaidRequest
-  - __invoice__: _string_
-  - __amount__: _number_
-
-### AddAppInvoiceRequest
-  - __payer_identifier__: _string_
-  - __http_callback_url__: _string_
-  - __invoice_req__: _[NewInvoiceRequest](#NewInvoiceRequest)_
-
-### GetAppUserLNURLInfoRequest
-  - __user_identifier__: _string_
-  - __base_url_override__: _string_
-
-### SetMockAppBalanceRequest
-  - __amount__: _number_
-
-### NewAddressResponse
-  - __address__: _string_
-
-### DecodeInvoiceRequest
-  - __invoice__: _string_
-
-### OpenChannelResponse
-  - __channelId__: _string_
-
-### HandleLnurlPayResponse
-  - __pr__: _string_
-  - __routes__: ARRAY of: _[Empty](#Empty)_
-
-### Product
-  - __id__: _string_
-  - __name__: _string_
-  - __price_sats__: _number_
-
-### LiveUserOperation
-  - __id__: _string_
-  - __operation__: _[UserOperation](#UserOperation)_
-
-### Empty
-
-### AddAppRequest
-  - __name__: _string_
-  - __allow_user_creation__: _boolean_
-
-### AddAppUserRequest
-  - __identifier__: _string_
-  - __fail_if_exists__: _boolean_
-  - __balance__: _number_
-
-### AppUser
-  - __identifier__: _string_
-  - __info__: _[UserInfo](#UserInfo)_
-  - __max_withdrawable__: _number_
-
-### PayAppUserInvoiceResponse
-  - __preimage__: _string_
-  - __amount_paid__: _number_
-
-### PayAddressResponse
-  - __txId__: _string_
-
-### NewInvoiceRequest
-  - __amountSats__: _number_
-  - __memo__: _string_
-
 ### DecodeInvoiceResponse
   - __amount__: _number_
 
-### UserOperations
+### AddProductRequest
-  - __fromIndex__: _number_
+  - __name__: _string_
-  - __toIndex__: _number_
+  - __price_sats__: _number_
-  - __operations__: ARRAY of: _[UserOperation](#UserOperation)_
 ## Enums
 ### The enumerators used in the messages
 

proto/service/structs.proto

@@ -224,6 +224,7 @@ message UserOperation {
     UserOperationType type = 2; 
     bool inbound =3;
     int64 amount = 4;
+    string identifier = 5;
 }
 message UserOperations {
     int64 fromIndex=1;

src/services/main/index.ts

@@ -68,7 +68,7 @@ export default class {
                 // This call will fail if the transaction is already registered
                 const addedTx = await this.storage.paymentStorage.AddAddressReceivingTransaction(userAddress, txOutput.hash, txOutput.index, amount, fee, tx)
                 await this.storage.userStorage.IncrementUserBalance(userAddress.user.user_id, addedTx.paid_amount - fee, tx)
-                this.triggerSubs(userAddress.user.user_id, { amount, paidAtUnix: Date.now() / 1000, inbound: true, type: Types.UserOperationType.INCOMING_TX })
+                this.triggerSubs(userAddress.user.user_id, { amount, paidAtUnix: Date.now() / 1000, inbound: true, type: Types.UserOperationType.INCOMING_TX, identifier: userAddress.address })
             } catch {
 
             }
@@ -99,7 +99,7 @@ export default class {
                 }
 
                 await this.triggerPaidCallback(log, userInvoice.callbackUrl)
-                this.triggerSubs(userInvoice.user.user_id, { amount, paidAtUnix: Date.now() / 1000, inbound: true, type: Types.UserOperationType.INCOMING_INVOICE })
+                this.triggerSubs(userInvoice.user.user_id, { amount, paidAtUnix: Date.now() / 1000, inbound: true, type: Types.UserOperationType.INCOMING_INVOICE, identifier: userInvoice.invoice })
                 log("paid invoice processed successfully")
             } catch (err: any) {
                 log("ERROR", "cannot process paid invoice", err.message || "")

src/services/main/paymentManager.ts

@@ -10,6 +10,10 @@ interface UserOperationInfo {
     serial_id: number
     paid_amount: number
     paid_at_unix: number
+    invoice?: string
+    address?: string
+    from_user?: { user_id: string }
+    to_user?: { user_id: string }
 }
 const defaultLnurlPayMetadata = `[["text/plain", "lnurl pay to Lightning.pub"]]`
 
@@ -283,12 +287,25 @@ export default class {
         return {
             toIndex: operations[0].serial_id,
             fromIndex: operations[operations.length - 1].serial_id,
-            operations: operations.map((o: UserOperationInfo): Types.UserOperation => ({
+            operations: operations.map((o: UserOperationInfo): Types.UserOperation => {
-                inbound,
+                let identifier = ""
-                type,
+                if (o.invoice) {
-                amount: o.paid_amount,
+                    identifier = o.invoice
-                paidAtUnix: o.paid_at_unix
+                } else if (o.address) {
-            }))
+                    identifier = o.address
+                } else if (type === Types.UserOperationType.INCOMING_USER_TO_USER && o.from_user) {
+                    identifier = o.from_user.user_id
+                } else if (type === Types.UserOperationType.OUTGOING_INVOICE && o.to_user) {
+                    identifier = o.to_user.user_id
+                }
+                return {
+                    inbound,
+                    type,
+                    amount: o.paid_amount,
+                    paidAtUnix: o.paid_at_unix,
+                    identifier
+                }
+            })
         }
     }