mainnet-js 2.7.34 → 3.0.0-next.1

package/src/message/signed.test.ts

@@ -1,6 +1,6 @@
 import { SignedMessage, hash_message } from "./signed.js";
 import { Wallet, RegTestWallet, TestNetWallet } from "../wallet/Wif.js";
-import { binToBase64, binToHex } from "@bitauth/libauth";
+import { binToHex } from "@bitauth/libauth";
 
 import fs from "fs";
 
@@ -14,13 +14,13 @@ describe("Test message Signing and Verification", () => {
     // Test that the double sha256 hash of the wrapped messages matches
     // what would be had internally in electron-cash
     // b'\x18Bitcoin Signed Message:\n' + b'{message.length}' + b'{message}'
-    let test_hash = await hash_message("test");
+    let test_hash = hash_message("test");
     expect(binToHex(test_hash)).toBe(
       "9ce428d58e8e4caf619dc6fc7b2c2c28f0561654d1f80f322c038ad5e67ff8a6"
     );
 
     // b'\xe6\xb5\x8b\xe8\xaf\x95' in binary python
-    let 测试_hash = await hash_message("测试");
+    let 测试_hash = hash_message("测试");
     expect(binToHex(测试_hash)).toBe(
       "8d8405050b7a763ccd5683f8470ea7dcbd10a87da2b7fe07eb2679ba71229688"
     );
@@ -34,12 +34,12 @@ describe("Test message Signing and Verification", () => {
     expect(w1.cashaddr!).toBe(
       "bitcoincash:qqehccy89v7ftlfgr9v0zvhjzyy7eatdkqt05lt3nw"
     );
-    let sig = await SignedMessage.sign(msg1, w1.privateKey!);
+    let sig = SignedMessage.sign(msg1, w1.privateKey!);
 
     let coreLibSig =
       "H/9jMOnj4MFbH3d7t4yCQ9i7DgZU/VZ278w3+ySv2F4yIsdqjsc5ng3kmN8OZAThgyfCZOQxZCWza9V5XzlVY0Y=";
     expect(sig.signature).toBe(coreLibSig);
-    let result = await SignedMessage.verify(msg1, sig.signature, w1.cashaddr!);
+    let result = SignedMessage.verify(msg1, sig.signature, w1.cashaddr!);
     expect(result.valid).toBe(true);
     expect(result.details!.messageHash).toBe(
       "gE9BDBFAOqW+yoOzABjnM+LQRWHd4dvUVrsTR+sIWsU="
@@ -50,7 +50,7 @@ describe("Test message Signing and Verification", () => {
     expect(result.details!.signatureType).toBe("recoverable");
 
     let msg2 = "Lessons for China from Japan’s lost decade";
-    result = await SignedMessage.verify(msg2, sig.signature, w1.cashaddr!);
+    result = SignedMessage.verify(msg2, sig.signature, w1.cashaddr!);
     expect(result.valid).toBe(false);
     expect(result.details!.messageHash).toBe(
       "070kQIcYPSHApGdOGH0O81N1AkMbNKwCTM3IX2Svd3I="
@@ -73,11 +73,11 @@ describe("Test message Signing and Verification", () => {
       "bchtest:qqf25s9nm4uq982t94vq75v78n4j0e4r4vdf9j48wn"
     );
     let msg = "test";
-    let sig = await SignedMessage.sign(msg, w.privateKey!);
-    let result = await SignedMessage.verify(msg, sig.signature, w.cashaddr!);
+    let sig = SignedMessage.sign(msg, w.privateKey!);
+    let result = SignedMessage.verify(msg, sig.signature, w.cashaddr!);
     expect(result.valid).toBe(true);
 
-    result = await SignedMessage.verify("test2", sig.signature, w.cashaddr!);
+    result = SignedMessage.verify("test2", sig.signature, w.cashaddr!);
     expect(result.valid).toBe(false);
   });
 
@@ -86,12 +86,12 @@ describe("Test message Signing and Verification", () => {
       "wif:regtest:cNfsPtqN2bMRS7vH5qd8tR8GMvgXyL5BjnGAKgZ8DYEiCrCCQcP6"
     );
     let msg = "test";
-    let sig = await SignedMessage.sign(msg, w.privateKey!);
+    let sig = SignedMessage.sign(msg, w.privateKey!);
 
-    let result = await SignedMessage.verify(msg, sig.signature, w.cashaddr!);
+    let result = SignedMessage.verify(msg, sig.signature, w.cashaddr!);
     expect(result.valid).toBe(true);
 
-    result = await SignedMessage.verify("test2", sig.signature, w.cashaddr!);
+    result = SignedMessage.verify("test2", sig.signature, w.cashaddr!);
     expect(result.valid).toBe(false);
   });
 
@@ -100,11 +100,11 @@ describe("Test message Signing and Verification", () => {
       "wif:regtest:cNfsPtqN2bMRS7vH5qd8tR8GMvgXyL5BjnGAKgZ8DYEiCrCCQcP6"
     );
     let msg = "测试";
-    let sig = await SignedMessage.sign(msg, w.privateKey!);
-    let result = await SignedMessage.verify(msg, sig.signature, w.cashaddr!);
+    let sig = SignedMessage.sign(msg, w.privateKey!);
+    let result = SignedMessage.verify(msg, sig.signature, w.cashaddr!);
     expect(result.valid).toBe(true);
 
-    result = await SignedMessage.verify("测试二", sig.signature, w.cashaddr!);
+    result = SignedMessage.verify("测试二", sig.signature, w.cashaddr!);
     expect(result.valid).toBe(false);
   });
 
@@ -113,8 +113,8 @@ describe("Test message Signing and Verification", () => {
       "wif:mainnet:L1TnU2zbNaAqMoVh65Cyvmcjzbrj41Gs9iTLcWbpJCMynXuap6UN"
     );
     let msg = "test";
-    let sig = await SignedMessage.sign(msg, w.privateKey!);
-    let result = await SignedMessage.verify(
+    let sig = SignedMessage.sign(msg, w.privateKey!);
+    let result = SignedMessage.verify(
       msg,
       sig.raw!.schnorr,
       undefined,
@@ -125,7 +125,7 @@ describe("Test message Signing and Verification", () => {
 
     let msg2 =
       "Biggest Selloff in 25 Years Hits Japan Bonds as BOJ Loosens Grip";
-    let invalid = await SignedMessage.verify(
+    let invalid = SignedMessage.verify(
       msg2,
       sig.raw!.schnorr,
       undefined,
@@ -139,8 +139,8 @@ describe("Test message Signing and Verification", () => {
       "wif:mainnet:L1TnU2zbNaAqMoVh65Cyvmcjzbrj41Gs9iTLcWbpJCMynXuap6UN"
     );
     let msg = "test";
-    let sig = await SignedMessage.sign(msg, w.privateKey!);
-    let result = await SignedMessage.verify(
+    let sig = SignedMessage.sign(msg, w.privateKey!);
+    let result = SignedMessage.verify(
       msg,
       sig.raw!.der,
       undefined,
@@ -155,8 +155,8 @@ describe("Test message Signing and Verification", () => {
       "wif:mainnet:L1TnU2zbNaAqMoVh65Cyvmcjzbrj41Gs9iTLcWbpJCMynXuap6UN"
     );
     let msg = "test";
-    let sig = await SignedMessage.sign(msg, w.privateKey!);
-    let result = await SignedMessage.verify(
+    let sig = SignedMessage.sign(msg, w.privateKey!);
+    let result = SignedMessage.verify(
       msg,
       sig.raw!.ecdsa,
       undefined,
@@ -167,7 +167,7 @@ describe("Test message Signing and Verification", () => {
 
     let msg2 =
       "Biggest Selloff in 25 Years Hits Japan Bonds as BOJ Loosens Grip";
-    let invalid = await SignedMessage.verify(
+    let invalid = SignedMessage.verify(
       msg2,
       sig.raw!.ecdsa,
       undefined,
@@ -181,8 +181,8 @@ describe("Test message Signing and Verification", () => {
       "wif:mainnet:L1TnU2zbNaAqMoVh65Cyvmcjzbrj41Gs9iTLcWbpJCMynXuap6UN"
     );
     let msg = await loadLargeMessage();
-    let sig = await SignedMessage.sign(msg, w.privateKey!);
-    let result = await SignedMessage.verify(msg, sig.signature, w.cashaddr!);
+    let sig = SignedMessage.sign(msg, w.privateKey!);
+    let result = SignedMessage.verify(msg, sig.signature, w.cashaddr!);
     expect(result.valid).toBe(true);
   });
 
@@ -194,21 +194,13 @@ describe("Test message Signing and Verification", () => {
     expect(w1.cashaddr!).toBe(
       "bitcoincash:qqehccy89v7ftlfgr9v0zvhjzyy7eatdkqt05lt3nw"
     );
-    let sig = await Wallet.signedMessage.sign(msg1, w1.privateKey!);
-    let result = await Wallet.signedMessage.verify(
-      msg1,
-      sig.signature,
-      w1.cashaddr!
-    );
+    let sig = SignedMessage.sign(msg1, w1.privateKey!);
+    let result = SignedMessage.verify(msg1, sig.signature, w1.cashaddr!);
     expect(result.valid).toBe(true);
 
     let msg2 =
       "Biggest Selloff in 25 Years Hits Japan Bonds as BOJ Loosens Grip";
-    let invalid = await Wallet.signedMessage.verify(
-      msg2,
-      sig.signature,
-      w1.cashaddr!
-    );
+    let invalid = SignedMessage.verify(msg2, sig.signature, w1.cashaddr!);
     expect(invalid.valid).toBe(false);
   });
 
@@ -221,13 +213,13 @@ describe("Test message Signing and Verification", () => {
     expect(w1.cashaddr!).toBe(
       "bitcoincash:qqehccy89v7ftlfgr9v0zvhjzyy7eatdkqt05lt3nw"
     );
-    let sig = await w1.sign(msg1);
-    let result = await w1.verify(msg1, sig.signature);
+    let sig = w1.sign(msg1);
+    let result = w1.verify(msg1, sig.signature);
     expect(result.valid).toBe(true);
 
     let msg2 =
       "Biggest Selloff in 25 Years Hits Japan Bonds as BOJ Loosens Grip";
-    let invalid = await w1.verify(msg2, sig.signature);
+    let invalid = w1.verify(msg2, sig.signature);
     expect(invalid.valid).toBe(false);
   });
 
@@ -244,14 +236,14 @@ describe("Test message Signing and Verification", () => {
     expect(w1.cashaddr!).toBe(
       "bitcoincash:qqad5sy4jml3f6vcp246dulsex04xp48wq23d35rqe"
     );
-    let result = await w1.verify(beak, beakSig);
+    let result = w1.verify(beak, beakSig);
     expect(result.valid).toBe(true);
     expect(result.details?.publicKeyHashMatch).toBe(true);
     expect(result.details?.publicKeyMatch).toBe(false);
     expect(result.details?.signatureValid).toBe(true);
     expect(result.details?.signatureType).toBe("recoverable");
 
-    let badResult = await w1.verify(falseMessage, beakSig);
+    let badResult = w1.verify(falseMessage, beakSig);
     expect(badResult.valid).toBe(false);
 
     // While the recoverable sig is valid, it doesn't match the message.
@@ -289,12 +281,12 @@ describe("Test message Signing and Verification", () => {
     expect(w1.cashaddr!).toBe(
       "bitcoincash:qqehccy89v7ftlfgr9v0zvhjzyy7eatdkqt05lt3nw"
     );
-    let sig = await SignedMessage.sign(msg1, w1.privateKey!);
+    let sig = SignedMessage.sign(msg1, w1.privateKey!);
 
     let coreLibSig =
       "H/9jMOnj4MFbH3d7t4yCQ9i7DgZU/VZ278w3+ySv2F4yIsdqjsc5ng3kmN8OZAThgyfCZOQxZCWza9V5XzlVY0Y=";
     expect(sig.signature).toBe(coreLibSig);
-    let result = await SignedMessage.verify(msg1, sig.signature, w1.cashaddr!);
+    let result = SignedMessage.verify(msg1, sig.signature, w1.cashaddr!);
     expect(result.valid).toBe(true);
     expect(result.details!.messageHash).toBe(
       "gE9BDBFAOqW+yoOzABjnM+LQRWHd4dvUVrsTR+sIWsU="
@@ -304,11 +296,7 @@ describe("Test message Signing and Verification", () => {
     expect(result.details!.signatureValid).toBe(true);
     expect(result.details!.signatureType).toBe("recoverable");
 
-    let result2 = await SignedMessage.verify(
-      msg1,
-      sig.signature,
-      w1.tokenaddr!
-    );
+    let result2 = SignedMessage.verify(msg1, sig.signature, w1.tokenaddr!);
     expect(result2.valid).toBe(true);
     expect(result2.details!.messageHash).toBe(
       "gE9BDBFAOqW+yoOzABjnM+LQRWHd4dvUVrsTR+sIWsU="

package/src/message/signed.ts

@@ -46,7 +46,7 @@ function message_magic(str: string) {
  *
  * @returns a promise to the hash of the string.
  */
-export async function hash_message(str: string) {
+export function hash_message(str: string) {
   const h = sha256.hash;
   return h(h(message_magic(str)));
 }
@@ -60,11 +60,8 @@ export class SignedMessage implements SignedMessageI {
    *
    * @returns a promise to signature as a string
    */
-  public async sign(
-    message: string,
-    privateKey: Uint8Array
-  ): Promise<SignedMessageResponseI> {
-    const messageHash = await hash_message(message);
+  public sign(message: string, privateKey: Uint8Array): SignedMessageResponseI {
+    const messageHash = hash_message(message);
     const rs = secp256k1.signMessageHashRecoverableCompact(
       privateKey,
       messageHash
@@ -99,7 +96,7 @@ export class SignedMessage implements SignedMessageI {
     };
   }
 
-  public static async sign(message: string, privateKey: Uint8Array) {
+  public static sign(message: string, privateKey: Uint8Array) {
     return new this().sign(message, privateKey);
   }
   /**
@@ -112,14 +109,14 @@ export class SignedMessage implements SignedMessageI {
    *
    * @returns a promise to signature as a string
    */
-  public async verify(
+  public verify(
     message: string,
     signature: string,
     cashaddr?: string,
     publicKey?: Uint8Array
-  ): Promise<VerifyMessageResponseI> {
+  ): VerifyMessageResponseI {
     // Check that the signature is valid for the given message.
-    const messageHash = await hash_message(message);
+    const messageHash = hash_message(message);
     const sig = base64ToBin(signature);
 
     let signatureValid = false;
@@ -139,7 +136,7 @@ export class SignedMessage implements SignedMessageI {
         throw new Error(recoveredPk);
       }
 
-      pkh = await hash160(recoveredPk);
+      pkh = hash160(recoveredPk);
       signatureType = "recoverable";
       signatureValid = secp256k1.verifySignatureCompact(
         rawSig,
@@ -193,7 +190,7 @@ export class SignedMessage implements SignedMessageI {
     };
   }
 
-  public static async verify(
+  public static verify(
     message: string,
     signature: string,
     cashaddr?: string,

package/src/network/Connection.test.ts

@@ -14,7 +14,7 @@ test("Should connect to mainnet", async () => {
 
   let wallet = await Wallet.newRandom();
   expect(wallet.provider == globalThis.BCH).toBeTruthy();
-  expect(await wallet.getBalance("sat")).toBe(0);
+  expect(await wallet.getBalance()).toBe(0n);
 
   let height = await globalThis.BCH.getBlockHeight();
   expect(height).toBeGreaterThan(5000);
@@ -23,7 +23,7 @@ test("Should connect to mainnet", async () => {
 test("Should use global provider when creating testnet wallet", async () => {
   let wallet = await TestNetWallet.newRandom();
   expect(wallet.provider == globalThis.tBCH).toBeTruthy();
-  expect(await wallet.getBalance("sat")).toBe(0);
+  expect(await wallet.getBalance()).toBe(0n);
 
   let height = await globalThis.tBCH.getBlockHeight();
   expect(height).toBeGreaterThan(114);
@@ -34,7 +34,7 @@ test.skip("Should lower overhead in creating wallets", async () => {
   for (let i = 0; i < 100; i++) {
     let wallet = await RegTestWallet.newRandom();
     expect(wallet.provider == globalThis.rBCH).toBeTruthy();
-    expect(await wallet.getBalance("sat")).toBe(0);
+    expect(await wallet.getBalance()).toBe(0n);
   }
 
   let height = await globalThis.rBCH.getBlockHeight();

package/src/network/ElectrumNetworkProvider.ts

@@ -9,12 +9,11 @@ import { default as NetworkProvider } from "./NetworkProvider.js";
 import {
   HexHeaderI,
   TxI,
-  UtxoI,
+  Utxo,
   ElectrumBalanceI,
   HeaderI,
 } from "../interface.js";
 import { Network } from "../interface.js";
-import { delay } from "../util/delay.js";
 import { ElectrumRawTransaction, ElectrumUtxo } from "./interface.js";
 
 import { CancelFn } from "../wallet/interface.js";
@@ -45,7 +44,7 @@ export default class ElectrumNetworkProvider implements NetworkProvider {
     }
 
     if (Config.UseMemoryCache && !(this._cache instanceof MemoryCache)) {
-      this._cache = new IndexedDbCache();
+      this._cache = new MemoryCache();
       return this._cache;
     }
 
@@ -77,16 +76,17 @@ export default class ElectrumNetworkProvider implements NetworkProvider {
     }
   }
 
-  async getUtxos(cashaddr: string): Promise<UtxoI[]> {
+  async getUtxos(cashaddr: string): Promise<Utxo[]> {
     const result = await this.performRequest<ElectrumUtxo[]>(
       "blockchain.address.listunspent",
       cashaddr,
       "include_tokens"
     );
     return result.map((utxo) => ({
+      address: cashaddr,
       txid: utxo.tx_hash,
       vout: utxo.tx_pos,
-      satoshis: utxo.value,
+      satoshis: BigInt(utxo.value),
       height: utxo.height,
       token: utxo.token_data
         ? {

package/src/network/NetworkProvider.ts

@@ -1,4 +1,4 @@
-import { TxI, UtxoI, Network, HexHeaderI, HeaderI } from "../interface.js";
+import { TxI, Utxo, Network, HexHeaderI, HeaderI } from "../interface.js";
 import { CancelFn } from "../wallet/interface.js";
 
 export default interface NetworkProvider {
@@ -12,7 +12,7 @@ export default interface NetworkProvider {
    * @param cashaddr The CashAddress for which we wish to retrieve UTXOs.
    * @returns List of UTXOs spendable by the provided address.
    */
-  getUtxos(cashaddr: string): Promise<UtxoI[]>;
+  getUtxos(cashaddr: string): Promise<Utxo[]>;
 
   /**
    * Retrieve all balance of an address in satoshi

package/src/network/Rpc.test.ts

@@ -1,8 +1,8 @@
 import { disconnectProviders, initProviders } from "./Connection";
 import { RegTestWallet } from "../wallet/Wif";
 import { getNetworkProvider } from "../network/default";
-import { Network } from "cashscript";
 import { mine } from "../mine";
+import { Network } from "../interface";
 
 const aliceWif = `wif:regtest:${process.env.PRIVATE_WIF!}`;
 
@@ -73,7 +73,7 @@ describe("Rpc tests", () => {
 
     let result = false;
     aliceWallet.watchBalance((balance) => {
-      expect(balance.bch).toBeGreaterThan(0);
+      expect(balance).toBeGreaterThan(0);
       result = true;
       // stop watching
       return true;
@@ -105,8 +105,7 @@ describe("Rpc tests", () => {
     await aliceWallet.send([
       {
         cashaddr: bobWallet.cashaddr!,
-        value: 1000,
-        unit: "satoshis",
+        value: 1000n,
       },
     ]);
 

package/src/network/constant.ts

@@ -7,8 +7,8 @@ export const networkTickerMap = {
 };
 
 export const mainnetServers = [
-  "wss://bch.imaginary.cash:50004",
-  //"wss://blackie.c3-soft.com:50004",
+  // "wss://bch.imaginary.cash:50004",
+  "wss://blackie.c3-soft.com:50004",
   // "wss://electrum.imaginary.cash:50004",
   // "wss://fulcrum.fountainhead.cash",
 ];
@@ -29,9 +29,9 @@ export const mainnetServers = [
 
 // chipnet
 export const testnetServers = [
-  // "wss://chipnet.imaginary.cash:50004",
+  "wss://chipnet.imaginary.cash:50004",
   //"wss://blackie.c3-soft.com:64004", // chipnet with protocol 1.5.0
-  "wss://chipnet.bch.ninja:50004",
+  // "wss://chipnet.bch.ninja:50004",
 ];
 
 export const regtestServers = ["ws://127.0.0.1:60003"];

package/src/network/getRelayFeeCache.ts

@@ -15,9 +15,9 @@ export async function getRelayFeeCache(provider: NetworkProvider) {
       relayFeePerKbInCoins;
   }
   if (typeof relayFeePerKbInCoins === "number") {
-    return Math.round(relayFeePerKbInCoins * bchParam.subUnits) / 1000;
+    return Math.round(relayFeePerKbInCoins * Number(bchParam.subUnits)) / 1000;
   } else {
     console.warn("Couldn't get min relay fee, using default instead");
-    return Math.round(0.00001 * bchParam.subUnits) / 1000;
+    return Math.round(0.00001 * Number(bchParam.subUnits)) / 1000;
   }
 }

package/src/rate/ExchangeRate.test.ts

@@ -1,8 +1,5 @@
-import { removeFetchMock, setupFetchMock } from "../test/fetch";
-import { BalanceResponse } from "../util/balanceObjectFromSatoshi";
-import { RegTestWallet } from "../wallet/Wif";
-import { ExchangeRate, getRateFromExchange } from "./ExchangeRate";
-import { delay } from "../util/delay";
+import { setupFetchMock } from "../test/fetch";
+import { ExchangeRate } from "./ExchangeRate";
 import { initProviders, disconnectProviders } from "../network";
 import { Config } from "../config";
 
@@ -25,45 +22,6 @@ describe("Exchange rate tests", () => {
     expect(rate).toBe(1337.42);
   });
 
-  test("Test watchBalanceUsd", async () => {
-    setupFetchMock("https://markets.api.bitcoin.com/live/bitcoin", {
-      data: {
-        BCH: 1337.42,
-      },
-    });
-
-    const alice = await RegTestWallet.fromId(process.env.ALICE_ID!);
-    const bob = await RegTestWallet.newRandom();
-    const balance = (await alice.getBalance()) as BalanceResponse;
-    let cbCounter = 0;
-    const cancelWatchFn = await alice.watchBalanceUsd(async (newBalance) => {
-      cbCounter++;
-      if (cbCounter === 1) {
-        expect(newBalance.usd!).toBeGreaterThan(balance.usd!);
-      }
-    }, 3000);
-
-    setupFetchMock("https://markets.api.bitcoin.com/live/bitcoin", {
-      data: {
-        BCH: 31337.42,
-      },
-    });
-
-    await delay(3000);
-
-    await alice.send({
-      cashaddr: bob.getDepositAddress(),
-      value: 10000,
-      unit: "sat",
-    });
-
-    await delay(3000);
-
-    removeFetchMock("https://markets.api.bitcoin.com/live/bitcoin");
-    expect(cbCounter).toBe(2);
-    await cancelWatchFn();
-  });
-
   test("Test other currencies", async () => {
     const eurRate = await ExchangeRate.get("eur");
     expect(eurRate).toBeGreaterThan(0);

package/src/rate/ExchangeRate.ts

@@ -42,7 +42,7 @@ export class ExchangeRate {
   }
 
   static async getRateFromLocalStorage(
-    symbol,
+    symbol: string,
     useCache = true
   ): Promise<number> {
     if (!useCache) {
@@ -136,4 +136,7 @@ export async function getRateFromExchange(symbol: string): Promise<number> {
 }
 
 // do not await and do not throw in case we are offline
-ExchangeRate.get("usd").catch(() => {});
+// this promise can be used to warm up the cache
+export const ExchageRatePromise = ExchangeRate.get(Config.DefaultCurrency)
+  .then((result) => result)
+  .catch((error: Error) => error);