diff --git a/backend/src/api/bitcoin/bitcoin-api.ts b/backend/src/api/bitcoin/bitcoin-api.ts index b77b63385..7fc8075ff 100644 --- a/backend/src/api/bitcoin/bitcoin-api.ts +++ b/backend/src/api/bitcoin/bitcoin-api.ts @@ -234,6 +234,10 @@ class BitcoinApi implements AbstractBitcoinApi { }); } + protected $validateAddress(address: string): Promise { + return this.bitcoindClient.validateAddress(address); + } + private async $calculateFeeFromInputs(transaction: IEsploraApi.Transaction, addPrevout: boolean): Promise { if (transaction.vin[0].is_coinbase) { transaction.fee = 0; diff --git a/backend/src/api/bitcoin/bitcoin-base.api.ts b/backend/src/api/bitcoin/bitcoin-base.api.ts index 22c8daaed..a79a1a311 100644 --- a/backend/src/api/bitcoin/bitcoin-base.api.ts +++ b/backend/src/api/bitcoin/bitcoin-base.api.ts @@ -31,10 +31,6 @@ class BitcoinBaseApi { return this.bitcoindClient.getRawMemPool(true); } - $validateAddress(address: string): Promise { - return this.bitcoindClient.validateAddress(address); - } - } export default new BitcoinBaseApi(); diff --git a/backend/src/api/bitcoin/electrum-api.ts b/backend/src/api/bitcoin/electrum-api.ts index ee8395178..6c275356b 100644 --- a/backend/src/api/bitcoin/electrum-api.ts +++ b/backend/src/api/bitcoin/electrum-api.ts @@ -4,7 +4,6 @@ import { IBitcoinApi } from './bitcoin-api.interface'; import { IEsploraApi } from './esplora-api.interface'; import { IElectrumApi } from './electrum-api.interface'; import BitcoinApi from './bitcoin-api'; -import bitcoinBaseApi from './bitcoin-base.api'; import mempool from '../mempool'; import logger from '../../logger'; import * as ElectrumClient from '@mempool/electrum-client'; @@ -64,7 +63,7 @@ class BitcoindElectrsApi extends BitcoinApi implements AbstractBitcoinApi { } async $getAddress(address: string): Promise { - const addressInfo = await bitcoinBaseApi.$validateAddress(address); + const addressInfo = await this.$validateAddress(address); if (!addressInfo || !addressInfo.isvalid) { return ({ 'address': address, @@ -117,7 +116,7 @@ class BitcoindElectrsApi extends BitcoinApi implements AbstractBitcoinApi { } async $getAddressTransactions(address: string, lastSeenTxId: string): Promise { - const addressInfo = await bitcoinBaseApi.$validateAddress(address); + const addressInfo = await this.$validateAddress(address); if (!addressInfo || !addressInfo.isvalid) { return []; }