@psf/bch-js 6.8.3 → 7.0.2

package/src/slp/nft1.js

@@ -9,18 +9,18 @@
 */
 
 // Public npm libraries
-// const axios = require('axios')
+// import axios from 'axios'
 
 // Local libraries.
-const Address = require('./address')
+import Address from './address.js'
 
-// const BigNumber = require('bignumber.js')
-const slpMdm = require('slp-mdm')
+// import BigNumber from 'bignumber.js'
+import slpMdm from 'slp-mdm'
+import TransactionBuilder from '../transaction-builder.js'
 
 // let _this
 // const addy = new Address()
 let addy
-const TransactionBuilder = require('../transaction-builder')
 
 class Nft1 {
   constructor (config) {
@@ -421,4 +421,4 @@ class Nft1 {
   }
 }
 
-module.exports = Nft1
+export default Nft1

package/src/slp/slp.js

@@ -7,34 +7,23 @@
 
 // imports
 // require deps
-// const BCHJS = require("../bch-js")
-const Address = require('./address')
-const ECPair = require('./ecpair')
-// const HDNode = require("./hdnode")
-const TokenType1 = require('./tokentype1')
-const NFT1 = require('./nft1')
-const Utils = require('./utils')
+// import BCHJS from "../bch-js.js"
+import Address from './address.js'
+import ECPair from './ecpair.js'
+// import HDNode from "./hdnode.js"
+import TokenType1 from './tokentype1.js'
+import NFT1 from './nft1.js'
+import Utils from './utils.js'
 
 // SLP is a superset of BITBOX
 class SLP {
   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
       }
     }
 
@@ -46,4 +35,4 @@ class SLP {
   }
 }
 
-module.exports = SLP
+export default SLP

package/src/slp/tokentype1.js

@@ -2,41 +2,30 @@
   This library handles the OP_RETURN of SLP TokenType1 transactions.
 */
 
-// const BCHJS = require("../bch-js")
+// import BCHJS from "../bch-js.js"
 // const bchjs = new BCHJS()
 
-const Address = require('./address')
-const Script = require('../script')
+import Address from './address.js'
+import Script from '../script.js'
 
-const BigNumber = require('bignumber.js')
-const slpMdm = require('slp-mdm')
-const axios = require('axios')
+import BigNumber from 'bignumber.js'
+import slpMdm from 'slp-mdm'
+import axios from 'axios'
+import TransactionBuilder from '../transaction-builder.js'
 
 // const addy = new Address()
 let addy
-const TransactionBuilder = require('../transaction-builder')
 
 let _this // local global
 
 class TokenType1 {
   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
       }
     }
 
@@ -483,4 +472,4 @@ class TokenType1 {
   }
 }
 
-module.exports = TokenType1
+export default TokenType1

package/src/slp/utils.js

@@ -1,35 +1,25 @@
 /* eslint-disable no-useless-catch */
 
 // Public npm libraries
-const axios = require('axios')
-const slpParser = require('slp-parser')
+import axios from 'axios'
+import slpParser from 'slp-parser'
 
 // Local libraries
-const Util = require('../util')
+import Util from '../util.js'
 
 let _this
 
 class Utils {
   constructor (config = {}) {
     this.restURL = config.restURL
-    this.apiToken = config.apiToken
     this.slpParser = slpParser
     this.authToken = config.authToken
-    this.axios = axios
+    // 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
       }
     }
 
@@ -184,4 +174,4 @@ class Utils {
   }
 }
 
-module.exports = Utils
+export default Utils

package/src/transaction-builder.js

