@psf/bch-js 6.8.2 → 7.0.1

package/src/blockchain.js

@@ -3,33 +3,22 @@
   - Add blockhash functionality back into getTxOutProof
 */
 
-const axios = require('axios')
+import axios from 'axios'
 
 // let _this
 
 class Blockchain {
   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
   }
 
   /**
@@ -52,8 +41,8 @@ class Blockchain {
    */
   async getBestBlockHash () {
     try {
-      const response = await axios.get(
-        `${this.restURL}blockchain/getBestBlockHash`,
+      const response = await this.axios.get(
+        `${this.restURL}full-node/blockchain/getBestBlockHash`,
         this.axiosOptions
       )
       return response.data
@@ -106,8 +95,8 @@ class Blockchain {
       if (!blockhash || typeof blockhash !== 'string') {
         throw new Error('blockhash must be a string')
       }
-      const response = await axios.post(
-        `${this.restURL}blockchain/getblock`,
+      const response = await this.axios.post(
+        `${this.restURL}full-node/blockchain/getblock`,
         {
           blockhash,
           verbosity
@@ -160,8 +149,8 @@ class Blockchain {
    */
   async getBlockchainInfo () {
     try {
-      const response = await axios.get(
-        `${this.restURL}blockchain/getBlockchainInfo`,
+      const response = await this.axios.get(
+        `${this.restURL}full-node/blockchain/getBlockchainInfo`,
         this.axiosOptions
       )
       return response.data
@@ -191,8 +180,8 @@ class Blockchain {
    */
   async getBlockCount () {
     try {
-      const response = await axios.get(
-        `${this.restURL}blockchain/getBlockCount`,
+      const response = await this.axios.get(
+        `${this.restURL}full-node/blockchain/getBlockCount`,
         this.axiosOptions
       )
       return response.data
@@ -227,8 +216,8 @@ class Blockchain {
     if (typeof height !== 'string') height = JSON.stringify(height)
 
     try {
-      const response = await axios.get(
-        `${this.restURL}blockchain/getBlockHash/${height}`,
+      const response = await this.axios.get(
+        `${this.restURL}full-node/blockchain/getBlockHash/${height}`,
         this.axiosOptions
       )
       return response.data
@@ -274,8 +263,8 @@ class Blockchain {
     try {
       // Handle single hash.
       if (typeof hash === 'string') {
-        const response = await axios.get(
-          `${this.restURL}blockchain/getBlockHeader/${hash}?verbose=${verbose}`,
+        const response = await this.axios.get(
+          `${this.restURL}full-node/blockchain/getBlockHeader/${hash}?verbose=${verbose}`,
           this.axiosOptions
         )
 
@@ -284,11 +273,11 @@ class Blockchain {
         // Handle array of hashes.
       } else if (Array.isArray(hash)) {
         // Dev note: must use axios.post for unit test stubbing.
-        const response = await axios.post(
-          `${this.restURL}blockchain/getBlockHeader`,
+        const response = await this.axios.post(
+          `${this.restURL}full-node/blockchain/getBlockHeader`,
           {
             hashes: hash,
-            verbose: verbose
+            verbose
           },
           this.axiosOptions
         )
@@ -335,8 +324,8 @@ class Blockchain {
    */
   async getChainTips () {
     try {
-      const response = await axios.get(
-        `${this.restURL}blockchain/getChainTips`,
+      const response = await this.axios.get(
+        `${this.restURL}full-node/blockchain/getChainTips`,
         this.axiosOptions
       )
       return response.data
@@ -367,8 +356,8 @@ class Blockchain {
    */
   async getDifficulty () {
     try {
-      const response = await axios.get(
-        `${this.restURL}blockchain/getDifficulty`,
+      const response = await this.axios.get(
+        `${this.restURL}full-node/blockchain/getDifficulty`,
         this.axiosOptions
       )
       return response.data
@@ -383,8 +372,8 @@ class Blockchain {
     if (typeof txid !== 'string') txid = JSON.stringify(txid)
 
     try {
-      const response = await axios.get(
-        `${this.restURL}blockchain/getMempoolAncestors/${txid}?verbose=${verbose}`,
+      const response = await this.axios.get(
+        `${this.restURL}full-node/blockchain/getMempoolAncestors/${txid}?verbose=${verbose}`,
         this.axiosOptions
       )
       return response.data
@@ -398,8 +387,8 @@ class Blockchain {
     if (typeof txid !== 'string') txid = JSON.stringify(txid)
 
     try {
-      const response = await axios.get(
-        `${this.restURL}blockchain/getMempoolDescendants/${txid}?verbose=${verbose}`,
+      const response = await this.axios.get(
+        `${this.restURL}full-node/blockchain/getMempoolDescendants/${txid}?verbose=${verbose}`,
         this.axiosOptions
       )
       return response.data
@@ -495,16 +484,16 @@ class Blockchain {
 
     try {
       if (typeof txid === 'string') {
-        const response = await axios.get(
-          `${this.restURL}blockchain/getMempoolEntry/${txid}`,
+        const response = await this.axios.get(
+          `${this.restURL}full-node/blockchain/getMempoolEntry/${txid}`,
           this.axiosOptions
         )
 
         return response.data
       } else if (Array.isArray(txid)) {
         // Dev note: must use axios.post for unit test stubbing.
-        const response = await axios.post(
-          `${this.restURL}blockchain/getMempoolEntry`,
+        const response = await this.axios.post(
+          `${this.restURL}full-node/blockchain/getMempoolEntry`,
           {
             txids: txid
           },
@@ -546,8 +535,8 @@ class Blockchain {
    */
   async getMempoolInfo () {
     try {
-      const response = await axios.get(
-        `${this.restURL}blockchain/getMempoolInfo`,
+      const response = await this.axios.get(
+        `${this.restURL}full-node/blockchain/getMempoolInfo`,
         this.axiosOptions
       )
       return response.data
@@ -593,8 +582,8 @@ class Blockchain {
    */
   async getRawMempool (verbose = false) {
     try {
-      const response = await axios.get(
-        `${this.restURL}blockchain/getRawMempool?vebose=${verbose}`,
+      const response = await this.axios.get(
+        `${this.restURL}full-node/blockchain/getRawMempool?vebose=${verbose}`,
         this.axiosOptions
       )
       return response.data
@@ -637,14 +626,14 @@ class Blockchain {
       }
 
       // Send the request to the REST API.
-      // const response = await axios.get(
+      // const response = await this.axios.get(
       //   `${this.restURL}blockchain/getTxOut/${txid}/${n}?includeMempool=${includeMempool}`,
       //   this.axiosOptions
       // )
-      const response = await axios.post(
-        `${this.restURL}blockchain/getTxOut`,
+      const response = await this.axios.post(
+        `${this.restURL}full-node/blockchain/getTxOut`,
         {
-          txid: txid,
+          txid,
           vout: n,
           mempool: includeMempool
         },
@@ -698,19 +687,19 @@ class Blockchain {
     try {
       // Single txid.
       if (typeof txids === 'string') {
-        const path = `${this.restURL}blockchain/getTxOutProof/${txids}`
+        const path = `${this.restURL}full-node/blockchain/getTxOutProof/${txids}`
         // if (blockhash) path = `${path}?blockhash=${blockhash}`
 
-        const response = await axios.get(path, this.axiosOptions)
+        const response = await this.axios.get(path, this.axiosOptions)
         return response.data
 
         // Array of txids.
       } else if (Array.isArray(txids)) {
         // Dev note: must use axios.post for unit test stubbing.
-        const response = await axios.post(
-          `${this.restURL}blockchain/getTxOutProof`,
+        const response = await this.axios.post(
+          `${this.restURL}full-node/blockchain/getTxOutProof`,
           {
-            txids: txids
+            txids
           },
           this.axiosOptions
         )
@@ -727,8 +716,8 @@ class Blockchain {
 
   async preciousBlock (blockhash) {
     try {
-      const response = await axios.get(
-        `${this.restURL}blockchain/preciousBlock/${blockhash}`,
+      const response = await this.axios.get(
+        `${this.restURL}full-node/blockchain/preciousBlock/${blockhash}`,
         this.axiosOptions
       )
       return response.data
@@ -740,8 +729,8 @@ class Blockchain {
 
   async pruneBlockchain (height) {
     try {
-      const response = await axios.post(
-        `${this.restURL}blockchain/pruneBlockchain/${height}`,
+      const response = await this.axios.post(
+        `${this.restURL}full-node/blockchain/pruneBlockchain/${height}`,
         this.axiosOptions
       )
       return response.data
@@ -753,8 +742,8 @@ class Blockchain {
 
   async verifyChain (checklevel = 3, nblocks = 6) {
     try {
-      const response = await axios.get(
-        `${this.restURL}blockchain/verifyChain?checklevel=${checklevel}&nblocks=${nblocks}`,
+      const response = await this.axios.get(
+        `${this.restURL}full-node/blockchain/verifyChain?checklevel=${checklevel}&nblocks=${nblocks}`,
         this.axiosOptions
       )
       return response.data
@@ -805,8 +794,8 @@ class Blockchain {
     try {
       // Single block
       if (typeof proof === 'string') {
-        const response = await axios.get(
-          `${this.restURL}blockchain/verifyTxOutProof/${proof}`,
+        const response = await this.axios.get(
+          `${this.restURL}full-node/blockchain/verifyTxOutProof/${proof}`,
           this.axiosOptions
         )
         return response.data
@@ -814,8 +803,8 @@ class Blockchain {
         // Array of hashes.
       } else if (Array.isArray(proof)) {
         // Dev note: must use axios.post for unit test stubbing.
-        const response = await axios.post(
-          `${this.restURL}blockchain/verifyTxOutProof`,
+        const response = await this.axios.post(
+          `${this.restURL}full-node/blockchain/verifyTxOutProof`,
           {
             proofs: proof
           },
@@ -833,4 +822,4 @@ class Blockchain {
   }
 }
 
-module.exports = Blockchain
+export default Blockchain

package/src/control.js

@@ -2,33 +2,22 @@
   API endpoints for basic control and information of the full node.
 */
 
-const axios = require('axios')
+import axios from 'axios'
 
 // let _this // Global reference to the instance of this class.
 
 class Control {
   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
   }
 
   /**
@@ -79,8 +68,8 @@ class Control {
    */
   async getNetworkInfo () {
     try {
-      const response = await axios.get(
-        `${this.restURL}control/getNetworkInfo`,
+      const response = await this.axios.get(
+        `${this.restURL}full-node/control/getNetworkInfo`,
         this.axiosOptions
       )
       return response.data
@@ -92,8 +81,8 @@ class Control {
 
   async getMemoryInfo () {
     try {
-      const response = await axios.get(
-        `${this.restURL}control/getMemoryInfo`,
+      const response = await this.axios.get(
+        `${this.restURL}full-node/control/getMemoryInfo`,
         this.axiosOptions
       )
       return response.data
@@ -115,4 +104,4 @@ class Control {
   // }
 }
 
-module.exports = Control
+export default Control

package/src/crypto.js

@@ -1,5 +1,5 @@
-const randomBytes = require('randombytes')
-const Bitcoin = require('@psf/bitcoincashjs-lib')
+import randomBytes from 'randombytes'
+import Bitcoin from '@psf/bitcoincashjs-lib'
 
 class Crypto {
   /**
@@ -135,4 +135,4 @@ class Crypto {
   }
 }
 
-module.exports = Crypto
+export default Crypto

package/src/dsproof.js

@@ -1,27 +1,16 @@
-const axios = require('axios')
+import axios from 'axios'
 
 let _this
 
 class DSProof {
   constructor (config) {
     this.restURL = config.restURL
-    this.apiToken = config.apiToken
     this.authToken = config.authToken
     this.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
       }
     }
 
@@ -67,7 +56,7 @@ class DSProof {
         throw new Error(`txid must be of length 64 (not ${txid.length})`)
       }
       const response = await _this.axios.get(
-        `${this.restURL}dsproof/getdsproof/${txid}`,
+        `${this.restURL}full-node/dsproof/getdsproof/${txid}`,
         this.axiosOptions
       )
       return response.data
@@ -78,4 +67,4 @@ class DSProof {
   }
 }
 
-module.exports = DSProof
+export default DSProof

package/src/ecash.js

@@ -44,4 +44,4 @@ class eCash {
   }
 }
 
-module.exports = eCash
+export default eCash

package/src/ecpair.js

@@ -1,5 +1,5 @@
-const Bitcoin = require('@psf/bitcoincashjs-lib')
-const coininfo = require('@psf/coininfo')
+import Bitcoin from '@psf/bitcoincashjs-lib'
+import coininfo from '@psf/coininfo'
 
 class ECPair {
   static setAddress (address) {
@@ -166,4 +166,4 @@ class ECPair {
   }
 }
 
-module.exports = ECPair
+export default ECPair

package/src/electrumx.js

@@ -3,10 +3,10 @@
   by FullStack.cash
 */
 // Public npm libraries
-const axios = require('axios')
+import axios from 'axios'
 
 // Local libraries.
-const Blockchain = require('./blockchain')
+import Blockchain from './blockchain.js'
 // const Address = require('./address')
 
 // let _this
@@ -14,30 +14,18 @@ const Blockchain = require('./blockchain')
 class ElectrumX {
   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.blockchain = new Blockchain(config)
-    // this.address = new Address(config)
-
-    // _this = this
   }
 
   /**
@@ -111,16 +99,16 @@ class ElectrumX {
 
       // Handle single address.
       if (typeof address === 'string') {
-        const response = await axios.get(
-          `${this.restURL}electrumx/utxos/${address}`,
+        const response = await this.axios.get(
+          `${this.restURL}fulcrum/utxos/${address}`,
           this.axiosOptions
         )
         return response.data
 
         // Handle array of addresses.
       } else if (Array.isArray(address)) {
-        const response = await axios.post(
-          `${this.restURL}electrumx/utxos`,
+        const response = await this.axios.post(
+          `${this.restURL}fulcrum/utxos`,
           {
             addresses: address
           },
@@ -195,16 +183,16 @@ class ElectrumX {
     try {
       // Handle single address.
       if (typeof address === 'string') {
-        const response = await axios.get(
-          `${this.restURL}electrumx/balance/${address}`,
+        const response = await this.axios.get(
+          `${this.restURL}fulcrum/balance/${address}`,
           this.axiosOptions
         )
         return response.data
 
         // Handle array of addresses.
       } else if (Array.isArray(address)) {
-        const response = await axios.post(
-          `${this.restURL}electrumx/balance`,
+        const response = await this.axios.post(
+          `${this.restURL}fulcrum/balance`,
           {
             addresses: address
           },
@@ -293,16 +281,16 @@ class ElectrumX {
     try {
       // Handle single address.
       if (typeof address === 'string') {
-        const response = await axios.get(
-          `${this.restURL}electrumx/transactions/${address}/${allTxs}`,
+        const response = await this.axios.get(
+          `${this.restURL}fulcrum/transactions/${address}/${allTxs}`,
           this.axiosOptions
         )
         return response.data
 
         // Handle array of addresses.
       } else if (Array.isArray(address)) {
-        const response = await axios.post(
-          `${this.restURL}electrumx/transactions`,
+        const response = await this.axios.post(
+          `${this.restURL}fulcrum/transactions`,
           {
             addresses: address,
             usrObj, // pass user data when making an internal call.
@@ -388,16 +376,16 @@ class ElectrumX {
     try {
       // Handle single address.
       if (typeof address === 'string') {
-        const response = await axios.get(
-          `${this.restURL}electrumx/unconfirmed/${address}`,
+        const response = await this.axios.get(
+          `${this.restURL}fulcrum/unconfirmed/${address}`,
           this.axiosOptions
         )
         return response.data
 
         // Handle array of addresses.
       } else if (Array.isArray(address)) {
-        const response = await axios.post(
-          `${this.restURL}electrumx/unconfirmed`,
+        const response = await this.axios.post(
+          `${this.restURL}fulcrum/unconfirmed`,
           {
             addresses: address
           },
@@ -457,8 +445,8 @@ class ElectrumX {
    */
   async blockHeader (height, count = 1) {
     try {
-      const response = await axios.get(
-        `${this.restURL}electrumx/block/headers/${height}?count=${count}`,
+      const response = await this.axios.get(
+        `${this.restURL}fulcrum/block/headers/${height}?count=${count}`,
         this.axiosOptions
       )
       return response.data
@@ -548,14 +536,14 @@ class ElectrumX {
     try {
       // Handle single transaction.
       if (typeof txid === 'string') {
-        const response = await axios.get(
-          `${this.restURL}electrumx/tx/data/${txid}`,
+        const response = await this.axios.get(
+          `${this.restURL}fulcrum/tx/data/${txid}`,
           this.axiosOptions
         )
         return response.data
       } else if (Array.isArray(txid)) {
-        const response = await axios.post(
-          `${this.restURL}electrumx/tx/data`,
+        const response = await this.axios.post(
+          `${this.restURL}fulcrum/tx/data`,
           {
             txids: txid
           },
@@ -596,8 +584,8 @@ class ElectrumX {
   async broadcast (txHex) {
     try {
       if (typeof txHex === 'string') {
-        const response = await axios.post(
-          `${this.restURL}electrumx/tx/broadcast`,
+        const response = await this.axios.post(
+          `${this.restURL}fulcrum/tx/broadcast`,
           { txHex },
           this.axiosOptions
         )
@@ -727,4 +715,4 @@ class ElectrumX {
   }
 }
 
-module.exports = ElectrumX
+export default ElectrumX

package/src/encryption.js

@@ -2,33 +2,24 @@
   This library contains useful functions that deal with encryption.
 */
 
-const axios = require('axios')
+import axios from 'axios'
 
 let _this
 
 class Encryption {
   constructor (config) {
     this.restURL = config.restURL
-    this.apiToken = config.apiToken
-    this.axios = axios
     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
       }
     }
 
+    // Use the shared axios instance if provided, otherwise fall back to axios
+    this.axios = config.axios || axios
+
     _this = this
   }
 
@@ -73,4 +64,4 @@ class Encryption {
   }
 }
 
-module.exports = Encryption
+export default Encryption