machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2065 from mempool/nymkappa/bugfix/liquid-block-api

Browse Source 
Liquid always uses esplora (regression of #2039)
This commit is contained in:
wiz 2022-07-11 10:56:42 +02:00 committed by GitHub
commit 38fa8de01f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/api/blocks.ts
View File

@ -527,13 +527,12 @@ class Blocks {
} }
} }
let block = await bitcoinClient.getBlock(hash);
// Not Bitcoin network, return the block as it // Not Bitcoin network, return the block as it
if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) { if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) {
return block; return await bitcoinApi.$getBlock(hash);
} }
let block = await bitcoinClient.getBlock(hash);
block = prepareBlock(block); block = prepareBlock(block);
// Bitcoin network, add our custom data on top // Bitcoin network, add our custom data on top
@ -547,8 +546,8 @@ class Blocks {
return blockExtended; return blockExtended;
} }
public async $getStrippedBlockTransactions(hash: string, skipMemoryCache: boolean = false, public async $getStrippedBlockTransactions(hash: string, skipMemoryCache = false,
skipDBLookup: boolean = false): Promise<TransactionStripped[]> skipDBLookup = false): Promise<TransactionStripped[]>
{ {
if (skipMemoryCache === false) { if (skipMemoryCache === false) {
// Check the memory cache // Check the memory cache

2
backend/src/api/common.ts
View File

@ -172,7 +172,7 @@ export class Common {
static indexingEnabled(): boolean { static indexingEnabled(): boolean {
return ( return (
['mainnet', 'testnet', 'signet', 'regtest'].includes(config.MEMPOOL.NETWORK) && ['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) &&
config.DATABASE.ENABLED === true && config.DATABASE.ENABLED === true &&
config.MEMPOOL.INDEXING_BLOCKS_AMOUNT !== 0 config.MEMPOOL.INDEXING_BLOCKS_AMOUNT !== 0
); );