beignet 0.0.39 → 0.0.41

package/src/electrum/index.ts

@@ -1,3 +1,6 @@
+import { Block } from 'bitcoinjs-lib';
+import * as electrum from 'rn-electrum-client/helpers';
+
 import {
 	EAddressType,
 	EAvailableNetworks,
@@ -22,6 +25,7 @@ import {
 	ITransaction,
 	ITxHash,
 	IUtxo,
+	Net,
 	TAddressTypeContent,
 	TConnectToElectrumRes,
 	TGetAddressHistory,
@@ -31,9 +35,9 @@ import {
 	TTxResponse,
 	TTxResult,
 	TUnspentAddressScriptHashData,
-	TUnspentAddressScriptHashResponse
+	TUnspentAddressScriptHashResponse,
+	Tls
 } from '../types';
-import * as electrum from 'rn-electrum-client/helpers';
 import {
 	err,
 	filterAddressesForGapLimit,
@@ -50,25 +54,14 @@ import {
 } from '../utils';
 import { Wallet } from '../wallet';
 import { onMessageKeys, POLLING_INTERVAL } from '../shapes';
-import { Block } from 'bitcoinjs-lib';
-import { Server } from 'net';
-import { TLSSocket } from 'tls';
-
-let tls, net;
-try {
-	tls = require('tls');
-	net = require('net');
-} catch {
-	// Modules not available, will attempt to use passed instances, if any.
-}
 
 export class Electrum {
 	private readonly _wallet: Wallet;
 	private sendMessage: TOnMessage;
 	private latestConnectionState: boolean | null = null;
 	private connectionPollingInterval: NodeJS.Timeout | null;
-	private tls: TLSSocket;
-	private net: Server;
+	private net: Net;
+	private tls: Tls;
 
 	public servers?: TServer | TServer[];
 	public network: EAvailableNetworks;
@@ -77,24 +70,25 @@ export class Electrum {
 	public onReceive?: (data: unknown) => void;
 	public batchLimit: number;
 	public batchDelay: number;
+
 	constructor({
 		wallet,
-		servers,
 		network,
-		onReceive,
-		tls: _tls,
-		net: _net,
+		net,
+		tls,
+		servers,
 		batchLimit = 20,
-		batchDelay = 50
+		batchDelay = 50,
+		onReceive
 	}: {
 		wallet: Wallet;
-		servers?: TServer | TServer[];
 		network: EAvailableNetworks;
-		onReceive?: (data: unknown) => void;
-		tls?: TLSSocket;
-		net?: Server;
+		net: Net;
+		tls: Tls;
+		servers?: TServer | TServer[];
 		batchLimit?: number;
 		batchDelay?: number;
+		onReceive?: (data: unknown) => void;
 	}) {
 		this._wallet = wallet;
 		this.sendMessage = wallet.sendMessage;
@@ -103,15 +97,10 @@ export class Electrum {
 		this.electrumNetwork = getElectrumNetwork(this.network);
 		this.connectedToElectrum = false;
 		this.onReceive = onReceive;
-		this.tls = _tls ?? tls;
-		this.net = _net ?? net;
+		this.net = net;
+		this.tls = tls;
 		this.batchLimit = batchLimit;
 		this.batchDelay = batchDelay;
-		if (!this.tls || !this.net) {
-			throw new Error(
-				'TLS and NET modules are not available and were not passed as instances'
-			);
-		}
 		this.connectionPollingInterval = setInterval(
 			(): Promise<void> => this.checkConnection(),
 			POLLING_INTERVAL
@@ -148,8 +137,8 @@ export class Electrum {
 		}
 		const startResponse = await electrum.start({
 			network: electrumNetwork,
-			tls: this.tls,
 			net: this.net,
+			tls: this.tls,
 			customPeers
 		});
 		if (startResponse.error && !this.wallet.isSwitchingNetworks)
@@ -858,7 +847,7 @@ export class Electrum {
 		}
 
 		// Subscribe to all provided script hashes.
-		const allScriptHashesPromise = scriptHashes.map(async (scriptHash) => {
+		const allScriptHashesPromises = scriptHashes.map(async (scriptHash) => {
 			const response: ISubscribeToAddress = await electrum.subscribeAddress({
 				scriptHash,
 				network: this.electrumNetwork,
@@ -872,7 +861,7 @@ export class Electrum {
 			}
 		});
 
-		const allUtxosPromise = allUtxos.map(async (utxo) => {
+		const allUtxosPromises = allUtxos.map(async (utxo) => {
 			const response: ISubscribeToAddress = await electrum.subscribeAddress({
 				scriptHash: utxo.scriptHash,
 				network: this.electrumNetwork,
@@ -892,7 +881,7 @@ export class Electrum {
 		});
 
 		try {
-			await Promise.all([allScriptHashesPromise, allUtxosPromise]);
+			await Promise.all([...allScriptHashesPromises, ...allUtxosPromises]);
 		} catch (e) {
 			return err(e);
 		}

package/src/types/electrum.ts

@@ -6,6 +6,9 @@ import {
 	IUtxo
 } from './wallet';
 
+export type Net = typeof import('net');
+export type Tls = typeof import('tls');
+
 export type TElectrumNetworks = 'bitcoin' | 'bitcoinTestnet' | 'bitcoinRegtest';
 export enum EElectrumNetworks {
 	bitcoin = 'bitcoin',

package/src/types/wallet.ts

@@ -3,12 +3,12 @@ import {
 	EElectrumNetworks,
 	IHeader,
 	INewBlock,
+	Net,
 	TServer,
-	TTxResult
+	TTxResult,
+	Tls
 } from './electrum';
 import { EFeeId, TGapLimitOptions } from './transaction';
-import { TLSSocket } from 'tls';
-import { Server } from 'net';
 import { ECPairInterface } from 'ecpair';
 import { BIP32Interface } from 'bip32';
 
@@ -190,10 +190,10 @@ export interface IWallet {
 	addressType?: EAddressType;
 	data?: IWalletData;
 	storage?: TStorage;
-	electrumOptions?: {
+	electrumOptions: {
+		net: Net;
+		tls: Tls;
 		servers?: TServer | TServer[];
-		tls?: TLSSocket;
-		net?: Server;
 		batchLimit?: number; // Maximum number of requests to be sent in a single batch
 		batchDelay?: number; // Delay (in milliseconds) between each batch of requests
 	};

package/src/wallet/index.ts

@@ -46,12 +46,14 @@ import {
 	IVout,
 	IWallet,
 	IWalletData,
+	Net,
 	TAddressIndexInfo,
 	TAddressTypeContent,
 	TAvailableNetworks,
 	TGapLimitOptions,
 	TGetData,
 	TGetTotalFeeObj,
+	Tls,
 	TMessageDataMap,
 	TOnMessage,
 	TProcessUnconfirmedTransactions,
@@ -107,8 +109,6 @@ import { GAP_LIMIT, TRANSACTION_DEFAULTS } from './constants';
 import cloneDeep from 'lodash.clonedeep';
 import { btcToSats } from '../utils/conversion';
 import * as bip39 from 'bip39';
-import { TLSSocket } from 'tls';
-import { Server } from 'net';
 
 const bip32 = BIP32Factory(ecc);
 
@@ -138,9 +138,9 @@ export class Wallet {
 	public readonly id: string;
 	public readonly name: string;
 	public electrumOptions?: {
+		net: Net;
+		tls: Tls;
 		servers?: TServer | TServer[];
-		tls?: TLSSocket;
-		net?: Server;
 		batchLimit?: number; // Maximum number of requests to be sent in a single batch
 		batchDelay?: number; // Delay (in milliseconds) between each batch of requests
 	};
@@ -160,7 +160,7 @@ export class Wallet {
 		network = EAvailableNetworks.mainnet,
 		addressType = EAddressType.p2wpkh,
 		storage,
-		electrumOptions = {},
+		electrumOptions,
 		onMessage = (): null => null,
 		customGetAddress,
 		customGetScriptHash,