Liquid always uses esplora (regression of #2039)

nymkappa · nymkappa · commit 0093eab26963 · 2022-07-11T08:41:28.000+02:00
diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts
@@ -527,13 +527,12 @@ class Blocks {
       }
     }
 
-    let block = await bitcoinClient.getBlock(hash);
-
     // Not Bitcoin network, return the block as it
     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);
 
     // Bitcoin network, add our custom data on top
@@ -547,8 +546,8 @@ class Blocks {
     return blockExtended;
   }
 
-  public async $getStrippedBlockTransactions(hash: string, skipMemoryCache: boolean = false,
-    skipDBLookup: boolean = false): Promise<TransactionStripped[]>
+  public async $getStrippedBlockTransactions(hash: string, skipMemoryCache = false,
+    skipDBLookup = false): Promise<TransactionStripped[]>
   {
     if (skipMemoryCache === false) {
       // Check the memory cache
diff --git a/backend/src/api/common.ts b/backend/src/api/common.ts
@@ -172,7 +172,7 @@ export class Common {
 
   static indexingEnabled(): boolean {
     return (
-      ['mainnet', 'testnet', 'signet', 'regtest'].includes(config.MEMPOOL.NETWORK) &&
+      ['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) &&
       config.DATABASE.ENABLED === true &&
       config.MEMPOOL.INDEXING_BLOCKS_AMOUNT !== 0
     );

Original file line number	Diff line number	Diff line change
`@@ -527,13 +527,12 @@ class Blocks {`
`527`	`527`	`}`
`528`	`528`	`}`
`529`	`529`
`530`		`- let block = await bitcoinClient.getBlock(hash);`
`531`		`-`
`532`	`530`	`// Not Bitcoin network, return the block as it`
`533`	`531`	`if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) {`
`534`		`- return block;`
	`532`	`+ return await bitcoinApi.$getBlock(hash);`
`535`	`533`	`}`
`536`	`534`
	`535`	`+ let block = await bitcoinClient.getBlock(hash);`
`537`	`536`	`block = prepareBlock(block);`
`538`	`537`
`539`	`538`	`// Bitcoin network, add our custom data on top`
`@@ -547,8 +546,8 @@ class Blocks {`
`547`	`546`	`return blockExtended;`
`548`	`547`	`}`
`549`	`548`
`550`		`- public async $getStrippedBlockTransactions(hash: string, skipMemoryCache: boolean = false,`
`551`		`- skipDBLookup: boolean = false): Promise<TransactionStripped[]>`
	`549`	`+ public async $getStrippedBlockTransactions(hash: string, skipMemoryCache = false,`
	`550`	`+ skipDBLookup = false): Promise<TransactionStripped[]>`
`552`	`551`	`{`
`553`	`552`	`if (skipMemoryCache === false) {`
`554`	`553`	`// Check the memory cache`