From 563def45d82a84720f6f6b677c8171ecbfcd62e5 Mon Sep 17 00:00:00 2001 From: softsimon Date: Mon, 24 Jun 2024 18:27:30 +0900 Subject: [PATCH] Fix address prefix for non esplora backend --- backend/src/api/bitcoin/bitcoin-api.ts | 10 +++++++++- backend/src/api/bitcoin/esplora-api.interface.ts | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/backend/src/api/bitcoin/bitcoin-api.ts b/backend/src/api/bitcoin/bitcoin-api.ts index 0724065ae..6714070bd 100644 --- a/backend/src/api/bitcoin/bitcoin-api.ts +++ b/backend/src/api/bitcoin/bitcoin-api.ts @@ -165,13 +165,21 @@ class BitcoinApi implements AbstractBitcoinApi { const mp = mempool.getMempool(); for (const tx in mp) { for (const vout of mp[tx].vout) { - if (vout.scriptpubkey_address.indexOf(prefix) === 0) { + if (vout.scriptpubkey_address?.indexOf(prefix) === 0) { found[vout.scriptpubkey_address] = ''; if (Object.keys(found).length >= 10) { return Object.keys(found); } } } + for (const vin of mp[tx].vin) { + if (vin.prevout?.scriptpubkey_address?.indexOf(prefix) === 0) { + found[vin.prevout?.scriptpubkey_address] = ''; + if (Object.keys(found).length >= 10) { + return Object.keys(found); + } + } + } } return Object.keys(found); } diff --git a/backend/src/api/bitcoin/esplora-api.interface.ts b/backend/src/api/bitcoin/esplora-api.interface.ts index 0a0960e46..6e6860a41 100644 --- a/backend/src/api/bitcoin/esplora-api.interface.ts +++ b/backend/src/api/bitcoin/esplora-api.interface.ts @@ -54,7 +54,7 @@ export namespace IEsploraApi { scriptpubkey: string; scriptpubkey_asm: string; scriptpubkey_type: string; - scriptpubkey_address: string; + scriptpubkey_address?: string; value: number; // Elements valuecommitment?: number;