mainnet-js 0.4.35 → 0.4.38

package/package.json

@@ -8,7 +8,7 @@
     "url": "https://github.com/mainnet-cash/mainnet-js/issues"
   },
   "name": "mainnet-js",
-  "version": "0.4.35",
+  "version": "0.4.38",
   "homepage": "https://mainnet.cash",
   "main": "dist/main/index.js",
   "module": "dist/module/index.js",
@@ -38,7 +38,7 @@
     "reload": "npx reload --dir=../../jest/playwright "
   },
   "dependencies": {
-    "@bitauth/libauth": "^1.18.0",
+    "@bitauth/libauth": "^1.19.1",
     "async-mutex": "^0.3.1",
     "axios": "^0.21.1",
     "bchaddrjs-slp": "^0.2.12",
@@ -49,7 +49,7 @@
     "buffer": "^6.0.3",
     "buffer-lite": "^1.0.0",
     "cashaddrjs": "^0.4.4",
-    "electrum-cash": "^2.0.8",
+    "electrum-cash": "^2.0.10",
     "events": "^3.2.0",
     "eventsource": "^1.0.7",
     "fake-indexeddb": "^3.1.2",

package/src/Wallet.test.ts

@@ -225,6 +225,50 @@ describe(`Test Wallet library`, () => {
     }
   });
 
