Merge pull request #984 from PayButton/feat/value-prop-trigger

Feat/value prop trigger

Author: Klakurka

components/Paybutton/PaybuttonTrigger.tsx

@@ -213,6 +213,8 @@ export default ({ paybuttonId, emailCredits }: IProps): JSX.Element => {
                   <div>&lt;opReturn&gt;</div>
                   <div>&lt;signature&gt;</div>
                   <div>&lt;inputAddresses&gt;</div>
+                  <div>&lt;value&gt;</div>
+
                 </div>
               </div>
               {/* Tooltip */}

constants/index.ts

@@ -241,7 +241,8 @@ export const TRIGGER_POST_VARIABLES = [
   '<signature>',
   '<timestamp>',
   '<txId>',
-  '<inputAddresses>'
+  '<inputAddresses>',
+  '<value>'
 ]
 
 export const PAYBUTTON_TRANSACTIONS_FILE_HEADERS = {

services/transactionService.ts

@@ -10,7 +10,7 @@ import { OpReturnData, parseAddress } from 'utils/validators'
 import { generatePaymentFromTx } from 'redis/paymentCache'
 import { ButtonDisplayData, Payment } from 'redis/types'
 
-export function getTransactionValue (transaction: TransactionWithPrices | TransactionsWithPaybuttonsAndPrices): QuoteValues {
+export function getTransactionValue (transaction: TransactionWithPrices | TransactionsWithPaybuttonsAndPrices | SimplifiedTransaction): QuoteValues {
   const ret: QuoteValues = {
     usd: new Prisma.Decimal(0),
     cad: new Prisma.Decimal(0)
@@ -62,7 +62,8 @@ export function getSimplifiedTrasaction (tx: TransactionWithAddressAndPrices, in
     timestamp,
     message: parsedOpReturn?.message ?? '',
     rawMessage: parsedOpReturn?.rawMessage ?? '',
-    inputAddresses: inputAddresses ?? []
+    inputAddresses: inputAddresses ?? [],
+    prices: tx.prices
   }
 
   return simplifiedTransaction

services/triggerService.ts

@@ -1,12 +1,13 @@
 import { PaybuttonTrigger, Prisma, UserProfile } from '@prisma/client'
 import axios from 'axios'
-import { RESPONSE_MESSAGES, NETWORK_TICKERS_FROM_ID } from 'constants/index'
+import { RESPONSE_MESSAGES, NETWORK_TICKERS_FROM_ID, SUPPORTED_QUOTES_FROM_ID } from 'constants/index'
 import prisma from 'prisma/clientInstance'
 import { EMPTY_OP_RETURN, OpReturnData, parseTriggerPostData } from 'utils/validators'
 import { BroadcastTxData } from 'ws-service/types'
 import { fetchPaybuttonById, fetchPaybuttonWithTriggers } from './paybuttonService'
 import config from 'config'
 import { MAIL_FROM, MAIL_HTML_REPLACER, MAIL_SUBJECT, getMailerTransporter, SendEmailParameters } from 'constants/mail'
+import { getTransactionValue } from './transactionService'
 
 const triggerWithPaybutton = Prisma.validator<Prisma.PaybuttonTriggerDefaultArgs>()({
   include: { paybutton: true }
@@ -247,14 +248,16 @@ export async function executeAddressTriggers (broadcastTxData: BroadcastTxData,
       rawMessage,
       inputAddresses
     } = tx
-
+    const values = getTransactionValue(tx)
     const addressTriggers = await fetchTriggersForAddress(address)
     if (addressTriggers.length === 0) return
     console.log(`[TRIGGER ${currency}]: Will execute ${addressTriggers.length} triggers for tx ${hash} and address ${address}`)
 
     // Send post requests
     const posterTriggers = addressTriggers.filter(t => !t.isEmailTrigger)
     await Promise.all(posterTriggers.map(async (trigger) => {
+      const userProfile = await fetchUserFromTriggerId(trigger.id)
+      const quoteSlug = SUPPORTED_QUOTES_FROM_ID[userProfile.preferredCurrencyId]
       const postDataParameters: PostDataParameters = {
         amount,
         currency,
@@ -269,8 +272,10 @@ export async function executeAddressTriggers (broadcastTxData: BroadcastTxData,
               rawMessage
             }
           : EMPTY_OP_RETURN,
-        inputAddresses
+        inputAddresses,
+        value: values[quoteSlug].toString()
       }
+
       await postDataForTrigger(trigger, postDataParameters)
     }))
 
@@ -391,6 +396,7 @@ export interface PostDataParameters {
   address: string
   opReturn: OpReturnData
   inputAddresses?: string[]
+  value: string
 }
 
 async function postDataForTrigger (trigger: TriggerWithPaybutton, postDataParameters: PostDataParameters): Promise<void> {

tests/unittests/validators.test.ts

@@ -413,7 +413,8 @@ describe('Signature payload', () => {
       message: 'my custom opReturn data',
       paymentId: '123paymentId',
       rawMessage: 'my custom opReturn data'
-    }
+    },
+    value: '0.0002189581274'
   }
   it('Gets payload for single variable', () => {
     const postData = '{"myVar": 3, "amount": <amount>}'
@@ -457,7 +458,8 @@ describe('Signature payload', () => {
         message: '',
         paymentId: '',
         rawMessage: ''
-      }
+      },
+      value: '0.0002189581274'
     }
     const postData = '{"id": <txId>, "coin": <currency>, "myVar": 3, "OP_RETURN": <opReturn>, "name": <buttonName>, "amount": <amount>, "ts": <timestamp>}'
     const result = v.exportedForTesting.getSignaturePayload(postData, params)
@@ -482,7 +484,8 @@ describe('Sign post data', () => {
       message: 'my custom opReturn data',
       paymentId: '123paymentId',
       rawMessage: 'my custom opReturn data'
-    }
+    },
+    value: '0.0002189581274'
   }
   it('Sign full payload', () => {
     const postData = '{"id": <txId>, "coin": <currency>, "myVar": 3, "OP_RETURN": <opReturn>, "to": <address>, "name": <buttonName>, "amount": <amount>, "ts": <timestamp>}'

utils/validators.ts

@@ -273,6 +273,8 @@ export function parseTriggerPostData ({ userId, postData, postDataParameters }:
       .replace('<opReturn>', opReturn)
       .replace('<signature>', `${JSON.stringify(signature, undefined, 2)}`)
       .replace('<inputAddresses>', `${JSON.stringify(postDataParameters.inputAddresses, undefined, 2)}`)
+      .replace('<value>', `"${postDataParameters.value}"`)
+
     const parsedResultingData = JSON.parse(resultingData)
     return parsedResultingData
   } catch (err: any) {
@@ -316,7 +318,8 @@ export const parsePaybuttonTriggerPOSTRequest = function (params: PaybuttonTrigg
       address: '',
       timestamp: 0,
       opReturn: EMPTY_OP_RETURN,
-      inputAddresses: []
+      inputAddresses: [],
+      value: ''
     }
     const parsed = parseTriggerPostData({
       userId: params.userId,

ws-service/types.ts

@@ -18,6 +18,12 @@ export interface SimplifiedTransaction {
   address: string
   rawMessage: string
   inputAddresses: string[]
+  prices: Array<{
+    price: {
+      value: Prisma.Decimal
+      quoteId: number
+    }
+  }>
 }
 
 export interface CreateQuoteAndShiftData {