@@ -1,7 +1,7 @@
-const Bitcoin = require('@psf/bitcoincashjs-lib')
-const coininfo = require('@psf/coininfo')
-const bip66 = require('bip66')
-const bip68 = require('bc-bip68')
+import Bitcoin from '@psf/bitcoincashjs-lib'
+import coininfo from '@psf/coininfo'
+import bip66 from 'bip66'
+import bip68 from 'bc-bip68'
 
 class TransactionBuilder {
   static setAddress (address) {
@@ -163,4 +163,4 @@ class TransactionBuilder {
   }
 }
 
-module.exports = TransactionBuilder
+export default TransactionBuilder

package/src/transaction.js

@@ -6,10 +6,10 @@
 // const BigNumber = require('bignumber.js')
 
 // Local libraries
-const RawTransaction = require('./raw-transactions')
-const SlpUtils = require('./slp/utils')
-const Blockchain = require('./blockchain')
-const PsfSlpIndexer = require('./psf-slp-indexer')
+import RawTransaction from './raw-transactions.js'
+import SlpUtils from './slp/utils.js'
+import Blockchain from './blockchain.js'
+import PsfSlpIndexer from './psf-slp-indexer.js'
 
 class Transaction {
   constructor (config = {}) {
@@ -77,4 +77,4 @@ class Transaction {
   }
 }
 
-module.exports = Transaction
+export default Transaction

package/src/util.js

@@ -1,30 +1,17 @@
-const axios = require('axios')
+// import axios from 'axios'
 
 // let _this
 
 class Util {
   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
       }
     }
-
-    // _this = this
   }
 
   /**
@@ -223,86 +210,6 @@ class Util {
   sleep (ms) {
     return new Promise(resolve => setTimeout(resolve, ms))
   }
-
-  /**
-   * @api Util.validateAddress() validateAddress()
-   * @apiName Validate Address.
-   * @apiGroup Util
-   * @apiDescription Return information about the given bitcoin address.
-   *
-   * @apiExample Example usage:
-   * (async () => {
-   *   try {
-   *     let validateAddress = await bchjs.Util.validateAddress("bitcoincash:qzc86hrdufhcwlyzk7k82x77kfs2myekn57nv9cw5f");
-   *     console.log(validateAddress);
-   *   } catch(error) {
-   *    console.error(error)
-   *   }
-   * })()
-   *
-   * // { isvalid: true,
-   * // address: '17fshh33qUze2yifiJ2sXgijSMzJ2KNEwu',
-   * // scriptPubKey: '76a914492ae280d70af33acf0ae7cd329b961e65e9cbd888ac',
-   * // ismine: true,
-   * // iswatchonly: false,
-   * // isscript: false,
-   * // pubkey: '0312eeb9ae5f14c3cf43cece11134af860c2ef7d775060e3a578ceec888acada31',
-   * // iscompressed: true,
-   * // account: 'Test' }
-   *
-   * (async () => {
-   *   try {
-   *     let validateAddress = await bchjs.Util.validateAddress(["bitcoincash:qzc86hrdufhcwlyzk7k82x77kfs2myekn57nv9cw5f"]);
-   *     console.log(validateAddress);
-   *   } catch(error) {
-   *    console.error(error)
-   *   }
-   * })()
-   *
-   * // [{ isvalid: true,
-   * // address: '17fshh33qUze2yifiJ2sXgijSMzJ2KNEwu',
-   * // scriptPubKey: '76a914492ae280d70af33acf0ae7cd329b961e65e9cbd888ac',
-   * // ismine: true,
-   * // iswatchonly: false,
-   * // isscript: false,
-   * // pubkey: '0312eeb9ae5f14c3cf43cece11134af860c2ef7d775060e3a578ceec888acada31',
-   * // iscompressed: true,
-   * // account: 'Test' }]
-   */
-  async validateAddress (address) {
-    try {
-      // Single block
-      if (typeof address === 'string') {
-        const response = await axios.get(
-          `${this.restURL}util/validateAddress/${address}`,
-          this.axiosOptions
-        )
-        return response.data
-
-        // Array of blocks.
-      } else if (Array.isArray(address)) {
-        const options1 = {
-          method: 'POST',
-          url: `${this.restURL}util/validateAddress`,
-          data: {
-            addresses: address
-          }
-          // headers: {
-          //   authorization: `Token ${this.apiToken}`
-          // }
-        }
-        const options = Object.assign({}, options1, this.axiosOptions)
-        const response = await axios(options)
-
-        return response.data
-      }
-
-      throw new Error('Input must be a string or array of strings.')
-    } catch (error) {
-      if (error.response && error.response.data) throw error.response.data
-      else throw error
-    }
-  }
 }
 
-module.exports = Util
+export default Util

package/src/utxo.js

@@ -6,11 +6,11 @@
 */
 
 // Local libraries
