mainnet-js 0.5.4 → 0.5.8

package/src/wallet/Wif.ts

@@ -65,6 +65,7 @@ import {
 import { checkWifNetwork } from "../util/checkWifNetwork";
 import { deriveCashaddr } from "../util/deriveCashaddr";
 import { derivePrefix, derivePublicKeyHash } from "../util/derivePublicKeyHash";
+import { checkForEmptySeed } from "../util/checkForEmptySeed";
 import { sanitizeUnit } from "../util/sanitizeUnit";
 import { sumUtxoValue } from "../util/sumUtxoValue";
 import { sumSendRequestAmounts } from "../util/sumSendRequestAmounts";
@@ -103,6 +104,9 @@ import { amountInSatoshi } from "../util/amountInSatoshi";
 import { getXPubKey } from "../util/getXPubKey";
 import { DERIVATION_PATHS, DUST_UTXO_THRESHOLD } from "../constant";
 
+import { TransactionHistoryI } from "../history/interface";
+import { getAddressHistory } from "../history/electrumTransformer";
+
 //#endregion Imports
 
 const secp256k1Promise = instantiateSecp256k1();
@@ -335,7 +339,10 @@ export class Wallet extends BaseWallet {
 
   private async _generateMnemonic() {
     this.mnemonic = generateMnemonic();
+    if (this.mnemonic.length == 0)
+      throw Error("refusing to create wallet from empty mnemonic");
     let seed = mnemonicToSeedSync(this.mnemonic!);
+    checkForEmptySeed(seed);
     let network = this.isTestnet ? "testnet" : "mainnet";
     this.parentXPubKey = await getXPubKey(
       seed,
@@ -394,8 +401,10 @@ export class Wallet extends BaseWallet {
     this.mnemonic = mnemonic;
 
     const crypto = await instantiateBIP32Crypto();
+    if (this.mnemonic.length == 0)
+      throw Error("refusing to create wallet from empty mnemonic");
     let seed = mnemonicToSeedSync(this.mnemonic);
-
+    checkForEmptySeed(seed);
     let hdNode = deriveHdPrivateNodeFromSeed(crypto, seed);
     if (!hdNode.valid) {
       throw Error("Invalid private key derived from mnemonic seed");
@@ -431,7 +440,10 @@ export class Wallet extends BaseWallet {
   // Get common xpub paths from zerothChild privateKey
   public async deriveHdPaths(hdPaths: string[]): Promise<any[]> {
     const crypto = await instantiateBIP32Crypto();
+    if (!this.mnemonic)
+      throw Error("refusing to create wallet from empty mnemonic");
     let seed = mnemonicToSeedSync(this.mnemonic!);
+    checkForEmptySeed(seed);
     let hdNode = deriveHdPrivateNodeFromSeed(crypto, seed);
     if (!hdNode.valid) {
       throw Error("Invalid private key derived from mnemonic seed");
@@ -1056,15 +1068,32 @@ export class Wallet extends BaseWallet {
   }
 
   // gets transaction history of this wallet
-  public async getHistory(): Promise<TxI[]> {
+  public async getRawHistory(): Promise<TxI[]> {
     return await this.provider!.getHistory(this.cashaddr!);
   }
 
+  // gets transaction history of this wallet
+  public async getHistory(
+    unit: UnitEnum,
+    start?: number,
+    count?: number,
+    collapseChange?: boolean
+  ): Promise<TransactionHistoryI> {
+    return getAddressHistory(
+      this.cashaddr!,
+      this.provider!,
+      unit,
+      start,
+      count,
+      collapseChange
+    );
+  }
+
   // gets last transaction of this wallet
   public async getLastTransaction(
     confirmedOnly: boolean = false
   ): Promise<ElectrumRawTransaction | null> {
-    let history: TxI[] = await this.getHistory();
+    let history: TxI[] = await this.getRawHistory();
     if (confirmedOnly) {
       history = history.filter((val) => val.height > 0);
     }