Merge branch 'master' into feat/async-and-improved-initialization

Author: chedieck

.githooks/pre-commit

@@ -1,2 +1,2 @@
 #!/bin/sh
-npx lint-staged
+yarn lint-staged

components/Paybutton/PaybuttonTrigger.tsx

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

constants/index.ts

@@ -238,6 +238,7 @@ export const TRIGGER_POST_VARIABLES = [
   '<timestamp>',
   '<txId>',
   '<inputAddresses>',
+  '<outputAddresses>',
   '<value>'
 ]
 

package.json

@@ -19,7 +19,8 @@
     "ci:integration:test": "yarn pretest && dotenv -e .env.test -- ts-node -O '{\"module\":\"commonjs\"}' node_modules/jest/bin/jest.js tests/integration-tests --forceExit",
     "tarDebug": "tar cf debug.tar logs/ paybutton-config.json .env*",
     "updateAllPrices": "./scripts/update-all-prices.sh",
-    "updateAllPriceConnections": "./scripts/update-all-price-connections.sh"
+    "updateAllPriceConnections": "./scripts/update-all-price-connections.sh",
+    "lint-staged": "lint-staged"
   },
   "dependencies": {
     "@emotion/react": "^11.8.2",
@@ -99,8 +100,8 @@
     "chronik-client-cashtokens/ecashaddrjs": "^2.0.0"
   },
   "lint-staged": {
-    "*.ts?(x)": [
-      "yarn eslint --fix"
+    "*.{ts,tsx}": [
+      "node ./node_modules/eslint/bin/eslint.js --fix"
     ]
   }
 }

services/chronikService.ts

@@ -503,22 +503,47 @@ export class ChronikBlockchainClient {
     }
   }
 
