mainnet-js 2.7.33 → 3.0.0-next.0

package/src/util/checkUtxos.ts

@@ -1,31 +1,26 @@
-import { UtxoI } from "../interface.js";
+import { Utxo, UtxoId } from "../interface.js";
 
 export async function checkUtxos(
-  utxos: UtxoI[],
-  wallet: import("../wallet/Wif.js").Wallet
-): Promise<UtxoI[]> {
-  if (utxos.some((val) => val.satoshis === 0)) {
-    const addressUtxos = await wallet.getAddressUtxos(wallet.cashaddr);
-    const absent = utxos.filter(
-      (val) =>
-        !addressUtxos.find(
-          (utxo) => val.txid === utxo.txid && val.vout === utxo.vout
-        )
-    );
-    if (absent.length) {
-      const absentString = absent
-        .map((val) => `${val.txid}:${val.vout}`)
-        .join(", ");
-      throw Error(`Utxos [${absentString}] not found in wallet`);
-    }
-
-    utxos = utxos.map(
-      (val) =>
-        addressUtxos.find(
-          (utxo) => val.txid === utxo.txid && val.vout === utxo.vout
-        )!
-    );
+  utxoIds: UtxoId[],
+  walletOrUtxos: Utxo[] | import("../wallet/Wif.js").Wallet
+): Promise<Utxo[]> {
+  const addressUtxos = Array.isArray(walletOrUtxos)
+    ? walletOrUtxos
+    : await walletOrUtxos.getUtxos();
+  const absent = utxoIds.filter(
+    (val) =>
+      !addressUtxos.find(
+        (utxo) => val.txid === utxo.txid && val.vout === utxo.vout
+      )
+  );
+  if (absent.length) {
+    const absentString = absent
+      .map((val) => `${val.txid}:${val.vout}`)
+      .join(", ");
+    throw Error(`Utxos [${absentString}] not found in wallet`);
   }
 
-  return utxos;
+  return addressUtxos.filter((val) =>
+    utxoIds.find((utxo) => val.txid === utxo.txid && val.vout === utxo.vout)
+  );
 }

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

@@ -35,3 +35,4 @@ export {
 } from "./balanceObjectFromSatoshi.js";
 export * from "./sumUtxoValue.js";
 export { decodeHeader } from "./header.js";
+export * from "./checkUtxos.js";

package/src/util/sumUtxoValue.ts

@@ -1,8 +1,8 @@
-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: number[] = utxos.map((o: Utxo) => {
       return o.satoshis;
     });
     const balance = balanceArray.reduce((a: number, b: number) => a + b, 0);
@@ -12,11 +12,11 @@ export function sumUtxoValue(utxos: UtxoI[]) {
   }
 }
 
-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);