mainnet-js 1.0.17 → 1.1.0

package/src/network/index.ts

@@ -4,3 +4,5 @@ export {
   initProviders,
   disconnectProviders,
 } from "./Connection.js";
+export { default as ElectrumNetworkProvider } from "./ElectrumNetworkProvider.js";
+export { default as NetworkProvider } from "./NetworkProvider.js";

package/src/util/amountInSatoshi.ts

@@ -19,7 +19,7 @@ export async function amountInSatoshi(
   const unit = sanitizeUnit(rawUnit);
   switch (unit) {
     case UnitEnum.BCH:
-      return value * bchParam.subUnits;
+      return Math.round(value * bchParam.subUnits);
     case UnitEnum.SATOSHI:
       return value;
     case UnitEnum.SAT:

package/src/wallet/Bcmr.ts

@@ -14,6 +14,7 @@ import { getGlobalProvider } from "../network/default.js";
 import ElectrumNetworkProvider from "../network/ElectrumNetworkProvider.js";
 import { ElectrumRawTransaction } from "../network/interface.js";
 import { IdentitySnapshot, Registry } from "./bcmr-v1.schema.js";
+import { initProvider } from "../network/Connection.js";
 
 export interface AuthChainElement {
   txHash: string;
@@ -145,9 +146,9 @@ export class BCMR {
       options.resolveBase = false;
     }
 
-    const provider = getGlobalProvider(
+    const provider = (await initProvider(
       options.network
-    ) as ElectrumNetworkProvider;
+    )!) as ElectrumNetworkProvider;
 
     if (options.rawTx === undefined) {
       options.rawTx = await provider.getRawTransactionObject(
@@ -229,7 +230,7 @@ export class BCMR {
           val.indexOf("6a0442434d52") === 0 ||
           val.indexOf("6a4c0442434d52") === 0 ||
           val.indexOf("6a4d040042434d52") === 0 ||
-          val.indexOf("6ade0400000042434d52") === 0
+          val.indexOf("6a4e0400000042434d52") === 0
       );
 
       if (bcmrOpReturns.length === 0) {

package/src/wallet/Util.test.ts

@@ -31,21 +31,21 @@ test("Should throw on non-existent transaction and invalid hash", async () => {
 
 test("Should get raw transaction", async () => {
   let wallet = await RegTestWallet.fromId(process.env.ALICE_ID!);
-  const utxo = (await wallet.getUtxos()).utxos![0];
+  const utxo = (await wallet.getUtxos())[0];
   const transaction = (await wallet.provider!.getRawTransactionObject(
-    utxo.txId
+    utxo.txid
   )) as ElectrumRawTransaction;
   expect((await wallet.util.decodeTransaction(transaction.hash)).hash).toBe(
-    utxo.txId
+    utxo.txid
   );
   expect((await wallet.util.decodeTransaction(transaction.hex)).txid).toBe(
-    utxo.txId
+    utxo.txid
   );
 
   // test static accessor
   expect(
     (await RegTestWallet.util.decodeTransaction(transaction.hex)).txid
-  ).toBe(utxo.txId);
+  ).toBe(utxo.txid);
 });
 
 test("Should decode a transaction from fist block", async () => {

package/src/wallet/Wif.ts

@@ -33,6 +33,7 @@ import {
 } from "./interface.js";
 
 import {
+  fromUtxoId,
   OpReturnData,
   SendRequest,
   SendRequestArray,
@@ -42,8 +43,6 @@ import {
   TokenGenesisRequest,
   TokenMintRequest,
   TokenSendRequest,
-  UtxoItem,
-  UtxoResponse,
   XPubKey,
 } from "./model.js";
 
@@ -659,14 +658,7 @@ export class Wallet extends BaseWallet {
     if (!this.cashaddr) {
       throw Error("Attempted to get utxos without an address");
     }
-    let utxos = await this.getAddressUtxos(this.cashaddr);
-    let resp = new UtxoResponse();
-    resp.utxos = await Promise.all(
-      utxos.map(async (o: UtxoI) => {
-        return UtxoItem.fromElectrum(o);
-      })
-    );
-    return resp;
+    return await this.getAddressUtxos(this.cashaddr);
   }
 
   // gets wallet balance in sats, bch and usd
@@ -882,8 +874,8 @@ export class Wallet extends BaseWallet {
     // get inputs
     let utxos: UtxoI[];
     if (params.options && params.options.utxoIds) {
-      utxos = params.options.utxoIds.map((utxoId) =>
-        UtxoItem.fromId(utxoId).asElectrum()
+      utxos = params.options.utxoIds.map((utxoId: UtxoI | string) =>
+        typeof utxoId === "string" ? fromUtxoId(utxoId) : utxoId
       );
     } else {
       utxos = (await this.getAddressUtxos(this.cashaddr)).filter(
@@ -1117,10 +1109,8 @@ export class Wallet extends BaseWallet {
     // get inputs from options or query all inputs
     let utxos: UtxoI[];
     if (options && options.utxoIds) {
-      utxos = options.utxoIds.map((utxoId) =>
-        typeof utxoId === "string"
-          ? UtxoItem.fromId(utxoId).asElectrum()
-          : utxoId
+      utxos = options.utxoIds.map((utxoId: UtxoI | string) =>
+        typeof utxoId === "string" ? fromUtxoId(utxoId) : utxoId
       );
     } else {
       utxos = await this.getAddressUtxos(this.cashaddr);

package/src/wallet/model.test.ts

@@ -1,32 +1,27 @@
 import { UtxoI } from "../interface";
-import { UtxoItem } from "./model";
+import { fromUtxoId, toUtxoId } from "./model";
 
 test("Should serialize utxo", () => {
-  let utxo = new UtxoItem({
-    txId: "this",
-    index: 42,
-    value: 1,
+  const utxo = toUtxoId({
+    txid: "this",
+    vout: 42,
+    satoshis: 1,
   }).toString();
-  expect(utxo.toString()).toBe("this:42:1");
+  expect(utxo).toBe("this:42:1");
 });
 
 test("Should deserialize utxo", () => {
-  let utxo = UtxoItem.fromId("this:42:1");
-  expect(utxo!.txId).toBe("this");
-  expect(utxo!.index).toBe(42);
-  expect(utxo!.value).toBe(1);
-  expect(utxo!.toString()).toBe("this:42:1");
+  const utxo = fromUtxoId("this:42:1");
+  expect(utxo.txid).toBe("this");
+  expect(utxo.vout).toBe(42);
+  expect(utxo.satoshis).toBe(1);
 });
 
 test("Should deserialize utxo", () => {
-  let u = {
+  const u = {
     txid: "this",
     vout: 42,
     satoshis: 1,
   } as UtxoI;
-  let utxo = UtxoItem.fromElectrum(u);
-  expect(utxo!.txId).toBe("this");
-  expect(utxo!.index).toBe(42);
-  expect(utxo!.value).toBe(1);
-  expect(utxo!.toString()).toBe("this:42:1");
+  expect(toUtxoId(u)).toBe("this:42:1");
 });

package/src/wallet/model.ts

@@ -3,7 +3,12 @@ import { sanitizeUnit } from "../util/sanitizeUnit.js";
 import { UnitEnum } from "../enum.js";
 import { NFTCapability, UtxoI } from "../interface.js";
 import { DELIMITER } from "../constant.js";
-import { binToNumberUint16LE, binToUtf8, hexToBin, utf8ToBin } from "@bitauth/libauth";
+import {
+  binToNumberUint16LE,
+  binToUtf8,
+  hexToBin,
+  utf8ToBin,
+} from "@bitauth/libauth";
 import { Config } from "../config.js";
 import { checkTokenaddr } from "../util/deriveCashaddr.js";
 
@@ -238,9 +243,11 @@ export class OpReturnData {
         throw new Error("Wrong data array element");
       }
 
-      if (length < 76) { // OP_PUSHDATA_1
+      if (length < 76) {
+        // OP_PUSHDATA_1
         lengthData = [length];
-      } else if (length < 223) { // default max `-datacarriersize`
+      } else if (length < 223) {
+        // default max `-datacarriersize`
         lengthData = [0x4c, length];
       } else {
         throw new Error("OP_RETURN data can not exceed 220 bytes in size");
@@ -299,66 +306,12 @@ export class OpReturnData {
    * @returns array of binary data chunks pushed, converted to utf8 strings
    */
   public static parse(opReturnHex: string): string[] {
-    return this.parseBinary(hexToBin(opReturnHex)).map(val => binToUtf8(val));
+    return this.parseBinary(hexToBin(opReturnHex)).map((val) => binToUtf8(val));
   }
 }
 
 export type SendRequestArray = Array<string | number | UnitEnum | Buffer>;
 
-export class UtxoItem {
-  index: number;
-  value: number;
-  utxoId: string;
-  txId: string;
-
-  constructor({
-    index,
-    value,
-    txId,
-  }: {
-    index: number;
-    value: number;
-    txId: string;
-  }) {
-    this.value = value;
-    this.txId = txId;
-    this.index = index;
-    this.utxoId = this.toString();
-  }
-
-  public toString() {
-    return [this.txId, this.index, this.value].join(DELIMITER);
-  }
-
-  public static fromId(utxoId: string) {
-    let [txid, vout, satoshis] = utxoId.split(DELIMITER);
-    return new this({
-      txId: txid,
-      index: parseInt(vout),
-      value: parseInt(satoshis),
-    });
-  }
-  public static fromElectrum(u: UtxoI) {
-    return new this({
-      txId: u.txid,
-      index: u.vout,
-      value: u.satoshis,
-    });
-  }
-
-  public asElectrum(): UtxoI {
-    return {
-      txid: this.txId,
-      vout: this.index,
-      satoshis: this.value,
-    } as UtxoI;
-  }
-}
-
-export class UtxoResponse {
-  "utxos"?: Array<UtxoItem>;
-}
-
 export class SendResponse {
   txId?: string;
   balance?: BalanceResponse;
@@ -401,3 +354,35 @@ export class XPubKey {
     };
   }
 }
+
+export const fromUtxoId = (utxoId: string): UtxoI => {
+  const [txid, vout, satoshis, tokenId, amount, capability, commitment] =
+    utxoId.split(DELIMITER);
+  return {
+    satoshis: satoshis ? parseInt(satoshis) : 0,
+    vout: parseInt(vout),
+    txid,
+    token: tokenId
+      ? {
+          tokenId,
+          amount: parseInt(amount),
+          capability: capability || undefined,
+          commitment: commitment || undefined,
+        }
+      : undefined,
+  } as UtxoI;
+};
+
+export const toUtxoId = (utxo: UtxoI): string => {
+  return [
+    utxo.txid,
+    utxo.vout,
+    utxo.satoshis,
+    utxo.token?.tokenId,
+    utxo.token?.amount,
+    utxo.token?.capability,
+    utxo.token?.commitment,
+  ]
+    .join(DELIMITER)
+    .replace(/:+$/, "");
+};