feat: remove redundant fields

PayButton · Feb 22, 2024 · ba5ba13 · ba5ba13
1 parent 9776b3c
commit ba5ba13
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 16 deletions.
diff --git a/services/chronikService.ts b/services/chronikService.ts
@@ -378,7 +378,7 @@ export class ChronikBlockchainClient implements BlockchainClient {
           }
           if (created) { // only execute trigger for unconfirmed tx arriving
             try {
-              await executeAddressTriggers(broadcastTxData)
+              await executeAddressTriggers(broadcastTxData, tx.address.networkId)
             } catch (err: any) {
               console.error(RESPONSE_MESSAGES.COULD_NOT_EXECUTE_TRIGGER_500.message, err.stack)
             }

diff --git a/services/transactionService.ts b/services/transactionService.ts
@@ -57,7 +57,7 @@ export function getSimplifiedTrasaction (tx: TransactionWithAddressAndPrices): S
   const simplifiedTransaction: SimplifiedTransaction = {
     hash,
     amount,
-    paymentId: parsedOpReturn?.paymentId,
+    paymentId: parsedOpReturn?.paymentId ?? '',
     confirmed,
     address: address.address,
     timestamp,

diff --git a/services/triggerService.ts b/services/triggerService.ts
@@ -176,17 +176,16 @@ interface PostDataTriggerLog {
   responseData: string
 }
 
-export async function executeAddressTriggers (broadcastTxData: BroadcastTxData): Promise<void> {
+export async function executeAddressTriggers (broadcastTxData: BroadcastTxData, networkId: number): Promise<void> {
   const address = broadcastTxData.address
   const tx = broadcastTxData.txs[0]
-  const currency = NETWORK_TICKERS_FROM_ID[tx.address.networkId]
+  const currency = NETWORK_TICKERS_FROM_ID[networkId]
   const {
     amount,
     hash,
     timestamp,
     paymentId,
-    message,
-    opReturn
+    message
   } = tx
 
   const addressTriggers = await fetchTriggersForAddress(address)
@@ -198,9 +197,7 @@ export async function executeAddressTriggers (broadcastTxData: BroadcastTxData):
       buttonName: trigger.paybutton.name,
       address,
       timestamp,
-      paymentId: paymentId ?? '',
-      message,
-      opReturn: opReturn ?? EMPTY_OP_RETURN
+      opReturn: { paymentId, message } ?? EMPTY_OP_RETURN
     }
     const hmac = await hashPostData(trigger.paybutton.providerUserId, postDataParameters)
     await postDataForTrigger(trigger, {
@@ -218,8 +215,6 @@ export interface PostDataParameters {
   txId: string
   buttonName: string
   address: string
-  paymentId: string
-  message: string
   opReturn: OpReturnData
 }
 
@@ -230,8 +225,6 @@ export interface PostDataParametersHashed {
   txId: string
   buttonName: string
   address: string
-  paymentId: string
-  message: string
   hmac: string
   opReturn: OpReturnData
 }

diff --git a/utils/validators.ts b/utils/validators.ts
@@ -230,8 +230,6 @@ export function parseTriggerPostData (postData: string, postDataParametersHashed
       buttonName: '',
       address: '',
       timestamp: 0,
-      paymentId: '',
-      message: '',
       opReturn: EMPTY_OP_RETURN,
       hmac: ''
     }

diff --git a/ws-service/types.ts b/ws-service/types.ts
@@ -11,7 +11,7 @@ export interface BroadcastTxData {
 export interface SimplifiedTransaction {
   hash: string
   amount: Prisma.Decimal
-  paymentId?: string
+  paymentId: string
   confirmed?: boolean
   message: string
   timestamp: number