Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions services/chronikService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,24 @@ export class ChronikBlockchainClient implements BlockchainClient {
}
}

private getSortedInputAddresses (transaction: Tx_InNode): string[] {
const addressValueMap = new Map<string, number>()

transaction.inputs.forEach((inp) => {
const address = outputScriptToAddress(this.networkSlug, inp.outputScript)
if (address !== undefined && address !== '') {
const currentValue = addressValueMap.get(address) ?? 0
addressValueMap.set(address, currentValue + inp.value)
}
})

const sortedInputAddresses = Array.from(addressValueMap.entries())
.sort(([, valueA], [, valueB]) => valueB - valueA)
.map(([address]) => address)

return sortedInputAddresses
}

private async processWsMessage (msg: WsMsgClient): Promise<void> {
// delete unconfirmed transaction from our database
// if they were cancelled and not confirmed
Expand All @@ -381,10 +399,11 @@ export class ChronikBlockchainClient implements BlockchainClient {
console.log(`${this.CHRONIK_MSG_PREFIX}: [${msg.msgType}] ${msg.txid}`)
const transaction = await this.chronik.tx(msg.txid)
const addressesWithTransactions = await this.getAddressesForTransaction(transaction)
const inputAddresses = this.getSortedInputAddresses(transaction)
for (const addressWithTransaction of addressesWithTransactions) {
const { created, tx } = await createTransaction(addressWithTransaction.transaction)
if (tx !== undefined) {
const broadcastTxData = this.broadcastIncomingTx(addressWithTransaction.address.address, tx)
const broadcastTxData = this.broadcastIncomingTx(addressWithTransaction.address.address, tx, inputAddresses)
if (created) { // only execute trigger for newly added txs
await executeAddressTriggers(broadcastTxData, tx.address.networkId)
}
Expand All @@ -402,11 +421,11 @@ export class ChronikBlockchainClient implements BlockchainClient {
}
}

private broadcastIncomingTx (addressString: string, createdTx: TransactionWithAddressAndPrices): BroadcastTxData {
private broadcastIncomingTx (addressString: string, createdTx: TransactionWithAddressAndPrices, inputAddresses: string[]): BroadcastTxData {
const broadcastTxData: BroadcastTxData = {} as BroadcastTxData
broadcastTxData.address = addressString
broadcastTxData.messageType = 'NewTx'
const newSimplifiedTransaction = getSimplifiedTrasaction(createdTx)
const newSimplifiedTransaction = getSimplifiedTrasaction(createdTx, inputAddresses)
broadcastTxData.txs = [newSimplifiedTransaction]
try { // emit broadcast for both unconfirmed and confirmed txs
this.wsEndpoint.emit(SOCKET_MESSAGES.TXS_BROADCAST, broadcastTxData)
Expand All @@ -430,10 +449,12 @@ export class ChronikBlockchainClient implements BlockchainClient {
}
for (const transaction of blockTxsToSync) {
const addressesWithTransactions = await this.getAddressesForTransaction(transaction)
const inputAddresses = this.getSortedInputAddresses(transaction)

for (const addressWithTransaction of addressesWithTransactions) {
const { created, tx } = await createTransaction(addressWithTransaction.transaction)
if (tx !== undefined) {
const broadcastTxData = this.broadcastIncomingTx(addressWithTransaction.address.address, tx)
const broadcastTxData = this.broadcastIncomingTx(addressWithTransaction.address.address, tx, inputAddresses)
if (created) { // only execute trigger for newly added txs
await executeAddressTriggers(broadcastTxData, tx.address.networkId)
}
Expand Down
5 changes: 3 additions & 2 deletions services/transactionService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export function getSimplifiedTransactions (transactionsToPersist: TransactionWit
return simplifiedTransactions
}

export function getSimplifiedTrasaction (tx: TransactionWithAddressAndPrices): SimplifiedTransaction {
export function getSimplifiedTrasaction (tx: TransactionWithAddressAndPrices, inputAddresses?: string[]): SimplifiedTransaction {
const {
hash,
amount,
Expand All @@ -64,7 +64,8 @@ export function getSimplifiedTrasaction (tx: TransactionWithAddressAndPrices): S
address: address.address,
timestamp,
message: parsedOpReturn?.message ?? '',
rawMessage: parsedOpReturn?.rawMessage ?? ''
rawMessage: parsedOpReturn?.rawMessage ?? '',
inputAddresses: inputAddresses ?? []
}

return simplifiedTransaction
Expand Down
1 change: 1 addition & 0 deletions ws-service/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export interface SimplifiedTransaction {
timestamp: number
address: string
rawMessage: string
inputAddresses: string[]
}

export interface CreateQuoteAndShiftData {
Expand Down
Loading