fix: WIP

Author: limpbrains

src/AppOnboarded.tsx

@@ -7,7 +7,7 @@ import RootNavigator from './navigation/root/RootNavigator';
 import InactivityTracker from './components/InactivityTracker';
 import { showToast } from './utils/notifications';
 import { startWalletServices } from './utils/startup';
-import { getOnChainWalletElectrum } from './utils/wallet';
+import { getOnChainWalletElectrumAsync } from './utils/wallet';
 import { unsubscribeFromLightningSubscriptions } from './utils/lightning';
 import { useAppSelector } from './hooks/redux';
 import { dispatch } from './store/helpers';
@@ -25,8 +25,6 @@ import {
 import { updateSettings } from './store/slices/settings';
 // import { updateExchangeRates } from './store/actions/wallet';
 
-const electrum = getOnChainWalletElectrum();
-
 const AppOnboarded = (): ReactElement => {
 	const { t } = useTranslation('other');
 	const appState = useRef(AppState.currentState);
@@ -59,22 +57,23 @@ const AppOnboarded = (): ReactElement => {
 		// on AppState change
 		const appStateSubscription = AppState.addEventListener(
 			'change',
-			(nextAppState) => {
+			async (nextAppState) => {
+				const electrum = await getOnChainWalletElectrumAsync();
 				// on App to foreground
 				if (
 					appState.current.match(/inactive|background/) &&
 					nextAppState === 'active'
 				) {
 					// resubscribe to electrum connection changes
-					electrum?.startConnectionPolling();
+					electrum.startConnectionPolling();
 				}
 
 				// on App to background
 				if (
 					appState.current.match(/active|inactive/) &&
 					nextAppState === 'background'
 				) {
-					electrum?.stopConnectionPolling();
+					electrum.stopConnectionPolling();
 				}
 
 				appState.current = nextAppState;

src/screens/Settings/GapLimit/index.tsx

@@ -12,7 +12,7 @@ import { gapLimitOptionsSelector } from '../../../store/reselect/wallet';
 import { ScrollView, TextInput, View } from '../../../styles/components';
 import { Caption13Up } from '../../../styles/text';
 import { showToast } from '../../../utils/notifications';
-import { getOnChainWallet, refreshWallet } from '../../../utils/wallet';
+import { getOnChainWalletAsync, refreshWallet } from '../../../utils/wallet';
 
 const GapLimit = ({}: SettingsScreenProps<'GapLimit'>): ReactElement => {
 	const { t } = useTranslation('settings');
@@ -68,7 +68,7 @@ const GapLimit = ({}: SettingsScreenProps<'GapLimit'>): ReactElement => {
 
 	const saveGapLimit = async (): Promise<void> => {
 		setLoading(true);
-		const wallet = getOnChainWallet();
+		const wallet = await getOnChainWalletAsync();
 		const res = wallet.updateGapLimit({
 			lookAhead: Number(lookAhead),
 			lookBehind: Number(lookBehind),

src/store/actions/wallet.ts

@@ -25,11 +25,12 @@ import {
 	createDefaultWallet,
 	getCurrentWallet,
 	getOnChainWallet,
+	getOnChainWalletAsync,
 	getOnChainWalletTransaction,
+	getOnChainWalletTransactionAsync,
 	getSelectedNetwork,
 	getSelectedWallet,
 	refreshWallet,
-	waitForWallet,
 } from '../../utils/wallet';
 import {
 	dispatch,
@@ -125,7 +126,7 @@ export const generateNewReceiveAddress = async ({
 	keyDerivationPath?: IKeyDerivationPath;
 }): Promise<Result<IAddress>> => {
 	try {
-		const wallet = getOnChainWallet();
+		const wallet = await getOnChainWalletAsync();
 		return wallet.generateNewReceiveAddress({ addressType, keyDerivationPath });
 	} catch (e) {
 		console.log(e);
@@ -138,22 +139,22 @@ export const generateNewReceiveAddress = async ({
  * @returns {Promise<string>}
  */
 export const clearUtxos = async (): Promise<string> => {
-	const wallet = getOnChainWallet();
+	const wallet = await getOnChainWalletAsync();
 	return await wallet.clearUtxos();
 };
 
-export const updateWalletBalance = ({
-	balance,
-}: {
-	balance: number;
-}): Result<string> => {
-	try {
-		const wallet = getOnChainWallet();
-		return wallet.updateWalletBalance({ balance });
-	} catch (e) {
-		return err(e);
-	}
-};
+// export const updateWalletBalance = ({
+// 	balance,
+// }: {
+// 	balance: number;
+// }): Result<string> => {
+// 	try {
+// 		const wallet = getOnChainWalletAsync();
+// 		return wallet.updateWalletBalance({ balance });
+// 	} catch (e) {
+// 		return err(e);
+// 	}
+// };
 
 /**
  * Parses and adds unconfirmed transactions to the store.
@@ -216,7 +217,7 @@ export const injectFakeTransaction = (
 // 	scanAllAddresses?: boolean;
 // 	replaceStoredTransactions?: boolean;
 // }): Promise<Result<string | undefined>> => {
-// 	const wallet = getOnChainWallet();
+// 	const wallet = async getOnChainWalletAsync();
 // 	return await wallet.updateTransactions({
 // 		scanAllAddresses,
 // 		replaceStoredTransactions,
@@ -233,7 +234,7 @@ export const deleteOnChainTransactionById = async ({
 }: {
 	txid: string;
 }): Promise<void> => {
-	const wallet = getOnChainWallet();
+	const wallet = await getOnChainWalletAsync();
 	return await wallet.deleteOnChainTransactionById({ txid });
 };
 
@@ -255,7 +256,7 @@ export const addBoostedTransaction = async ({
 	type?: EBoostType;
 	fee: number;
 }): Promise<Result<IBoostedTransaction>> => {
-	const wallet = getOnChainWallet();
+	const wallet = await getOnChainWalletAsync();
 	return await wallet.addBoostedTransaction({
 		newTxId,
 		oldTxId,
@@ -290,7 +291,7 @@ export const setupOnChainTransaction = async ({
 	outputs?: IOutput[]; // Used to pre-specify outputs to use.
 } = {}): Promise<TSetupTransactionResponse> => {
 	rbf = rbf ?? getSettingsStore().rbf;
-	const transaction = getOnChainWalletTransaction();
+	const transaction = await getOnChainWalletTransactionAsync();
 	return await transaction.setupTransaction({
 		inputTxHashes,
 		utxos,
@@ -310,7 +311,7 @@ export const getChangeAddress = async ({
 }: {
 	addressType?: EAddressType;
 }): Promise<Result<IAddress>> => {
-	const wallet = getOnChainWallet();
+	const wallet = await getOnChainWalletAsync();
 	return await wallet.getChangeAddress(addressType);
 };
 
@@ -331,8 +332,7 @@ export const updateSendTransaction = (
  * @returns {Result<string>}
  */
 export const resetSendTransaction = async (): Promise<Result<string>> => {
-	await waitForWallet();
-	const transaction = getOnChainWalletTransaction();
+	const transaction = await getOnChainWalletTransactionAsync();
 	return transaction.resetSendTransaction();
 };
 
@@ -341,7 +341,7 @@ export const updateSelectedAddressType = async ({
 }: {
 	addressType: EAddressType;
 }): Promise<void> => {
-	const wallet = getOnChainWallet();
+	const wallet = await getOnChainWalletAsync();
 	const addressTypesToMonitor = wallet.addressTypesToMonitor;
 	if (!addressTypesToMonitor.includes(addressType)) {
 		// Append the new address type so we monitor it in subsequent sessions.

src/store/utils/fees.ts

@@ -4,7 +4,7 @@ import { dispatch, getFeesStore } from '../helpers';
 import { updateOnchainFees } from '../slices/fees';
 import { getFeeEstimates } from '../../utils/wallet/transactions';
 import { EAvailableNetwork } from '../../utils/networks';
-import { getOnChainWallet, getSelectedNetwork } from '../../utils/wallet';
+import { getOnChainWalletAsync, getSelectedNetwork } from '../../utils/wallet';
 import { IOnchainFees } from 'beignet';
 
 export const REFRESH_INTERVAL = 60 * 30; // in seconds, 30 minutes
@@ -46,6 +46,6 @@ export const refreshOnchainFeeEstimates = async ({
 }: {
 	forceUpdate?: boolean;
 }): Promise<Result<IOnchainFees>> => {
-	const wallet = getOnChainWallet();
+	const wallet = await getOnChainWalletAsync();
 	return await wallet.updateFeeEstimates(forceUpdate);
 };

src/utils/ledger.ts

@@ -16,7 +16,7 @@ import {
 } from './lightning';
 import { EAvailableNetwork } from './networks';
 import {
-	getOnChainWalletElectrum,
+	getOnChainWalletElectrumAsync,
 	getScriptHash,
 	getSelectedNetwork,
 	getSelectedWallet,
@@ -59,7 +59,7 @@ export const getChannelCloseTime = async (
 
 	// we have to construct IAddress to get the history
 	const scriptHash = await getScriptHash(address, selectedNetwork);
-	const el = getOnChainWalletElectrum();
+	const el = await getOnChainWalletElectrumAsync();
 	const scriptHashes: IAddress[] = [
 		{
 			index: 0,

src/utils/lightning/index.ts

@@ -42,8 +42,8 @@ import {
 	getBip39Passphrase,
 	getCurrentAddressIndex,
 	getMnemonicPhrase,
-	getOnChainWalletData,
-	getOnChainWalletElectrum,
+	getOnChainWalletDataAsync,
+	getOnChainWalletElectrumAsync,
 	getSelectedNetwork,
 	getSelectedWallet,
 	ldkSeed,
@@ -214,7 +214,7 @@ export const setLdkStoragePath = (): Promise<Result<string>> =>
 const broadcastTransaction: TBroadcastTransaction = async (
 	rawTx: string,
 ): Promise<Result<string>> => {
-	const electrum = getOnChainWalletElectrum();
+	const electrum = await getOnChainWalletElectrumAsync();
 	const res = await electrum.broadcastTransaction({
 		rawTx,
 		subscribeToOutputAddress: false,
@@ -229,7 +229,7 @@ const broadcastTransaction: TBroadcastTransaction = async (
 const getScriptPubKeyHistory = async (
 	scriptPubKey: string,
 ): Promise<TGetAddressHistory[]> => {
-	const electrum = getOnChainWalletElectrum();
+	const electrum = await getOnChainWalletElectrumAsync();
 	return await electrum.getScriptPubKeyHistory(scriptPubKey);
 };
 
@@ -913,7 +913,7 @@ export const getBestBlock = async (
 	selectedNetwork: EAvailableNetwork = getSelectedNetwork(),
 ): Promise<THeader> => {
 	try {
-		const beignetHeader = getOnChainWalletData().header;
+		const beignetHeader = (await getOnChainWalletDataAsync()).header;
 		const storageHeader = getWalletStore().header[selectedNetwork];
 		const header =
 			beignetHeader.height > storageHeader.height
@@ -937,7 +937,7 @@ export const getTransactionData = async (
 	let transactionData = DefaultTransactionDataShape;
 	try {
 		const data = [{ tx_hash: txId }];
-		const electrum = getOnChainWalletElectrum();
+		const electrum = await getOnChainWalletElectrumAsync();
 		const response = await electrum.getTransactions({
 			txHashes: data,
 		});

src/utils/wallet/electrum.ts

@@ -2,11 +2,12 @@ import { err, ok, Result } from '@synonymdev/result';
 
 import { EAvailableNetwork } from '../networks';
 import {
+	ITransaction,
 	getCustomElectrumPeers,
-	getOnChainWallet,
+	getOnChainWalletAsync,
 	getOnChainWalletElectrum,
+	getOnChainWalletElectrumAsync,
 	getSelectedNetwork,
-	ITransaction,
 	refreshWallet,
 } from './index';
 import {
@@ -35,7 +36,7 @@ export type TUnspentAddressScriptHashData = {
  * @returns {Promise<boolean>}
  */
 export const isConnectedElectrum = async (): Promise<boolean> => {
-	const electrum = getOnChainWalletElectrum();
+	const electrum = await getOnChainWalletElectrumAsync();
 	return electrum.isConnected();
 };
 
@@ -65,7 +66,7 @@ export const listUnspentAddressScriptHashes = async ({
 }: {
 	addresses: TUnspentAddressScriptHashData;
 }): Promise<Result<IGetUtxosResponse>> => {
-	const electrum = getOnChainWalletElectrum();
+	const electrum = await getOnChainWalletElectrumAsync();
 	const unspentAddressResult = await electrum.listUnspentAddressScriptHashes({
 		addresses,
 	});
@@ -89,7 +90,7 @@ export const subscribeToAddresses = async ({
 	scriptHashes?: string[];
 	onReceive?: () => void;
 } = {}): Promise<Result<string>> => {
-	const electrum = getOnChainWalletElectrum();
+	const electrum = await getOnChainWalletElectrumAsync();
 	return electrum.subscribeToAddresses({ scriptHashes, onReceive });
 };
 
@@ -132,7 +133,7 @@ export const getTransactions = async ({
 }: {
 	txHashes: ITxHash[];
 }): Promise<Result<IGetTransactions>> => {
-	const electrum = getOnChainWalletElectrum();
+	const electrum = await getOnChainWalletElectrumAsync();
 	return await electrum.getTransactions({ txHashes });
 };
 
@@ -147,7 +148,7 @@ export interface IPeerData {
  * @return {Promise<Result<IPeerData>>}
  */
 export const getConnectedPeer = async (): Promise<Result<IPeerData>> => {
-	const electrum = getOnChainWalletElectrum();
+	const electrum = await getOnChainWalletElectrumAsync();
 	const peerData = await electrum.getConnectedPeer();
 	return peerData as Result<IPeerData>;
 };
@@ -173,7 +174,7 @@ export const getTransactionsFromInputs = async ({
 }: {
 	txHashes: ITxHash[];
 }): Promise<Result<IGetTransactionsFromInputs>> => {
-	const electrum = getOnChainWalletElectrum();
+	const electrum = await getOnChainWalletElectrumAsync();
 	return await electrum.getTransactionsFromInputs({ txHashes });
 };
 
@@ -197,7 +198,7 @@ export const getAddressHistory = async ({
 	scriptHashes?: IAddress[];
 	scanAllAddresses?: boolean;
 }): Promise<Result<IGetAddressHistoryResponse[]>> => {
-	const electrum = getOnChainWalletElectrum();
+	const electrum = await getOnChainWalletElectrumAsync();
 	return await electrum.getAddressHistory({ scriptHashes, scanAllAddresses });
 };
 
@@ -217,7 +218,7 @@ export const connectToElectrum = async ({
 	showNotification?: boolean;
 	selectedNetwork?: EAvailableNetwork;
 } = {}): Promise<Result<string>> => {
-	const electrum = getOnChainWalletElectrum();
+	const electrum = await getOnChainWalletElectrumAsync();
 
 	// Attempt to disconnect from any old/lingering connections
 	await electrum?.disconnect();
@@ -254,7 +255,7 @@ export const getAddressBalance = async ({
 }: {
 	addresses: string[];
 }): Promise<Result<number>> => {
-	const wallet = getOnChainWallet();
+	const wallet = await getOnChainWalletAsync();
 	return await wallet.getAddressesBalance(addresses);
 };
 
@@ -269,7 +270,7 @@ export const getBlockHex = async ({
 }: {
 	height?: number;
 }): Promise<Result<string>> => {
-	const electrum = getOnChainWalletElectrum();
+	const electrum = await getOnChainWalletElectrumAsync();
 	return await electrum.getBlockHex({ height });
 };
 
@@ -280,14 +281,14 @@ export const getBlockHex = async ({
  * @param {EAvailableNetwork} [selectedNetwork]
  * @returns {string}
  */
-export const getBlockHashFromHex = ({
-	blockHex,
-}: {
-	blockHex?: string;
-}): string => {
-	const electrum = getOnChainWalletElectrum();
-	return electrum.getBlockHashFromHex({ blockHex });
-};
+// export const getBlockHashFromHex = ({
+// 	blockHex,
+// }: {
+// 	blockHex?: string;
+// }): string => {
+// 	const electrum = getOnChainWalletElectrum();
+// 	return electrum.getBlockHashFromHex({ blockHex });
+// };
 
 /**
  * Returns last known block height, and it's corresponding hex from local storage.