-  private getSortedInputAddresses (transaction: Tx): string[] {
+  private getSortedInputAddresses (transaction: Tx): Array<{address: string, amount: Prisma.Decimal}> {
     const addressSatsMap = new Map<string, bigint>()
-
     transaction.inputs.forEach((inp) => {
       const address = outputScriptToAddress(this.networkSlug, inp.outputScript)
       if (address !== undefined && address !== '') {
         const currentValue = addressSatsMap.get(address) ?? 0n
         addressSatsMap.set(address, currentValue + inp.sats)
       }
     })
-
+    const unitDivisor = this.networkId === XEC_NETWORK_ID
+      ? 1e2
+      : (this.networkId === BCH_NETWORK_ID ? 1e8 : 1)
     const sortedInputAddresses = Array.from(addressSatsMap.entries())
       .sort(([, valueA], [, valueB]) => Number(valueB - valueA))
-      .map(([address]) => address)
+    return sortedInputAddresses.map(([address, sats]) => {
+      const decimal = new Prisma.Decimal(sats.toString())
+      const amount = decimal.dividedBy(unitDivisor)
+      return { address, amount }
+    })
+  }
 
-    return sortedInputAddresses
+  private getSortedOutputAddresses (transaction: Tx): Array<{address: string, amount: Prisma.Decimal}> {
+    const addressSatsMap = new Map<string, bigint>()
+    transaction.outputs.forEach((out) => {
+      const address = outputScriptToAddress(this.networkSlug, out.outputScript)
+      if (address !== undefined && address !== '') {
+        const currentValue = addressSatsMap.get(address) ?? 0n
+        addressSatsMap.set(address, currentValue + out.sats)
+      }
+    })
+    const unitDivisor = this.networkId === XEC_NETWORK_ID
+      ? 1e2
+      : (this.networkId === BCH_NETWORK_ID ? 1e8 : 1)
+    const sortedOutputAddresses = Array.from(addressSatsMap.entries())
+      .sort(([, valueA], [, valueB]) => Number(valueB - valueA))
+      .map(([address, sats]) => {
+        const decimal = new Prisma.Decimal(sats.toString())
+        const amount = decimal.dividedBy(unitDivisor)
+        return { address, amount }
+      })
+    return sortedOutputAddresses
   }
 
   public async waitForSyncing (txId: string, addressStringArray: string[]): Promise<void> {
@@ -565,10 +590,11 @@ export class ChronikBlockchainClient {
         const addressesWithTransactions = await this.getAddressesForTransaction(transaction)
         await this.waitForSyncing(msg.txid, addressesWithTransactions.map(obj => obj.address.address))
         const inputAddresses = this.getSortedInputAddresses(transaction)
+        const outputAddresses = this.getSortedOutputAddresses(transaction)
         for (const addressWithTransaction of addressesWithTransactions) {
           const { created, tx } = await upsertTransaction(addressWithTransaction.transaction)
           if (tx !== undefined) {
-            const broadcastTxData = this.broadcastIncomingTx(addressWithTransaction.address.address, tx, inputAddresses)
+            const broadcastTxData = this.broadcastIncomingTx(addressWithTransaction.address.address, tx, inputAddresses, outputAddresses)
             if (created) { // only execute trigger for newly added txs
               await executeAddressTriggers(broadcastTxData, tx.address.networkId)
             }
@@ -592,11 +618,11 @@ export class ChronikBlockchainClient {
     }
   }
 
-  private broadcastIncomingTx (addressString: string, createdTx: TransactionWithAddressAndPrices, inputAddresses: string[]): BroadcastTxData {
+  private broadcastIncomingTx (addressString: string, createdTx: TransactionWithAddressAndPrices, inputAddresses: Array<{address: string, amount: Prisma.Decimal}>, outputAddresses: Array<{address: string, amount: Prisma.Decimal}>): BroadcastTxData {
     const broadcastTxData: BroadcastTxData = {} as BroadcastTxData
     broadcastTxData.address = addressString
     broadcastTxData.messageType = 'NewTx'
-    const newSimplifiedTransaction = getSimplifiedTrasaction(createdTx, inputAddresses)
+    const newSimplifiedTransaction = getSimplifiedTrasaction(createdTx, inputAddresses, outputAddresses)
     broadcastTxData.txs = [newSimplifiedTransaction]
     try { // emit broadcast for both unconfirmed and confirmed txs
       this.wsEndpoint.emit(SOCKET_MESSAGES.TXS_BROADCAST, broadcastTxData)
@@ -620,11 +646,12 @@ export class ChronikBlockchainClient {
     for (const transaction of blockTxsToSync) {
       const addressesWithTransactions = await this.getAddressesForTransaction(transaction)
       const inputAddresses = this.getSortedInputAddresses(transaction)
+      const outputAddresses = this.getSortedOutputAddresses(transaction)
 
       for (const addressWithTransaction of addressesWithTransactions) {
         const { created, tx } = await upsertTransaction(addressWithTransaction.transaction)
         if (tx !== undefined) {
-          const broadcastTxData = this.broadcastIncomingTx(addressWithTransaction.address.address, tx, inputAddresses)
+          const broadcastTxData = this.broadcastIncomingTx(addressWithTransaction.address.address, tx, inputAddresses, outputAddresses)
           if (created) { // only execute trigger for newly added txs
             await executeAddressTriggers(broadcastTxData, tx.address.networkId)
           }

services/transactionService.ts

@@ -41,7 +41,7 @@ export function getSimplifiedTransactions (transactionsToPersist: TransactionWit
   return simplifiedTransactions
 }
 
-export function getSimplifiedTrasaction (tx: TransactionWithAddressAndPrices, inputAddresses?: string[]): SimplifiedTransaction {
+export function getSimplifiedTrasaction (tx: TransactionWithAddressAndPrices, inputAddresses?: Array<{address: string, amount: Prisma.Decimal}>, outputAddresses?: Array<{address: string, amount: Prisma.Decimal}>): SimplifiedTransaction {
   const {
     hash,
     amount,
@@ -63,6 +63,7 @@ export function getSimplifiedTrasaction (tx: TransactionWithAddressAndPrices, in
     message: parsedOpReturn?.message ?? '',
     rawMessage: parsedOpReturn?.rawMessage ?? '',
     inputAddresses: inputAddresses ?? [],
+    outputAddresses: outputAddresses ?? [],
     prices: tx.prices
   }
 

services/triggerService.ts

@@ -250,7 +250,8 @@ export interface PostDataParameters {
   buttonName: string
   address: string
   opReturn: OpReturnData
-  inputAddresses?: string[]
+  inputAddresses?: Array<{address: string, amount: Prisma.Decimal}>
+  outputAddresses?: Array<{address: string, amount: Prisma.Decimal}>
   value: string
 }
 

tests/unittests/transactionService.test.ts

@@ -169,3 +169,28 @@ describe('Fetch transactions by paybuttonId', () => {
     }
   })
 })
+
+describe('Address object arrays (input/output) integration', () => {
+  it('getSimplifiedTrasaction returns provided input/output address objects untouched', () => {
+    const tx: any = {
+      hash: 'hash1',
+      amount: new Prisma.Decimal(5),
+      confirmed: true,
+      opReturn: '',
+      address: { address: 'ecash:qqprimaryaddressxxxxxxxxxxxxxxxxxxxxx' },
+      timestamp: 1700000000,
+      prices: mockedTransaction.prices
+    }
+    const inputs = [
+      { address: 'ecash:qqinput1', amount: new Prisma.Decimal(1.23) },
+      { address: 'ecash:qqinput2', amount: new Prisma.Decimal(4.56) }
+    ]
+    const outputs = [
+      { address: 'ecash:qqout1', amount: new Prisma.Decimal(7.89) },
+      { address: 'ecash:qqout2', amount: new Prisma.Decimal(0.12) }
+    ]
+    const simplified = transactionService.getSimplifiedTrasaction(tx, inputs, outputs)
+    expect(simplified.inputAddresses).toEqual(inputs)
+    expect(simplified.outputAddresses).toEqual(outputs)
+  })
+})