mainnet-js 1.0.1 → 1.0.3

package/src/network/default.ts

@@ -9,8 +9,12 @@ import {
 import { parseElectrumUrl } from "./util.js";
 import { ElectrumHostParams, ElectrumClusterParams } from "./interface.js";
 import { Network } from "../interface.js";
-import { networkTickerMap, clusterParams } from "./constant.js";
-import { ELECTRUM_CASH_PROTOCOL_VERSION } from "./constant.js";
+import {
+  networkTickerMap,
+  clusterParams,
+  ELECTRUM_CASH_PROTOCOL_VERSION,
+  ELECTRUM_CASH_PROTOCOL_VERSION_MAINNET,
+} from "./constant.js";
 
 export function setGlobalProvider(
   network: Network,
@@ -75,11 +79,11 @@ export function getNetworkProvider(
       let clusterParam = clusterParams[network];
       clusterParam["confidence"] = getConfidence();
       clusterParam = Object.assign({}, clusterParam, options);
-      clusterOrClient = getCluster(servers, clusterParam);
+      clusterOrClient = getCluster(servers, clusterParam, network);
     }
     // The server is a single string in an array
     else {
-      clusterOrClient = getClient(servers);
+      clusterOrClient = getClient(servers, network);
     }
     let provider = new ElectrumNetworkProvider(
       clusterOrClient,
@@ -98,8 +102,8 @@ export function getNetworkProvider(
 }
 
 // Create a cluster give a list of servers and parameters
-function getCluster(servers: string[], params) {
-  let electrum = getElectrumCluster(params);
+function getCluster(servers: string[], params, network: Network) {
+  let electrum = getElectrumCluster(params, network);
 
   for (const s of servers) {
     let url = parseElectrumUrl(s);
@@ -115,15 +119,17 @@ function getCluster(servers: string[], params) {
 }
 
 // create a client with a list of servers
-function getClient(servers: string[]) {
+function getClient(servers: string[], network: Network) {
   let url = parseElectrumUrl(servers[0]);
-  return getElectrumClient(url, 120000);
+  return getElectrumClient(url, 120000, network);
 }
 
-function getElectrumCluster(params: ElectrumClusterParams) {
+function getElectrumCluster(params: ElectrumClusterParams, network: Network) {
   return new ElectrumCluster(
     getUserAgent(),
-    ELECTRUM_CASH_PROTOCOL_VERSION,
+    network === Network.MAINNET
+      ? ELECTRUM_CASH_PROTOCOL_VERSION_MAINNET
+      : ELECTRUM_CASH_PROTOCOL_VERSION,
     params.confidence,
     params.distribution,
     params.order,
@@ -131,10 +137,16 @@ function getElectrumCluster(params: ElectrumClusterParams) {
   );
 }
 
-function getElectrumClient(params: ElectrumHostParams, timeout: number) {
+function getElectrumClient(
+  params: ElectrumHostParams,
+  timeout: number,
+  network: Network
+) {
   return new ElectrumClient(
     getUserAgent(),
-    ELECTRUM_CASH_PROTOCOL_VERSION,
+    network === Network.MAINNET
+      ? ELECTRUM_CASH_PROTOCOL_VERSION_MAINNET
+      : ELECTRUM_CASH_PROTOCOL_VERSION,
     params.host,
     params.port,
     params.scheme,

package/src/network/interface.ts

@@ -1,4 +1,5 @@
 import { ClusterOrder } from "electrum-cash";
+import { NFTCapability } from "../interface";
 
 export interface BlockHeader {
   height: number;
@@ -23,6 +24,18 @@ export interface ElectrumUtxo {
   value: number;
   tx_hash: string;
   height: number;
+  token_data:
+    | {
+        amount: string;
+        category: string;
+        nft:
+          | {
+              capability: NFTCapability | undefined;
+              commitment: string | undefined;
+            }
+          | undefined;
+      }
+    | undefined;
 }
 
 export interface ElectrumRawTransaction {

package/src/wallet/Cashtokens.test.ts

@@ -6,13 +6,21 @@ import { binToHex, utf8ToBin } from "@bitauth/libauth";
 import { delay } from "../util";
 
 beforeAll(async () => {
-  await initProviders([Network.REGTEST]);
+  await initProviders();
 });
 afterAll(async () => {
-  await disconnectProviders([Network.REGTEST]);
+  await disconnectProviders();
 });
 
 describe(`Test cashtokens`, () => {
+  test("Test chipnet request", async () => {
+    const wallet = await TestNetWallet.watchOnly(
+      "bchtest:pzszr88euuuy87uarx9krcuh5psy4zzghsm2033xk4"
+    );
+    const utxos = await wallet.getTokenUtxos();
+    expect(utxos[0].token?.tokenId).toBeDefined();
+  });
+
   test("Test tokens will not be burned when sending bch value", async () => {
     const alice = await RegTestWallet.fromId(process.env.ALICE_ID!);
     const bob = await RegTestWallet.newRandom();