mainnet-js 2.7.34 → 3.0.0-next.1

package/src/util/deriveCashaddr.ts

@@ -80,6 +80,10 @@ function decodeAddress(address: string): DecodedCashAddress {
 }
 
 export function toCashaddr(address: string): string {
+  if (address.indexOf(":q") > 0 || address.indexOf(":p") > 0) {
+    return address;
+  }
+
   const result = decodeAddress(address);
 
   return encodeCashAddress({
@@ -90,6 +94,10 @@ export function toCashaddr(address: string): string {
 }
 
 export function toTokenaddr(address: string): string {
+  if (address.indexOf(":z") > 0 || address.indexOf(":r") > 0) {
+    return address;
+  }
+
   const result = decodeAddress(address);
 
   return encodeCashAddress({

package/src/util/deriveNetwork.ts

@@ -10,7 +10,7 @@ export function derivedNetwork(addresses: string[]) {
   // Get a unique set of networks requested
   let networkSet = new Set(networks);
   if (networkSet.size > 1) {
-    throw Error("Contract addresses are not on the same network");
+    throw Error("Addresses are not on the same network");
   } else if (networkSet.size === 0) {
     throw Error("No address network was derived");
   } else {

package/src/util/derivePublicKeyHash.test.ts

@@ -53,16 +53,3 @@ test("Should calculate public key hash consistent with hash160", async () => {
   expect(binToHex(pkh2)).toEqual("d986ed01b7a22225a70edbf2ba7cfb63a15cb3aa");
   expect(binToHex(pkh3)).toEqual("d986ed01b7a22225a70edbf2ba7cfb63a15cb3aa");
 });
-
-test("Should return the a public key hash of manually set wallet", async () => {
-  let w = new Wallet();
-  // @ts-ignore
-  w.privateKey = hexToBin(
-    "e284129cc0922579a535bbf4d1a3b25773090d28c909bc0fed73b5e0222cc372"
-  );
-  // @ts-ignore
-  await w.deriveInfo();
-  let pkh = derivePublicKeyHash(w.getDepositAddress());
-  let expectedPKH = "d986ed01b7a22225a70edbf2ba7cfb63a15cb3aa";
-  expect(binToHex(pkh)).toBe(expectedPKH);
-});

package/src/util/hd.ts

@@ -0,0 +1,16 @@
+export const arrayRange = (start: number, stop: number) =>
+  Array.from({ length: stop - start }, (_, index) => start + index);
+
+export const getNextUnusedIndex = (
+  index: number,
+  statuses: Array<string | null>
+): number => {
+  if (index === -1) {
+    index = statuses.findIndex((status) => status === null);
+    if (index === -1) {
+      index = statuses.length;
+    }
+  }
+
+  return index;
+};

package/src/util/index.ts

@@ -8,7 +8,7 @@ export {
   binToBase64,
   sha256,
 } from "@bitauth/libauth";
-export { convert, convertObject } from "./convert.js";
+export * from "./convert.js";
 export { delay } from "./delay.js";
 export { derivedNetwork } from "./deriveNetwork.js";
 export { derivePublicKeyHash } from "./derivePublicKeyHash.js";
@@ -22,16 +22,12 @@ export {
 export { getRuntimePlatform, RuntimePlatform } from "./getRuntimePlatform.js";
 export { getUsdRate } from "./getUsdRate.js";
 export { hash160 } from "./hash160.js";
-export { ExchangeRate } from "../rate/ExchangeRate.js";
+export { ExchangeRate, ExchageRatePromise } from "../rate/ExchangeRate.js";
 export { sanitizeAddress } from "./sanitizeAddress.js";
 export { sanitizeUnit } from "./sanitizeUnit.js";
 export { getWeakRandomInt } from "./randomInt.js";
 export { getXPubKey } from "../util/getXPubKey.js";
 export { sumUtxoValue } from "./sumUtxoValue.js";
-export {
-  BalanceResponse,
-  balanceFromSatoshi,
-  balanceResponseFromSatoshi,
-} from "./balanceObjectFromSatoshi.js";
 export * from "./sumUtxoValue.js";
 export { decodeHeader } from "./header.js";
+export * from "./checkUtxos.js";

package/src/util/satoshiToAmount.test.ts

@@ -1,6 +1,6 @@
 import { satoshiToAmount } from "./satoshiToAmount";
 
 test("get a zero satoshis", async () => {
-  let zero = await satoshiToAmount(0, "sat");
+  let zero = await satoshiToAmount(0n, "sat");
   expect(zero).toBe(0);
 });

package/src/util/satoshiToAmount.ts

@@ -12,27 +12,21 @@ import { sanitizeUnit } from "../util/sanitizeUnit.js";
  * @returns a promise to the value in the unit of account given by rawUnit
  */
 export async function satoshiToAmount(
-  value: number,
+  value: bigint,
   rawUnit: any
 ): Promise<number> {
   const unit = sanitizeUnit(rawUnit);
   switch (unit) {
     case UnitEnum.BCH:
-      return value / bchParam.subUnits;
-    case UnitEnum.SATOSHI:
-      return value;
+      return Number(value) / Number(bchParam.subUnits);
     case UnitEnum.SAT:
-      return value;
-    case UnitEnum.SATS:
-      return value;
-    case UnitEnum.SATOSHIS:
-      return value;
+      return Number(value);
     default:
       const Currency_over_BCH = await ExchangeRate.get(rawUnit);
       // truncate currency amounts to fixed precision (2),
       // then return the fixed value string as a float.
       const currencyValue = Number(
-        value * (Currency_over_BCH / bchParam.subUnits)
+        Number(value) * (Currency_over_BCH / Number(bchParam.subUnits))
       ).toFixed(2);
       return Number.parseFloat(currencyValue);
   }

package/src/util/sumSendRequestAmounts.ts

@@ -3,7 +3,6 @@ import {
   SendRequest,
   TokenSendRequest,
 } from "../wallet/model.js";
-import { amountInSatoshi } from "./amountInSatoshi.js";
 
 // This function sums a list of send request objects
 export async function sumSendRequestAmounts(
@@ -13,10 +12,10 @@ export async function sumSendRequestAmounts(
     const balanceArray: (BigInt | Error)[] = await Promise.all(
       requests.map(async (r: SendRequest | TokenSendRequest | OpReturnData) => {
         if (r instanceof SendRequest) {
-          return BigInt(await amountInSatoshi(r.value, r.unit));
+          return r.value;
         } else if (r instanceof TokenSendRequest) {
-          return BigInt(r.value || 1000);
-        } else return BigInt(0);
+          return r.value || 1000n;
+        } else return 0n;
       })
     );
     const balance = balanceArray.reduce(sumBalance, BigInt(0));

package/src/util/sumUtxoValue.ts

@@ -1,22 +1,22 @@
-import { UtxoI } from "../interface.js";
+import { Utxo } from "../interface.js";
 
-export function sumUtxoValue(utxos: UtxoI[]) {
+export function sumUtxoValue(utxos: Utxo[]) {
   if (utxos.length > 0) {
-    const balanceArray: number[] = utxos.map((o: UtxoI) => {
+    const balanceArray: bigint[] = utxos.map((o: Utxo) => {
       return o.satoshis;
     });
-    const balance = balanceArray.reduce((a: number, b: number) => a + b, 0);
+    const balance = balanceArray.reduce((a: bigint, b: bigint) => a + b, 0n);
     return balance;
   } else {
-    return 0;
+    return 0n;
   }
 }
 
-export function sumTokenAmounts(utxos: UtxoI[], tokenId: string): bigint {
+export function sumTokenAmounts(utxos: Utxo[], tokenId: string): bigint {
   if (utxos.length > 0) {
     const tokenArray: bigint[] = utxos
       .filter((utxo) => utxo.token?.tokenId === tokenId)
-      .map((o: UtxoI) => {
+      .map((o: Utxo) => {
         return o.token?.amount || 0n;
       });
     const balance = tokenArray.reduce((a: bigint, b: bigint) => a + b, 0n);