fix: getBestBlock

Author: limpbrains

src/utils/lightning/index.ts

@@ -31,11 +31,11 @@ import lm, {
 	TCloseChannelReq,
 	TCreatePaymentReq,
 	TGetFees,
-	THeader,
 	TInvoice,
 	TPaymentReq,
 	TTransactionData,
 	TTransactionPosition,
+	TGetBestBlock,
 } from '@synonymdev/react-native-ldk';
 
 import {
@@ -48,7 +48,6 @@ import {
 	getBip39Passphrase,
 	getCurrentAddressIndex,
 	getMnemonicPhrase,
-	getOnChainWalletDataAsync,
 	getOnChainWalletElectrumAsync,
 	getSelectedNetwork,
 	getSelectedWallet,
@@ -61,9 +60,7 @@ import {
 	getFeesStore,
 	getLightningStore,
 	getStore,
-	getWalletStore,
 } from '../../store/helpers';
-import { defaultHeader } from '../../store/shapes/wallet';
 import { updateBackupState } from '../../store/slices/lightning';
 import {
 	moveMetaIncPaymentTags,
@@ -437,6 +434,13 @@ export const setupLdk = async ({
 			return err(e);
 		}
 
+		// check if getBestBlock is working
+		try {
+			await getBestBlock();
+		} catch (e) {
+			return err(e);
+		}
+
 		const lmStart = await lm.start({
 			account: account.value,
 			getFees,
@@ -1008,24 +1012,23 @@ export const getSha256 = (str: string): string => {
 };
 
 /**
- * Returns last known header information from storage.
+ * Returns the last known block header when Electrum is connected.
  * @returns {Promise<THeader>}
  */
-export const getBestBlock = async (
-	selectedNetwork: EAvailableNetwork = getSelectedNetwork(),
-): Promise<THeader> => {
-	try {
-		const beignetHeader = (await getOnChainWalletDataAsync()).header;
-		const storageHeader = getWalletStore().header[selectedNetwork];
-		const header =
-			beignetHeader.height > storageHeader.height
-				? beignetHeader
-				: storageHeader;
-		return header?.height ? header : defaultHeader;
-	} catch (e) {
-		console.log(e);
-		return defaultHeader;
+const getBestBlock: TGetBestBlock = async () => {
+	const electrum = await getOnChainWalletElectrumAsync();
+	let i = 0;
+	while (
+		!(await electrum.isConnected()) ||
+		electrum.getBlockHeader().hex !== ''
+	) {
+		await sleep(100);
+		// timeout 10 seconds
+		if (i++ > 100) {
+			throw new Error('Unable to connect to Electrum server');
+		}
 	}
+	return electrum.getBlockHeader();
 };
 
 /**