@psf/bch-js 6.8.3 → 7.0.2

package/src/generating.js

@@ -1,35 +1,24 @@
-const axios = require('axios')
+import axios from 'axios'
 
 // let _this
 
 class Generating {
   constructor (config) {
     this.restURL = config.restURL
-    this.apiToken = config.apiToken
     this.authToken = config.authToken
+    // Use the shared axios instance if provided, otherwise fall back to axios
+    this.axios = config.axios || axios
 
-    if (this.authToken) {
-      // Add Basic Authentication token to the authorization header.
-      this.axiosOptions = {
-        headers: {
-          authorization: this.authToken
-        }
-      }
-    } else {
-      // Add JWT token to the authorization header.
-      this.axiosOptions = {
-        headers: {
-          authorization: `Token ${this.apiToken}`
-        }
+    this.axiosOptions = {
+      headers: {
+        authorization: this.authToken
       }
     }
-
-    // _this = this
   }
 
   async generateToAddress (blocks, address, maxtries = 1000000) {
     try {
-      const response = await axios.post(
+      const response = await this.axios.post(
         `${this.restURL}generating/generateToAddress/${blocks}/${address}?maxtries=${maxtries}`,
         this.axiosOptions
       )
@@ -41,4 +30,4 @@ class Generating {
   }
 }
 
-module.exports = Generating
+export default Generating

package/src/hdnode.js

@@ -1,7 +1,7 @@
-const Bitcoin = require('@psf/bitcoincashjs-lib')
-const coininfo = require('@psf/coininfo')
-const bip32utils = require('@chris.troutner/bip32-utils')
-const bchaddrjs = require('bchaddrjs-slp')
+import Bitcoin from '@psf/bitcoincashjs-lib'
+import coininfo from '@psf/coininfo'
+import bip32utils from '@chris.troutner/bip32-utils'
+import bchaddrjs from 'bchaddrjs-slp'
 
 class HDNode {
   constructor (address) {
@@ -637,4 +637,4 @@ class HDNode {
   }
 }
 
-module.exports = HDNode
+export default HDNode

package/src/mining.js

@@ -1,35 +1,24 @@
-const axios = require('axios')
+import axios from 'axios'
 
 // let _this
 
 class Mining {
   constructor (config) {
     this.restURL = config.restURL
-    this.apiToken = config.apiToken
     this.authToken = config.authToken
+    // Use the shared axios instance if provided, otherwise fall back to axios
+    this.axios = config.axios || axios
 
-    if (this.authToken) {
-      // Add Basic Authentication token to the authorization header.
-      this.axiosOptions = {
-        headers: {
-          authorization: this.authToken
-        }
-      }
-    } else {
-      // Add JWT token to the authorization header.
-      this.axiosOptions = {
-        headers: {
-          authorization: `Token ${this.apiToken}`
-        }
+    this.axiosOptions = {
+      headers: {
+        authorization: this.authToken
       }
     }
-
-    // _this = this
   }
 
   async getBlockTemplate (templateRequest) {
     try {
-      const response = await axios.get(
+      const response = await this.axios.get(
         `${this.restURL}mining/getBlockTemplate/${templateRequest}`,
         this.axiosOptions
       )
@@ -42,7 +31,7 @@ class Mining {
 
   async getMiningInfo () {
     try {
-      const response = await axios.get(
+      const response = await this.axios.get(
         `${this.restURL}mining/getMiningInfo`,
         this.axiosOptions
       )
@@ -55,7 +44,7 @@ class Mining {
 
   async getNetworkHashps (nblocks = 120, height = 1) {
     try {
-      const response = await axios.get(
+      const response = await this.axios.get(
         `${this.restURL}mining/getNetworkHashps?nblocks=${nblocks}&height=${height}`,
         this.axiosOptions
       )
@@ -71,7 +60,7 @@ class Mining {
     if (parameters) path = `${path}?parameters=${parameters}`
 
     try {
-      const response = await axios.post(path, this.axiosOptions)
+      const response = await this.axios.post(path, this.axiosOptions)
       return response.data
     } catch (error) {
       if (error.response && error.response.data) throw error.response.data
@@ -80,4 +69,4 @@ class Mining {
   }
 }
 
-module.exports = Mining
+export default Mining

package/src/mnemonic.js

@@ -1,11 +1,8 @@
-/* eslint no-prototype-builtins: "off" */
-/* eslint node/no-callback-literal: "off" */
-
-const BIP39 = require('bip39')
-const randomBytes = require('randombytes')
-const Bitcoin = require('@psf/bitcoincashjs-lib')
-const Buffer = require('safe-buffer').Buffer
-const wif = require('wif')
+import BIP39 from 'bip39'
+import randomBytes from 'randombytes'
+import Bitcoin from '@psf/bitcoincashjs-lib'
+import { Buffer } from 'safe-buffer'
+import wif from 'wif'
 
 class Mnemonic {
   constructor (address) {
@@ -338,7 +335,7 @@ class Mnemonic {
   }
 }
 
-module.exports = Mnemonic
+export default Mnemonic
 
 // The following code is from: https://raw.githubusercontent.com/iancoleman/bip39/7ff86d4c983f1e8c80b87b31acfd69fcf98c1b82/src/js/levenshtein.js
 
@@ -356,7 +353,7 @@ const _extend = function (dst) {
   const sources = Array.prototype.slice.call(arguments, 1)
   for (let i = 0; i < sources.length; ++i) {
     const src = sources[i]
-    for (const p in src) if (src.hasOwnProperty(p)) dst[p] = src[p]
+    for (const p in src) if (Object.prototype.hasOwnProperty.call(src, p)) dst[p] = src[p]
   }
   return dst
 }
@@ -503,7 +500,7 @@ const Levenshtein = {
         try {
           options.progress.call(null, (i * 100.0) / str1.length)
         } catch (err) {
-          return cb(`Progress callback: ${err.toString()}`)
+          return cb(new Error(`Progress callback: ${err.toString()}`))
         }
       }
 

package/src/price.js

@@ -1,49 +1,22 @@
-const axios = require('axios')
+import axios from 'axios'
 
 // let _this
 
 class Price {
   constructor (config) {
-    // _this = this
-
     this.restURL = config.restURL
-    this.apiToken = config.apiToken
     this.authToken = config.authToken
 
-    if (this.authToken) {
-      // Add Basic Authentication token to the authorization header.
-      this.axiosOptions = {
-        headers: {
-          authorization: this.authToken
-        }
-      }
-    } else {
-      // Add JWT token to the authorization header.
-      this.axiosOptions = {
-        headers: {
-          authorization: `Token ${this.apiToken}`
-        }
+    this.axiosOptions = {
+      headers: {
+        authorization: this.authToken
       }
     }
 
-    this.axios = axios
+    // Use the shared axios instance if provided, otherwise fall back to axios
+    this.axios = config.axios || axios
   }
 
-  // This endpoint is deprecated. Documentation removed.
-  // async current (currency = 'usd') {
-  //   try {
-  //     const response = await this.axios.get(
-  //       `https://index-api.bitcoin.com/api/v0/cash/price/${currency.toLowerCase()}`
-  //     )
-  //     // console.log(`response.data: ${JSON.stringify(response.data, null, 2)}`)
-  //
-  //     return response.data.price
-  //   } catch (err) {
-  //     if (err.response && err.response.data) throw err.response.data
-  //     else throw err
-  //   }
-  // }
-
   /**
    * @api price.getUsd() getUsd()
    * @apiName Price getUsd()
@@ -122,80 +95,6 @@ class Price {
     }
   }
 
-  /**
-   * @api price.getBchaUsd() getBchaUsd()
-   * @apiName Price getBchaUsd()
-   * @apiGroup Price
-   * @apiDescription Return current price of BCHA in USD.
-   * This endpoint gets the USD price of XEC from the Coinex API. The price
-   * denominated in BCHA comes from bch-api, so it has a better chance of
-   * working in Tor.
-   *
-   * @apiExample Example usage:
-   *(async () => {
-   *  try {
-   *    let current = await bchjs.Price.getBchaUsd();
-   *    console.log(current);
-   *  } catch(err) {
-   *   console.error(err)
-   *  }
-   *})()
-   *
-   * // 212.34
-   */
-  async getBchaUsd () {
-    try {
-      const response = await this.axios.get(
-        `${this.restURL}price/bchausd`,
-        this.axiosOptions
-      )
-      // console.log(`response.data: ${JSON.stringify(response.data, null, 2)}`)
-
-      const bchaPrice = response.data.usd * 1000000
-      // Convert XEC denomination to BCHA denomination
-
-      return bchaPrice
-    } catch (err) {
-      if (err.response && err.response.data) throw err.response.data
-      else throw err
-    }
-  }
-
-  /**
-   * @api price.getXecUsd() getXecUsd()
-   * @apiName Price getXecUsd()
-   * @apiGroup Price
-   * @apiDescription Return current price of XEC in USD.
-   * This endpoint gets the USD price of XEC from the Coinex API. The price
-   * comes from bch-api, so it has a better chance of working in Tor.
-   *
-   * @apiExample Example usage:
-   *(async () => {
-   *  try {
-   *    let current = await bchjs.Price.getXecUsd();
-   *    console.log(current);
-   *  } catch(err) {
-   *   console.error(err)
-   *  }
-   *})()
-   *
-   * // 0.00021234
-   */
-  async getXecUsd () {
-    try {
-      const response = await this.axios.get(
-        `${this.restURL}price/bchausd`,
-        this.axiosOptions
-      )
-      // console.log(`response.data: ${JSON.stringify(response.data, null, 2)}`)
-
-      return response.data.usd
-    } catch (err) {
-      if (err.response && err.response.data) throw err.response.data
-      else throw err
-    }
-  }
-
   /**
    * @api price.getBchUsd() getBchUsd()
    * @apiName Price getBchUsd()
@@ -268,4 +167,4 @@ class Price {
   }
 }
 
-module.exports = Price
+export default Price

package/src/psf-slp-indexer.js

@@ -7,41 +7,30 @@
 */
 
 // Public npm libraries
-const axios = require('axios')
+import axios from 'axios'
 
 // Local libraries
-const RawTransaction = require('./raw-transactions')
-const SlpUtils = require('./slp/utils')
+import RawTransaction from './raw-transactions.js'
+import SlpUtils from './slp/utils.js'
 
 // let _this
 
 class PsfSlpIndexer {
   constructor (config = {}) {
     this.restURL = config.restURL
-    this.apiToken = config.apiToken
     this.authToken = config.authToken
+    // Use the shared axios instance if provided, otherwise fall back to axios
+    this.axios = config.axios || axios
 
-    if (this.authToken) {
-      // Add Basic Authentication token to the authorization header.
-      this.axiosOptions = {
-        headers: {
-          authorization: this.authToken
-        }
-      }
-    } else {
-      // Add JWT token to the authorization header.
-      this.axiosOptions = {
-        headers: {
-          authorization: `Token ${this.apiToken}`
-        }
+    this.axiosOptions = {
+      headers: {
+        authorization: this.authToken
       }
     }
 
     // Encapsulate dependencies
     this.rawTransaction = new RawTransaction(config)
     this.slpUtils = new SlpUtils(config)
-
-    // _this = this
   }
 
   /**
@@ -71,8 +60,8 @@ class PsfSlpIndexer {
    */
   async status () {
     try {
-      const response = await axios.get(
-        `${this.restURL}psf/slp/status`,
+      const response = await this.axios.get(
+        `${this.restURL}slp/status`,
         this.axiosOptions
       )
       return response.data
@@ -136,8 +125,8 @@ class PsfSlpIndexer {
 
       // Handle single address.
       if (typeof address === 'string') {
-        const response = await axios.post(
-          `${this.restURL}psf/slp/address`,
+        const response = await this.axios.post(
+          `${this.restURL}slp/address`,
           { address },
           this.axiosOptions
         )
@@ -201,8 +190,8 @@ class PsfSlpIndexer {
     try {
       // Handle single address.
       if (typeof tokenId === 'string') {
-        const response = await axios.post(
-          `${this.restURL}psf/slp/token`,
+        const response = await this.axios.post(
+          `${this.restURL}slp/token`,
           { tokenId, withTxHistory },
           this.axiosOptions
         )
@@ -293,8 +282,8 @@ class PsfSlpIndexer {
 
       // Handle single address.
       if (typeof txid === 'string') {
-        const response = await axios.post(
-          `${this.restURL}psf/slp/txid`,
+        const response = await this.axios.post(
+          `${this.restURL}slp/txid`,
           { txid },
           this.axiosOptions
         )
@@ -423,12 +412,12 @@ class PsfSlpIndexer {
    */
   async getTokenData (tokenId, withTxHistory = false) {
     try {
-      const url = `${this.restURL}psf/slp/token/data`
+      const url = `${this.restURL}slp/token/data`
       // console.log(`url: ${url}`)
 
       // Handle single address.
       if (typeof tokenId === 'string') {
-        const response = await axios.post(
+        const response = await this.axios.post(
           // 'https://bchn.fullstack.cash/v5/psf/slp/token/data/',
           url,
           { tokenId, withTxHistory },
@@ -516,12 +505,12 @@ class PsfSlpIndexer {
    */
   async getTokenData2 (tokenId, updateCache = false) {
     try {
-      const url = `${this.restURL}psf/slp/token/data2`
+      const url = `${this.restURL}slp/token/data2`
       // console.log(`url: ${url}`)
 
       // Handle single address.
       if (typeof tokenId === 'string') {
-        const response = await axios.post(
+        const response = await this.axios.post(
           // 'https://bchn.fullstack.cash/v5/psf/slp/token/data/',
           url,
           { tokenId, updateCache },
@@ -539,4 +528,4 @@ class PsfSlpIndexer {
   }
 }
 
-module.exports = PsfSlpIndexer
+export default PsfSlpIndexer

package/src/raw-transactions.js

@@ -1,33 +1,20 @@
-const axios = require('axios')
+import axios from 'axios'
 
 // let _this
 
 class RawTransactions {
   constructor (config) {
     this.restURL = config.restURL
-    this.apiToken = config.apiToken
     this.authToken = config.authToken
 
-    if (this.authToken) {
-      // Add Basic Authentication token to the authorization header.
-      this.axiosOptions = {
-        headers: {
-          authorization: this.authToken
-        }
-      }
-    } else {
-      // Add JWT token to the authorization header.
-      this.axiosOptions = {
-        headers: {
-          authorization: `Token ${this.apiToken}`
-        }
+    this.axiosOptions = {
+      headers: {
+        authorization: this.authToken
       }
     }
 
-    // Encapsulate dependencies
-    this.axios = axios
-
-    // this = this
+    // Use the shared axios instance if provided, otherwise fall back to axios
+    this.axios = config.axios || axios
   }
 
   /**
@@ -96,8 +83,8 @@ class RawTransactions {
     try {
       // Single hex
       if (typeof hex === 'string') {
-        const response = await axios.get(
-          `${this.restURL}rawtransactions/decodeRawTransaction/${hex}`,
+        const response = await this.axios.get(
+          `${this.restURL}full-node/rawtransactions/decodeRawTransaction/${hex}`,
           this.axiosOptions
         )
 
@@ -107,13 +94,13 @@ class RawTransactions {
       } else if (Array.isArray(hex)) {
         const options = {
           method: 'POST',
-          url: `${this.restURL}rawtransactions/decodeRawTransaction`,
+          url: `${this.restURL}full-node/rawtransactions/decodeRawTransaction`,
           data: {
             hexes: hex
           },
           headers: this.axiosOptions.headers
         }
-        const response = await axios(options)
+        const response = await this.axios(options)
 
         return response.data
       }
@@ -164,8 +151,8 @@ class RawTransactions {
 
     try {
       if (typeof script === 'string') {
-        const response = await axios.get(
-          `${this.restURL}rawtransactions/decodeScript/${script}`,
+        const response = await this.axios.get(
+          `${this.restURL}full-node/rawtransactions/decodeScript/${script}`,
           this.axiosOptions
         )
 
@@ -173,13 +160,13 @@ class RawTransactions {
       } else if (Array.isArray(script)) {
         const options = {
           method: 'POST',
-          url: `${this.restURL}rawtransactions/decodeScript`,
+          url: `${this.restURL}full-node/rawtransactions/decodeScript`,
           data: {
             hexes: script
           },
           headers: this.axiosOptions.headers
         }
-        const response = await axios(options)
+        const response = await this.axios(options)
 
         return response.data
       }
@@ -263,8 +250,8 @@ class RawTransactions {
         //   'getRawTransaction() this.axiosOptions: ',
         //   this.axiosOptions
         // )
-        const response = await axios.get(
-          `${this.restURL}rawtransactions/getRawTransaction/${txid}?verbose=${verbose}`,
+        const response = await this.axios.get(
+          `${this.restURL}full-node/rawtransactions/getRawTransaction/${txid}?verbose=${verbose}`,
           this.axiosOptions
         )
 
@@ -272,15 +259,15 @@ class RawTransactions {
       } else if (Array.isArray(txid)) {
         const options = {
           method: 'POST',
-          url: `${this.restURL}rawtransactions/getRawTransaction`,
+          url: `${this.restURL}full-node/rawtransactions/getRawTransaction`,
           data: {
             txids: txid,
-            verbose: verbose,
+            verbose,
             usrObj // pass user data when making an internal call.
           },
           headers: this.axiosOptions.headers
         }
-        const response = await axios(options)
+        const response = await this.axios(options)
 
         return response.data
       }
@@ -460,7 +447,7 @@ class RawTransactions {
       // Single tx hex.
       if (typeof hex === 'string') {
         const response = await this.axios.get(
-          `${this.restURL}rawtransactions/sendRawTransaction/${hex}`,
+          `${this.restURL}full-node/rawtransactions/sendRawTransaction/${hex}`,
           this.axiosOptions
         )
 
@@ -478,7 +465,7 @@ class RawTransactions {
       } else if (Array.isArray(hex)) {
         const options = {
           method: 'POST',
-          url: `${this.restURL}rawtransactions/sendRawTransaction`,
+          url: `${this.restURL}full-node/rawtransactions/sendRawTransaction`,
           data: {
             hexes: hex
           },
@@ -498,4 +485,4 @@ class RawTransactions {
   }
 }
 
-module.exports = RawTransactions
+export default RawTransactions

package/src/schnorr.js

@@ -1,24 +1,13 @@
-const schnorr = require('bip-schnorr')
+import schnorr from 'bip-schnorr'
 
 class Schnorr {
   constructor (config) {
     this.restURL = config.restURL
-    this.apiToken = config.apiToken
     this.authToken = config.authToken
 
-    if (this.authToken) {
-      // Add Basic Authentication token to the authorization header.
-      this.axiosOptions = {
-        headers: {
-          authorization: this.authToken
-        }
-      }
-    } else {
-      // Add JWT token to the authorization header.
-      this.axiosOptions = {
-        headers: {
-          authorization: `Token ${this.apiToken}`
-        }
+    this.axiosOptions = {
+      headers: {
+        authorization: this.authToken
       }
     }
   }
@@ -509,4 +498,4 @@ class Schnorr {
   }
 }
 
-module.exports = Schnorr
+export default Schnorr

package/src/script.js

@@ -1,4 +1,6 @@
-const Bitcoin = require('@psf/bitcoincashjs-lib')
+import Bitcoin from '@psf/bitcoincashjs-lib'
+import { createRequire } from 'module'
+const require = createRequire(import.meta.url)
 const opcodes = require('@psf/bitcoincash-ops')
 
 class Script {
@@ -240,4 +242,4 @@ class Script {
   }
 }
 
-module.exports = Script
+export default Script

package/src/slp/address.js

@@ -1,9 +1,9 @@
-const BCHJSAddress = require('../address')
+import BCHJSAddress from '../address.js'
+
+import bchaddrjs from 'bchaddrjs-slp'
 // const bchAddress = new BCHJSAddress()
 let bchAddress
 
-const bchaddrjs = require('bchaddrjs-slp')
-
 class Address extends BCHJSAddress {
   constructor (config) {
     super(config)
@@ -661,4 +661,4 @@ class Address extends BCHJSAddress {
   }
 }
 
-module.exports = Address
+export default Address

package/src/slp/ecpair.js

@@ -1,9 +1,9 @@
-// const BCHJS = require("../bch-js")
+// import BCHJS from "../bch-js.js"
 // const bchjs = new BCHJS()
 
-const BCHJSECPair = require('../ecpair')
+import BCHJSECPair from '../ecpair.js'
 
-const bchaddrjs = require('bchaddrjs-slp')
+import bchaddrjs from 'bchaddrjs-slp'
 
 class ECPair extends BCHJSECPair {
   /*
@@ -31,4 +31,4 @@ class ECPair extends BCHJSECPair {
   }
 }
 
-module.exports = ECPair
+export default ECPair