mainnet-js 1.1.34 → 2.0.1

package/src/wallet/Wif.ts

@@ -77,20 +77,7 @@ import { sumTokenAmounts, sumUtxoValue } from "../util/sumUtxoValue.js";
 import { sumSendRequestAmounts } from "../util/sumSendRequestAmounts.js";
 import { ElectrumRawTransaction } from "../network/interface.js";
 import { getRelayFeeCache } from "../network/getRelayFeeCache.js";
-import {
-  RegTestSlp,
-  RegTestWatchSlp,
-  RegTestWifSlp,
-  Slp,
-  TestNetSlp,
-  TestNetWatchSlp,
-  TestNetWifSlp,
-  WatchSlp,
-  WifSlp,
-} from "./Slp.js";
 import axios from "axios";
-import { SlpSendResponse } from "../slp/interface.js";
-import { toCashAddress } from "../util/bchaddr.js";
 import {
   RegTestUtil,
   RegTestWatchUtil,
@@ -137,28 +124,11 @@ export class Wallet extends BaseWallet {
   publicKey?: Uint8Array;
   publicKeyHash?: Uint8Array;
   networkPrefix: CashAddressNetworkPrefix;
-  _slp?: Slp;
-  _slpAware: boolean = false; // a flag which activates utxo checking against an external slp indexer
   _slpSemiAware: boolean = false; // a flag which requires an utxo to have more than 546 sats to be spendable and counted in the balance
   _util?: Util;
   static signedMessage: SignedMessageI = new SignedMessage();
 
   //#region Accessors
-  // interface to slp functions. see Slp.ts
-  public get slp() {
-    if (!this._slp) {
-      this._slp = new Slp(this);
-      this._slpAware = true;
-    }
-
-    return this._slp;
-  }
-
-  // interface to slp functions. see Slp.ts
-  public static get slp() {
-    return Slp;
-  }
-
   // interface to util functions. see Util.ts
   public get util() {
     if (!this._util) {
@@ -173,11 +143,6 @@ export class Wallet extends BaseWallet {
     return Util;
   }
 
-  public slpAware(value: boolean = true): Wallet {
-    this._slpAware = value;
-    return this;
-  }
-
   public slpSemiAware(value: boolean = true): Wallet {
     this._slpSemiAware = value;
     return this;
@@ -346,23 +311,6 @@ export class Wallet extends BaseWallet {
       address
     ) as InstanceType<T>;
   }
-
-  /**
-   * fromSlpaddr - create an SLP aware watch-only wallet in the network derived from the address
-   *
-   * such kind of wallet does not have a private key and is unable to spend any funds
-   * however it still allows to use many utility functions such as getting and watching balance, etc.
-   *
-   * @param address   slpaddress of a wallet
-   *
-   * @returns instantiated wallet
-   */
-  public static async fromSlpaddr<T extends typeof Wallet>(
-    this: T,
-    address: string
-  ): Promise<InstanceType<T>> {
-    return this.fromCashaddr(toCashAddress(address)) as InstanceType<T>;
-  }
   //#endregion Constructors and Statics
 
   //#region Protected implementations
@@ -639,18 +587,7 @@ export class Wallet extends BaseWallet {
       address = this.cashaddr!;
     }
 
-    if (this._slpAware) {
-      const [bchUtxos, slpOutpoints] = await Promise.all([
-        this.provider!.getUtxos(address),
-        this.slp.getSlpOutpoints(),
-      ]);
-      return bchUtxos.filter(
-        (bchutxo) =>
-          slpOutpoints.findIndex(
-            (slpOutpoint) => `${bchutxo.txid}:${bchutxo.vout}` === slpOutpoint
-          ) === -1
-      );
-    } else if (this._slpSemiAware) {
+    if (this._slpSemiAware) {
       const bchUtxos: UtxoI[] = await this.provider!.getUtxos(address);
       return bchUtxos.filter(
         (bchutxo) => bchutxo.satoshis > DUST_UTXO_THRESHOLD
@@ -866,10 +803,6 @@ export class Wallet extends BaseWallet {
       throw Error("attempted to send without a cashaddr");
     }
 
-    if (params.options && params.options.slpAware) {
-      this._slpAware = true;
-    }
-
     if (params.options && params.options.slpSemiAware) {
       this._slpSemiAware = true;
     }
@@ -920,7 +853,6 @@ export class Wallet extends BaseWallet {
       privateKey: this.privateKey ?? Uint8Array.from([]),
       sourceAddress: this.cashaddr!,
       relayFeePerByteInSatoshi: relayFeePerByteInSatoshi,
-      slpOutputs: [],
       feePaidBy: feePaidBy,
     });
     const spendableAmount = sumUtxoValue(fundingUtxos);
@@ -1097,10 +1029,6 @@ export class Wallet extends BaseWallet {
       throw Error("attempted to send without a cashaddr");
     }
 
-    if (options && options.slpAware) {
-      this._slpAware = true;
-    }
-
     if (options && options.slpSemiAware) {
       this._slpSemiAware = true;
     }
@@ -1238,7 +1166,6 @@ export class Wallet extends BaseWallet {
       privateKey: this.privateKey ?? Uint8Array.from([]),
       sourceAddress: this.cashaddr!,
       relayFeePerByteInSatoshi: relayFeePerByteInSatoshi,
-      slpOutputs: [],
       feePaidBy: feePaidBy,
     });
 
@@ -1262,7 +1189,6 @@ export class Wallet extends BaseWallet {
       privateKey: this.privateKey ?? Uint8Array.from([]),
       sourceAddress: this.cashaddr!,
       relayFeePerByteInSatoshi: relayFeePerByteInSatoshi,
-      slpOutputs: [],
       feePaidBy: feePaidBy,
     });
     const { encodedTransaction, sourceOutputs } = await buildEncodedTransaction(
@@ -1273,7 +1199,6 @@ export class Wallet extends BaseWallet {
         sourceAddress: this.cashaddr!,
         fee,
         discardChange,
-        slpOutputs: [],
         feePaidBy,
         changeAddress,
         buildUnsigned: options?.buildUnsigned === true,
@@ -1857,38 +1782,7 @@ export class TestNetWallet extends Wallet {
         `${TestNetWallet.faucetServer}/faucet/get_addresses`
       );
       const data = response.data;
-      return await this.slpAware().sendMax(data.bchtest);
-    } catch (e: any) {
-      console.log(e);
-      console.log(e.response ? e.response.data : "");
-      throw e;
-    }
-  }
-
-  // will receive 10 testnet tokens, rate limits apply
-  async getTestnetSlp(tokenId: string): Promise<string> {
-    try {
-      const response = await axios.post(
-        `${TestNetWallet.faucetServer}/faucet/get_testnet_slp`,
-        { slpaddr: this.slp.slpaddr, tokenId: tokenId }
-      );
-      const data = response.data;
-      return data.txId;
-    } catch (e) {
-      //console.log(e);
-      //console.log(e.response ? e.response.data : "");
-      throw e;
-    }
-  }
-
-  // be nice and return them back
-  async returnTestnetSlp(tokenId: string): Promise<SlpSendResponse> {
-    try {
-      const response = await axios.post(
-        `${TestNetWallet.faucetServer}/faucet/get_addresses`
-      );
-      const data = response.data;
-      return await this.slp.sendMax(data.slptest, tokenId);
+      return await this.sendMax(data.bchtest);
     } catch (e: any) {
       console.log(e);
       console.log(e.response ? e.response.data : "");
@@ -1896,11 +1790,6 @@ export class TestNetWallet extends Wallet {
     }
   }
 
-  // interface to static slp functions. see Slp.ts
-  public static get slp() {
-    return TestNetSlp;
-  }
-
   // interface to static util functions. see Util.ts
   public static get util() {
     return TestNetUtil;
@@ -1916,11 +1805,6 @@ export class RegTestWallet extends Wallet {
     super(name, NetworkType.Regtest);
   }
 
-  // interface to static slp functions. see Slp.ts
-  public static get slp() {
-    return RegTestSlp;
-  }
-
   // interface to static util functions. see Util.ts
   public static get util() {
     return RegTestUtil;
@@ -1937,11 +1821,6 @@ export class WifWallet extends Wallet {
     super(name, NetworkType.Mainnet, WalletTypeEnum.Wif);
   }
 
-  // interface to static slp functions. see Slp.ts
-  public static get slp() {
-    return WifSlp;
-  }
-
   // interface to static util functions. see Util.ts
   public static get util() {
     return WifUtil;
@@ -1958,11 +1837,6 @@ export class TestNetWifWallet extends Wallet {
     super(name, NetworkType.Testnet, WalletTypeEnum.Wif);
   }
 
-  // interface to static slp functions. see Slp.ts
-  public static get slp() {
-    return TestNetWifSlp;
-  }
-
   // interface to static util functions. see Util.ts
   public static get util() {
     return TestNetWifUtil;
@@ -1979,11 +1853,6 @@ export class RegTestWifWallet extends Wallet {
     super(name, NetworkType.Regtest, WalletTypeEnum.Wif);
   }
 
-  // interface to static slp functions. see Slp.ts
-  public static get slp() {
-    return RegTestWifSlp;
-  }
-
   // interface to static util functions. see Util.ts
   public static get util() {
     return RegTestWifUtil;
@@ -2000,11 +1869,6 @@ export class WatchWallet extends Wallet {
     super(name, NetworkType.Mainnet, WalletTypeEnum.Watch);
   }
 
-  // interface to static slp functions. see Slp.ts
-  public static get slp() {
-    return WatchSlp;
-  }
-
   // interface to static util functions. see Util.ts
   public static get util() {
     return WatchUtil;
@@ -2021,11 +1885,6 @@ export class TestNetWatchWallet extends Wallet {
     super(name, NetworkType.Testnet, WalletTypeEnum.Watch);
   }
 
-  // interface to static slp functions. see Slp.ts
-  public static get slp() {
-    return TestNetWatchSlp;
-  }
-
   // interface to static util functions. see Util.ts
   public static get util() {
     return TestNetWatchUtil;
@@ -2042,11 +1901,6 @@ export class RegTestWatchWallet extends Wallet {
     super(name, NetworkType.Regtest, WalletTypeEnum.Watch);
   }
 
-  // interface to static slp functions. see Slp.ts
-  public static get slp() {
-    return RegTestWatchSlp;
-  }
-
   // interface to static util functions. see Util.ts
   public static get util() {
     return RegTestWatchUtil;

package/src/wallet/createWallet.ts

@@ -164,41 +164,6 @@ export async function createWallet(body: WalletRequestI): Promise<Wallet> {
   }
 }
 
-/**
- * Create a new SLP aware wallet
- * @param body A wallet request object
- * @returns A promise to a new wallet object
- */
-export async function createSlpWallet(body: WalletRequestI): Promise<Wallet> {
-  let wallet;
-  let walletType = body.type ? body.type : "seed";
-  let networkType = body.network ? body.network : "mainnet";
-
-  // Named wallets are saved in the database
-  if (body.name && body.name.length > 0) {
-    wallet = await walletClassMap[walletType][networkType]().slp.named(
-      body.name
-    );
-    if (wallet.network != networkType) {
-      throw Error(
-        `A wallet already exists with name ${body.name}, but with network ${wallet.network} not ${body.network}, per request`
-      );
-    }
-    if (wallet.walletType != walletType) {
-      throw Error(
-        `A wallet already exists with name ${body.name}, but with type ${wallet.walletType} not ${body.type}, per request`
-      );
-    }
-    return wallet;
-  }
-  // This handles unsaved/unnamed wallets
-  else {
-    wallet = await walletClassMap[walletType][networkType]().slp.newRandom();
-    wallet.walletType = walletType;
-    return wallet;
-  }
-}
-
 /**
  * Create a new wallet
  * @param walletRequest A wallet request object
@@ -215,22 +180,6 @@ export async function createWalletResponse(
   }
 }
 
-/**
- * Create a new SLP aware wallet
- * @param walletRequest A wallet request object
- * @returns A new wallet object
- */
-export async function createSlpWalletResponse(
-  walletRequest: WalletRequestI
-): Promise<WalletResponseI> {
-  let wallet = await createSlpWallet(walletRequest);
-  if (wallet) {
-    return asJsonResponse(wallet);
-  } else {
-    throw Error("Error creating wallet");
-  }
-}
-
 /**
  * asJsonResponse return a wallet as json
  * @param wallet A wallet object
@@ -241,7 +190,6 @@ function asJsonResponse(wallet: Wallet): WalletResponseI {
     return {
       name: wallet.name,
       cashaddr: wallet.cashaddr as string,
-      slpaddr: wallet.slp.slpaddr,
       walletId: wallet.toString(),
       ...wallet.getSeed(),
       network: wallet.network as any,
@@ -250,7 +198,6 @@ function asJsonResponse(wallet: Wallet): WalletResponseI {
     return {
       name: wallet.name,
       cashaddr: wallet.cashaddr as string,
-      slpaddr: wallet.slp.slpaddr,
       walletId: wallet.toString(),
       wif: wallet.privateKeyWif,
       network: wallet.network as any,

package/src/wallet/interface.ts

@@ -16,7 +16,6 @@ export interface WalletRequestI {
 export interface WalletResponseI {
   name: string;
   cashaddr?: string;
-  slpaddr?: string;
   address?: string;
   walletId: string;
   network?: NetworkEnum;
@@ -48,7 +47,6 @@ export interface WalletInfoI {
 export interface SendRequestOptionsI {
   utxoIds?: string[] | UtxoI[];
   changeAddress?: string;
-  slpAware?: boolean; // a flag which activates utxo checking against an external slp indexer
   slpSemiAware?: boolean; // a flag which requires an utxo to have more than 546 sats to be spendable and counted in the balance
   queryBalance?: boolean;
   awaitTransactionPropagation?: boolean;

package/src/webhook/Webhook.ts

@@ -8,11 +8,6 @@ export enum WebhookType {
   transactionOut = "transaction:out",
   transactionInOut = "transaction:in,out",
   balance = "balance",
-
-  slpTransactionIn = "slptransaction:in",
-  slpTransactionOut = "slptransaction:out",
-  slpTransactionInOut = "slptransaction:in,out",
-  slpBalance = "slpbalance",
 }
 
 export enum WebhookRecurrence {
@@ -22,14 +17,13 @@ export enum WebhookRecurrence {
 
 export class Webhook {
   id?: number;
-  cashaddr!: string; // depending on type of the hook, either cashaddr or slpaddr
+  cashaddr!: string;
   type!: string;
   recurrence!: string;
   url!: string;
-  status!: string; // bch only
-  last_height!: number; // bch only
-  tx_seen!: TxI[]; // bch only
-  tokenId?: string; // slp only
+  status!: string;
+  last_height!: number;
+  tx_seen!: TxI[];
   expires_at!: Date;
 
   db!: SqlProvider;

package/src/webhook/index.ts

@@ -1,5 +1,4 @@
 export { default as WebhookWorker } from "./WebhookWorker.js";
 export * from "./Webhook.js";
 export * from "./WebhookBch.js";
-export * from "./WebhookSlp.js";
 export * from "./interface.js";

package/src/webhook/interface.ts

@@ -3,6 +3,5 @@ export interface RegisterWebhookParams {
   url: string;
   type: string;
   recurrence: string;
-  tokenId?: string;
   duration_sec?: number;
 }

package/webpack.config.cjs

@@ -1,5 +1,4 @@
 const { merge } = require("webpack-merge");
-const path = require("path");
 const packageJson = require("./package.json");
 const HtmlWebpackPlugin = require("html-webpack-plugin");
 const InjectBodyPlugin = require("inject-body-webpack-plugin").default;
@@ -8,6 +7,7 @@ const BundleAnalyzerPlugin =
 const CircularDependencyPlugin = require("circular-dependency-plugin");
 const __basedir = require("path").resolve(__dirname, "../../");
 
+const path = require("path");
 const webpack = require("webpack");
 
 const baseConfig = {
@@ -96,11 +96,6 @@ const browserConfig = {
   ],
   resolve: {
     alias: {
-      ethers$: require.resolve("ethers/lib/index.js"),
-      "@ethersproject/web$": require.resolve("@ethersproject/web/lib/index.js"),
-      "@ethersproject/contracts$": require.resolve(
-        "@ethersproject/contracts/lib/index.js"
-      ),
       bufferutil: false,
       child_process: false,
       crypto: false,
@@ -119,10 +114,15 @@ const browserConfig = {
       pg: false,
       "pg-format": false,
       "pg-native": false,
-      solc: false,
       tls: false,
       url: false,
       zlib: false,
+      [path.resolve(__dirname, "./src/webhook/index.ts")]: false,
+      [path.resolve(__dirname, "./src/webhook/interface.ts")]: false,
+      [path.resolve(__dirname, "./src/webhook/Webhook.ts")]: false,
+      [path.resolve(__dirname, "./src/webhook/WebhookBch.ts")]: false,
+      [path.resolve(__dirname, "./src/webhook/WebhookWorker.ts")]: false,
+      [path.resolve(__dirname, "./src/db/SqlProvider.ts")]: false,
     },
     fallback: {
       stream: require.resolve("stream-browserify"),

package/dist/module/slp/GsppProvider.d.ts

@@ -1,55 +0,0 @@
-import { Network } from "../interface.js";
-import { SlpTokenBalance, SlpTokenInfo, SlpTxI, SlpUtxoI } from "./interface.js";
-import BigNumber from "bignumber.js";
-import { SlpCancelWatchFn, SlpProvider, SlpWatchBalanceCallback, SlpWatchTransactionCallback } from "./SlpProvider.js";
-export declare class GsppProvider implements SlpProvider {
-    network: Network;
-    static defaultServers: {
-        mainnet: {
-            dataSource: string;
-            eventSource: string;
-        };
-        testnet: {
-            dataSource: string;
-            eventSource: string;
-        };
-        regtest: {
-            dataSource: string;
-            eventSource: string;
-        };
-    };
-    servers: {
-        mainnet: {
-            dataSource: string;
-            eventSource: string;
-        };
-        testnet: {
-            dataSource: string;
-            eventSource: string;
-        };
-        regtest: {
-            dataSource: string;
-            eventSource: string;
-        };
-    };
-    caching: boolean;
-    constructor(network?: Network);
-    SlpOutpoints(slpaddr: string): Promise<String[]>;
-    SlpUtxos(slpaddr: string): Promise<SlpUtxoI[]>;
-    SlpSpendableUtxos(slpaddr: string, tokenId?: string): Promise<SlpUtxoI[]>;
-    SlpBatonUtxos(slpaddr: string, tokenId?: string): Promise<SlpUtxoI[]>;
-    SlpTokenInfo(tokenId: string): Promise<SlpTokenInfo | undefined>;
-    SlpAllTokenBalances(slpaddr: string): Promise<SlpTokenBalance[]>;
-    SlpTokenBalance(slpaddr: string, tokenId: string): Promise<SlpTokenBalance>;
-    SlpAddressTransactionHistory(_slpaddr: string, _tokenId?: string, _limit?: number, _skip?: number): Promise<SlpTxI[]>;
-    SlpWaitForTransaction(slpaddr: string, tokenId?: string): Promise<SlpTxI>;
-    SlpWaitForBalance(value: BigNumber.Value, slpaddr: string, tokenId: string): Promise<SlpTokenBalance>;
-    SlpWatchBalance(callback: SlpWatchBalanceCallback, slpaddr: string, tokenId: string): SlpCancelWatchFn;
-    SlpWatchTransactions(callback: SlpWatchTransactionCallback, slpaddr?: string, tokenId?: string): SlpCancelWatchFn;
-    GsppQuery(queryObject: any, endpoint?: string): Promise<any>;
-    SlpSocketEventSource(queryObject: any): EventSource;
-}
-export declare function _convertBalanceBigNumbers(balances: SlpTokenBalance[]): SlpTokenBalance[];
-export declare function _convertUtxoBigNumbers(utxos: SlpUtxoI[]): SlpUtxoI[];
-export declare function _convertSlpTokenInfo(tokenInfo: SlpTokenInfo | undefined): SlpTokenInfo | undefined;
-//# sourceMappingURL=GsppProvider.d.ts.map

package/dist/module/slp/GsppProvider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"GsppProvider.d.ts","sourceRoot":"","sources":["../../../src/slp/GsppProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAO,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAEL,eAAe,EACf,YAAY,EACZ,MAAM,EACN,QAAQ,EACT,MAAM,gBAAgB,CAAC;AACxB,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,uBAAuB,EACvB,2BAA2B,EAE5B,MAAM,kBAAkB,CAAC;AAW1B,qBAAa,YAAa,YAAW,WAAW;IAoB3B,OAAO,EAAE,OAAO;IAnBnC,OAAc,cAAc;;;;;;;;;;;;;MAa1B;IAEK,OAAO;;;;;;;;;;;;;MAAsC;IAE7C,OAAO,EAAE,OAAO,CAAS;gBAEb,OAAO,GAAE,OAAyB;IAkB/C,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAOhD,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAa9C,iBAAiB,CACrB,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,QAAQ,EAAE,CAAC;IAQhB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAQrE,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAShE,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAYhE,eAAe,CACnB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,eAAe,CAAC;IAiBrB,4BAA4B,CAChC,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,GAAE,MAAY,EACpB,KAAK,GAAE,MAAU,GAChB,OAAO,CAAC,MAAM,EAAE,CAAC;IAKd,qBAAqB,CACzB,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC;IAcZ,iBAAiB,CACrB,KAAK,EAAE,SAAS,CAAC,KAAK,EACtB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,eAAe,CAAC;IAgB3B,eAAe,CACb,QAAQ,EAAE,uBAAuB,EACjC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GACd,gBAAgB;IAYnB,oBAAoB,CAClB,QAAQ,EAAE,2BAA2B,EACrC,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,GACf,gBAAgB;IA4BZ,SAAS,CAAC,WAAW,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IA0B5D,oBAAoB,CAAC,WAAW,EAAE,GAAG,GAAG,WAAW;CAM3D;AA6BD,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,eAAe,EAAE,GAC1B,eAAe,EAAE,CAKnB;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,QAAQ,EAAE,CAMpE;AAED,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,YAAY,GAAG,SAAS,GAClC,YAAY,GAAG,SAAS,CAS1B"}