mainnet-js 2.6.7 → 2.7.1

package/src/wallet/Cashtokens.test.headless.js

@@ -474,7 +474,7 @@ describe(`Wallet should function in the browser`, () => {
         0
       );
 
-      const cancel = bob.watchTokenBalance(tokenId, (balance) => {
+      const cancel = await bob.watchTokenBalance(tokenId, (balance) => {
         seenBalance = balance;
       });
 

package/src/wallet/Cashtokens.test.ts

@@ -1,13 +1,12 @@
-import { RegTestWallet, TestNetWallet, Wallet } from "./Wif";
+import { RegTestWallet, TestNetWallet } from "./Wif";
 import { initProviders, disconnectProviders } from "../network/Connection";
 import {
-  OpReturnData,
   SendRequest,
   SendResponse,
   TokenMintRequest,
   TokenSendRequest,
 } from "./model";
-import { Network, NFTCapability } from "../interface";
+import { NFTCapability } from "../interface";
 import {
   binToHex,
   binsAreEqual,
@@ -16,8 +15,8 @@ import {
   utf8ToBin,
 } from "@bitauth/libauth";
 import { delay } from "../util";
-import json from "../../polyfill/json";
 import { Config } from "../config";
+import json from "../test/json.test";
 
 beforeAll(async () => {
   await initProviders();
@@ -318,13 +317,13 @@ describe(`Test cashtokens`, () => {
     const bob = await RegTestWallet.newRandom();
     await alice.send([
       new TokenSendRequest({
-        cashaddr: bob.address!,
+        cashaddr: bob.cashaddr!,
         tokenId: tokenId,
         capability: NFTCapability.none,
         commitment: "0a",
       }),
       new TokenSendRequest({
-        cashaddr: bob.address!,
+        cashaddr: bob.cashaddr!,
         tokenId: tokenId,
         capability: NFTCapability.none,
         commitment: "0a",
@@ -621,12 +620,12 @@ describe(`Test cashtokens`, () => {
       0
     );
 
-    const cancel = bob.watchTokenBalance(tokenId, (balance) => {
+    const cancel = await bob.watchTokenBalance(tokenId, (balance) => {
       seenBalance = balance;
     });
 
     let bobTxId = ".";
-    const txCancel = bob.watchAddressTokenTransactions((tx) => {
+    const txCancel = await bob.watchAddressTokenTransactions((tx) => {
       bobTxId = tx.txid;
     });
 

package/src/wallet/Util.ts

@@ -1,25 +1,17 @@
 import {
-  RegTestWallet,
-  RegTestWatchWallet,
-  RegTestWifWallet,
-  TestNetWallet,
-  TestNetWatchWallet,
-  TestNetWifWallet,
-  Wallet,
-  WatchWallet,
-  WifWallet,
-} from "../wallet/Wif.js";
-import {
+  Transaction as LibAuthTransaction,
+  assertSuccess,
   binToHex,
   decodeTransaction as decodeTransactionLibAuth,
   hexToBin,
-  lockingBytecodeToCashAddress,
-  Transaction as LibAuthTransaction,
-  assertSuccess,
   isPayToPublicKey,
-  publicKeyToP2pkhCashAddress,
   lockingBytecodeToAddressContents,
+  lockingBytecodeToCashAddress,
+  publicKeyToP2pkhCashAddress,
 } from "@bitauth/libauth";
+import { bchParam } from "../chain.js";
+import { NetworkType, prefixFromNetworkMap } from "../enum.js";
+import { getNetworkProvider } from "../network/default.js";
 import {
   ElectrumRawTransaction,
   ElectrumRawTransactionVin,
@@ -27,25 +19,24 @@ import {
   ElectrumRawTransactionVout,
   ElectrumRawTransactionVoutScriptPubKey,
 } from "../network/interface.js";
-import { bchParam } from "../chain.js";
+import NetworkProvider from "../network/NetworkProvider.js";
 import { getTransactionHash } from "../util/transaction.js";
 
 /**
  * Class with various wallet utilities.
  */
 export class Util {
-  readonly wallet: Wallet;
-  static get walletType() {
-    return Wallet;
-  }
+  readonly network: NetworkType;
+  provider: NetworkProvider;
 
   /**
    * Initializes a wallet Util class.
    *
-   * @param wallet     A wallet object
+   * @param network     The network type to use. Defaults to mainnet.
    */
-  constructor(wallet: Wallet) {
-    this.wallet = wallet;
+  constructor(network = NetworkType.Mainnet) {
+    this.network = network;
+    this.provider = getNetworkProvider(network);
   }
 
   public async getTransactionHash(rawTransactionHex: string): Promise<string> {
@@ -74,7 +65,7 @@ export class Util {
     } else {
       // tx hash, look up the raw transaction
       txHash = transactionHashOrHex;
-      transactionHex = await this.wallet.provider!.getRawTransaction(txHash);
+      transactionHex = await this.provider.getRawTransaction(txHash);
       transactionBin = hexToBin(transactionHex);
     }
 
@@ -140,12 +131,12 @@ export class Util {
                     publicKey: lockingBytecodeToAddressContents(
                       output.lockingBytecode
                     ).payload,
-                    prefix: this.wallet.networkPrefix,
+                    prefix: prefixFromNetworkMap[this.network],
                   })
                 : assertSuccess(
                     lockingBytecodeToCashAddress({
                       bytecode: output.lockingBytecode,
-                      prefix: this.wallet.networkPrefix,
+                      prefix: prefixFromNetworkMap[this.network],
                     })
                   ).address,
             ],
@@ -168,85 +159,12 @@ export class Util {
 
   public static async decodeTransaction(
     transactionHashOrHex: string,
-    loadInputValues: boolean = false
+    loadInputValues: boolean = false,
+    network?: NetworkType
   ): Promise<ElectrumRawTransaction> {
-    return new this.walletType().util.decodeTransaction(
+    return new this(network).decodeTransaction(
       transactionHashOrHex,
       loadInputValues
     );
   }
 }
-
-//#region Specific wallet classes
-/**
- * Class to manage a testnet wallet.
- */
-export class TestNetUtil extends Util {
-  static get walletType() {
-    return TestNetWallet;
-  }
-}
-
-/**
- * Class to manage a regtest wallet.
- */
-export class RegTestUtil extends Util {
-  static get walletType() {
-    return RegTestWallet;
-  }
-}
-
-/**
- * Class to manage a bitcoin cash wif wallet.
- */
-export class WifUtil extends Util {
-  static get walletType() {
-    return WifWallet;
-  }
-}
-
-/**
- * Class to manage a testnet wif wallet.
- */
-export class TestNetWifUtil extends Util {
-  static get walletType() {
-    return TestNetWifWallet;
-  }
-}
-
-/**
- * Class to manage a regtest wif wallet.
- */
-export class RegTestWifUtil extends Util {
-  static get walletType() {
-    return RegTestWifWallet;
-  }
-}
-
-/**
- * Class to manage a bitcoin cash watch wallet.
- */
-export class WatchUtil extends Util {
-  static get walletType() {
-    return WatchWallet;
-  }
-}
-
-/**
- * Class to manage a testnet watch wallet.
- */
-export class TestNetWatchUtil extends Util {
-  static get walletType() {
-    return TestNetWatchWallet;
-  }
-}
-
-/**
- * Class to manage a regtest watch wallet.
- */
-export class RegTestWatchUtil extends Util {
-  static get walletType() {
-    return RegTestWatchWallet;
-  }
-}
-//#endregion

package/src/wallet/Wif.bip39.test.ts

@@ -14,7 +14,7 @@ describe(`Test bip39 edge cases`, () => {
   test("Should catch a blank seed", async () => {
     try {
       let w = RegTestWallet.fromSeed("");
-      let cashaddr = (await w).address;
+      let cashaddr = (await w).cashaddr;
       expect(cashaddr).toContain(
         "bchreg:qrvcdmgpk73zyfd8pmdl9wnuld36zh9n4g974kwcsl"
       );
@@ -28,7 +28,7 @@ describe(`Test bip39 edge cases`, () => {
       let w = RegTestWallet.fromSeed(
         "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon"
       );
-      let cashaddr = (await w).address;
+      let cashaddr = (await w).cashaddr;
       expect(cashaddr).toContain(
         "bchreg:qrvcdmgpk73zyfd8pmdl9wnuld36zh9n4g974kwcsl"
       );
@@ -41,7 +41,7 @@ describe(`Test bip39 edge cases`, () => {
     let w = RegTestWallet.fromSeed(
       "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
     );
-    let cashaddr = (await w).address;
+    let cashaddr = (await w).cashaddr;
     expect(cashaddr).toContain(
       "bchreg:qrvcdmgpk73zyfd8pmdl9wnuld36zh9n4g974kwcsl"
     );

package/src/wallet/Wif.test.ts

@@ -16,9 +16,9 @@ import {
   utf8ToBin,
 } from "@bitauth/libauth";
 import { mine } from "../mine";
-import json from "../../polyfill/json";
-import ElectrumNetworkProvider from "../network/ElectrumNetworkProvider";
 import { Config } from "../config";
+import { CancelFn } from "./interface";
+import json from "../test/json.test";
 
 beforeAll(async () => {
   await initProviders();
@@ -642,9 +642,9 @@ describe(`Wallet subscriptions`, () => {
   test("Should watch then wait", async () => {
     const aliceWallet = await RegTestWallet.newRandom();
 
-    let cancel = aliceWallet.watchBalance(() => {});
+    let cancel = await aliceWallet.watchBalance(() => {});
 
-    cancel();
+    await cancel();
   });
 
   test("Should wait for balance", async () => {
@@ -677,7 +677,7 @@ describe(`Wallet subscriptions`, () => {
       },
     ]);
 
-    let cancel = bob.watchBalance(() => {});
+    let cancel = await bob.watchBalance(() => {});
     let balance = await bob.waitForBalance(2000, "sat");
     expect(balance.sat!).toBe(2000);
     await cancel();
@@ -801,50 +801,56 @@ describe(`Wallet subscriptions`, () => {
     }, 0);
 
     let aliceWatchResult = false;
-    const aliceWatchCancel = (
-      alice.provider! as ElectrumNetworkProvider
-    ).watchAddressStatus(alice.getDepositAddress(), (_status) => {
-      aliceWatchCancel();
-      aliceWatchResult = true;
-    });
+    let aliceWatchCancel: CancelFn;
+    aliceWatchCancel = await alice.provider!.watchAddressStatus(
+      alice.getDepositAddress(),
+      async (_status) => {
+        await aliceWatchCancel?.();
+        aliceWatchResult = true;
+      }
+    );
 
     let bobWatchResult = false;
     let bobTransactionId = "";
-    const bobWatchCancel = bob.watchAddress((txHash) => {
-      bobWatchCancel();
+    let bobWatchCancel: CancelFn;
+    bobWatchCancel = await bob.watchAddress(async (txHash) => {
+      await bobWatchCancel?.();
       bobWatchResult = true;
       bobTransactionId = txHash;
     });
 
     let bobBalanceWatchResult = false;
-    const bobBalanceWatchCancel = bob.watchBalance((balance) => {
+    let bobBalanceWatchCancel: CancelFn;
+    bobBalanceWatchCancel = await bob.watchBalance(async (balance) => {
+      // skip if balance is zero yet
+      if (!balance.bch) {
+        return;
+      }
+
       expect(balance.bch!).toBe(0.001);
-      bobBalanceWatchCancel();
+      await bobBalanceWatchCancel?.();
       bobBalanceWatchResult = true;
     });
 
     let blockWatchResult = false;
-    const blockWatchCancel = bob.watchBlocks((block) => {
+    let blockWatchCancel: CancelFn;
+    blockWatchCancel = await bob.watchBlocks(async (block) => {
       expect(block.height).toBeGreaterThan(1);
-      blockWatchCancel();
+      await blockWatchCancel?.();
       blockWatchResult = true;
     });
 
+    const blockNumber = await alice.provider!.getBlockHeight();
+
     let blockWaitResult = false;
     setTimeout(async () => {
-      const blockNumber = await (
-        alice.provider! as ElectrumNetworkProvider
-      ).getBlockHeight();
-      const result = await alice.waitForBlock();
+      const result = await alice.waitForBlock(blockNumber + 1);
       expect(result.height).toBe(blockNumber + 1);
       blockWaitResult = true;
     }, 0);
 
     let blockNumberWaitResult = false;
     setTimeout(async () => {
-      const blockNumber = await (
-        alice.provider! as ElectrumNetworkProvider
-      ).getBlockHeight();
       const result = await alice.waitForBlock(blockNumber + 2);
       expect(result.height).toBe(blockNumber + 2);
       blockNumberWaitResult = true;
@@ -1068,7 +1074,7 @@ describe(`Wallet extrema behavior regression testing`, () => {
     const aliceWif = `wif:regtest:${process.env.PRIVATE_WIF!}`;
     const aliceWallet = await RegTestWallet.fromId(aliceWif);
     const bobWallet = await RegTestWallet.newRandom();
-    aliceWallet.privateKey = undefined;
+    delete (aliceWallet as any).privateKey;
 
     const aliceUtxos = await aliceWallet.getAddressUtxos();