fix(BlockstreamProvider): rename Esplora

rename blockstream provider to esplora provider to eventually allow for other esplora instances to be used

apps/electron/src/main.ts

@@ -21,7 +21,7 @@ import {
   LND,
   OnchainBaseProvider,
   BitcoinCoreProvider,
-  BlockstreamProvider,
+  EsploraProvider,
   ElectrumProvider
 } from '@lily/shared-server';
 
@@ -153,20 +153,27 @@ const setupInitialNodeConfig = async () => {
       }
     } catch (e) {
       console.log('Failed to retrieve remote Bitcoin Core connection data.');
+      const defaultElectrumEndpoint = 'electrum.emzy.de';
       try {
-        console.log('Connecting to Electrum...');
-        OnchainDataProvider = new ElectrumProvider('electrum.emzy.de', 50002, 'tcp', isTestnet);
+        console.log(`Connecting to ${defaultElectrumEndpoint}...`);
+        OnchainDataProvider = new ElectrumProvider(
+          defaultElectrumEndpoint,
+          50002,
+          'tcp',
+          isTestnet
+        );
         await OnchainDataProvider.initialize();
-        console.log('Connected to Electrum');
+        console.log(`Connected to ${defaultElectrumEndpoint}`);
       } catch (e) {
-        console.log('Failed to connect to Electrum');
+        console.log(`Failed to connect to ${defaultElectrumEndpoint}`);
+        const defaultEsploraEndpoint = 'https://blockstream.info';
         try {
-          console.log('Connecting to Blockstream...');
-          OnchainDataProvider = new BlockstreamProvider('https://blockstream.info', isTestnet);
+          console.log(`Connecting to ${defaultEsploraEndpoint}...`);
+          OnchainDataProvider = new EsploraProvider(defaultEsploraEndpoint, isTestnet);
           OnchainDataProvider.initialize();
-          console.log('Connected to Blockstream');
+          console.log(`Connected to ${defaultEsploraEndpoint}`);
         } catch (e) {
-          console.log('Failed to connect to Blockstream');
+          console.log(`Failed to connect to ${defaultEsploraEndpoint}`);
         }
       }
     }
@@ -558,7 +565,7 @@ ipcMain.handle('/changeNodeConfig', async (event, args) => {
     );
     await OnchainDataProvider.initialize();
   } else {
-    OnchainDataProvider = new BlockstreamProvider('https://blockstream.info', isTestnet);
+    OnchainDataProvider = new EsploraProvider('https://blockstream.info', isTestnet);
     await OnchainDataProvider.initialize();
   }
   const config = OnchainDataProvider.getConfig();

apps/frontend/src/pages/Settings/NetworkSettings.tsx

@@ -41,7 +41,7 @@ const NetworkSettings = ({
   const connectToBlockstream = async () => {
     setNodeConfig(undefined);
     const response = await platform.changeNodeConfig({
-      provider: 'Blockstream'
+      provider: 'Esplora'
     });
     setNodeConfig(response);
   };
@@ -79,9 +79,9 @@ const NetworkSettings = ({
       onClick: async () => await connectToBitcoinCore()
     });
   }
-  if (nodeConfig && nodeConfig.provider !== 'Blockstream') {
+  if (nodeConfig && nodeConfig.provider !== 'Esplora') {
     nodeConfigDropdownItems.push({
-      label: 'Connect to Blockstream',
+      label: 'Connect to Blockstream.info',
       onClick: async () => await connectToBlockstream()
     });
   }

apps/frontend/src/utils/accountMap.ts

@@ -86,16 +86,16 @@ const decorateTx = (
 };
 
 export const serializeTransactions = (
-  transactionsFromBlockstream: EsploraTransactionResponse[],
+  transactions: EsploraTransactionResponse[],
   addresses: Address[],
   changeAddresses: Address[]
 ): Transaction[] => {
-  transactionsFromBlockstream.sort((a, b) => a.status.block_time - b.status.block_time);
+  transactions.sort((a, b) => a.status.block_time - b.status.block_time);
 
   const addressesMap = createMap(addresses, 'address');
   const changeAddressesMap = createMap(changeAddresses, 'address');
 
-  const txMap = createMap(transactionsFromBlockstream, 'txid');
+  const txMap = createMap(transactions, 'txid');
   const decoratedTxs = Object.values(txMap).map((tx) =>
     decorateTx(tx, addressesMap, changeAddressesMap)
   );

packages/shared-server/src/OnchainProviders/Blockstream.ts → packages/shared-server/src/OnchainProviders/Esplora.ts

@@ -21,10 +21,9 @@ import {
   EsploraTransactionResponse
 } from '@lily/types';
 
-// TODO: this should really be renamed "EsploraProvider" and generalize to allow ports, protocols, etc like ElectrumProvider
-export class BlockstreamProvider extends OnchainBaseProvider {
+export class EsploraProvider extends OnchainBaseProvider {
   constructor(url: string, testnet: boolean) {
-    super('Blockstream', testnet, { url });
+    super('Esplora', testnet, { url });
   }
 
   async initialize() {

packages/shared-server/src/OnchainProviders/OnchainBaseProvider.ts

@@ -7,7 +7,7 @@ import {
 } from '@lily/types';
 import { Network, networks } from 'bitcoinjs-lib';
 
-type Providers = 'Blockstream' | 'Electrum' | 'Bitcoin Core';
+type Providers = 'Esplora' | 'Electrum' | 'Bitcoin Core';
 
 export interface OnchainProviderInterface {
   getAccountData: (account: OnChainConfig) => Promise<LilyOnchainAccount>;

packages/shared-server/src/OnchainProviders/index.ts

@@ -1,4 +1,4 @@
 export * from './OnchainBaseProvider';
-export * from './Blockstream';
+export * from './Esplora';
 export * from './BitcoinCore';
 export * from './Electrum';

packages/shared-server/src/utils/accountMap.ts

@@ -88,16 +88,16 @@ const decorateTx = (
 };
 
 export const serializeTransactions = (
-  transactionsFromBlockstream: EsploraTransactionResponse[],
+  transactions: EsploraTransactionResponse[],
   addresses: Address[],
   changeAddresses: Address[]
 ): Transaction[] => {
-  transactionsFromBlockstream.sort((a, b) => a.status.block_time - b.status.block_time);
+  transactions.sort((a, b) => a.status.block_time - b.status.block_time);
 
   const addressesMap = createMap(addresses, 'address');
   const changeAddressesMap = createMap(changeAddresses, 'address');
 
-  const txMap = createMap(transactionsFromBlockstream, 'txid');
+  const txMap = createMap(transactions, 'txid');
   const decoratedTxs = Object.values(txMap).map((tx) =>
     decorateTx(tx, addressesMap, changeAddressesMap)
   );

packages/types/src/index.ts

@@ -81,8 +81,8 @@ export interface BitcoinCoreNodeConfig extends ClientOption {
   provider: 'Bitcoin Core';
 }
 
-export interface BlockstreamNodeConfig {
-  provider: 'Blockstream';
+export interface EsploraNodeConfig {
+  provider: 'Esplora';
 }
 
 export interface ElectrumNodeConfig {
@@ -98,7 +98,7 @@ export interface OnchainProviderConnectionDetails {
 export interface NodeConfigWithBlockchainInfo {
   provider:
     | BitcoinCoreNodeConfig['provider']
-    | BlockstreamNodeConfig['provider']
+    | EsploraNodeConfig['provider']
     | ElectrumNodeConfig['provider'];
   connectionDetails: OnchainProviderConnectionDetails;
   connected: boolean;