mainnet-js 2.7.31 → 3.0.0-next.0

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.
@@ -261,6 +253,26 @@ describe("Test message Signing and Verification", () => {
     expect(result.details?.signatureType).toBe("recoverable");
   });
 
+  // Test verifying a long message (>= 253 bytes) signed by Electron Cash
+  // This tests that the varint length encoding is correct
+  test("Test verifying long message signature from Electron Cash", async () => {
+    // 329 byte message (10 lines of "1234567890 1234567890 1234567890")
+    const longMsg = Array(10)
+      .fill("1234567890 1234567890 1234567890")
+      .join("\n");
+    expect(longMsg.length).toBe(329); // Confirm >= 253 bytes
+
+    const ecSig =
+      "IPJZmd0kYQbll507F1wWMcbA7WPMcBkF6GhtYXQEpSHsWFNLzDmvy5rI0uA0NDlkHbUiHAiy67lPeCQoHJ8tk7s=";
+
+    // Private key: cPPQTpVuL8WPDcH9wuhjVcbdKtRX3j4Q4uV2qnL8hbtyW2ugMAcn
+    const addr = "bchtest:qrynfuk47hxqj4sgpt62v3yzzpnjw6l2hvnc4p897k";
+
+    const result = await SignedMessage.verify(longMsg, ecSig, addr);
+    expect(result.valid).toBe(true);
+    expect(result.details?.publicKeyHashMatch).toBe(true);
+  });
+
   test("Test signature verification with cashaddr and tokenaddr is equivalent", async () => {
     let msg1 = "Chancellor on brink of second bailout for banks";
     let w1 = await Wallet.fromId(
@@ -269,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="
@@ -284,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

@@ -1,10 +1,10 @@
 import {
   assertSuccess,
   base64ToBin,
+  bigIntToCompactUint,
   binToBase64,
   decodeCashAddress,
   encodeCashAddress,
-  hexToBin,
   RecoveryId,
   secp256k1,
   sha256,
@@ -21,8 +21,8 @@ import {
 /**
  * message_magic - Add "Magic", per standard bitcoin message signing.
  *
- * In this case, the magic is simply adding the number 24 as binary "\x16", and "Bitcoin Signed Message\n" followed
- * by the size of the message in binary followed by the message encoded as binary.
+ * In this case, the magic is simply adding the number 24 as binary "\x18", and "Bitcoin Signed Message\n" followed
+ * by the size of the message in Bitcoin's "varint" format followed by the message encoded as binary.
  *
  * @param {str} string    The string to add the magic syntax to.
  *
@@ -30,12 +30,12 @@ import {
  */
 // see    https://github.com/Electron-Cash/Electron-Cash/blob/49f9f672364f50053a026e4a5cb30e92db2d195d/electroncash/bitcoin.py#L524
 function message_magic(str: string) {
-  const length = utf8ToBin(str).length.toString(16);
+  const msgBytes = utf8ToBin(str);
   const payload = `\x18Bitcoin Signed Message:\n`;
   return new Uint8Array([
     ...utf8ToBin(payload),
-    ...hexToBin(length),
-    ...utf8ToBin(str),
+    ...bigIntToCompactUint(BigInt(msgBytes.length)),
+    ...msgBytes,
   ]);
 }
 
@@ -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/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,13 +76,14 @@ 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,

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!}`;
 

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"];