-const Electrumx = require('./electrumx')
-const Slp = require('./slp/slp')
-const PsfSlpIndexer = require('./psf-slp-indexer')
-const BigNumber = require('bignumber.js')
-const Blockchain = require('./blockchain')
+import Electrumx from './electrumx.js'
+import Slp from './slp/slp.js'
+import PsfSlpIndexer from './psf-slp-indexer.js'
+import BigNumber from 'bignumber.js'
+import Blockchain from './blockchain.js'
 
 class UTXO {
   constructor (config = {}) {
@@ -420,4 +420,4 @@ class UTXO {
   }
 }
 
-module.exports = UTXO
+export default UTXO

package/test/e2e/bch-js-e2e-tests.js

@@ -2,10 +2,11 @@
   A Mocha test file for running end-to-end (e2e) tests.
 */
 
-// const mocha = require("mocha")
-const assert = require('chai').assert
+// import mocha from "mocha"
+import chai from 'chai'
 
-const sendToken = require('./send-token/send-token')
+import sendToken from './send-token/send-token.js'
+const { assert } = chai
 
 describe('#end-to-end tests', () => {
   describe('#send-tokens', () => {

package/test/e2e/ipfs/ipfs-e2e.js

@@ -3,12 +3,18 @@
   IPFS is working.
 */
 
-process.env.IPFS_API = 'http://localhost:5001'
+import { fileURLToPath } from 'url'
+import { dirname } from 'path'
 // process.env.IPFS_API = `https://ipfs-api.fullstack.cash`
 
-const BCHJS = require('../../../src/bch-js')
+import BCHJS from '../../../src/bch-js.js'
+
+process.env.IPFS_API = 'http://localhost:5001'
 const bchjs = new BCHJS()
 
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
+
 describe('#IPFS', () => {
   it('should upload a file to the server', async () => {
     const path = `${__dirname.toString()}/ipfs-e2e.js`

package/test/e2e/rate-limits/anonymous-rate-limits.js

@@ -12,13 +12,14 @@
   mocha --timeout=30000 anonymous-rate-limits.js
 */
 
-const assert = require('chai').assert
+import chai from 'chai'
+// const RESTURL = `http://localhost:3000/v5/`
+
+import BCHJS from '../../../src/bch-js.js'
+const { assert } = chai
 
 // const RESTURL = `https://abc.fullstack.cash/v5/`
 const RESTURL = 'https://bchn.fullstack.cash/v5/'
-// const RESTURL = `http://localhost:3000/v5/`
-
-const BCHJS = require('../../../src/bch-js')
 const bchjs = new BCHJS({ restURL: RESTURL })
 
 describe('#anonymous rate limits', () => {

package/test/e2e/rate-limits/basic-auth-rate-limits.js

@@ -7,11 +7,12 @@
   - Update the PRO_PASS value with a current PRO_PASSES string used by bch-api.
 */
 
-const assert = require('chai').assert
+import chai from 'chai'
 
-const PRO_PASS = 'testpassword'
+import BCHJS from '../../../src/bch-js.js'
+const { assert } = chai
 
-const BCHJS = require('../../../src/bch-js')
+const PRO_PASS = 'testpassword'
 const bchjs = new BCHJS({
   // restURL: `https://bchn.fullstack.cash/v5/`,
   restURL: 'https://abc.fullstack.cash/v5/',

package/test/e2e/rate-limits/free-rate-limits.js

@@ -11,12 +11,13 @@
   - Update the JWT_TOKEN value with a current free-level JWT token.
 */
 
-const assert = require('chai').assert
+import chai from 'chai'
+
+import BCHJS from '../../../src/bch-js.js'
+const { assert } = chai
 
 const JWT_TOKEN =
   'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjVlODhhY2YyMDIyMWMxMDAxMmFkOTQwMSIsImVtYWlsIjoiZGVtb0BkZW1vLmNvbSIsImFwaUxldmVsIjoxMCwicmF0ZUxpbWl0IjozLCJpYXQiOjE2MDQ4NTQ2OTEsImV4cCI6MTYwNzQ0NjY5MX0.iwse0z0KDKHx9graCxcOwj6lSlfKQAb1zLhmjvygvts'
-
-const BCHJS = require('../../../src/bch-js')
 const bchjs = new BCHJS({
   restURL: 'https://api.fullstack.cash/v5/',
   // restURL: `http://localhost:3000/v5/`,

package/test/e2e/rate-limits/full-node-rate-limits.js

@@ -11,12 +11,13 @@
   - Update the JWT_TOKEN value with a paid tier JWT token.
 */
 
-const assert = require('chai').assert
+import chai from 'chai'
+
+import BCHJS from '../../../src/bch-js.js'
+const { assert } = chai
 
 const JWT_TOKEN =
   'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjVlODhhY2JmMDIyMWMxMDAxMmFkOTNmZiIsImVtYWlsIjoiY2hyaXMudHJvdXRuZXJAZ21haWwuY29tIiwiYXBpTGV2ZWwiOjQwLCJyYXRlTGltaXQiOjMsImlhdCI6MTYwMzIyNzEwNCwiZXhwIjoxNjA1ODE5MTA0fQ.CV36grzdD36Ht3BwZGHG4XU40CVDzMRw9Ars1x1r27M'
-
-const BCHJS = require('../../../src/bch-js')
 const bchjs = new BCHJS({
   // restURL: `https://bchn.fullstack.cash/v5/`,
   restURL: 'https:/abc.fullstack.cash/v5/',

package/test/e2e/rate-limits/indexer-rate-limits.js

@@ -7,12 +7,13 @@
   - Update the JWT_TOKEN value with a current indexer-level JWT token.
 */
 
-const assert = require('chai').assert
+import chai from 'chai'
+
+import BCHJS from '../../../src/bch-js.js'
+const { assert } = chai
 
 const JWT_TOKEN =
   'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjVlODhhY2JmMDIyMWMxMDAxMmFkOTNmZiIsImVtYWlsIjoiY2hyaXMudHJvdXRuZXJAZ21haWwuY29tIiwiYXBpTGV2ZWwiOjQwLCJyYXRlTGltaXQiOjMsImlhdCI6MTYwMzIyNzEwNCwiZXhwIjoxNjA1ODE5MTA0fQ.CV36grzdD36Ht3BwZGHG4XU40CVDzMRw9Ars1x1r27M'
-
-const BCHJS = require('../../../src/bch-js')
 const bchjs = new BCHJS({
   // restURL: `https://bchn.fullstack.cash/v5/`,
   restURL: 'https://abc.fullstack.cash/v5/',

package/test/e2e/send-raw-transaction-bulk/sendrawtransaction.js

@@ -18,26 +18,33 @@ const RECV_ADDR2 = 'bchtest:qz6yw0kqgfkknfy6jh2jvlfnkzmre3lt2u0pgcckdk'
 const SATOSHIS_TO_SEND = 1000
 
 // Instantiate BITBOX.
-const bitboxLib = '../../../lib/BITBOX'
-const BITBOXSDK = require(bitboxLib)
-const BITBOX = new BITBOXSDK({ restURL: 'https://trest.bitcoin.com/v2/' })
-// const BITBOX = new BITBOXSDK({ restURL: "http://localhost:3000/v2/" })
-
-// const util = require('util')
+// Note: Dynamic require with variable - use dynamic import in ESM
+const bitboxLib = '../../../lib/BITBOX.js'
+let BITBOXSDK, BITBOX, walletInfo
 
 // Open the wallet generated with create-wallet.
-let walletInfo = {}
-try {
-  walletInfo = require('./wallet.json')
-} catch (err) {
-  console.log(
-    'Could not open wallet.json. Generate a wallet with create-wallet first.'
-  )
-  process.exit(0)
-}
+let SEND_ADDR, SEND_MNEMONIC
+
+// Load dependencies asynchronously
+async function loadDependencies () {
+  BITBOXSDK = (await import(bitboxLib)).default
+  BITBOX = new BITBOXSDK({ restURL: 'https://trest.bitcoin.com/v2/' })
+  // const BITBOX = new BITBOXSDK({ restURL: "http://localhost:3000/v2/" })
 
-const SEND_ADDR = walletInfo.cashAddress
-const SEND_MNEMONIC = walletInfo.mnemonic
+  try {
+    const { createRequire } = await import('module')
+    const require = createRequire(import.meta.url)
+    walletInfo = require('./wallet.json')
+  } catch (err) {
+    console.log(
+      'Could not open wallet.json. Generate a wallet with create-wallet first.'
+    )
+    process.exit(0)
+  }
+
+  SEND_ADDR = walletInfo.cashAddress
+  SEND_MNEMONIC = walletInfo.mnemonic
+}
 
 async function testSend () {
   try {
@@ -57,7 +64,10 @@ async function testSend () {
     console.log('Error in testSend: ', err)
   }
 }
-testSend()
+// Load dependencies then run test
+loadDependencies().then(() => {
+  testSend()
+})
 
 // Build a TX hex with the largest UTXO.
 async function buildTx1 (recAddr) {

package/test/e2e/send-raw-transaction-single/sendrawtransaction.js

@@ -17,26 +17,33 @@ const RECV_ADDR1 = 'bchtest:qzfn2mly05t6fjsh5kjj0dqq0jjtct27ng089dgg05'
 const SATOSHIS_TO_SEND = 1000
 
 // Instantiate BITBOX.
-const bitboxLib = '../../../lib/BITBOX'
-const BITBOXSDK = require(bitboxLib)
-const BITBOX = new BITBOXSDK({ restURL: 'https://trest.bitcoin.com/v2/' })
-// const BITBOX = new BITBOXSDK({ restURL: "http://localhost:3000/v2/" })
-
-// const util = require('util')
+// Note: Dynamic require with variable - use dynamic import in ESM
+const bitboxLib = '../../../lib/BITBOX.js'
+let BITBOXSDK, BITBOX, walletInfo
 
 // Open the wallet generated with create-wallet.
-let walletInfo = {}
-try {
-  walletInfo = require('./wallet.json')
-} catch (err) {
-  console.log(
-    'Could not open wallet.json. Generate a wallet with create-wallet first.'
-  )
-  process.exit(0)
-}
+let SEND_ADDR, SEND_MNEMONIC
+
+// Load dependencies asynchronously
+async function loadDependencies () {
+  BITBOXSDK = (await import(bitboxLib)).default
+  BITBOX = new BITBOXSDK({ restURL: 'https://trest.bitcoin.com/v2/' })
+  // const BITBOX = new BITBOXSDK({ restURL: "http://localhost:3000/v2/" })
 
-const SEND_ADDR = walletInfo.cashAddress
-const SEND_MNEMONIC = walletInfo.mnemonic
+  try {
+    const { createRequire } = await import('module')
+    const require = createRequire(import.meta.url)
+    walletInfo = require('./wallet.json')
+  } catch (err) {
+    console.log(
+      'Could not open wallet.json. Generate a wallet with create-wallet first.'
+    )
+    process.exit(0)
+  }
+
+  SEND_ADDR = walletInfo.cashAddress
+  SEND_MNEMONIC = walletInfo.mnemonic
+}
 
 async function testSend () {
   try {
@@ -54,7 +61,10 @@ async function testSend () {
     console.log('Error in testSend: ', err)
   }
 }
-testSend()
+// Load dependencies then run test
+loadDependencies().then(() => {
+  testSend()
+})
 
 // Build a TX hex with the largest UTXO.
 async function buildTx1 (recAddr) {

package/test/e2e/send-token/send-token.js

@@ -8,7 +8,9 @@
 */
 
 // Inspect utility used for debugging.
-const util = require('util')
+import util from 'util'
+
+import lib from '../util/e2e-util.js'
 util.inspect.defaultOptions = {
   showHidden: true,
   colors: true,
@@ -21,8 +23,6 @@ util.inspect.defaultOptions = {
 const WALLET1 = '../wallet1.json'
 const WALLET2 = '../wallet2.json'
 
-const lib = require('../util/e2e-util')
-
 // The main test function.
 // Sends a token and reports on how long it takes to show up in SLPDB production.
 async function sendTokenTest () {
@@ -95,6 +95,6 @@ function sleep (ms) {
   return new Promise(resolve => setTimeout(resolve, ms))
 }
 
-module.exports = {
+export default {
   sendTokenTest
 }