mainnet-js 3.1.2 → 3.1.5

package/src/wallet/HDWallet.ts

@@ -16,7 +16,7 @@ import {
   sha256,
   utf8ToBin,
 } from "@bitauth/libauth";
-import { WalletCache, WalletCacheI } from "../cache/index.js";
+import { PersistentWalletCache, WalletCacheI } from "../cache/index.js";
 import { Config } from "../config.js";
 import { NetworkType, prefixFromNetworkMap, UnitEnum } from "../enum.js";
 import { getHistory } from "../history/getHistory.js";
@@ -240,7 +240,7 @@ export class HDWallet extends BaseWallet {
       )
     );
     // @ts-ignore
-    this.walletCache = new WalletCache(
+    this.walletCache = new PersistentWalletCache(
       this.walletId,
       this.xPrivNode ?? this.xPubNode,
       this.networkPrefix

package/src/wallet/WalletCache.test.ts

@@ -0,0 +1,45 @@
+import { RegTestWallet, RegTestWifWallet } from "./Wif";
+import { RegTestWatchWallet } from "./Watch";
+import { RegTestHDWallet } from "./HDWallet";
+
+describe("Wallet cache initialization", () => {
+  test("Seed wallet should have walletCache with at least one entry", async () => {
+    const wallet = await RegTestWallet.newRandom();
+    expect(wallet.walletCache).toBeDefined();
+    expect(wallet.walletCache!.get(wallet.cashaddr)).toBeDefined();
+    expect(wallet.walletCache!.get(wallet.cashaddr)!.privateKey).toBeDefined();
+  });
+
+  test("Wif wallet should have walletCache with at least one entry", async () => {
+    const wallet = await RegTestWifWallet.newRandom();
+    expect(wallet.walletCache).toBeDefined();
+    expect(wallet.walletCache!.get(wallet.cashaddr)).toBeDefined();
+    expect(wallet.walletCache!.get(wallet.cashaddr)!.privateKey).toBeDefined();
+  });
+
+  test("Wif wallet from ID should have walletCache with at least one entry", async () => {
+    const wallet = await RegTestWallet.fromId(
+      "wif:regtest:cNfsPtqN2bMRS7vH5qd8tR8GMvgXyL5BjnGAKgZ8DYEiCrCCQcP6"
+    );
+    expect(wallet.walletCache).toBeDefined();
+    expect(wallet.walletCache!.get(wallet.cashaddr)).toBeDefined();
+    expect(wallet.walletCache!.get(wallet.cashaddr)!.privateKey).toBeDefined();
+  });
+
+  test("HD wallet should have walletCache with at least one entry", async () => {
+    const wallet = await RegTestHDWallet.newRandom();
+    expect(wallet.walletCache).toBeDefined();
+    const depositAddr = wallet.getDepositAddress();
+    expect(wallet.walletCache!.get(depositAddr)).toBeDefined();
+    expect(wallet.walletCache!.get(depositAddr)!.privateKey).toBeDefined();
+    await wallet.stop();
+  });
+
+  test("Watch wallet should have empty walletCache", async () => {
+    const wallet = await RegTestWatchWallet.watchOnly(
+      "bchreg:qpttdv3qg2usm4nm7talhxhl05mlhms3ys43u76rn0"
+    );
+    expect(wallet.walletCache).toBeDefined();
+    expect(wallet.walletCache!.get(wallet.cashaddr)).toBeUndefined();
+  });
+});

package/src/wallet/Wif.test.ts

@@ -1187,3 +1187,5 @@ describe(`Wallet extrema behavior regression testing`, () => {
     ).resolves.not.toThrow();
   });
 });
+
+

package/src/wallet/Wif.ts

@@ -215,13 +215,20 @@ export class Wallet extends WatchWallet {
     }
 
     // rest cases are for watch wallets
-    return super.initialize({
+    await super.initialize({
       name,
       publicKey,
       publicKeyCompressed,
       publicKeyHash,
       address,
     });
+
+    if (this.privateKey) {
+      // @ts-ignore
+      this.walletCache = new Map<string, { privateKey: Uint8Array }>().set(this.cashaddr, { privateKey: this.privateKey });
+    }
+
+    return this;
   }
   //#endregion Constructors and Statics