+  test("Should send a transaction with change to different change address", async () => {
+    // Build Alice's wallet from Wallet Import Format string, send some sats
+    if (!process.env.PRIVATE_WIF) {
+      throw Error("Attempted to pass an empty WIF");
+    } else {
+      let funder = await RegTestWallet.fromWIF(process.env.PRIVATE_WIF); // insert WIF from #1
+
+      const alice = await createWallet({
+        type: WalletTypeEnum.Wif,
+        network: "regtest",
+      });
+      const bob = await createWallet({
+        type: WalletTypeEnum.Wif,
+        network: "regtest",
+      });
+      const charlie = await createWallet({
+        type: WalletTypeEnum.Wif,
+        network: "regtest",
+      });
+      await funder.send([
+        {
+          cashaddr: alice.cashaddr!,
+          value: 3000,
+          unit: "satoshis",
+        },
+      ]);
+
+      let sendResponse = await alice.send(
+        [
+          {
+            cashaddr: bob.cashaddr!,
+            value: 1000,
+            unit: "satoshis",
+          },
+        ],
+        {
+          changeAddress: charlie.cashaddr!,
+        }
+      );
+      expect(await bob.getBalance("sat")).toBe(1000);
+      expect(await charlie.getBalance("sat")).toBe(1780);
+    }
+  });
+
   test("Should send maximum amount from specific utxos", async () => {
     // Build Alice's wallet from Wallet Import Format string, send some sats
     if (!process.env.PRIVATE_WIF) {

package/src/message/signed.ts

@@ -144,12 +144,14 @@ export class SignedMessage implements SignedMessageI {
         }
       }
     } else if (publicKey) {
-      if (secp256k1.verifySignatureSchnorr(sig, publicKey, messageHash)) {
-        signatureType = "schnorr";
-        valid = true;
-      } else if (secp256k1.verifySignatureDER(sig, publicKey, messageHash)) {
+      if (secp256k1.verifySignatureDER(sig, publicKey, messageHash)) {
         signatureType = "der";
         valid = true;
+      } else if (
+        secp256k1.verifySignatureSchnorr(sig, publicKey, messageHash)
+      ) {
+        signatureType = "schnorr";
+        valid = true;
       } else if (
         secp256k1.verifySignatureCompact(sig, publicKey, messageHash)
       ) {

package/src/network/ElectrumNetworkProvider.ts

@@ -360,9 +360,15 @@ export default class ElectrumNetworkProvider implements NetworkProvider {
   ): Promise<RequestResponse> {
     await this.ready();
 
-    const result = await this.electrum.request(name, ...parameters);
+    let result = await this.electrum.request(name, ...parameters);
 
-    if (result instanceof Error) throw result;
+    // If the first request fails, retry
+    if (result instanceof Error) {
+      result = await this.electrum.request(name, ...parameters);
+
+      // If the second attempt fails, throw.
+      if (result instanceof Error) throw result;
+    }
 
     return result;
   }

package/src/network/constant.ts

@@ -8,11 +8,24 @@ export const networkTickerMap = {
   regtest: "rBCH",
 };
 
-export const mainnetServers = ["wss://fulcrum.fountainhead.cash"];
+export const mainnetServers = [
+  "wss://bch.imaginary.cash:50004",
+  //"wss://blackie.c3-soft.com:50004",
+  "wss://electrum.imaginary.cash:50004",
+  "wss://fulcrum.fountainhead.cash",
+];
 
-export const testnetServers = ["wss://tbch.loping.net:60004"];
+export const testnetServers = [
+  "wss://tbch.loping.net:60004",
+  "wss://blackie.c3-soft.com:60004",
+  "wss://testnet.bitcoincash.network:60004",
+  //,"wss://unavailable.invalid:50004"
+];
 
-export const regtestServers = ["ws://127.0.0.1:60003"];
+export const regtestServers = [
+  "ws://127.0.0.1:60003",
+  //,"wss://unavailable.invalid:50004"
+];
 
 export const defaultServers = {
   mainnet: mainnetServers,
@@ -22,13 +35,15 @@ export const defaultServers = {
 
 export const clusterParams = {
   mainnet: {
-    distribution: 2,
-    order: ClusterOrder.PRIORITY,
+    confidence: 1,
+    distribution: 1,
+    order: ClusterOrder.RANDOM,
     timeout: 45000,
   },
   testnet: {
+    confidence: 1,
     distribution: 1,
-    order: ClusterOrder.PRIORITY,
+    order: ClusterOrder.RANDOM,
     timeout: 50000,
   },
   regtest: {

package/src/network/default.ts

@@ -100,7 +100,13 @@ function getCluster(servers: string[], params) {
 
   for (const s of servers) {
     let url = parseElectrumUrl(s);
-    electrum.addServer(url.host, url.port, url.scheme, false);
+    try {
+      electrum.addServer(url.host, url.port, url.scheme, false);
+    } catch (error) {
+      console.log(
+        `Error connecting ${url.host}:${url.port} over ${url.scheme}`
+      );
+    }
   }
   return electrum;
 }

package/src/transaction/Wif.ts

@@ -30,7 +30,8 @@ export async function buildP2pkhNonHdTransaction(
   fee: number = 0,
   discardChange = false,
   slpOutputs: any[] = [],
-  feePaidBy: FeePaidByEnum = FeePaidByEnum.change
+  feePaidBy: FeePaidByEnum = FeePaidByEnum.change,
+  changeAddress: string = ""
 ) {
   if (!signingKey) {
     throw new Error("Missing signing key when building transaction");
@@ -48,14 +49,6 @@ export async function buildP2pkhNonHdTransaction(
 
   const sendAmount = await sumSendRequestAmounts(outputs);
 
-  // Get the change locking bytecode
-  let changeLockingBytecode = compiler.generateBytecode("lock", {
-    keys: { privateKeys: { key: signingKey } },
-  });
-  if (!changeLockingBytecode.success) {
-    throw new Error(changeLockingBytecode.toString());
-  }
-
   try {
     const changeAmount = BigInt(inputAmount) - BigInt(sendAmount) - BigInt(fee);
 
@@ -65,6 +58,18 @@ export async function buildP2pkhNonHdTransaction(
 
     if (discardChange !== true) {
       if (changeAmount > DUST_UTXO_THRESHOLD) {
+        let changeLockingBytecode;
+        if (changeAddress) {
+          changeLockingBytecode = cashAddressToLockingBytecode(changeAddress);
+        } else {
+          // Get the change locking bytecode
+          changeLockingBytecode = compiler.generateBytecode("lock", {
+            keys: { privateKeys: { key: signingKey } },
+          });
+        }
+        if (typeof changeLockingBytecode === "string") {
+          throw new Error(changeLockingBytecode);
+        }
         lockedOutputs.push({
           lockingBytecode: changeLockingBytecode.bytecode,
           satoshis: bigIntToBinUint64LEClamped(BigInt(changeAmount)),
@@ -282,7 +287,8 @@ export async function buildEncodedTransaction(
   fee: number = 0,
   discardChange = false,
   slpOutputs: any[] = [],
-  feePaidBy: FeePaidByEnum = FeePaidByEnum.change
+  feePaidBy: FeePaidByEnum = FeePaidByEnum.change,
+  changeAddress: string = ""
 ) {
   let txn = await buildP2pkhNonHdTransaction(
     fundingUtxos,
@@ -291,7 +297,8 @@ export async function buildEncodedTransaction(
     fee,
     discardChange,
     slpOutputs,
-    feePaidBy
+    feePaidBy,
+    changeAddress
   );
   // submit transaction
   if (txn.success) {

package/src/wallet/Wif.test.ts

@@ -471,7 +471,7 @@ describe(`Watch only Wallets`, () => {
     }
   });
 
-  test("Should send to a testnet coins to a random address", async () => {
+  test("Should send to testnet coins to a random address", async () => {
     if (!process.env.ALICE_TESTNET_WALLET_ID) {
       throw Error("Attempted to pass an empty address");
     } else {

package/src/wallet/Wif.ts

@@ -970,6 +970,13 @@ export class Wallet extends BaseWallet {
       feePaidBy = FeePaidByEnum.change;
     }
 
+    let changeAddress;
+    if (options && options.changeAddress) {
+      changeAddress = options.changeAddress;
+    } else {
+      changeAddress = "";
+    }
+
     // get inputs from options or query all inputs
     let utxos: UtxoI[];
     if (options && options.utxoIds) {
@@ -1026,7 +1033,8 @@ export class Wallet extends BaseWallet {
       fee,
       discardChange,
       [],
-      feePaidBy
+      feePaidBy,
+      changeAddress
     );
 
     return encodedTransaction;