Merge pull request #797 from PayButton/feat/broadcast-parsed-op-return

[#774] feat: broadcast parsed op return

Author: Klakurka

constants/index.ts

@@ -77,7 +77,8 @@ export const RESPONSE_MESSAGES = {
   INVALID_DATA_JSON_WITH_VARIABLES_400: (variables: string[]) => { return { statusCode: 400, message: `Data is not valid. Make sure that ${variables.join(', ')} are not inside quotes.` } },
   PAGE_SIZE_LIMIT_EXCEEDED_400: { statusCode: 400, message: `Page size limit should be at most ${TX_PAGE_SIZE_LIMIT}.` },
   PAGE_SIZE_AND_PAGE_SHOULD_BE_NUMBERS_400: { statusCode: 400, message: 'pageSize and page parameters should be valid integers.' },
-  INVALID_OUTPUT_SCRIPT_LENGTH_500: (l: number) => { return { statusCode: 500, message: `Invalid outputScript length ${l}` } }
+  INVALID_OUTPUT_SCRIPT_LENGTH_500: (l: number) => { return { statusCode: 500, message: `Invalid outputScript length ${l}` } },
+  FAILED_TO_PARSE_TX_OP_RETURN_500: { statusCode: 500, message: 'Failed to parse OP_RETURN data in Tx.' }
 }
 
 export type KeyValueT<T> = Record<string, T>

prisma/seeds/triggers.ts

@@ -5,7 +5,7 @@ export const paybuttonTriggers = [
     sendEmail: false,
     postData: `{
       "env": "dev",
-      "OP_RETURN": <opReturn>,
+      "opReturn": <opReturn>,
       "name": <buttonName>,
       "address": <address>,
       "amount": <amount>,

ws-service/server.ts

@@ -46,6 +46,18 @@ const addressRouteConnection = (socket: Socket): void => {
 
 const broadcastTxs = async (broadcastTxData: BroadcastTxData): Promise<void> => {
   console.log('broadcasting', broadcastTxData.txs.length, broadcastTxData.messageType, 'txs to', broadcastTxData.address)
+  try {
+    const parsedTxs = broadcastTxData.txs.map(
+      t => {
+        const parsedOpReturnData = t.opReturn === '' ? null : JSON.parse(t.opReturn)
+        t.opReturn = parsedOpReturnData
+        return t
+      })
+    broadcastTxData.txs = parsedTxs
+  } catch (err: any) {
+    console.error(RESPONSE_MESSAGES.FAILED_TO_PARSE_TX_OP_RETURN_500.message)
+    console.error('Error stack:', err.stack)
+  }
   if (broadcastTxData?.txs?.length === 0) {
     console.warn(RESPONSE_MESSAGES.BROADCAST_EMPTY_TX_400)
     return