Merge pull request #220 from Permissionless-Software-Foundation/ct-unstable

Removing SLPDB endpoints
feat(slpdb): Removing endpoints that expect SLPDB interface
2026-09-22 00:52:01 -07:00 · 2022-03-14 15:54:49 -07:00 · 2022-03-14 15:50:21 -07:00 · 2022-03-14 15:13:41 -07:00 · 2022-03-14 14:49:28 -07:00 · 2022-03-14 14:43:52 -07:00
19 changed files with 4828 additions and 7046 deletions
@@ -0,0 +1,8 @@
+[
+  {
+    "srcDir": "",
+    "destDir": "",
+    "files": "**/*.js",
+    "command": "npm run lint"
+  }
+]
@@ -1,8 +1,7 @@
-Copyright 2021 Permissionless Software Foundation contributors
+Copyright 2022 Permissionless Software Foundation contributors

 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software

 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
@@ -1,7 +1,7 @@
 {
  "name": "@psf/bch-js",
-  "version": "5.0.0",
-  "description": "The FullStack.cash JavaScript library for Bitcoin Cash and SLP Tokens",
+  "version": "6.0.0",
+  "description": "A JavaScript library for working with Bitcoin Cash, eCash, and SLP Tokens",
  "author": "Chris Troutner <chris.troutner@gmail.com>",
  "contributors": [
    "Gabriel Cardona <gabriel@bitcoin.com>",
@@ -37,14 +37,12 @@
    "url": "git+https://github.com/Permissionless-Software-Foundation/bch-js.git"
  },
  "dependencies": {
-    "@psf/bip21": "2.0.1",
    "@chris.troutner/bip32-utils": "1.0.5",
+    "@psf/bip21": "2.0.1",
    "@psf/bitcoincash-ops": "2.0.0",
    "@psf/bitcoincashjs-lib": "4.0.2",
    "@psf/coininfo": "4.0.0",
-    "@uppy/core": "1.10.4",
-    "@uppy/tus": "1.5.12",
-    "axios": "^0.21.4",
+    "axios": "0.26.1",
    "bc-bip68": "1.0.5",
    "bchaddrjs-slp": "0.2.5",
    "bigi": "1.4.2",
@@ -65,7 +63,7 @@
    "wif": "2.0.6"
  },
  "devDependencies": {
-    "apidoc": "0.17.7",
+    "apidoc": "0.50.5",
    "assert": "2.0.0",
    "chai": "4.1.2",
    "coveralls": "3.0.2",
@@ -75,12 +73,12 @@
    "eslint-plugin-node": "11.1.0",
    "eslint-plugin-prettier": "3.3.1",
    "eslint-plugin-standard": "4.0.0",
-    "husky": "^4.3.8",
+    "husky": "4.3.8",
    "lodash.clonedeep": "4.5.0",
-    "mocha": "9.1.3",
+    "mocha": "9.2.1",
    "node-mocks-http": "1.7.0",
    "nyc": "15.1.0",
-    "semantic-release": "18.0.0",
+    "semantic-release": "^19.0.2",
    "sinon": "9.2.2",
    "standard": "^16.0.4"
  },
@@ -28,7 +28,6 @@ const Script = require('./script')
 const Price = require('./price')
 const Schnorr = require('./schnorr')
 const SLP = require('./slp/slp')
-const IPFS = require('./ipfs')
 const Encryption = require('./encryption')
 const Utxo = require('./utxo')
 const Transaction = require('./transaction')
@@ -111,7 +110,6 @@ class BCHJS {
    this.SLP = new SLP(libConfig)
    this.SLP.HDNode = this.HDNode

-    this.IPFS = new IPFS()
    this.Utxo = new Utxo(libConfig)
    this.Transaction = new Transaction(libConfig)

@@ -1,454 +0,0 @@
-/*
-  This library interacts with the IPFS REST API at FullStack.cash for uploading
-  and downloading data from the IPFS network.
-*/
-
-const axios = require('axios')
-const Uppy = require('@uppy/core')
-const Tus = require('@uppy/tus')
-const fs = require('fs')
-
-let _this
-
-class IPFS {
-  constructor (config) {
-    this.IPFS_API = process.env.IPFS_API
-      ? process.env.IPFS_API
-      : 'https://ipfs-file-upload.fullstackcash.nl'
-    // : `http://localhost:5001`
-
-    // Default options when calling axios.
-    this.axiosOptions = {
-      headers: {
-        // authorization: `Token ${this.apiToken}`,
-        timeout: 15000 // Timeout if the server does not respond in time.
-      }
-    }
-
-    _this = this
-
-    _this.axios = axios
-    _this.fs = fs
-
-    // Initialize Uppy
-    _this.uppy = _this.initUppy()
-  }
-
-  // Initializes Uppy, which is used for file uploads.
-  initUppy () {
-    const uppy = Uppy({
-      allowMultipleUploads: false,
-      meta: { test: 'avatar' },
-      debug: false,
-      restrictions: {
-        maxFileSize: null,
-        maxNumberOfFiles: 1,
-        minNumberOfFiles: 1,
-        allowedFileTypes: null // type of files allowed to load
-      }
-    })
-    uppy.use(Tus, { endpoint: `${_this.IPFS_API}/uppy-files` })
-
-    return uppy
-  }
-
-  /**
-   * @api IPFS.createFileModelServer()  createFileModelServer()
-   * @apiName createFileModelServer()
-   * @apiGroup IPFS
-   * @apiDescription Creates a new model on the server. If successful, will
-   * return an object with file data. That object contains a BCH address,
-   * payment amount, and _id required to be able to upload a file.
-   *
-   * @apiExample Example usage:
-   * (async () => {
-   *   try {
-   *     const path = `${__dirname}/ipfs.js`
-   *     let fileData = await bchjs.IPFS.createFileModelServer(path);
-   *     console.log(fileData);
-   *   } catch(error) {
-   *    console.error(error)
-   *   }
-   * })()
-   *
-   * {
-   *   "success": true,
-   *   "hostingCostBCH": 0.00004197,
-   *   "hostingCostUSD": 0.01,
-   *   "file": {
-   *   "payloadLink": "",
-   *   "hasBeenPaid": false,
-   *   "_id": "5ec562319bfacc745e8d8a52",
-   *   "schemaVersion": 1,
-   *   "size": 4458,
-   *   "fileName": "ipfs.js",
-   *   "fileExtension": "js",
-   *   "createdTimestamp": "1589994033.655",
-   *   "hostingCost": 4196,
-   *   "walletIndex": 49,
-   *   "bchAddr": "bchtest:qzrpkevu7h2ayfa4rjx08r5elvpfu72dg567x3mh3c",
-   *   "__v": 0
-   * }
-   */
-  async createFileModelServer (path) {
-    try {
-      // Ensure the file exists.
-      if (!_this.fs.existsSync(path)) {
-        throw new Error(`Could not find this file: ${path}`)
-      }
-
-      // Read in the file.
-      const fileBuf = _this.fs.readFileSync(path)
-      // console.log(`fileBuf: `, fileBuf)
-
-      // console.log(`Buffer length: ${fileBuf.length}`)
-
-      // Get the file name from the path.
-      const splitPath = path.split('/')
-      const fileName = splitPath[splitPath.length - 1]
-
-      // Get the file extension.
-      const splitExt = fileName.split('.')
-      const fileExt = splitExt[splitExt.length - 1]
-
-      const fileObj = {
-        schemaVersion: 1,
-        size: fileBuf.length,
-        fileName: fileName,
-        fileExtension: fileExt
-      }
-      // console.log(`fileObj: ${JSON.stringify(fileObj, null, 2)}`)
-
-      const fileData = await _this.axios.post(`${this.IPFS_API}/files`, {
-        file: fileObj
-      })
-      // console.log(`fileData.data: ${JSON.stringify(fileData.data, null, 2)}`)
-
-      return fileData.data
-    } catch (err) {
-      console.error('Error in createFileModel()')
-      throw err
-    }
-  }
-
-  /**
-   * @api IPFS.uploadFileServer()  uploadFileServer()
-   * @apiName uploadFile()
-   * @apiGroup IPFS
-   * @apiDescription Upload a file to the FullStack.cash IPFS server. If
-   * successful, it will return an object with an ID, a BCH address, and an
-   * amount of BCH to pay.
-   *
-   * @apiExample Example usage:
-   * (async () => {
-   *   try {
-   *     const path = `${__dirname}/ipfs.js`
-   *     let fileData = await bchjs.IPFS.uploadFileServer(path, "5ec562319bfacc745e8d8a52");
-   *     console.log(fileData);
-   *   } catch(error) {
-   *    console.error(error)
-   *   }
-   * })()
-   *
-   * {
-   *   "schemaVersion": 1,
-   *   "size": 2374,
-   *   "fileId": "5ec562319bfacc745e8d8a52",
-   *   "fileName": "ipfs.js",
-   *   "fileExtension": "js"
-   * }
-   */
-  async uploadFileServer (path, modelId) {
-    try {
-      // Ensure the file exists.
-      if (!_this.fs.existsSync(path)) {
-        throw new Error(`Could not find this file: ${path}`)
-      }
-
-      if (!modelId) {
-        throw new Error(
-          'Must include a file model ID in order to upload a file.'
-        )
-      }
-
-      // Read in the file.
-      const fileBuf = _this.fs.readFileSync(path)
-
-      // Get the file name from the path.
-      const splitPath = path.split('/')
-      const fileName = splitPath[splitPath.length - 1]
-
-      // Prepare the upload object. Get a file ID from Uppy.
-      const id = _this.uppy.addFile({
-        name: fileName,
-        data: fileBuf,
-        source: 'Local',
-        isRemote: false
-      })
-      // console.log(`id: ${JSON.stringify(id, null, 2)}`)
-
-      // Add the model ID, required to be allowed to upload the file.
-      _this.uppy.setFileMeta(id, { fileModelId: modelId })
-
-      // Upload the file to the server.
-      const upData = await _this.uppy.upload()
-
-      if (upData.failed.length) {
-        throw new Error('The file could not be uploaded')
-      }
-
-      if (upData.successful.length) {
-        delete upData.successful[0].data
-        // console.log(`upData: ${JSON.stringify(upData, null, 2)}`)
-
-        const fileObj = {
-          schemaVersion: 1,
-          size: upData.successful[0].progress.bytesTotal,
-          fileId: upData.successful[0].meta.fileModelId,
-          fileName: upData.successful[0].name,
-          fileExtension: upData.successful[0].extension
-        }
-        // console.log(`fileObj: ${JSON.stringify(fileObj, null, 2)}`)
-
-        return fileObj
-        // return true
-      }
-
-      return false
-    } catch (err) {
-      console.error('Error in bch-js/src/ipfs.js/upload(): ')
-      throw err
-    }
-  }
-
-  /**
-   * @api IPFS.getStatus()  getStatus()
-   * @apiName getStatus()
-   * @apiGroup IPFS
-   * @apiDescription Gets the status of the uploaded file. Will return an object
-   * that indicates the payment status. If the file is paid, it should contain
-   * an IPFS hash.
-   *
-   * @apiExample Example usage:
-   * (async () => {
-   *   try {
-   *     const modelId = "5ec7392c2acfe57aa62e945a"
-   *     let fileData = await bchjs.IPFS.getStatus(modelId)
-   *     console.log(fileData)
-   *   } catch(error) {
-   *    console.error(error)
-   *   }
-   * })()
-   *
-   * {
-   *    "hasBeenPaid": true,
-   *    "satCost": 4403,
-   *    "bchAddr": "bchtest:qz5z82u0suqh80x5tfx4ht8kdrkkw664vcy44uz0wk",
-   *    "ipfsHash": "QmRDHPhY5hCNVRMVQvS2H9uty8P1skdwgLaHpUAkEvsjcE",
-   *    "fileId": "5ec7392c2acfe57aa62e945a",
-   *    "fileName": "ipfs-e2e.js"
-   * }
-   */
-  async getStatus (modelId) {
-    try {
-      if (!modelId) throw new Error('Must include a file model ID.')
-
-      const fileData = await _this.axios.get(
-        `${this.IPFS_API}/files/${modelId}`
-      )
-      // console.log(`fileData.data: ${JSON.stringify(fileData.data, null, 2)}`)
-
-      const fileObj = {
-        hasBeenPaid: fileData.data.file.hasBeenPaid,
-        satCost: fileData.data.file.hostingCost,
-        bchAddr: fileData.data.file.bchAddr,
-        ipfsHash: fileData.data.file.payloadLink,
-        fileId: fileData.data.file._id,
-        fileName: fileData.data.file.fileName
-      }
-
-      return fileObj
-    } catch (err) {
-      console.error('Error in getStatus()')
-      throw err
-    }
-  }
-
-  /**
-   * @api IPFS.createFileModelWeb()  createFileModelWeb()
-   * @apiName createFileModelWeb()
-   * @apiGroup IPFS
-   * @apiDescription Creates a new model on the server. If successful, will
-   * return an object with file data. That object contains a BCH address,
-   * payment amount, and _id required to be able to upload a file.
-   *
-   * @apiExample Example usage:
-   * (async () => {
-   *   try {
-   *     const content = ['PSF']
-   *     const name = 'psf.txt' // Content can be Array , ArrayBuffer , Blob
-   *     const options = { type: "text/plain" }
-   *     const file =  new File(content,name,options)
-   *     let fileData = await bchjs.IPFS.createFileModelWeb(file);
-   *     console.log(fileData);
-   *   } catch(error) {
-   *    console.error(error)
-   *   }
-   * })()
-   *
-   * {
-   *   "success": true,
-   *   "hostingCostBCH": 0.00004197,
-   *   "hostingCostUSD": 0.01,
-   *   "file": {
-   *   "payloadLink": "",
-   *   "hasBeenPaid": false,
-   *   "_id": "5ec562319bfacc745e8d8a52",
-   *   "schemaVersion": 1,
-   *   "size": 4458,
-   *   "fileName": "ipfs.js",
-   *   "fileExtension": "js",
-   *   "createdTimestamp": "1589994033.655",
-   *   "hostingCost": 4196,
-   *   "walletIndex": 49,
-   *   "bchAddr": "bchtest:qzrpkevu7h2ayfa4rjx08r5elvpfu72dg567x3mh3c",
-   *   "__v": 0
-   * }
-   */
-  async createFileModelWeb (file) {
-    try {
-      if (!file) throw new Error('File is required')
-
-      const { name, size } = file
-
-      if (!name || typeof name !== 'string') {
-        throw new Error("File should have the property 'name' of string type")
-      }
-
-      if (!size || typeof size !== 'number') {
-        throw new Error("File should have the property 'size' of number type")
-      }
-
-      // Get the file extension.
-      const splitExt = name.split('.')
-      const fileExt = splitExt[splitExt.length - 1]
-
-      const fileObj = {
-        schemaVersion: 1,
-        size: size,
-        fileName: name,
-        fileExtension: fileExt
-      }
-      // console.log(`fileObj: ${JSON.stringify(fileObj, null, 2)}`)
-
-      const fileData = await _this.axios.post(`${this.IPFS_API}/files`, {
-        file: fileObj
-      })
-      // console.log(`fileData.data: ${JSON.stringify(fileData.data, null, 2)}`)
-
-      return fileData.data
-    } catch (err) {
-      console.error('Error in createFileModelWeb()')
-      throw err
-    }
-  }
-
-  /**
-   * @api IPFS.uploadFileWeb()  uploadFileWeb()
-   * @apiName uploadFileWeb()
-   * @apiGroup IPFS
-   * @apiDescription Upload a file to the FullStack.cash IPFS server. If
-   * successful, it will return an object with an ID, a BCH address, and an
-   * amount of BCH to pay.
-   *
-   * @apiExample Example usage:
-   * (async () => {
-   *   try {
-   *    *     const content = ['PSF']
-   *     const name = 'psf.txt' // Content can be Array , ArrayBuffer , Blob
-   *     const options = { type: "text/plain" }
-   *     const file =  new File(content,name,options)
-   *     let fileData = await bchjs.IPFS.uploadFile(file, "5ec562319bfacc745e8d8a52");
-   *     console.log(fileData);
-   *   } catch(error) {
-   *    console.error(error)
-   *   }
-   * })()
-   *
-   * {
-   *   "schemaVersion": 1,
-   *   "size": 2374,
-   *   "fileId": "5ec562319bfacc745e8d8a52",
-   *   "fileName": "ipfs.js",
-   *   "fileExtension": "js"
-   * }
-   */
-  async uploadFileWeb (file, modelId) {
-    try {
-      if (!file) throw new Error('File is required')
-
-      const { name, type, size } = file
-
-      if (!name || typeof name !== 'string') {
-        throw new Error("File should have the property 'name' of string type")
-      }
-
-      if (!type || typeof type !== 'string') {
-        throw new Error("File should have the property 'type' of string type")
-      }
-
-      if (!size || typeof size !== 'number') {
-        throw new Error("File should have the property 'size' of number type")
-      }
-
-      if (!modelId) {
-        throw new Error(
-          'Must include a file model ID in order to upload a file.'
-        )
-      }
-
-      // Prepare the upload object. Get a file ID from Uppy.
-      const id = _this.uppy.addFile({
-        name: name,
-        data: file,
-        source: 'Local',
-        isRemote: false
-      })
-      // console.log(`id: ${JSON.stringify(id, null, 2)}`)
-
-      // Add the model ID, required to be allowed to upload the file.
-      _this.uppy.setFileMeta(id, { fileModelId: modelId })
-
-      // Upload the file to the server.
-      const upData = await _this.uppy.upload()
-
-      if (upData.failed.length) {
-        throw new Error('The file could not be uploaded')
-      }
-
-      if (upData.successful.length) {
-        delete upData.successful[0].data
-        // console.log(`upData: ${JSON.stringify(upData, null, 2)}`)
-
-        const fileObj = {
-          schemaVersion: 1,
-          size: upData.successful[0].progress.bytesTotal,
-          fileId: upData.successful[0].meta.fileModelId,
-          fileName: upData.successful[0].name,
-          fileExtension: upData.successful[0].extension
-        }
-        // console.log(`fileObj: ${JSON.stringify(fileObj, null, 2)}`)
-
-        return fileObj
-        // return true
-      }
-
-      return false
-    } catch (err) {
-      console.error('Error in bch-js/src/ipfs.js/uploadFileWeb(): ')
-      throw err
-    }
-  }
-}
-
-module.exports = IPFS
@@ -41,7 +41,7 @@ class PsfSlpIndexer {
    this.rawTransaction = new RawTransaction(config)
    this.slpUtils = new SlpUtils(config)

-    // _this = this
+  // _this = this
  }

  /**
@@ -53,8 +53,8 @@ class PsfSlpIndexer {
   * @apiExample Example usage:
   * (async () => {
   *   try {
-   *     let status = await bchjs.PsfSlpIndexer.status();
-   *     console.log(status);
+   *     let status = await bchjs.PsfSlpIndexer.status()
+   *     console.log(status)
   *   } catch(error) {
   *    console.error(error)
   *   }
@@ -91,8 +91,8 @@ class PsfSlpIndexer {
   * @apiExample Example usage:
   * (async () => {
   *   try {
-   *     let balance = await bchjs.PsfSlpIndexer.balance('bitcoincash:qzmd5vxgh9m22m6fgvm57yd6kjnjl9qnwywsf3583n');
-   *     console.log(balance);
+   *     let balance = await bchjs.PsfSlpIndexer.balance('bitcoincash:qzmd5vxgh9m22m6fgvm57yd6kjnjl9qnwywsf3583n')
+   *     console.log(balance)
   *   } catch(error) {
   *    console.error(error)
   *   }
@@ -155,12 +155,14 @@ class PsfSlpIndexer {
   * @apiName Token Stats
   * @apiGroup PSF SLP
   * @apiDescription Return list stats for a single slp token.
+   * The second input is a Boolean, which determins the the transaction history
+   * of the token is included in the returned data. The default is false.
   *
   * @apiExample Example usage:
   * (async () => {
   *   try {
-   *     let tokenStats = await bchjs.PsfSlpIndexer.tokenStats('a4fb5c2da1aa064e25018a43f9165040071d9e984ba190c222a7f59053af84b2');
-   *     console.log(tokenStats);
+   *     let tokenStats = await bchjs.PsfSlpIndexer.tokenStats('a4fb5c2da1aa064e25018a43f9165040071d9e984ba190c222a7f59053af84b2', true)
+   *     console.log(tokenStats)
   *   } catch(error) {
   *    console.error(error)
   *   }
@@ -194,13 +196,13 @@ class PsfSlpIndexer {
   *
   */

-  async tokenStats (tokenId) {
+  async tokenStats (tokenId, withTxHistory = false) {
    try {
      // Handle single address.
      if (typeof tokenId === 'string') {
        const response = await axios.post(
          `${this.restURL}psf/slp/token`,
-          { tokenId },
+          { tokenId, withTxHistory },
          this.axiosOptions
        )
        return response.data
@@ -221,8 +223,8 @@ class PsfSlpIndexer {
   * @apiExample Example usage:
   * (async () => {
   *   try {
-   *     let txData = await bchjs.PsfSlpIndexer.tx('a4fb5c2da1aa064e25018a43f9165040071d9e984ba190c222a7f59053af84b2');
-   *     console.log(txData);
+   *     let txData = await bchjs.PsfSlpIndexer.tx('a4fb5c2da1aa064e25018a43f9165040071d9e984ba190c222a7f59053af84b2')
+   *     console.log(txData)
   *   } catch(error) {
   *    console.error(error)
   *   }
@@ -20,276 +20,6 @@ class UTXO {
    this.BigNumber = BigNumber
  }

-  /**
-   * @api Utxo.getOld() getOld()
-   * @apiName getOld
-   * @apiGroup UTXO
-   * @apiDescription Get UTXOs for an address (from SLPDB)
-   *
-   * Given an address, this function will return an object with thre following
-   * properties:
-   * - address: "" - the address these UTXOs are associated with
-   * - bchUtxos: [] - UTXOs confirmed to be spendable as normal BCH
-   * - nullUtxo: [] - UTXOs that did not pass SLP validation. Should be ignored and
-   *   not spent, to be safe.
-   * - slpUtxos: {} - UTXOs confirmed to be colored as valid SLP tokens
-   *   - type1: {}
-   *     - tokens: [] - SLP token Type 1 tokens.
-   *     - mintBatons: [] - SLP token Type 1 mint batons.
-   *   - nft: {}
-   *     - tokens: [] - NFT tokens
-   *     - groupTokens: [] - NFT Group tokens, used to create NFT tokens.
-   *     - groupMintBatons: [] - Minting baton to create more NFT Group tokens.
-   *
-   * Note: You can pass in an optional second Boolean argument. The default
-   * `false` will use the normal waterfall validation method. Set to `true`,
-   * SLP UTXOs will be validated with the whitelist filtered SLPDB. This will
-   * result is many more UTXOs in the `nullUtxos` array.
-   *
-   * @apiExample Example usage:
-   * (async () => {
-   *   try {
-   *     let utxos = await bchjs.Utxo.getOld('simpleledger:qrm0c67wwqh0w7wjxua2gdt2xggnm90xwsr5k22euj');
-   *     console.log(utxos);
-   *   } catch(error) {
-   *    console.error(error)
-   *   }
-   * })()
-   *
-   * // returns
-   * [
-   *  {
-   *   "address": "bitcoincash:qrm0c67wwqh0w7wjxua2gdt2xggnm90xws00a3lezv",
-   *   "bchUtxos": [
-   *    {
-   *      "height": 674513,
-   *      "tx_hash": "705bcc442e5a2770e560b528f52a47b1dcc9ce9ab6a8de9dfdefa55177f00d04",
-   *      "tx_pos": 3,
-   *      "value": 38134,
-   *      "txid": "705bcc442e5a2770e560b528f52a47b1dcc9ce9ab6a8de9dfdefa55177f00d04",
-   *      "vout": 3,
-   *      "isValid": false
-   *    }
-   *   ],
-   *   "nullUtxos": [],
-   *   "slpUtxos": {
-   *    "type1": {
-   *      "mintBatons": [
-   *        {
-   *          "height": 674512,
-   *          "tx_hash": "acbb0d3ceef55aa3e5fafc19335ae4bf2f8edba3c0567547dfd402391db32230",
-   *          "tx_pos": 2,
-   *          "value": 546,
-   *          "txid": "acbb0d3ceef55aa3e5fafc19335ae4bf2f8edba3c0567547dfd402391db32230",
-   *          "vout": 2,
-   *          "utxoType": "minting-baton",
-   *          "tokenId": "acbb0d3ceef55aa3e5fafc19335ae4bf2f8edba3c0567547dfd402391db32230",
-   *          "tokenTicker": "SLPTEST",
-   *          "tokenName": "SLP Test Token",
-   *          "tokenDocumentUrl": "https://FullStack.cash",
-   *          "tokenDocumentHash": "",
-   *          "decimals": 8,
-   *          "tokenType": 1,
-   *          "isValid": true
-   *        }
-   *      ],
-   *      "tokens": [
-   *        {
-   *          "height": 674512,
-   *          "tx_hash": "acbb0d3ceef55aa3e5fafc19335ae4bf2f8edba3c0567547dfd402391db32230",
-   *          "tx_pos": 1,
-   *          "value": 546,
-   *          "txid": "acbb0d3ceef55aa3e5fafc19335ae4bf2f8edba3c0567547dfd402391db32230",
-   *          "vout": 1,
-   *          "utxoType": "token",
-   *          "tokenQty": "100",
-   *          "tokenId": "acbb0d3ceef55aa3e5fafc19335ae4bf2f8edba3c0567547dfd402391db32230",
-   *          "tokenTicker": "SLPTEST",
-   *          "tokenName": "SLP Test Token",
-   *          "tokenDocumentUrl": "https://FullStack.cash",
-   *          "tokenDocumentHash": "",
-   *          "decimals": 8,
-   *          "tokenType": 1,
-   *          "isValid": true
-   *        }
-   *      ]
-   *   },
-   *   "nft": {
-   *      "groupMintBatons": [
-   *        {
-   *          "height": 674513,
-   *          "tx_hash": "705bcc442e5a2770e560b528f52a47b1dcc9ce9ab6a8de9dfdefa55177f00d04",
-   *          "tx_pos": 2,
-   *          "value": 546,
-   *          "txid": "705bcc442e5a2770e560b528f52a47b1dcc9ce9ab6a8de9dfdefa55177f00d04",
-   *          "vout": 2,
-   *          "utxoType": "minting-baton",
-   *          "transactionType": "mint",
-   *          "tokenId": "a9a2458a0f9f0761d5b8725c256f2e7fa35b9de4dec6f47b46e9f20d92d0e395",
-   *          "tokenType": 129,
-   *          "tokenTicker": "NFTGT",
-   *          "tokenName": "NFT Test Group Token",
-   *          "tokenDocumentUrl": "https://FullStack.cash",
-   *          "tokenDocumentHash": "",
-   *          "decimals": 0,
-   *          "mintBatonVout": 2,
-   *          "isValid": true
-   *        }
-   *      ],
-   *      "groupTokens": [
-   *        {
-   *          "height": 674513,
-   *          "tx_hash": "705bcc442e5a2770e560b528f52a47b1dcc9ce9ab6a8de9dfdefa55177f00d04",
-   *          "tx_pos": 1,
-   *          "value": 546,
-   *          "txid": "705bcc442e5a2770e560b528f52a47b1dcc9ce9ab6a8de9dfdefa55177f00d04",
-   *          "vout": 1,
-   *          "utxoType": "token",
-   *          "tokenQty": "10",
-   *          "transactionType": "mint",
-   *          "tokenId": "a9a2458a0f9f0761d5b8725c256f2e7fa35b9de4dec6f47b46e9f20d92d0e395",
-   *          "tokenType": 129,
-   *          "tokenTicker": "NFTGT",
-   *          "tokenName": "NFT Test Group Token",
-   *          "tokenDocumentUrl": "https://FullStack.cash",
-   *          "tokenDocumentHash": "",
-   *          "decimals": 0,
-   *          "mintBatonVout": 2,
-   *          "isValid": true
-   *        }
-   *      ],
-   *      "tokens": [
-   *        {
-   *          "height": 674512,
-   *          "tx_hash": "eeddccc4d716f04157ea132ac93a48040fea34a6b57f3d8f0cccb7d1a731ab2b",
-   *          "tx_pos": 1,
-   *          "value": 546,
-   *          "txid": "eeddccc4d716f04157ea132ac93a48040fea34a6b57f3d8f0cccb7d1a731ab2b",
-   *          "vout": 1,
-   *          "utxoType": "token",
-   *          "tokenQty": "1",
-   *          "tokenId": "eeddccc4d716f04157ea132ac93a48040fea34a6b57f3d8f0cccb7d1a731ab2b",
-   *          "tokenTicker": "NFT004",
-   *          "tokenName": "NFT Child",
-   *          "tokenDocumentUrl": "https://FullStack.cash",
-   *          "tokenDocumentHash": "",
-   *          "decimals": 0,
-   *          "tokenType": 65,
-   *          "isValid": true
-   *        }
-   *      ]
-   *    }
-   *   }
-   *  }
-   * ]
-   *
-   *
-   */
-  async getOld (address, useWhitelist = false) {
-    try {
-      if (!address) {
-        throw new Error('Address must be an array or a string')
-      }
-
-      // Convert address to an array if it is a string.
-      if (typeof address === 'string') address = [address]
-
-      // Throw an error if there are more than 20 addresses passed in at a time.
-      if (address.length > 20) throw new Error('Too many elements, 20 max.')
-
-      // Covert each address to a BCH address.
-      const addr = address.map(elem => this.slp.Address.toCashAddress(elem))
-
-      // Get the UTXOs associated with the address.
-      const utxoData = await this.electrumx.utxo(addr)
-      // console.log(`utxoData: ${JSON.stringify(utxoData, null, 2)}`)
-
-      // Hydate the utxos with token information.
-      let hydratedUtxos
-      if (useWhitelist) {
-        hydratedUtxos = await this.slp.Utils.hydrateUtxosWL(utxoData.utxos)
-      } else {
-        hydratedUtxos = await this.slp.Utils.hydrateUtxos(utxoData.utxos)
-      }
-      // console.log(`hydratedUtxos: ${JSON.stringify(hydratedUtxos, null, 2)}`)
-
-      const retAry = [] // Return array
-
-      // Loop through each address.
-      for (let i = 0; i < hydratedUtxos.slpUtxos.length; i++) {
-        const thisAddr = hydratedUtxos.slpUtxos[i]
-
-        const addrObj = {
-          address: thisAddr.address
-        }
-
-        // Filter out the different types of UTXOs.
-        addrObj.bchUtxos = thisAddr.utxos.filter(elem => elem.isValid === false)
-        addrObj.nullUtxos = thisAddr.utxos.filter(elem => elem.isValid === null)
-
-        // Break down the SLP UTXOs.
-        addrObj.slpUtxos = {
-          type1: {},
-          nft: {}
-        }
-
-        // Token Type 1 Minting Batons.
-        addrObj.slpUtxos.type1.mintBatons = thisAddr.utxos.filter(elem => {
-          const isValid = elem.isValid === true
-          const tokenTypeIs1 = elem.tokenType === 1
-          const isMintingBaton = elem.utxoType === 'minting-baton'
-
-          return isValid && tokenTypeIs1 && isMintingBaton
-        })
-
-        // Token Type 1 tokens.
-        addrObj.slpUtxos.type1.tokens = thisAddr.utxos.filter(elem => {
-          const isValid = elem.isValid === true
-          const tokenTypeIs1 = elem.tokenType === 1
-          const isToken = elem.utxoType === 'token'
-
-          return isValid && tokenTypeIs1 && isToken
-        })
-
-        // NFT Group Minting Batons
-        addrObj.slpUtxos.nft.groupMintBatons = thisAddr.utxos.filter(elem => {
-          const isValid = elem.isValid === true
-          const tokenTypeIs129 = elem.tokenType === 129
-          const isMintingBaton = elem.utxoType === 'minting-baton'
-
-          return isValid && tokenTypeIs129 && isMintingBaton
-        })
-
-        // NFT Group tokens
-        addrObj.slpUtxos.nft.groupTokens = thisAddr.utxos.filter(elem => {
-          const isValid = elem.isValid === true
-          const tokenTypeIs129 = elem.tokenType === 129
-          const isToken = elem.utxoType === 'token'
-
-          return isValid && tokenTypeIs129 && isToken
-        })
-
-        // NFT (Child) tokens
-        addrObj.slpUtxos.nft.tokens = thisAddr.utxos.filter(elem => {
-          const isValid = elem.isValid === true
-          const tokenTypeIs65 = elem.tokenType === 65
-          const isToken = elem.utxoType === 'token'
-
-          return isValid && tokenTypeIs65 && isToken
-        })
-
-        retAry.push(addrObj)
-      }
-
-      return retAry
-    } catch (err) {
-      console.error('Error in bchjs.utxo.get()')
-
-      if (err.error) throw new Error(err.error)
-      throw err
-    }
-  }
-
  /**
   * @api Utxo.get() get()
   * @apiName get
@@ -404,8 +134,18 @@ class UTXO {
        if (!thisUtxo.isSlp) {
          thisUtxo.txid = thisUtxo.tx_hash
          thisUtxo.vout = thisUtxo.tx_pos
-          thisUtxo.isSlp = false
          thisUtxo.address = addr
+
+          // Check the transaction to see if its a 'null' token, ignored by
+          // the indexer.
+          const txData = await this.psfSlpIndexer.tx(thisUtxo.tx_hash)
+          // console.log(`txData: ${JSON.stringify(txData, null, 2)}`)
+          if (txData.txData.isValidSlp === null) {
+            thisUtxo.isSlp = null
+          } else {
+            thisUtxo.isSlp = false
+          }
+          // console.log(`thisUtxo.isSlp: ${thisUtxo.isSlp}`)
        }
      }

@@ -438,7 +178,7 @@ class UTXO {

      return outObj
    } catch (err) {
-      // console.error('Error in bchjs.utxo.get2(): ', err)
+      console.error('Error in bchjs.Utxo.get(): ', err)

      if (err.error) throw new Error(err.error)
      throw err
@@ -1,226 +0,0 @@
-/*
-  Integration tests for the bchjs covering SLP tokens.
-  These tests are specific to the ABC chain.
-*/
-
-const chai = require('chai')
-const assert = chai.assert
-
-const BCHJS = require('../../../../src/bch-js')
-let bchjs
-
-// Inspect utility used for debugging.
-const util = require('util')
-util.inspect.defaultOptions = {
-  showHidden: true,
-  colors: true,
-  depth: 1
-}
-
-describe('#SLP', () => {
-  // before(() => {
-  //   console.log(`bchjs.SLP.restURL: ${bchjs.SLP.restURL}`)
-  //   console.log(`bchjs.SLP.apiToken: ${bchjs.SLP.apiToken}`)
-  // })
-
-  beforeEach(async () => {
-    // Introduce a delay so that the BVT doesn't trip the rate limits.
-    if (process.env.IS_USING_FREE_TIER) await sleep(1500)
-
-    bchjs = new BCHJS({ restURL: process.env.RESTURL })
-  })
-
-  describe('#util', () => {
-    describe('#tokenUtxoDetails', () => {
-      it('should handle a range of UTXO types', async () => {
-        const utxos = [
-          // Malformed SLP tx
-          {
-            note: 'Malformed SLP tx',
-            tx_hash:
-              'f7e5199ef6669ad4d078093b3ad56e355b6ab84567e59ad0f08a5ad0244f783a',
-            tx_pos: 1,
-            value: 546
-          },
-          // Normal TX (non-SLP)
-          {
-            note: 'Normal TX (non-SLP)',
-            tx_hash:
-              '01cdaec2f8b311fc2d6ecc930247bd45fa696dc204ab684596e281fe1b06c1f0',
-            tx_pos: 0,
-            value: 400000
-          },
-          // Valid PSF SLP tx
-          {
-            note: 'Valid PSF SLP tx',
-            tx_hash:
-              'daf4d8b8045e7a90b7af81bfe2370178f687da0e545511bce1c9ae539eba5ffd',
-            tx_pos: 1,
-            value: 546
-          },
-          // Valid SLP token not in whitelist
-          {
-            note: 'Valid SLP token not in whitelist',
-            tx_hash:
-              '3a4b628cbcc183ab376d44ce5252325f042268307ffa4a53443e92b6d24fb488',
-            tx_pos: 1,
-            value: 546
-          },
-          // Token send on BCHN network.
-          {
-            note: 'Token send on BCHN network',
-            tx_hash:
-              '402c663379d9699b6e2dd38737061e5888c5a49fca77c97ab98e79e08959e019',
-            tx_pos: 1,
-            value: 546
-          },
-          // Token send on ABC network.
-          {
-            note: 'Token send on ABC network',
-            tx_hash:
-              '336bfe2168aac4c3303508a9e8548a0d33797a83b85b76a12d845c8d6674f79d',
-            tx_pos: 1,
-            value: 546
-          },
-          // Known invalid SLP token send of PSF tokens.
-          {
-            note: 'Known invalid SLP token send of PSF tokens',
-            tx_hash:
-              '2bf691ad3679d928fef880b8a45b93b233f8fa0d0a92cf792313dbe77b1deb74',
-            tx_pos: 1,
-            value: 546
-          }
-        ]
-
-        const data = await bchjs.SLP.Utils.tokenUtxoDetails(utxos)
-        // console.log(`data: ${JSON.stringify(data, null, 2)}`)
-
-        // Malformed SLP tx
-        assert.equal(data[0].tx_hash, utxos[0].tx_hash)
-        assert.equal(data[0].isValid, false)
-
-        // Normal TX (non-SLP)
-        assert.equal(data[1].tx_hash, utxos[1].tx_hash)
-        assert.equal(data[1].isValid, false)
-
-        // Valid PSF SLP tx
-        assert.equal(data[2].tx_hash, utxos[2].tx_hash)
-        assert.equal(data[2].isValid, true)
-
-        // Valid SLP token not in whitelist
-        assert.equal(data[3].tx_hash, utxos[3].tx_hash)
-        assert.equal(data[3].isValid, true)
-
-        // Token send on BCHN network
-        assert.equal(data[4].tx_hash, utxos[4].tx_hash)
-        // assert.equal(data[4].isValid, true)
-        assert.equal(data[4].isValid, null)
-
-        // Token send on ABC network
-        assert.equal(data[5].tx_hash, utxos[5].tx_hash)
-        assert.equal(data[5].isValid, true)
-
-        // Known invalid SLP token send of PSF tokens
-        assert.equal(data[6].tx_hash, utxos[6].tx_hash)
-        assert.equal(data[6].isValid, false)
-      })
-    })
-
-    describe('#validateTxid3', () => {
-      it('should invalidate a known invalid TXID', async () => {
-        const txid =
-          'f7e5199ef6669ad4d078093b3ad56e355b6ab84567e59ad0f08a5ad0244f783a'
-
-        const result = await bchjs.SLP.Utils.validateTxid3(txid)
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        assert.isArray(result)
-
-        assert.property(result[0], 'txid')
-        assert.equal(result[0].txid, txid)
-
-        assert.property(result[0], 'valid')
-        assert.equal(result[0].valid, null)
-      })
-
-      it('should validate a known valid TXID', async () => {
-        const txid =
-          'daf4d8b8045e7a90b7af81bfe2370178f687da0e545511bce1c9ae539eba5ffd'
-
-        const result = await bchjs.SLP.Utils.validateTxid3(txid)
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        assert.isArray(result)
-
-        assert.property(result[0], 'txid')
-        assert.equal(result[0].txid, txid)
-
-        assert.property(result[0], 'valid')
-        assert.equal(result[0].valid, true)
-      })
-
-      it('should handle a mix of valid, invalid, and non-SLP txs', async () => {
-        const txids = [
-          // Malformed SLP tx
-          'f7e5199ef6669ad4d078093b3ad56e355b6ab84567e59ad0f08a5ad0244f783a',
-          // Normal TX (non-SLP)
-          '01cdaec2f8b311fc2d6ecc930247bd45fa696dc204ab684596e281fe1b06c1f0',
-          // Valid PSF SLP tx
-          'daf4d8b8045e7a90b7af81bfe2370178f687da0e545511bce1c9ae539eba5ffd',
-          // Valid SLP token not in whitelist
-          '3a4b628cbcc183ab376d44ce5252325f042268307ffa4a53443e92b6d24fb488',
-          // Unprocessed SLP TX
-          // "a0d6406eecfd8634158efa9314ff15b4cbf451938e9dc7b5678c46b41eabc6ed" // Mint baton
-          '402c663379d9699b6e2dd38737061e5888c5a49fca77c97ab98e79e08959e019'
-        ]
-
-        const result = await bchjs.SLP.Utils.validateTxid3(txids)
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        assert.isArray(result)
-        assert.equal(result[0].valid, null)
-        assert.equal(result[1].valid, null)
-        assert.equal(result[2].valid, true)
-        // assert.equal(result[2].valid, null)
-        assert.equal(result[3].valid, true)
-        assert.equal(result[4].valid, null)
-      })
-    })
-
-    describe('#validateTxid', () => {
-      it('should handle a mix of valid, invalid, and non-SLP txs', async () => {
-        const txids = [
-          // Malformed SLP tx
-          'f7e5199ef6669ad4d078093b3ad56e355b6ab84567e59ad0f08a5ad0244f783a',
-          // Normal TX (non-SLP)
-          '01cdaec2f8b311fc2d6ecc930247bd45fa696dc204ab684596e281fe1b06c1f0',
-          // Valid PSF SLP tx
-          'daf4d8b8045e7a90b7af81bfe2370178f687da0e545511bce1c9ae539eba5ffd',
-          // Valid SLP token not in whitelist
-          '3a4b628cbcc183ab376d44ce5252325f042268307ffa4a53443e92b6d24fb488',
-          // Token send on BCHN network.
-          '402c663379d9699b6e2dd38737061e5888c5a49fca77c97ab98e79e08959e019',
-          // Token send on ABC network.
-          '336bfe2168aac4c3303508a9e8548a0d33797a83b85b76a12d845c8d6674f79d'
-        ]
-
-        const result = await bchjs.SLP.Utils.validateTxid(txids)
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        assert.isArray(result)
-        assert.equal(result[0].valid, null)
-        assert.equal(result[1].valid, null)
-        assert.equal(result[2].valid, true)
-        // assert.equal(result[2].valid, null)
-        assert.equal(result[3].valid, true)
-        assert.equal(result[4].valid, null)
-        assert.equal(result[5].valid, true)
-      })
-    })
-  })
-})
-
-// Promise-based sleep function
-function sleep (ms) {
-  return new Promise(resolve => setTimeout(resolve, ms))
-}
@@ -1,71 +0,0 @@
-/*
-  Integration tests for the bchjs. Only covers calls made to
-  rest.bitcoin.com.
-
-  TODO
-*/
-
-const chai = require('chai')
-const assert = chai.assert
-const BCHJS = require('../../../../src/bch-js')
-const bchjs = new BCHJS()
-
-// Inspect utility used for debugging.
-const util = require('util')
-util.inspect.defaultOptions = {
-  showHidden: true,
-  colors: true,
-  depth: 3
-}
-
-describe('#rawtransaction', () => {
-  beforeEach(async () => {
-    if (process.env.IS_USING_FREE_TIER) await sleep(3000)
-  })
-
-  /*
-    Testing sentRawTransaction isn't really possible with an integration test,
-    as the endpoint really needs an e2e test to be properly tested. The tests
-    below expect error messages returned from the server, but at least test
-    that the server is responding on those endpoints, and responds consistently.
-  */
-  describe('sendRawTransaction', () => {
-    it('should send a single transaction hex', async () => {
-      try {
-        const hex =
-          '01000000013ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a000000006a4730440220540986d1c58d6e76f8f05501c520c38ce55393d0ed7ed3c3a82c69af04221232022058ea43ed6c05fec0eccce749a63332ed4525460105346f11108b9c26df93cd72012103083dfc5a0254613941ddc91af39ff90cd711cdcde03a87b144b883b524660c39ffffffff01807c814a000000001976a914d7e7c4e0b70eaa67ceff9d2823d1bbb9f6df9a5188ac00000000'
-
-        await bchjs.RawTransactions.sendRawTransaction(hex)
-        // console.log(`result ${JSON.stringify(result, null, 2)}`)
-
-        assert.equal(true, false, 'Unexpected result!')
-      } catch (err) {
-        // console.log(`err: ${util.inspect(err)}`)
-
-        assert.hasAllKeys(err, ['error'])
-        assert.include(err.error, 'Missing inputs')
-      }
-    })
-
-    it('should send an array of tx hexes', async () => {
-      try {
-        const hexes = [
-          '01000000013ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a000000006a4730440220540986d1c58d6e76f8f05501c520c38ce55393d0ed7ed3c3a82c69af04221232022058ea43ed6c05fec0eccce749a63332ed4525460105346f11108b9c26df93cd72012103083dfc5a0254613941ddc91af39ff90cd711cdcde03a87b144b883b524660c39ffffffff01807c814a000000001976a914d7e7c4e0b70eaa67ceff9d2823d1bbb9f6df9a5188ac00000000',
-          '01000000013ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a000000006a4730440220540986d1c58d6e76f8f05501c520c38ce55393d0ed7ed3c3a82c69af04221232022058ea43ed6c05fec0eccce749a63332ed4525460105346f11108b9c26df93cd72012103083dfc5a0254613941ddc91af39ff90cd711cdcde03a87b144b883b524660c39ffffffff01807c814a000000001976a914d7e7c4e0b70eaa67ceff9d2823d1bbb9f6df9a5188ac00000000'
-        ]
-
-        const result = await bchjs.RawTransactions.sendRawTransaction(hexes)
-        console.log(`result ${JSON.stringify(result, null, 2)}`)
-      } catch (err) {
-        // console.log(`err: ${util.inspect(err)}`)
-
-        assert.hasAllKeys(err, ['error'])
-        assert.include(err.error, 'Missing inputs')
-      }
-    })
-  })
-})
-
-function sleep (ms) {
-  return new Promise(resolve => setTimeout(resolve, ms))
-}
@@ -1,273 +0,0 @@
-/*
-  Integration tests for the bchjs covering SLP tokens.
-  These tests are specific to the ABC chain.
-*/
-
-const chai = require('chai')
-const assert = chai.assert
-
-const BCHJS = require('../../../../src/bch-js')
-let bchjs
-
-// Inspect utility used for debugging.
-const util = require('util')
-util.inspect.defaultOptions = {
-  showHidden: true,
-  colors: true,
-  depth: 1
-}
-
-describe('#SLP', () => {
-  // before(() => {
-  //   console.log(`bchjs.SLP.restURL: ${bchjs.SLP.restURL}`)
-  //   console.log(`bchjs.SLP.apiToken: ${bchjs.SLP.apiToken}`)
-  // })
-
-  beforeEach(async () => {
-    // Introduce a delay so that the BVT doesn't trip the rate limits.
-    if (process.env.IS_USING_FREE_TIER) await sleep(3000)
-
-    bchjs = new BCHJS()
-  })
-
-  describe('#util', () => {
-    describe('#decodeOpReturn', () => {
-      it('should decode a NFT Child transaction', async () => {
-        const txid =
-          'eeddccc4d716f04157ea132ac93a48040fea34a6b57f3d8f0cccb7d1a731ab2b'
-
-        const data = await bchjs.SLP.Utils.decodeOpReturn(txid)
-        // console.log(`data: ${JSON.stringify(data, null, 2)}`)
-
-        assert.property(data, 'tokenType')
-        assert.property(data, 'txType')
-        assert.property(data, 'ticker')
-        assert.property(data, 'name')
-        assert.property(data, 'tokenId')
-        assert.property(data, 'documentUri')
-        assert.property(data, 'documentHash')
-        assert.property(data, 'decimals')
-        assert.property(data, 'mintBatonVout')
-        assert.property(data, 'qty')
-
-        assert.equal(data.tokenType, 65)
-        assert.equal(data.mintBatonVout, 0)
-        assert.equal(data.qty, '1')
-      })
-    })
-
-    describe('#tokenUtxoDetails', () => {
-      it('should handle a range of UTXO types', async () => {
-        const utxos = [
-          // Malformed SLP tx
-          {
-            note: 'Malformed SLP tx',
-            tx_hash:
-              'f7e5199ef6669ad4d078093b3ad56e355b6ab84567e59ad0f08a5ad0244f783a',
-            tx_pos: 1,
-            value: 546
-          },
-          // Normal TX (non-SLP)
-          {
-            note: 'Normal TX (non-SLP)',
-            tx_hash:
-              '01cdaec2f8b311fc2d6ecc930247bd45fa696dc204ab684596e281fe1b06c1f0',
-            tx_pos: 0,
-            value: 400000
-          },
-          // Valid PSF SLP tx
-          {
-            note: 'Valid PSF SLP tx',
-            tx_hash:
-              'daf4d8b8045e7a90b7af81bfe2370178f687da0e545511bce1c9ae539eba5ffd',
-            tx_pos: 1,
-            value: 546
-          },
-          // Valid SLP token not in whitelist
-          {
-            note: 'Valid SLP token not in whitelist',
-            tx_hash:
-              '3a4b628cbcc183ab376d44ce5252325f042268307ffa4a53443e92b6d24fb488',
-            tx_pos: 1,
-            value: 546
-          },
-          // Token send on BCHN network.
-          {
-            note: 'Token send on BCHN network',
-            tx_hash:
-              '402c663379d9699b6e2dd38737061e5888c5a49fca77c97ab98e79e08959e019',
-            tx_pos: 1,
-            value: 546
-          },
-          // Token send on ABC network.
-          {
-            note: 'Token send on ABC network',
-            tx_hash:
-              '336bfe2168aac4c3303508a9e8548a0d33797a83b85b76a12d845c8d6674f79d',
-            tx_pos: 1,
-            value: 546
-          },
-          // Known invalid SLP token send of PSF tokens.
-          {
-            note: 'Known invalid SLP token send of PSF tokens',
-            tx_hash:
-              '2bf691ad3679d928fef880b8a45b93b233f8fa0d0a92cf792313dbe77b1deb74',
-            tx_pos: 1,
-            value: 546
-          }
-        ]
-
-        const data = await bchjs.SLP.Utils.tokenUtxoDetails(utxos)
-        // console.log(`data: ${JSON.stringify(data, null, 2)}`)
-
-        // Malformed SLP tx
-        assert.equal(data[0].tx_hash, utxos[0].tx_hash)
-        assert.equal(data[0].isValid, false)
-
-        // Normal TX (non-SLP)
-        assert.equal(data[1].tx_hash, utxos[1].tx_hash)
-        assert.equal(data[1].isValid, false)
-
-        // Valid PSF SLP tx
-        assert.equal(data[2].tx_hash, utxos[2].tx_hash)
-        assert.equal(data[2].isValid, true)
-
-        // Valid SLP token not in whitelist
-        assert.equal(data[3].tx_hash, utxos[3].tx_hash)
-        assert.equal(data[3].isValid, true)
-
-        // Token send on BCHN network
-        assert.equal(data[4].tx_hash, utxos[4].tx_hash)
-        assert.equal(data[4].isValid, true)
-
-        // Token send on ABC network
-        assert.equal(data[5].tx_hash, utxos[5].tx_hash)
-        assert.equal(data[5].isValid, null)
-
-        // Known invalid SLP token send of PSF tokens
-        assert.equal(data[6].tx_hash, utxos[6].tx_hash)
-        assert.equal(data[6].isValid, false)
-      })
-    })
-
-    describe('#validateTxid3', () => {
-      it('should invalidate a known invalid TXID', async () => {
-        const txid =
-          'f7e5199ef6669ad4d078093b3ad56e355b6ab84567e59ad0f08a5ad0244f783a'
-
-        const result = await bchjs.SLP.Utils.validateTxid3(txid)
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        assert.isArray(result)
-
-        assert.property(result[0], 'txid')
-        assert.equal(result[0].txid, txid)
-
-        assert.property(result[0], 'valid')
-        assert.equal(result[0].valid, null)
-      })
-
-      it('should validate a known valid TXID', async () => {
-        const txid =
-          'daf4d8b8045e7a90b7af81bfe2370178f687da0e545511bce1c9ae539eba5ffd'
-
-        const result = await bchjs.SLP.Utils.validateTxid3(txid)
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        assert.isArray(result)
-
-        assert.property(result[0], 'txid')
-        assert.equal(result[0].txid, txid)
-
-        assert.property(result[0], 'valid')
-        assert.equal(result[0].valid, true)
-      })
-
-      it('should handle a mix of valid, invalid, and non-SLP txs', async () => {
-        const txids = [
-          // Malformed SLP tx
-          'f7e5199ef6669ad4d078093b3ad56e355b6ab84567e59ad0f08a5ad0244f783a',
-          // Normal TX (non-SLP)
-          '01cdaec2f8b311fc2d6ecc930247bd45fa696dc204ab684596e281fe1b06c1f0',
-          // Valid PSF SLP tx
-          'daf4d8b8045e7a90b7af81bfe2370178f687da0e545511bce1c9ae539eba5ffd',
-          // Valid SLP token not in whitelist
-          '3a4b628cbcc183ab376d44ce5252325f042268307ffa4a53443e92b6d24fb488',
-          // Unprocessed SLP TX
-          '402c663379d9699b6e2dd38737061e5888c5a49fca77c97ab98e79e08959e019'
-        ]
-
-        const result = await bchjs.SLP.Utils.validateTxid3(txids)
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        assert.isArray(result)
-
-        assert.equal(result[0].txid, txids[0])
-        assert.equal(result[0].valid, null)
-
-        assert.equal(result[1].txid, txids[1])
-        assert.equal(result[1].valid, null)
-
-        assert.equal(result[2].txid, txids[2])
-        assert.equal(result[2].valid, true)
-
-        // True in validateTxid() (no whitelist SLPDB) but null in validateTxid3()
-        assert.equal(result[3].txid, txids[3])
-        assert.equal(result[3].valid, true)
-
-        // Note: This should change from null to true once SLPDB finishes indexing.
-        assert.equal(result[4].txid, txids[4])
-        // True when no whitelist SLPDB is used.
-        assert.equal(result[4].valid, true)
-      })
-    })
-
-    describe('#validateTxid', () => {
-      it('should handle a mix of valid, invalid, and non-SLP txs', async () => {
-        const txids = [
-          // Malformed SLP tx
-          'f7e5199ef6669ad4d078093b3ad56e355b6ab84567e59ad0f08a5ad0244f783a',
-          // Normal TX (non-SLP)
-          '01cdaec2f8b311fc2d6ecc930247bd45fa696dc204ab684596e281fe1b06c1f0',
-          // Valid PSF SLP tx
-          'daf4d8b8045e7a90b7af81bfe2370178f687da0e545511bce1c9ae539eba5ffd',
-          // Valid SLP token not in whitelist
-          '3a4b628cbcc183ab376d44ce5252325f042268307ffa4a53443e92b6d24fb488',
-          // Token send on BCHN network.
-          '402c663379d9699b6e2dd38737061e5888c5a49fca77c97ab98e79e08959e019',
-          // Token send on ABC network.
-          '336bfe2168aac4c3303508a9e8548a0d33797a83b85b76a12d845c8d6674f79d'
-        ]
-
-        const result = await bchjs.SLP.Utils.validateTxid(txids)
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        assert.isArray(result)
-
-        assert.equal(result[0].txid, txids[0])
-        assert.equal(result[0].valid, null)
-
-        assert.equal(result[1].txid, txids[1])
-        assert.equal(result[1].valid, null)
-
-        assert.equal(result[2].txid, txids[2])
-        assert.equal(result[2].valid, true)
-
-        // True in validateTxid() but null in validateTxid3()
-        assert.equal(result[3].txid, txids[3])
-        assert.equal(result[3].valid, true)
-
-        assert.equal(result[4].txid, txids[4])
-        assert.equal(result[4].valid, true)
-
-        assert.equal(result[5].txid, txids[5])
-        assert.equal(result[5].valid, null)
-      })
-    })
-  })
-})
-
-// Promise-based sleep function
-function sleep (ms) {
-  return new Promise(resolve => setTimeout(resolve, ms))
-}
@@ -1,105 +0,0 @@
-/*
-  Integration tests for the utxo.js library.
-*/
-
-const assert = require('chai').assert
-
-const BCHJS = require('../../../../src/bch-js')
-const bchjs = new BCHJS()
-
-describe('#UTXO', () => {
-  beforeEach(async () => {
-    // sandbox = sinon.createSandbox()
-
-    if (process.env.IS_USING_FREE_TIER) await sleep(3000)
-  })
-
-  describe('#get', () => {
-    it('should get hydrated and filtered UTXOs for an address', async () => {
-      // const addr = 'bitcoincash:qqh793x9au6ehvh7r2zflzguanlme760wuzehgzjh9'
-      const addr = 'simpleledger:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvyucjzqt9'
-
-      const result = await bchjs.Utxo.get(addr)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.isArray(result)
-      assert.property(result[0], 'address')
-      assert.property(result[0], 'bchUtxos')
-      assert.property(result[0], 'nullUtxos')
-      assert.property(result[0], 'slpUtxos')
-      assert.isArray(result[0].bchUtxos)
-      assert.isArray(result[0].nullUtxos)
-    })
-
-    it('should handle an array of addresses', async () => {
-      const addr = [
-        'simpleledger:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvyucjzqt9',
-        'bitcoincash:qqh793x9au6ehvh7r2zflzguanlme760wuzehgzjh9'
-      ]
-
-      const result = await bchjs.Utxo.get(addr)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.isArray(result)
-      assert.property(result[0], 'address')
-      assert.property(result[0], 'bchUtxos')
-      assert.property(result[0], 'nullUtxos')
-      assert.property(result[0], 'slpUtxos')
-      assert.isArray(result[0].bchUtxos)
-      assert.isArray(result[0].nullUtxos)
-    })
-
-    it('should handle NFTs and minting batons', async () => {
-      const addr = 'simpleledger:qrm0c67wwqh0w7wjxua2gdt2xggnm90xwsr5k22euj'
-
-      const result = await bchjs.Utxo.get(addr)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.isArray(result)
-      assert.property(result[0], 'address')
-      assert.property(result[0], 'bchUtxos')
-      assert.property(result[0], 'nullUtxos')
-      assert.property(result[0], 'slpUtxos')
-      assert.isArray(result[0].bchUtxos)
-      assert.isArray(result[0].nullUtxos)
-
-      assert.isArray(result[0].slpUtxos.type1.mintBatons)
-      assert.isArray(result[0].slpUtxos.type1.tokens)
-      assert.isArray(result[0].slpUtxos.nft.groupMintBatons)
-      assert.isArray(result[0].slpUtxos.nft.groupTokens)
-      assert.isArray(result[0].slpUtxos.nft.tokens)
-    })
-  })
-
-  describe('#findBiggestUtxo', () => {
-    it('should sort UTXOs from Electrumx', async () => {
-      const addr = 'bitcoincash:qq54fgjn3hz0357n8a6guy4demw9xfkjk5jcj0xr0z'
-
-      const electrumxUtxos = await bchjs.Electrumx.utxo(addr)
-      // console.log(`Electrumx utxos: ${JSON.stringify(electrumxUtxos, null, 2)}`)
-
-      const result = bchjs.Utxo.findBiggestUtxo(electrumxUtxos.utxos)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.property(result, 'satoshis')
-      assert.equal(result.satoshis, 800)
-    })
-
-    it('should sort UTXOs from Utxos.get()', async () => {
-      const addr = 'bitcoincash:qq54fgjn3hz0357n8a6guy4demw9xfkjk5jcj0xr0z'
-
-      const utxos = await bchjs.Utxo.get(addr)
-      // console.log(`utxos: ${JSON.stringify(utxos, null, 2)}`)
-
-      const result = bchjs.Utxo.findBiggestUtxo(utxos[0].bchUtxos)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.property(result, 'satoshis')
-      assert.equal(result.satoshis, 800)
-    })
-  })
-})
-
-function sleep (ms) {
-  return new Promise(resolve => setTimeout(resolve, ms))
-}
@@ -40,13 +40,24 @@ describe('#psf-slp-indexer', () => {
  })

  describe('#tokenStats', () => {
-    it('should get stats on a token', async () => {
+    it('should get stats on a token, without tx history', async () => {
      const tokenId =
        '38e97c5d7d3585a2cbf3f9580c82ca33985f9cb0845d4dcce220cb709f9538b0'

      const result = await bchjs.PsfSlpIndexer.tokenStats(tokenId)
      // console.log('result: ', result)

+      assert.property(result.tokenData, 'documentUri')
+      assert.property(result.tokenData, 'totalBurned')
+    })
+
+    it('should get stats on a token, with tx history', async () => {
+      const tokenId =
+        '38e97c5d7d3585a2cbf3f9580c82ca33985f9cb0845d4dcce220cb709f9538b0'
+
+      const result = await bchjs.PsfSlpIndexer.tokenStats(tokenId, true)
+      // console.log('result: ', result)
+
      assert.property(result.tokenData, 'documentUri')
      assert.property(result.tokenData, 'txs')
      assert.property(result.tokenData, 'totalBurned')
@@ -6,6 +6,7 @@ const assert = require('chai').assert

 const BCHJS = require('../../../../src/bch-js')
 const bchjs = new BCHJS()
+// const bchjs = new BCHJS({ restURL: 'http://192.168.2.129:3000/v5/' })

 describe('#UTXO', () => {
  beforeEach(async () => {
@@ -14,154 +15,39 @@ describe('#UTXO', () => {
    if (process.env.IS_USING_FREE_TIER) await sleep(3000)
  })

-  if (process.env.TESTSLP) {
-    describe('#getOld', () => {
-      it('should get hydrated and filtered UTXOs for an address', async () => {
-        // const addr = 'bitcoincash:qqh793x9au6ehvh7r2zflzguanlme760wuzehgzjh9'
-        const addr = 'simpleledger:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvyucjzqt9'
-
-        const result = await bchjs.Utxo.getOld(addr)
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        assert.isArray(result)
-        assert.property(result[0], 'address')
-        assert.property(result[0], 'bchUtxos')
-        assert.property(result[0], 'nullUtxos')
-        assert.property(result[0], 'slpUtxos')
-        assert.isArray(result[0].bchUtxos)
-        assert.isArray(result[0].nullUtxos)
-      })
-
-      it('should handle an array of addresses', async () => {
-        const addr = [
-          'simpleledger:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvyucjzqt9',
-          'bitcoincash:qqh793x9au6ehvh7r2zflzguanlme760wuzehgzjh9'
-        ]
-
-        const result = await bchjs.Utxo.getOld(addr)
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        assert.isArray(result)
-        assert.property(result[0], 'address')
-        assert.property(result[0], 'bchUtxos')
-        assert.property(result[0], 'nullUtxos')
-        assert.property(result[0], 'slpUtxos')
-        assert.isArray(result[0].bchUtxos)
-        assert.isArray(result[0].nullUtxos)
-      })
-
-      it('should handle NFTs and minting batons', async () => {
-        const addr = 'simpleledger:qrm0c67wwqh0w7wjxua2gdt2xggnm90xwsr5k22euj'
-
-        const result = await bchjs.Utxo.getOld(addr)
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        assert.isArray(result)
-        assert.property(result[0], 'address')
-        assert.property(result[0], 'bchUtxos')
-        assert.property(result[0], 'nullUtxos')
-        assert.property(result[0], 'slpUtxos')
-        assert.isArray(result[0].bchUtxos)
-        assert.isArray(result[0].nullUtxos)
-
-        assert.isArray(result[0].slpUtxos.type1.mintBatons)
-        assert.isArray(result[0].slpUtxos.type1.tokens)
-        assert.isArray(result[0].slpUtxos.nft.groupMintBatons)
-        assert.isArray(result[0].slpUtxos.nft.groupTokens)
-        assert.isArray(result[0].slpUtxos.nft.tokens)
-      })
-
-      it('should use the whitelist when flag is set', async () => {
-        const addr = 'simpleledger:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvyucjzqt9'
-        const useWhitelist = true
-
-        const result = await bchjs.Utxo.getOld(addr, useWhitelist)
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        assert.isArray(result)
-        assert.property(result[0], 'address')
-        assert.property(result[0], 'bchUtxos')
-        assert.property(result[0], 'nullUtxos')
-        assert.property(result[0], 'slpUtxos')
-        assert.isArray(result[0].bchUtxos)
-        assert.isArray(result[0].nullUtxos)
-
-        // Most token UTXOs should end up in the nullUtxos array.
-        assert.isAbove(result[0].bchUtxos.length, 0)
-        assert.isAbove(result[0].nullUtxos.length, 1)
-      })
-    })
-
-    describe('#findBiggestUtxo', () => {
-      it('should sort UTXOs from Electrumx', async () => {
-        const addr = 'bitcoincash:qq54fgjn3hz0357n8a6guy4demw9xfkjk5jcj0xr0z'
-
-        const electrumxUtxos = await bchjs.Electrumx.utxo(addr)
-        // console.log(`Electrumx utxos: ${JSON.stringify(electrumxUtxos, null, 2)}`)
-
-        const result = bchjs.Utxo.findBiggestUtxo(electrumxUtxos.utxos)
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        assert.property(result, 'satoshis')
-        assert.equal(result.satoshis, 800)
-      })
-
-      it('should sort UTXOs from Utxos.get()', async () => {
-        const addr = 'bitcoincash:qq54fgjn3hz0357n8a6guy4demw9xfkjk5jcj0xr0z'
-
-        const utxos = await bchjs.Utxo.getOld(addr)
-        // console.log(`utxos: ${JSON.stringify(utxos, null, 2)}`)
-
-        const result = bchjs.Utxo.findBiggestUtxo(utxos[0].bchUtxos)
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        assert.property(result, 'satoshis')
-        assert.equal(result.satoshis, 800)
-      })
-    })
-  }
-
  describe('#hydrateTokenData', () => {
    it('should hydrate token UTXOs', async () => {
      const utxos = [
        {
-          txid:
-            '384e1b8197e8de7d38f98317af2cf5f6bcb50007c46943b3498a6fab6e8aeb7c',
+          txid: '384e1b8197e8de7d38f98317af2cf5f6bcb50007c46943b3498a6fab6e8aeb7c',
          vout: 1,
          type: 'token',
          qty: '10000000',
-          tokenId:
-            'a436c8e1b6bee3d701c6044d190f76f774be83c36de8d34a988af4489e86dd37',
+          tokenId: 'a436c8e1b6bee3d701c6044d190f76f774be83c36de8d34a988af4489e86dd37',
          address: 'bitcoincash:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvg8nfhq4m'
        },
        {
-          txid:
-            '4fc789405d58ec612c69eba29aa56cf0c7f228349801114138424eb68df4479d',
+          txid: '4fc789405d58ec612c69eba29aa56cf0c7f228349801114138424eb68df4479d',
          vout: 1,
          type: 'token',
          qty: '100000000',
-          tokenId:
-            'df808a41672a0a0ae6475b44f272a107bc9961b90f29dc918d71301f24fe92fb',
+          tokenId: 'df808a41672a0a0ae6475b44f272a107bc9961b90f29dc918d71301f24fe92fb',
          address: 'bitcoincash:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvg8nfhq4m'
        },
        {
-          txid:
-            '42054bba4d69bfe7801ece0cffc754194b04239034fdfe9dbe321ef76c9a2d93',
+          txid: '42054bba4d69bfe7801ece0cffc754194b04239034fdfe9dbe321ef76c9a2d93',
          vout: 5,
          type: 'token',
          qty: '4764',
-          tokenId:
-            'f05faf13a29c7f5e54ab921750aafb6afaa953db863bd2cf432e918661d4132f',
+          tokenId: 'f05faf13a29c7f5e54ab921750aafb6afaa953db863bd2cf432e918661d4132f',
          address: 'bitcoincash:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvg8nfhq4m'
        },
        {
-          txid:
-            '06938d0a0d15aa76524ffe61fe111d6d2b2ea9dd8dcd4c7c7744614ced370861',
+          txid: '06938d0a0d15aa76524ffe61fe111d6d2b2ea9dd8dcd4c7c7744614ced370861',
          vout: 5,
          type: 'token',
          qty: '238',
-          tokenId:
-            'f05faf13a29c7f5e54ab921750aafb6afaa953db863bd2cf432e918661d4132f',
+          tokenId: 'f05faf13a29c7f5e54ab921750aafb6afaa953db863bd2cf432e918661d4132f',
          address: 'bitcoincash:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvg8nfhq4m'
        }
      ]
@@ -199,7 +85,7 @@ describe('#UTXO', () => {

    // TODO: NFTs are currently not identified as different than normal BCH UTXOs.
    // The psf-slp-indexer needs to be updated to fix this issue.
-    it('should handle NFTs and minting batons', async () => {
+    it('should handle minting batons', async () => {
      const addr = 'simpleledger:qrm0c67wwqh0w7wjxua2gdt2xggnm90xwsr5k22euj'

      const result = await bchjs.Utxo.get(addr)
@@ -218,6 +104,15 @@ describe('#UTXO', () => {
      assert.isAbove(result.bchUtxos.length, 0)
      assert.equal(result.slpUtxos.type1.tokens.length, 0)
    })
+
+    it('should handle Group NFTs', async () => {
+      const addr = 'bitcoincash:qrnghwrfgccf3s5e9wnglzxegcnhje9rkcwv2eka33'
+
+      const result = await bchjs.Utxo.get(addr)
+      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
+
+      assert.equal(result.nullUtxos.length, 0)
+    })
  })
 })

@@ -497,476 +497,6 @@ describe('#SLP', () => {
        })
      })

-      describe('#tokenUtxoDetailsWL', () => {
-        it('should return details for a simple SEND SLP token utxo', async () => {
-          const utxos = [
-            {
-              height: 660554,
-              tx_hash:
-                '89b3f0c84efe8b01b24e2d7ac08636de5781f31dbb84478e3de868ca0a7ed93a',
-              tx_pos: 1,
-              value: 546
-            }
-          ]
-
-          const data = await bchjs.SLP.Utils.tokenUtxoDetailsWL(utxos)
-          // console.log(`data: ${JSON.stringify(data, null, 2)}`)
-
-          assert.property(data[0], 'txid')
-          assert.property(data[0], 'vout')
-          assert.property(data[0], 'height')
-          assert.property(data[0], 'utxoType')
-          assert.property(data[0], 'tokenId')
-          assert.property(data[0], 'tokenTicker')
-          assert.property(data[0], 'tokenName')
-          assert.property(data[0], 'tokenDocumentUrl')
-          assert.property(data[0], 'tokenDocumentHash')
-          assert.property(data[0], 'decimals')
-          assert.property(data[0], 'tokenQty')
-          assert.property(data[0], 'isValid')
-          assert.equal(data[0].isValid, true)
-        })
-
-        it('should return false for BCH-only UTXOs', async () => {
-          const utxos = [
-            {
-              txid:
-                'a937f792c7c9eb23b4f344ce5c233d1ac0909217d0a504d71e6b1e4efb864a3b',
-              vout: 0,
-              amount: 0.00001,
-              satoshis: 1000,
-              confirmations: 0,
-              ts: 1578424704
-            },
-            {
-              txid:
-                '53fd141c2e999e080a5860887441a2c45e9cbe262027e2bd2ac998fc76e43c44',
-              vout: 0,
-              amount: 0.00001,
-              satoshis: 1000,
-              confirmations: 0,
-              ts: 1578424634
-            }
-          ]
-
-          const data = await bchjs.SLP.Utils.tokenUtxoDetailsWL(utxos)
-          // console.log(`data: ${JSON.stringify(data, null, 2)}`)
-
-          assert.isArray(data)
-          assert.equal(data[0].isValid, false)
-          assert.equal(data[1].isValid, false)
-        })
-
-        it('should handle a dust attack', async () => {
-          // it("#dustattack", async () => {
-          const utxos = [
-            {
-              height: 655965,
-              tx_hash:
-                'a675af87dcd8d39be782737aa52e0076b52eb2f5ce355ffcb5567a64dd96b77e',
-              tx_pos: 151,
-              value: 547,
-              satoshis: 547,
-              txid:
-                'a675af87dcd8d39be782737aa52e0076b52eb2f5ce355ffcb5567a64dd96b77e',
-              vout: 151,
-              address: 'bitcoincash:qq4dw3sm8qvglspy6w2qg0u2ugsy9zcfcqrpeflwww',
-              hdIndex: 11
-            }
-          ]
-
-          const data = await bchjs.SLP.Utils.tokenUtxoDetailsWL(utxos)
-          // console.log(`data: ${JSON.stringify(data, null, 2)}`)
-
-          assert.equal(data[0].isValid, false)
-        })
-
-        it('should handle null SLPDB validations', async () => {
-          const utxos = [
-            {
-              height: 665577,
-              tx_hash:
-                '4b89405c54d1c0bde8aa476a47561a42a6e7a5e927daa2ec69d428810eae3419',
-              tx_pos: 1,
-              value: 546
-            },
-            {
-              height: 665577,
-              tx_hash:
-                '3a4b628cbcc183ab376d44ce5252325f042268307ffa4a53443e92b6d24fb488',
-              tx_pos: 1,
-              value: 546
-            }
-          ]
-
-          const data = await bchjs.SLP.Utils.tokenUtxoDetailsWL(utxos)
-          // console.log(`data: ${JSON.stringify(data, null, 2)}`)
-
-          assert.isArray(data)
-          // assert.equal(data[0].isValid, null)
-        })
-      })
-
-      describe('#balancesForAddress', () => {
-        it('should fetch all balances for address: simpleledger:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvyucjzqt9', async () => {
-          const balances = await bchjs.SLP.Utils.balancesForAddress(
-            'simpleledger:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvyucjzqt9'
-          )
-          // console.log(`balances: ${JSON.stringify(balances, null, 2)}`)
-
-          assert.isArray(balances)
-          assert.hasAllKeys(balances[0], [
-            'tokenId',
-            'balanceString',
-            'balance',
-            'decimalCount',
-            'slpAddress'
-          ])
-        })
-
-        it('should fetch balances for multiple addresses', async () => {
-          const addresses = [
-            'simpleledger:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvyucjzqt9',
-            'simpleledger:qqss4zp80hn6szsa4jg2s9fupe7g5tcg5ucdyl3r57'
-          ]
-
-          const balances = await bchjs.SLP.Utils.balancesForAddress(addresses)
-          // console.log(`balances: ${JSON.stringify(balances, null, 2)}`)
-
-          assert.isArray(balances)
-          assert.isArray(balances[0])
-          assert.hasAllKeys(balances[0][0], [
-            'tokenId',
-            'balanceString',
-            'balance',
-            'decimalCount',
-            'slpAddress'
-          ])
-        })
-      })
-
-      describe('#hydrateUtxos-', () => {
-        it('should hydrate UTXOs', async () => {
-          const utxos = [
-            {
-              utxos: [
-                {
-                  txid:
-                    'd56a2b446d8149c39ca7e06163fe8097168c3604915f631bc58777d669135a56',
-                  vout: 3,
-                  value: '6816',
-                  height: 606848,
-                  confirmations: 13,
-                  satoshis: 6816
-                },
-                {
-                  txid:
-                    'd56a2b446d8149c39ca7e06163fe8097168c3604915f631bc58777d669135a56',
-                  vout: 2,
-                  value: '546',
-                  height: 606848,
-                  confirmations: 13,
-                  satoshis: 546
-                }
-              ]
-            }
-          ]
-
-          const result = await bchjs.SLP.Utils.hydrateUtxos(utxos)
-          // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-          // Test the general structure of the output.
-          assert.isArray(result.slpUtxos)
-          assert.equal(result.slpUtxos.length, 1)
-          assert.equal(result.slpUtxos[0].utxos.length, 2)
-
-          // Test the non-slp UTXO.
-          assert.property(result.slpUtxos[0].utxos[0], 'txid')
-          assert.property(result.slpUtxos[0].utxos[0], 'vout')
-          assert.property(result.slpUtxos[0].utxos[0], 'value')
-          assert.property(result.slpUtxos[0].utxos[0], 'height')
-          assert.property(result.slpUtxos[0].utxos[0], 'confirmations')
-          assert.property(result.slpUtxos[0].utxos[0], 'satoshis')
-          assert.property(result.slpUtxos[0].utxos[0], 'isValid')
-          assert.equal(result.slpUtxos[0].utxos[0].isValid, false)
-
-          // Test the slp UTXO.
-          assert.property(result.slpUtxos[0].utxos[1], 'txid')
-          assert.property(result.slpUtxos[0].utxos[1], 'vout')
-          assert.property(result.slpUtxos[0].utxos[1], 'value')
-          assert.property(result.slpUtxos[0].utxos[1], 'height')
-          assert.property(result.slpUtxos[0].utxos[1], 'confirmations')
-          assert.property(result.slpUtxos[0].utxos[1], 'satoshis')
-          assert.property(result.slpUtxos[0].utxos[1], 'isValid')
-          assert.equal(result.slpUtxos[0].utxos[1].isValid, true)
-          assert.property(result.slpUtxos[0].utxos[1], 'transactionType')
-          assert.property(result.slpUtxos[0].utxos[1], 'tokenId')
-          assert.property(result.slpUtxos[0].utxos[1], 'tokenTicker')
-          assert.property(result.slpUtxos[0].utxos[1], 'tokenName')
-          assert.property(result.slpUtxos[0].utxos[1], 'tokenDocumentUrl')
-          assert.property(result.slpUtxos[0].utxos[1], 'tokenDocumentHash')
-          assert.property(result.slpUtxos[0].utxos[1], 'decimals')
-          assert.property(result.slpUtxos[0].utxos[1], 'tokenType')
-          assert.property(result.slpUtxos[0].utxos[1], 'tokenQty')
-        })
-
-        it('should process data directly from Electrumx', async () => {
-          const addrs = [
-            'bitcoincash:qqnt53cfw990u6y38xgezm0lfa8hknw0wueezcpagp',
-            'bitcoincash:qrh3qgtax6adegzc7zxm6m4sgrv9wq28yqnfn33ce5',
-            'bitcoincash:qqcaee5w4ws77n8s2gzy6fwtma6uxd7ctq8553e495'
-          ]
-
-          const utxos = await bchjs.Electrumx.utxo(addrs)
-          // console.log(`utxos: ${JSON.stringify(utxos, null, 2)}`)
-
-          const result = await bchjs.SLP.Utils.hydrateUtxos(utxos.utxos)
-          // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-          // Test the general structure of the output.
-          assert.isArray(result.slpUtxos)
-          assert.equal(result.slpUtxos.length, 3)
-          assert.equal(result.slpUtxos[0].utxos.length, 1)
-          assert.equal(result.slpUtxos[1].utxos.length, 1)
-          assert.equal(result.slpUtxos[2].utxos.length, 2)
-
-          try {
-            // Test the expected values.
-            assert.equal(result.slpUtxos[0].utxos[0].isValid, false)
-            assert.equal(result.slpUtxos[1].utxos[0].isValid, true)
-            assert.equal(result.slpUtxos[1].utxos[0].tokenTicker, 'TROUT')
-            assert.equal(result.slpUtxos[2].utxos[0].isValid, false)
-            assert.equal(result.slpUtxos[2].utxos[1].isValid, true)
-            assert.equal(result.slpUtxos[2].utxos[1].tokenTicker, 'VALENTINE')
-          } catch (err) {
-            console.error(
-              'The hydrateUtxos call may hitting rate limits, or SLPDB may be having issues if "isValid" results are "null"'
-            )
-            console.log('Error: ', err)
-          }
-        })
-
-        it('should handle null SLPDB validations', async () => {
-          const utxos = [
-            {
-              height: 665577,
-              tx_hash:
-                '4b89405c54d1c0bde8aa476a47561a42a6e7a5e927daa2ec69d428810eae3419',
-              tx_pos: 1,
-              value: 546
-            },
-            {
-              height: 665577,
-              tx_hash:
-                'f7e5199ef6669ad4d078093b3ad56e355b6ab84567e59ad0f08a5ad0244f783a',
-              tx_pos: 1,
-              value: 546
-            }
-          ]
-
-          const data = await bchjs.SLP.Utils.hydrateUtxos([{ utxos: utxos }])
-          // console.log(`data: ${JSON.stringify(data, null, 2)}`)
-
-          assert.isArray(data.slpUtxos)
-          assert.equal(data.slpUtxos[0].isValid, null)
-        })
-      })
-
-      describe('#hydrateUtxosWL', () => {
-        it('should hydrate UTXOs', async () => {
-          const utxos = [
-            {
-              utxos: [
-                {
-                  txid:
-                    '89b3f0c84efe8b01b24e2d7ac08636de5781f31dbb84478e3de868ca0a7ed93a',
-                  vout: 1,
-                  value: 546
-                }
-              ]
-            }
-          ]
-
-          const result = await bchjs.SLP.Utils.hydrateUtxosWL(utxos)
-          // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-          // Test the general structure of the output.
-          assert.isArray(result.slpUtxos)
-          assert.equal(result.slpUtxos.length, 1)
-          assert.equal(result.slpUtxos[0].utxos.length, 1)
-
-          // Test the non-slp UTXO.
-          assert.property(result.slpUtxos[0].utxos[0], 'txid')
-          assert.property(result.slpUtxos[0].utxos[0], 'vout')
-          assert.property(result.slpUtxos[0].utxos[0], 'value')
-          assert.property(result.slpUtxos[0].utxos[0], 'isValid')
-          assert.equal(result.slpUtxos[0].utxos[0].isValid, true)
-        })
-
-        it('should process data directly from Electrumx', async () => {
-          const addrs = [
-            'bitcoincash:qqnt53cfw990u6y38xgezm0lfa8hknw0wueezcpagp',
-            'bitcoincash:qrh3qgtax6adegzc7zxm6m4sgrv9wq28yqnfn33ce5',
-            'bitcoincash:qqcaee5w4ws77n8s2gzy6fwtma6uxd7ctq8553e495'
-          ]
-
-          const utxos = await bchjs.Electrumx.utxo(addrs)
-          // console.log(`utxos: ${JSON.stringify(utxos, null, 2)}`)
-
-          const result = await bchjs.SLP.Utils.hydrateUtxosWL(utxos.utxos)
-          // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-          // Test the general structure of the output.
-          assert.isArray(result.slpUtxos)
-          assert.equal(result.slpUtxos.length, 3)
-          assert.equal(result.slpUtxos[0].utxos.length, 1)
-          assert.equal(result.slpUtxos[1].utxos.length, 1)
-          assert.equal(result.slpUtxos[2].utxos.length, 2)
-
-          try {
-            // Test the expected values.
-            assert.equal(result.slpUtxos[0].utxos[0].isValid, false)
-            assert.equal(result.slpUtxos[1].utxos[0].isValid, true)
-            assert.equal(result.slpUtxos[1].utxos[0].tokenTicker, 'TROUT')
-            assert.equal(result.slpUtxos[2].utxos[0].isValid, false)
-            // assert.equal(result.slpUtxos[2].utxos[1].isValid, null)
-            assert.equal(result.slpUtxos[2].utxos[1].tokenTicker, 'VALENTINE')
-          } catch (err) {
-            console.error(
-              'The hydrateUtxos call may hitting rate limits, or SLPDB may be having issues if "isValid" results are "null"'
-            )
-            console.log('Error: ', err)
-          }
-        })
-
-        it('should handle null SLPDB validations', async () => {
-          const utxos = [
-            {
-              height: 665577,
-              tx_hash:
-                '4b89405c54d1c0bde8aa476a47561a42a6e7a5e927daa2ec69d428810eae3419',
-              tx_pos: 1,
-              value: 546
-            },
-            {
-              height: 665577,
-              tx_hash:
-                'f7e5199ef6669ad4d078093b3ad56e355b6ab84567e59ad0f08a5ad0244f783a',
-              tx_pos: 1,
-              value: 546
-            }
-          ]
-
-          const data = await bchjs.SLP.Utils.hydrateUtxosWL([{ utxos: utxos }])
-          // console.log(`data: ${JSON.stringify(data, null, 2)}`)
-
-          assert.isArray(data.slpUtxos)
-          assert.equal(data.slpUtxos[0].isValid, null)
-        })
-      })
-
-      describe('#validateTxid', () => {
-        // This test is not necessary.
-        it('should handle a null response from SLPDB', async () => {
-          const txid =
-            '4b89405c54d1c0bde8aa476a47561a42a6e7a5e927daa2ec69d428810eae3419'
-
-          const result = await bchjs.SLP.Utils.validateTxid(txid)
-          // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-          assert.isArray(result)
-          assert.equal(result[0].txid, txid)
-          // assert.equal(result[0].valid, null)
-        })
-
-        it('should handle a null response from SLPDB', async () => {
-          const txid = [
-            '4b89405c54d1c0bde8aa476a47561a42a6e7a5e927daa2ec69d428810eae3419',
-            '3a4b628cbcc183ab376d44ce5252325f042268307ffa4a53443e92b6d24fb488'
-          ]
-
-          const result = await bchjs.SLP.Utils.validateTxid(txid)
-          // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-          assert.isArray(result)
-          assert.equal(result[0].txid, txid[0])
-          // assert.equal(result[0].valid, null)
-        })
-      })
-
-      describe('#validateTxid2', () => {
-        it('should invalidate a known invalid TXID', async () => {
-          const txid =
-            'f7e5199ef6669ad4d078093b3ad56e355b6ab84567e59ad0f08a5ad0244f783a'
-
-          const result = await bchjs.SLP.Utils.validateTxid2(txid)
-          // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-          assert.property(result, 'txid')
-          assert.equal(result.txid, txid)
-
-          assert.property(result, 'isValid')
-          assert.equal(result.isValid, false)
-        })
-
-        it('should validate a known valid TXID', async () => {
-          const txid =
-            '3a4b628cbcc183ab376d44ce5252325f042268307ffa4a53443e92b6d24fb488'
-
-          const result = await bchjs.SLP.Utils.validateTxid2(txid)
-          // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-          assert.property(result, 'txid')
-          assert.equal(result.txid, txid)
-
-          assert.property(result, 'isValid')
-          assert.equal(result.isValid, true)
-        })
-      })
-
-      describe('#getWhitelist', () => {
-        it('should get the whitelist', async () => {
-          const result = await bchjs.SLP.Utils.getWhitelist()
-          // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-          assert.isArray(result)
-          assert.property(result[0], 'name')
-          assert.property(result[1], 'tokenId')
-        })
-      })
-
-      describe('#getStatus', () => {
-        it('should return the current block height of the SLPDB indexer', async () => {
-          const result = await bchjs.SLP.Utils.getStatus()
-
-          // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-          assert.property(result, 'bchBlockHeight')
-          assert.property(result, 'slpProcessedBlockHeight')
-        })
-      })
-
-      describe('#waterfallValidateTxid', () => {
-        it('should validate known good txid not in whitelist', async () => {
-          const txid =
-            '3a4b628cbcc183ab376d44ce5252325f042268307ffa4a53443e92b6d24fb488'
-
-          const result = await bchjs.SLP.Utils.waterfallValidateTxid(txid)
-          // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-          assert.equal(result, true)
-        })
-
-        it('should invalidate a known invalid TXID', async () => {
-          const txid =
-            'f7e5199ef6669ad4d078093b3ad56e355b6ab84567e59ad0f08a5ad0244f783a'
-
-          const result = await bchjs.SLP.Utils.waterfallValidateTxid(txid)
-          // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-          assert.equal(result, false)
-        })
-      })
      describe('#tokentype1', () => {
        describe('#getHexOpReturn', () => {
          it('should return OP_RETURN object ', async () => {
@@ -1,443 +0,0 @@
-/*
-  Unit tests for the IPFS Class.
-*/
-
-const assert = require('chai').assert
-const sinon = require('sinon')
-const BCHJS = require('../../src/bch-js')
-let bchjs
-
-const mockData = require('./fixtures/ipfs-mock')
-
-describe('#IPFS', () => {
-  let sandbox
-
-  beforeEach(() => {
-    sandbox = sinon.createSandbox()
-
-    bchjs = new BCHJS()
-  })
-
-  afterEach(() => sandbox.restore())
-
-  describe('#initUppy', () => {
-    it('should initialize uppy', () => {
-      bchjs.IPFS.initUppy()
-    })
-  })
-
-  describe('#createFileModelServer', () => {
-    it('should throw an error if file does not exist', async () => {
-      try {
-        const path = '/non-existant-file'
-
-        await bchjs.IPFS.createFileModelServer(path)
-
-        assert.equal(true, false, 'Unexpected result')
-      } catch (err) {
-        // console.log(`err.message: ${err.message}`)
-        assert.include(err.message, 'Could not find this file')
-      }
-    })
-
-    it('should create a new file model', async () => {
-      const path = `${__dirname.toString()}/ipfs.js`
-
-      sandbox
-        .stub(bchjs.IPFS.axios, 'post')
-        .resolves({ data: mockData.mockNewFileModel })
-
-      const result = await bchjs.IPFS.createFileModelServer(path)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.property(result, 'success')
-      assert.equal(result.success, true)
-
-      assert.property(result, 'hostingCostBCH')
-      assert.property(result, 'hostingCostUSD')
-      assert.property(result, 'file')
-
-      assert.property(result.file, 'payloadLink')
-      assert.property(result.file, 'hasBeenPaid')
-      assert.property(result.file, '_id')
-      assert.property(result.file, 'schemaVersion')
-      assert.property(result.file, 'size')
-      assert.property(result.file, 'fileName')
-      assert.property(result.file, 'fileExtension')
-      assert.property(result.file, 'createdTimestamp')
-      assert.property(result.file, 'hostingCost')
-      assert.property(result.file, 'walletIndex')
-      assert.property(result.file, 'bchAddr')
-    })
-  })
-
-  describe('#uploadFileServer', () => {
-    it('should throw an error if file does not exist', async () => {
-      try {
-        const path = '/non-existant-file'
-
-        await bchjs.IPFS.uploadFileServer(path)
-
-        assert.equal(true, false, 'Unexpected result')
-      } catch (err) {
-        // console.log(`err.message: ${err.message}`)
-        assert.include(err.message, 'Could not find this file')
-      }
-    })
-
-    it('should throw an error if modelId is not included', async () => {
-      try {
-        const path = `${__dirname.toString()}/ipfs.js`
-
-        await bchjs.IPFS.uploadFileServer(path)
-
-        assert.equal(true, false, 'Unexpected result')
-      } catch (err) {
-        // console.log(`err.message: ${err.message}`)
-        assert.include(err.message, 'Must include a file model ID')
-      }
-    })
-
-    it('Should throw error if the file was not uploaded', async () => {
-      try {
-        const mock = {
-          successful: [],
-          failed: [
-            {
-              id: 'file id'
-            }
-          ]
-        }
-        sandbox.stub(bchjs.IPFS.uppy, 'upload').resolves(mock)
-
-        const path = `${__dirname.toString()}/ipfs.js`
-        await bchjs.IPFS.uploadFileServer(path, '5ec562319bfacc745e8d8a52')
-
-        assert.equal(true, false, 'Unexpected result')
-      } catch (err) {
-        // console.log(err)
-        assert.include(err.message, 'The file could not be uploaded')
-      }
-    })
-
-    it('should return file object if the file is uploaded', async () => {
-      try {
-        sandbox.stub(bchjs.IPFS.uppy, 'upload').resolves(mockData.uploadData)
-
-        const path = `${__dirname.toString()}/ipfs.js`
-        const result = await bchjs.IPFS.uploadFileServer(
-          path,
-          '5ec562319bfacc745e8d8a52'
-        )
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        assert.property(result, 'schemaVersion')
-        assert.property(result, 'size')
-        assert.property(result, 'fileId')
-        assert.property(result, 'fileName')
-        assert.property(result, 'fileExtension')
-      } catch (err) {
-        // console.log(err)
-        assert.equal(true, false, 'Unexpected result')
-      }
-    })
-  })
-
-  describe('#getStatus', () => {
-    it('should throw an error if modelId is not included', async () => {
-      try {
-        await bchjs.IPFS.getStatus()
-
-        assert.equal(true, false, 'Unexpected result')
-      } catch (err) {
-        // console.log(`err.message: ${err.message}`)
-        assert.include(err.message, 'Must include a file model ID')
-      }
-    })
-
-    it('should get data on an unpaid file', async () => {
-      const modelId = '5ec7392c2acfe57aa62e945a'
-
-      sandbox
-        .stub(bchjs.IPFS.axios, 'get')
-        .resolves({ data: mockData.unpaidFileData })
-
-      const result = await bchjs.IPFS.getStatus(modelId)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.property(result, 'hasBeenPaid')
-      assert.property(result, 'satCost')
-      assert.property(result, 'bchAddr')
-      assert.property(result, 'ipfsHash')
-      assert.property(result, 'fileId')
-      assert.property(result, 'fileName')
-    })
-
-    it('should get data on an unpaid file', async () => {
-      const modelId = '5ec7392c2acfe57aa62e945a'
-
-      sandbox
-        .stub(bchjs.IPFS.axios, 'get')
-        .resolves({ data: mockData.paidFileData })
-
-      const result = await bchjs.IPFS.getStatus(modelId)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.property(result, 'hasBeenPaid')
-      assert.property(result, 'satCost')
-      assert.property(result, 'bchAddr')
-      assert.property(result, 'ipfsHash')
-      assert.property(result, 'fileId')
-      assert.property(result, 'fileName')
-    })
-  })
-
-  describe('#createFileModelWeb', () => {
-    it('should throw an error if file is undefined', async () => {
-      try {
-        let file
-
-        await bchjs.IPFS.createFileModelWeb(file)
-
-        assert.equal(true, false, 'Unexpected result')
-      } catch (err) {
-        // console.log(`err.message: ${err.message}`)
-        assert.include(err.message, 'File is required')
-      }
-    })
-    it('should throw an error if file is empty', async () => {
-      try {
-        const file = {}
-
-        await bchjs.IPFS.createFileModelWeb(file)
-
-        assert.equal(true, false, 'Unexpected result')
-      } catch (err) {
-        // console.log(`err.message: ${err.message}`)
-        assert.include(
-          err.message,
-          'File should have the property \'name\' of string type'
-        )
-      }
-    })
-    it("should throw an error if 'name' property is not included", async () => {
-      try {
-        const file = {
-          size: 5000
-        }
-
-        await bchjs.IPFS.createFileModelWeb(file)
-
-        assert.equal(true, false, 'Unexpected result')
-      } catch (err) {
-        // console.log(`err.message: ${err.message}`)
-        assert.include(
-          err.message,
-          'File should have the property \'name\' of string type'
-        )
-      }
-    })
-
-    it("should throw an error if 'size' property is not included", async () => {
-      try {
-        const file = {
-          name: 'ipfs.js'
-        }
-
-        await bchjs.IPFS.createFileModelWeb(file)
-
-        assert.equal(true, false, 'Unexpected result')
-      } catch (err) {
-        // console.log(`err.message: ${err.message}`)
-        assert.include(
-          err.message,
-          'File should have the property \'size\' of number type'
-        )
-      }
-    })
-
-    it('should create a new file model', async () => {
-      const file = {
-        name: 'ipfs.js',
-        size: 5000,
-        type: 'text/plain'
-      }
-      sandbox
-        .stub(bchjs.IPFS.axios, 'post')
-        .resolves({ data: mockData.mockNewFileModel })
-
-      const result = await bchjs.IPFS.createFileModelWeb(file)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.property(result, 'success')
-      assert.equal(result.success, true)
-
-      assert.property(result, 'hostingCostBCH')
-      assert.property(result, 'hostingCostUSD')
-      assert.property(result, 'file')
-
-      assert.property(result.file, 'payloadLink')
-      assert.property(result.file, 'hasBeenPaid')
-      assert.property(result.file, '_id')
-      assert.property(result.file, 'schemaVersion')
-      assert.property(result.file, 'size')
-      assert.property(result.file, 'fileName')
-      assert.property(result.file, 'fileExtension')
-      assert.property(result.file, 'createdTimestamp')
-      assert.property(result.file, 'hostingCost')
-      assert.property(result.file, 'walletIndex')
-      assert.property(result.file, 'bchAddr')
-    })
-  })
-
-  describe('#uploadFileWeb', () => {
-    it('should throw an error if file is undefined', async () => {
-      try {
-        let file
-
-        await bchjs.IPFS.uploadFileWeb(file)
-
-        assert.equal(true, false, 'Unexpected result')
-      } catch (err) {
-        // console.log(`err.message: ${err.message}`)
-        assert.include(err.message, 'File is required')
-      }
-    })
-    it('should throw an error if file is empty', async () => {
-      try {
-        const file = {}
-
-        await bchjs.IPFS.uploadFileWeb(file)
-
-        assert.equal(true, false, 'Unexpected result')
-      } catch (err) {
-        // console.log(`err.message: ${err.message}`)
-        assert.include(
-          err.message,
-          'File should have the property \'name\' of string type'
-        )
-      }
-    })
-    it("should throw an error if 'name' property is not included", async () => {
-      try {
-        const file = {
-          size: 5000,
-          type: 'text/plain'
-        }
-
-        await bchjs.IPFS.uploadFileWeb(file)
-
-        assert.equal(true, false, 'Unexpected result')
-      } catch (err) {
-        // console.log(`err.message: ${err.message}`)
-        assert.include(
-          err.message,
-          'File should have the property \'name\' of string type'
-        )
-      }
-    })
-    it("should throw an error if 'size' property is not included", async () => {
-      try {
-        const file = {
-          name: 'ipfs.js',
-          type: 'text/plain'
-        }
-
-        await bchjs.IPFS.uploadFileWeb(file)
-
-        assert.equal(true, false, 'Unexpected result')
-      } catch (err) {
-        // console.log(`err.message: ${err.message}`)
-        assert.include(
-          err.message,
-          'File should have the property \'size\' of number type'
-        )
-      }
-    })
-    it("should throw an error if 'type' property is not included", async () => {
-      try {
-        const file = {
-          name: 'ipfs.js',
-          size: 5000
-        }
-
-        await bchjs.IPFS.uploadFileWeb(file)
-
-        assert.equal(true, false, 'Unexpected result')
-      } catch (err) {
-        // console.log(`err.message: ${err.message}`)
-        assert.include(
-          err.message,
-          'File should have the property \'type\' of string type'
-        )
-      }
-    })
-    it('should throw an error if modelId is not included', async () => {
-      try {
-        const file = {
-          name: 'ipfs.js',
-          size: 5000,
-          type: 'text/plain'
-        }
-        await bchjs.IPFS.uploadFileWeb(file)
-
-        assert.equal(true, false, 'Unexpected result')
-      } catch (err) {
-        // console.log(`err.message: ${err.message}`)
-        assert.include(err.message, 'Must include a file model ID')
-      }
-    })
-
-    it('Should throw error if the file was not uploaded', async () => {
-      try {
-        const mock = {
-          successful: [],
-          failed: [
-            {
-              id: 'file id'
-            }
-          ]
-        }
-        sandbox.stub(bchjs.IPFS.uppy, 'upload').resolves(mock)
-
-        const file = {
-          name: 'ipfs.js',
-          size: 5000,
-          type: 'text/plain'
-        }
-        await bchjs.IPFS.uploadFileWeb(file, '5ec562319bfacc745e8d8a52')
-
-        assert.equal(true, false, 'Unexpected result')
-      } catch (err) {
-        // console.log(err)
-        assert.include(err.message, 'The file could not be uploaded')
-      }
-    })
-
-    it('should return file object if the file is uploaded', async () => {
-      try {
-        sandbox.stub(bchjs.IPFS.uppy, 'upload').resolves(mockData.uploadData)
-
-        const file = {
-          name: 'ipfs.js',
-          size: 5000,
-          type: 'text/plain'
-        }
-        const result = await bchjs.IPFS.uploadFileWeb(
-          file,
-          '5ec562319bfacc745e8d8a52'
-        )
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        assert.property(result, 'schemaVersion')
-        assert.property(result, 'size')
-        assert.property(result, 'fileId')
-        assert.property(result, 'fileName')
-        assert.property(result, 'fileExtension')
-      } catch (err) {
-        // console.log(err)
-        assert.equal(true, false, 'Unexpected result')
-      }
-    })
-  })
-})
@@ -45,216 +45,6 @@ describe('#SLP Utils', () => {
    sandbox.restore()
  })

-  describe('#list', () => {
-    it('should list single SLP token by id', async () => {
-      sandbox
-        .stub(uut.Utils.axios, 'get')
-        .resolves({ data: mockData.mockToken })
-
-      const tokenId =
-        '4276533bb702e7f8c9afd8aa61ebf016e95011dc3d54e55faa847ac1dd461e84'
-
-      const list = await uut.Utils.list(tokenId)
-      // console.log(`list: ${JSON.stringify(list, null, 2)}`)
-
-      assert.equal(list.id, tokenId)
-      assert.property(list, 'decimals')
-      assert.property(list, 'symbol')
-      assert.property(list, 'documentUri')
-      assert.property(list, 'name')
-    })
-
-    it('should list multiple SLP tokens by array of ids', async () => {
-      // Mock the call to the REST API
-      sandbox
-        .stub(uut.Utils.axios, 'post')
-        .resolves({ data: mockData.mockList })
-
-      const tokenIds = [
-        '4276533bb702e7f8c9afd8aa61ebf016e95011dc3d54e55faa847ac1dd461e84',
-        '8fc284dcbc922f7bb7e2a443dc3af792f52923bba403fcf67ca028c88e89da0e'
-      ]
-
-      const list = await uut.Utils.list(tokenIds)
-      // console.log(`list: ${JSON.stringify(list, null, 2)}`)
-
-      assert.isArray(list)
-      assert.property(list[0], 'symbol')
-      assert.property(list[1], 'symbol')
-    })
-  })
-
-  describe('#balancesForAddress', () => {
-    it('should throw an error if input is not a string or array of strings', async () => {
-      try {
-        const address = 1234
-
-        await uut.Utils.balancesForAddress(address)
-
-        assert.equal(true, false, 'Uh oh. Code path should not end here.')
-      } catch (err) {
-        // console.log(`Error: `, err)
-        assert.include(
-          err.message,
-          'Input address must be a string or array of strings'
-        )
-      }
-    })
-
-    it('should fetch all balances for address: simpleledger:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvyucjzqt9', async () => {
-      // Mock the call to the REST API
-      if (process.env.TEST === 'unit') {
-        sandbox
-          .stub(uut.Utils.axios, 'get')
-          .resolves({ data: mockData.balancesForAddress })
-      }
-      // sandbox
-      //  .stub(uut.Utils, "balancesForAddress")
-      //  .resolves(mockData.balancesForAddress)
-
-      const balances = await uut.Utils.balancesForAddress(
-        'simpleledger:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvyucjzqt9'
-      )
-      // console.log(`balances: ${JSON.stringify(balances, null, 2)}`)
-
-      assert.isArray(balances)
-      assert.hasAllKeys(balances[0], [
-        'tokenId',
-        'balanceString',
-        'balance',
-        'decimalCount',
-        'slpAddress'
-      ])
-    })
-
-    it('should fetch balances for multiple addresses.', async () => {
-      const addresses = [
-        'simpleledger:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvyucjzqt9',
-        'simpleledger:qqss4zp80hn6szsa4jg2s9fupe7g5tcg5ucdyl3r57'
-      ]
-
-      // Mock the call to the REST API
-      if (process.env.TEST === 'unit') {
-        sandbox
-          .stub(uut.Utils.axios, 'post')
-          .resolves({ data: mockData.balancesForAddresses })
-      }
-
-      const balances = await uut.Utils.balancesForAddress(addresses)
-      // console.log(`balances: ${JSON.stringify(balances, null, 2)}`)
-
-      assert.isArray(balances)
-      assert.isArray(balances[0])
-      assert.hasAllKeys(balances[0][0], [
-        'tokenId',
-        'balanceString',
-        'balance',
-        'decimalCount',
-        'slpAddress'
-      ])
-    })
-  })
-
-  describe('#validateTxid', () => {
-    it('should validate slp txid', async () => {
-      // Mock the call to the REST API
-      sandbox
-        .stub(uut.Utils.axios, 'post')
-        .resolves({ data: mockData.mockIsValidTxid })
-
-      const isValid = await uut.Utils.validateTxid(
-        'df808a41672a0a0ae6475b44f272a107bc9961b90f29dc918d71301f24fe92fb'
-      )
-      assert.deepEqual(isValid, [
-        {
-          txid:
-            'df808a41672a0a0ae6475b44f272a107bc9961b90f29dc918d71301f24fe92fb',
-          valid: true
-        }
-      ])
-    })
-  })
-
-  describe('#balancesForToken', () => {
-    it('should retrieve token balances for a given tokenId', async () => {
-      // Mock the call to the REST API
-      sandbox
-        .stub(uut.Utils.axios, 'get')
-        .resolves({ data: mockData.mockBalancesForToken })
-
-      const balances = await uut.Utils.balancesForToken(
-        'df808a41672a0a0ae6475b44f272a107bc9961b90f29dc918d71301f24fe92fb'
-      )
-
-      assert.hasAnyKeys(balances[0], ['tokenBalance', 'slpAddress'])
-    })
-  })
-
-  describe('#tokenStats', () => {
-    it('should retrieve stats for a given tokenId', async () => {
-      // Mock the call to the REST API
-      sandbox
-        .stub(uut.Utils.axios, 'get')
-        .resolves({ data: mockData.mockTokenStats })
-
-      const tokenStats = await uut.Utils.tokenStats(
-        'df808a41672a0a0ae6475b44f272a107bc9961b90f29dc918d71301f24fe92fb'
-      )
-
-      assert.hasAnyKeys(tokenStats, [
-        'circulatingSupply',
-        'decimals',
-        'documentUri',
-        'name',
-        'satoshisLockedUp',
-        'symbol',
-        'tokenId',
-        'totalBurned',
-        'totalMinted',
-        'txnsSinceGenesis',
-        'validAddresses',
-        'validUtxos'
-      ])
-    })
-  })
-
-  describe('#transactions', () => {
-    it('should retrieve transactions for a given tokenId and address', async () => {
-      // Mock the call to the REST API
-      sandbox
-        .stub(uut.Utils.axios, 'get')
-        .resolves({ data: mockData.mockTransactions })
-
-      const transactions = await uut.Utils.transactions(
-        '495322b37d6b2eae81f045eda612b95870a0c2b6069c58f70cf8ef4e6a9fd43a',
-        'simpleledger:qrhvcy5xlegs858fjqf8ssl6a4f7wpstaqnt0wauwu'
-      )
-
-      assert.hasAnyKeys(transactions[0], ['txid', 'tokenDetails'])
-    })
-  })
-
-  describe('#burnTotal', () => {
-    it('should retrieve input, output and burn totals', async () => {
-      // Mock the call to the REST API
-      sandbox
-        .stub(uut.Utils.axios, 'get')
-        .resolves({ data: mockData.mockBurnTotal })
-
-      const burnTotal = await uut.Utils.burnTotal(
-        'c7078a6c7400518a513a0bde1f4158cf740d08d3b5bfb19aa7b6657e2f4160de'
-      )
-      // console.log(`burnTotal: ${JSON.stringify(burnTotal, null, 2)}`)
-
-      assert.hasAnyKeys(burnTotal, [
-        'transactionId',
-        'inputTotal',
-        'outputTotal',
-        'burnTotal'
-      ])
-    })
-  })
-
  describe('#decodeOpReturn', () => {
    it('should throw an error for a non-string input', async () => {
      try {
@@ -1910,518 +1700,4 @@ describe('#SLP Utils', () => {
      assert.equal(data[0].isValid, false)
    })
  })
-
-  describe('#tokenUtxoDetailsWL', () => {
-    it('should return details for a simple SEND SLP token utxo', async () => {
-      // Mock the call to REST API
-      // Stub the calls to decodeOpReturn.
-      sandbox
-        .stub(uut.Utils, 'decodeOpReturn')
-        .onCall(0)
-        .resolves({
-          tokenType: 1,
-          txType: 'SEND',
-          tokenId:
-            '497291b8a1dfe69c8daea50677a3d31a5ef0e9484d8bebb610dac64bbc202fb7',
-          amounts: ['200000000', '99887500000000']
-        })
-        .onCall(1)
-        .resolves({
-          tokenType: 1,
-          txType: 'GENESIS',
-          ticker: 'TOK-CH',
-          name: 'TokyoCash',
-          tokenId:
-            '497291b8a1dfe69c8daea50677a3d31a5ef0e9484d8bebb610dac64bbc202fb7',
-          documentUri: '',
-          documentHash: '',
-          decimals: 8,
-          mintBatonVout: 0,
-          qty: '2100000000000000'
-        })
-
-      // Stub the call to validateTxid
-      sandbox.stub(uut.Utils, 'validateTxid3').resolves([
-        {
-          txid:
-            'fde117b1f176b231e2fa9a6cb022e0f7c31c288221df6bcb05f8b7d040ca87cb',
-          valid: true
-        }
-      ])
-
-      const utxos = [
-        {
-          txid:
-            'fde117b1f176b231e2fa9a6cb022e0f7c31c288221df6bcb05f8b7d040ca87cb',
-          vout: 1,
-          amount: 0.00000546,
-          satoshis: 546,
-          height: 596089,
-          confirmations: 748
-        }
-      ]
-
-      const data = await uut.Utils.tokenUtxoDetailsWL(utxos)
-      // console.log(`data: ${JSON.stringify(data, null, 2)}`)
-
-      assert.property(data[0], 'txid')
-      assert.property(data[0], 'vout')
-      assert.property(data[0], 'height')
-      assert.property(data[0], 'utxoType')
-      assert.property(data[0], 'tokenId')
-      assert.property(data[0], 'tokenTicker')
-      assert.property(data[0], 'tokenName')
-      assert.property(data[0], 'tokenDocumentUrl')
-      assert.property(data[0], 'tokenDocumentHash')
-      assert.property(data[0], 'decimals')
-      assert.property(data[0], 'tokenQty')
-      assert.property(data[0], 'isValid')
-      assert.equal(data[0].isValid, true)
-    })
-  })
-
-  describe('#txDetails', () => {
-    it('should throw an error if txid is not included', async () => {
-      try {
-        await uut.Utils.txDetails()
-      } catch (err) {
-        assert.include(
-          err.message,
-          'txid string must be included',
-          'Expected error message.'
-        )
-      }
-    })
-
-    it('should throw error for non-existent txid', async () => {
-      try {
-        // Mock the call to the REST API
-        if (process.env.TEST === 'unit') {
-          sandbox
-            .stub(uut.Utils.axios, 'get')
-            // .resolves({ data: mockData.nonSLPTxDetailsWithoutOpReturn })
-            .throws({ error: 'TXID not found' })
-        }
-
-        const txid =
-          'd284e71227ec89f714b964d8eda595be6392bebd2fac46082bc5a9ce6fb7b33e'
-
-        await uut.Utils.txDetails(txid)
-        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-        assert.fail('Unexpected result')
-      } catch (err) {
-        // console.log(`err: `, err)
-        assert.include(err.error, 'TXID not found', 'Expected error message.')
-      }
-    })
-
-    it('should return details for an SLP txid', async () => {
-      // Mock the call to the REST API
-      if (process.env.TEST === 'unit') {
-        sandbox
-          .stub(uut.Utils.axios, 'get')
-          .resolves({ data: mockData.mockTxDetails })
-      }
-
-      const txid =
-        '9dbaaafc48c49a21beabada8de632009288a2cd52eecefd0c00edcffca9955d0'
-
-      const result = await uut.Utils.txDetails(txid)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.hasAnyKeys(result, [
-        'txid',
-        'version',
-        'locktime',
-        'vin',
-        'vout',
-        'blockhash',
-        'blockheight',
-        'confirmations',
-        'time',
-        'blocktime',
-        'valueOut',
-        'size',
-        'valueIn',
-        'fees',
-        'tokenInfo',
-        'tokenIsValid'
-      ])
-    })
-  })
-
-  describe('#hydrateUtxos', () => {
-    it('should throw an error if input is not an array', async () => {
-      try {
-        const utxos = 1234
-
-        await uut.Utils.hydrateUtxos(utxos)
-
-        assert.equal(true, false, 'Uh oh. Code path should not end here.')
-      } catch (err) {
-        // console.log(`Error: `, err)
-        assert.include(err.message, 'Input must be an array.')
-      }
-    })
-  })
-
-  describe('#hydrateUtxosWL', () => {
-    it('should throw an error if input is not an array', async () => {
-      try {
-        const utxos = 1234
-
-        await uut.Utils.hydrateUtxosWL(utxos)
-
-        assert.equal(true, false, 'Uh oh. Code path should not end here.')
-      } catch (err) {
-        // console.log(`Error: `, err)
-        assert.include(err.message, 'Input must be an array.')
-      }
-    })
-  })
-
-  describe('#validateTxid2', () => {
-    it('should throw an error if the input is an array', async () => {
-      try {
-        const txid = [
-          'f7e5199ef6669ad4d078093b3ad56e355b6ab84567e59ad0f08a5ad0244f783a'
-        ]
-
-        await uut.Utils.validateTxid2(txid)
-
-        assert.equal(true, false, 'Unexpected result')
-      } catch (err) {
-        // console.log("err: ", err)
-        assert.include(err.message, 'txid must be 64 character string')
-      }
-    })
-
-    it('should throw an error for a malformed txid', async () => {
-      try {
-        const txid =
-          'f7e5199ef6669ad4d078093b3ad56e355b6ab84567e59ad0f08a5ad0244f783'
-
-        await uut.Utils.validateTxid2(txid)
-
-        assert.equal(true, false, 'Unexpected result')
-      } catch (err) {
-        // console.log("err: ", err)
-        assert.include(err.message, 'txid must be 64 character string')
-      }
-    })
-
-    it('should invalidate a known invalid TXID', async () => {
-      const txid =
-        'f7e5199ef6669ad4d078093b3ad56e355b6ab84567e59ad0f08a5ad0244f783a'
-
-      // Mock live network calls.
-      sandbox.stub(uut.Utils.axios, 'get').resolves({
-        data: {
-          txid: txid,
-          isValid: false,
-          msg: ''
-        }
-      })
-
-      const result = await uut.Utils.validateTxid2(txid)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.property(result, 'txid')
-      assert.equal(result.txid, txid)
-
-      assert.property(result, 'isValid')
-      assert.equal(result.isValid, false)
-    })
-
-    it('should validate a known valid TXID', async () => {
-      const txid =
-        '3a4b628cbcc183ab376d44ce5252325f042268307ffa4a53443e92b6d24fb488'
-
-      // Mock live network calls.
-      sandbox.stub(uut.Utils.axios, 'get').resolves({
-        data: {
-          txid: txid,
-          isValid: true,
-          msg: ''
-        }
-      })
-
-      const result = await uut.Utils.validateTxid2(txid)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.property(result, 'txid')
-      assert.equal(result.txid, txid)
-
-      assert.property(result, 'isValid')
-      assert.equal(result.isValid, true)
-    })
-
-    // slp-validate can take a long time. bch-api cuts it off if it fails to
-    // return is less than 10 seconds. This test case handle this situation.
-    it('should handle timeout errors', async () => {
-      try {
-        const txid =
-          'eacb1085dfa296fef6d4ae2c0f4529a1bef096dd2325bdcc6dcb5241b3bdb579'
-
-        // Mock live network calls.
-        sandbox.stub(uut.Utils.axios, 'get').rejects({
-          error:
-            'Network error: Could not communicate with full node or other external service.'
-        })
-
-        await uut.Utils.validateTxid2(txid)
-
-        assert.equal(true, false, 'Unexpected result')
-      } catch (err) {
-        // console.log("err: ", err)
-        assert.include(err.message, 'slp-validate timed out')
-      }
-    })
-  })
-
-  describe('#validateTxid', () => {
-    it('should invalidate a known invalid TXID', async () => {
-      const txid =
-        'f7e5199ef6669ad4d078093b3ad56e355b6ab84567e59ad0f08a5ad0244f783a'
-
-      // Mock live network calls.
-      sandbox.stub(uut.Utils.axios, 'post').resolves({
-        data: mockData.mockValidateTxid3Invalid
-      })
-
-      const result = await uut.Utils.validateTxid(txid)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.isArray(result)
-
-      assert.property(result[0], 'txid')
-      assert.equal(result[0].txid, txid)
-
-      assert.property(result[0], 'valid')
-      assert.equal(result[0].valid, null)
-    })
-    /*
-    it("should handle a mix of valid, invalid, and non-SLP txs", async () => {
-      const txids = [
-        // Malformed SLP tx
-        "f7e5199ef6669ad4d078093b3ad56e355b6ab84567e59ad0f08a5ad0244f783a",
-        // Normal TX (non-SLP)
-        "01cdaec2f8b311fc2d6ecc930247bd45fa696dc204ab684596e281fe1b06c1f0",
-        // Valid PSF SLP tx
-        "daf4d8b8045e7a90b7af81bfe2370178f687da0e545511bce1c9ae539eba5ffd",
-        // Valid SLP token not in whitelist
-        "3a4b628cbcc183ab376d44ce5252325f042268307ffa4a53443e92b6d24fb488"
-      ]
-
-      const result = await uut.Utils.validateTxid(txids)
-      console.log(`result: ${JSON.stringify(result, null, 2)}`)
-    })
-*/
-  })
-
-  describe('#waterfallValidateTxid', () => {
-    // This test ensures that the whitelist SLPDB is called before the
-    // general purpose SLPDB.
-    it('should call validateTxid3() first', async () => {
-      const txid = 'fakeTxid'
-
-      const retVal = [{ txid, valid: true }]
-
-      // Use stubs to force the desired code path.
-      sandbox.stub(uut.Utils, 'validateTxid3').resolves(retVal)
-      sandbox
-        .stub(uut.Utils, 'validateTxid')
-        .rejects(new Error('Unexpected code path'))
-      sandbox
-        .stub(uut.Utils, 'validateTxid2')
-        .rejects(new Error('Unexpected code path'))
-
-      const result = await uut.Utils.waterfallValidateTxid(txid)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.equal(result, true)
-    })
-
-    // This test ensures that the general purpose SLPDB is called after the
-    // whitelist SLPDB, but before slp-api.
-    it('should call validateTxid() second', async () => {
-      const txid = 'fakeTxid'
-
-      const retVal1 = [{ txid, valid: null }]
-      const retVal2 = [{ txid, valid: true }]
-
-      // Use stubs to force the desired code path.
-      sandbox.stub(uut.Utils, 'validateTxid3').resolves(retVal1)
-      sandbox.stub(uut.Utils, 'validateTxid').resolves(retVal2)
-      sandbox
-        .stub(uut.Utils, 'validateTxid2')
-        .rejects(new Error('Unexpected code path'))
-
-      const result = await uut.Utils.waterfallValidateTxid(txid)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.equal(result, true)
-    })
-
-    // This test ensures that slp-api is called if both SLPDBs return null.
-    it('should call slp-api last', async () => {
-      const txid = 'fakeTxid'
-
-      const retVal1 = [{ txid, valid: null }]
-
-      // Use stubs to force the desired code path.
-      sandbox.stub(uut.Utils, 'validateTxid3').resolves(retVal1)
-      sandbox.stub(uut.Utils, 'validateTxid').resolves(retVal1)
-      sandbox.stub(uut.Utils, 'validateTxid2').resolves({ isValid: true })
-
-      const result = await uut.Utils.waterfallValidateTxid(txid)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.equal(result, true)
-    })
-
-    // CT 08-09-21 Changed behavior. validateTxid3() is now wrapped in a
-    // try/catch statement that exits quietly if there is an error.
-    // it('catches and throws an error', async () => {
-    //   try {
-    //     const txid = 'fakeTxid'
-    //
-    //     // Force an error
-    //     sandbox
-    //       .stub(uut.Utils, 'validateTxid3')
-    //       .rejects(new Error('fake error'))
-    //
-    //     await await uut.Utils.waterfallValidateTxid(txid)
-    //
-    //     assert.fail('Unexpected result')
-    //   } catch (err) {
-    //     // console.log(`err.message: ${err.message}`)
-    //     assert.include(err.message, 'fake error')
-    //   }
-    // })
-  })
-
-  describe('#getWhitelist', () => {
-    it('should return the list', async () => {
-      sandbox
-        .stub(uut.Utils.axios, 'get')
-        .resolves({ data: mockData.mockWhitelist })
-
-      const result = await uut.Utils.getWhitelist()
-
-      assert.isArray(result)
-      assert.property(result[0], 'name')
-      assert.property(result[1], 'tokenId')
-    })
-
-    it('catches and throws an error', async () => {
-      try {
-        sandbox.stub(uut.Utils.axios, 'get').rejects({
-          error:
-            'Network error: Could not communicate with full node or other external service.'
-        })
-
-        await uut.Utils.getWhitelist()
-
-        assert.fail('Unexpected result')
-      } catch (err) {
-        console.log('err: ', err)
-        assert.include(err.error, 'Network error')
-      }
-    })
-  })
-
-  describe('#validateTxid3', () => {
-    it('should invalidate a known invalid TXID', async () => {
-      const txid =
-        'f7e5199ef6669ad4d078093b3ad56e355b6ab84567e59ad0f08a5ad0244f783a'
-
-      // Mock live network calls.
-      sandbox.stub(uut.Utils.axios, 'post').resolves({
-        data: mockData.mockValidateTxid3Invalid
-      })
-
-      const result = await uut.Utils.validateTxid3(txid)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.isArray(result)
-
-      assert.property(result[0], 'txid')
-      assert.equal(result[0].txid, txid)
-
-      assert.property(result[0], 'valid')
-      assert.equal(result[0].valid, null)
-    })
-
-    it('should handle an array with a single element', async () => {
-      sandbox
-        .stub(uut.Utils.axios, 'post')
-        .resolves({ data: mockData.mockValidateTxid3Valid })
-
-      const txid = [
-        'daf4d8b8045e7a90b7af81bfe2370178f687da0e545511bce1c9ae539eba5ffd'
-      ]
-
-      const result = await uut.Utils.validateTxid3(txid)
-
-      assert.isArray(result)
-
-      assert.property(result[0], 'txid')
-      assert.equal(result[0].txid, txid)
-
-      assert.property(result[0], 'valid')
-      assert.equal(result[0].valid, true)
-    })
-
-    it('should handle an single string input', async () => {
-      sandbox
-        .stub(uut.Utils.axios, 'post')
-        .resolves({ data: mockData.mockValidateTxid3Valid })
-
-      const txid =
-        'daf4d8b8045e7a90b7af81bfe2370178f687da0e545511bce1c9ae539eba5ffd'
-
-      const result = await uut.Utils.validateTxid3(txid)
-
-      assert.isArray(result)
-
-      assert.property(result[0], 'txid')
-      assert.equal(result[0].txid, txid)
-
-      assert.property(result[0], 'valid')
-      assert.equal(result[0].valid, true)
-    })
-
-    it('catches and throws an error', async () => {
-      try {
-        sandbox.stub(uut.Utils.axios, 'post').rejects({
-          error:
-            'Network error: Could not communicate with full node or other external service.'
-        })
-
-        await uut.Utils.validateTxid3()
-
-        assert.equal(true, false, 'Unexpected result')
-      } catch (err) {
-        // console.log("err: ", err)
-        assert.include(err.error, 'Network error')
-      }
-    })
-  })
-
-  describe('#getStatus', () => {
-    it('should return the current block height of the SLPDB indexer', async () => {
-      sandbox
-        .stub(uut.Utils.axios, 'get')
-        .resolves({ data: mockData.slpdbStatus })
-
-      const result = await uut.Utils.getStatus()
-
-      // console.log(`result: `, result)
-
-      assert.property(result, 'bchBlockHeight')
-      assert.property(result, 'slpProcessedBlockHeight')
-    })
-  })
 })
@@ -15,137 +15,6 @@ describe('#utxo', () => {
  beforeEach(() => (sandbox = sinon.createSandbox()))
  afterEach(() => sandbox.restore())

-  describe('#getOld', () => {
-    it('should get hydrated and filtered UTXOs for an address', async () => {
-      // Mock dependencies.
-      sandbox.stub(bchjs.Utxo.electrumx, 'utxo').resolves(mockData.mockUtxoData)
-      sandbox
-        .stub(bchjs.Utxo.slp.Utils, 'hydrateUtxos')
-        .resolves(mockData.mockHydratedUtxos)
-
-      const addr = 'simpleledger:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvyucjzqt9'
-
-      const result = await bchjs.Utxo.getOld(addr)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.isArray(result)
-      assert.property(result[0], 'address')
-      assert.property(result[0], 'bchUtxos')
-      assert.property(result[0], 'nullUtxos')
-      assert.property(result[0], 'slpUtxos')
-      assert.isArray(result[0].bchUtxos)
-      assert.isArray(result[0].nullUtxos)
-    })
-
-    it('should catch and throw an error', async () => {
-      try {
-        // Force an error
-        sandbox
-          .stub(bchjs.Utxo.electrumx, 'utxo')
-          .rejects(new Error('test error'))
-
-        const addr = 'simpleledger:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvyucjzqt9'
-
-        await bchjs.Utxo.getOld(addr)
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'test error')
-      }
-    })
-
-    it('should handle an array of addresses', async () => {
-      // Mock dependencies.
-      sandbox.stub(bchjs.Utxo.electrumx, 'utxo').resolves({ utxos: {} })
-      sandbox
-        .stub(bchjs.Utxo.slp.Utils, 'hydrateUtxos')
-        .resolves(mockData.mockTwoHydratedAddrs)
-
-      const addr = [
-        'simpleledger:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvyucjzqt9',
-        'bitcoincash:qqh793x9au6ehvh7r2zflzguanlme760wuzehgzjh9'
-      ]
-
-      const result = await bchjs.Utxo.getOld(addr)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.isArray(result)
-      assert.equal(result.length, 2)
-      assert.property(result[0], 'address')
-      assert.property(result[0], 'bchUtxos')
-      assert.property(result[0], 'nullUtxos')
-      assert.property(result[0], 'slpUtxos')
-      assert.isArray(result[0].bchUtxos)
-      assert.isArray(result[0].nullUtxos)
-    })
-
-    it('should throw an error for array of 21 elements', async () => {
-      try {
-        const addr = 'simpleledger:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvyucjzqt9'
-
-        const addrs = []
-        for (let i = 0; i < 21; i++) {
-          addrs.push(addr)
-        }
-
-        await bchjs.Utxo.getOld(addrs)
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'Too many elements, 20 max.')
-      }
-    })
-
-    it('should handle NFTs and minting batons', async () => {
-      // Mock dependencies.
-      sandbox.stub(bchjs.Utxo.electrumx, 'utxo').resolves({ utxos: {} })
-      sandbox
-        .stub(bchjs.Utxo.slp.Utils, 'hydrateUtxos')
-        .resolves(mockData.mockEveryUtxoType)
-
-      const addr = 'simpleledger:qrm0c67wwqh0w7wjxua2gdt2xggnm90xwsr5k22euj'
-
-      const result = await bchjs.Utxo.getOld(addr)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.isArray(result)
-      assert.property(result[0], 'address')
-      assert.property(result[0], 'bchUtxos')
-      assert.property(result[0], 'nullUtxos')
-      assert.property(result[0], 'slpUtxos')
-      assert.isArray(result[0].bchUtxos)
-      assert.isArray(result[0].nullUtxos)
-
-      assert.isArray(result[0].slpUtxos.type1.mintBatons)
-      assert.isArray(result[0].slpUtxos.type1.tokens)
-      assert.isArray(result[0].slpUtxos.nft.groupMintBatons)
-      assert.isArray(result[0].slpUtxos.nft.groupTokens)
-      assert.isArray(result[0].slpUtxos.nft.tokens)
-    })
-
-    it('should use the whitelist when flag is set', async () => {
-      // Mock dependencies.
-      sandbox.stub(bchjs.Utxo.electrumx, 'utxo').resolves(mockData.mockUtxoData)
-      sandbox
-        .stub(bchjs.Utxo.slp.Utils, 'hydrateUtxosWL')
-        .resolves(mockData.mockHydratedUtxos)
-
-      const addr = 'simpleledger:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvyucjzqt9'
-      const useWhitelist = true
-
-      const result = await bchjs.Utxo.getOld(addr, useWhitelist)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.isArray(result)
-      assert.property(result[0], 'address')
-      assert.property(result[0], 'bchUtxos')
-      assert.property(result[0], 'nullUtxos')
-      assert.property(result[0], 'slpUtxos')
-      assert.isArray(result[0].bchUtxos)
-      assert.isArray(result[0].nullUtxos)
-    })
-  })
-
  describe('#findBiggestUtxo', () => {
    it('should throw error for non-array input', async () => {
      try {
@@ -249,6 +118,10 @@ describe('#utxo', () => {
      sandbox
        .stub(bchjs.Utxo.psfSlpIndexer, 'balance')
        .resolves(mockData.psfSlpIndexerUtxos01)
+      sandbox
+        .stub(bchjs.Utxo.psfSlpIndexer, 'tx')
+        .resolves({ txData: { isValidSlp: false } })
+
      // Mock function to return the same input. Good enough for this test.
      sandbox.stub(bchjs.Utxo, 'hydrateTokenData').resolves(x => x)

@@ -278,6 +151,9 @@ describe('#utxo', () => {
      sandbox
        .stub(bchjs.Utxo.electrumx, 'utxo')
        .resolves(mockData.fulcrumUtxos02)
+      sandbox
+        .stub(bchjs.Utxo.psfSlpIndexer, 'tx')
+        .resolves({ txData: { isValidSlp: false } })

      // Force psf-slp-indexer to return no UTXOs
      sandbox
Author	SHA1	Message	Date
Chris Troutner	4764463fc5	Merge pull request #220 from Permissionless-Software-Foundation/ct-unstable Removing SLPDB endpoints	2022-03-14 15:54:49 -07:00
Chris Troutner	857458db57	feat(slpdb): Removing endpoints that expect SLPDB interface	2022-03-14 15:50:21 -07:00
Chris Troutner	5f8f05d194	Working on removing slpdb endpoints	2022-03-14 15:13:41 -07:00
Chris Troutner	e455d9efec	fix(dependencies): Ensuring I'm using exact versions. npm audit = 0 vulns	2022-03-14 14:49:28 -07:00
Chris Troutner	ad4e05c289	Bumping to v6.0.0	2022-03-14 14:43:52 -07:00
Chris Troutner	0c1eda8e5a	Merge pull request #219 from Permissionless-Software-Foundation/ct-unstable Updates to tests	2022-03-13 19:12:18 -07:00
Chris Troutner	f15bc7e454	fix(tests): Deleting unneeded integration tests	2022-03-13 17:25:51 -07:00
Chris Troutner	e9113d864e	fix(ecash): Removing SLPDB tests	2022-03-13 13:20:09 -07:00
Chris Troutner	277c9ce0fd	Merge pull request #217 from Permissionless-Software-Foundation/ct-unstable feat(ipfs): Removing the ipfs pinning libraries and dependencies	2022-03-10 16:47:43 -08:00
Chris Troutner	e0c07d1542	feat(ipfs): Removing the ipfs pinning libraries and dependencies	2022-03-10 16:45:27 -08:00
Chris Troutner	56bc942e87	fix(tests): Fixing broken integration test	2022-03-10 16:38:41 -08:00
Chris Troutner	34b9cefb65	fix(psf-slp-indexer): Switching URL back	2022-03-10 16:37:11 -08:00
Chris Troutner	6a35091eec	fix(psf-slp-indexer): Fixing issue with url	2022-03-10 16:24:12 -08:00
Chris Troutner	02e3ff4dcd	Merge pull request #216 from Permissionless-Software-Foundation/ct-unstable fix(psf-slp-indexer): Adding flag for tx history of tokens	2022-02-06 13:26:05 -08:00
Chris Troutner	64f8adea25	fix(psf-slp-indexer): Adding flag for tx history of tokens	2022-02-06 13:23:25 -08:00
Chris Troutner	bcf817f5c7	Merge pull request #215 from Permissionless-Software-Foundation/ct-unstable Fixing integration test	2022-01-31 21:22:25 -08:00
Chris Troutner	541377e548	Fixing integration test	2022-01-31 21:18:08 -08:00
Chris Troutner	84b44b299a	Merge pull request #214 from Permissionless-Software-Foundation/ct-unstable fix(UTXO.get()): Added detection of null-tagged UTXOs	2022-01-31 21:13:50 -08:00
Chris Troutner	b6456df1f4	Fixing unit tests	2022-01-31 21:11:11 -08:00
Chris Troutner	b1826c04cb	fix(UTXO.get()): Added detection of null-tagged UTXOs	2022-01-31 20:57:36 -08:00