Using config.restURL instead of hard-coded URL

fix(Utxo.get()): Added additional integration tests

.gitignore

@@ -4,6 +4,7 @@ wallet-info.txt
 wallet.json
 integration-test-sweet.sh
 integration-test-ss.sh
+integration-test-bitfinex.sh
 
 docs/
 coverage/

.on-save.json

@@ -0,0 +1,8 @@
+[
+  {
+    "srcDir": "",
+    "destDir": "",
+    "files": "**/*.js",
+    "command": "npm run lint"
+  }
+]

LICENSE.md

@@ -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.
-

README.md

@@ -3,9 +3,9 @@
 [![Version](https://img.shields.io/npm/v/@psf/bch-js)](https://www.npmjs.com/package/@psf/bch-js)
 [![Downloads/week](https://img.shields.io/npm/dw/@psf/bch-js)](https://npmjs.org/package/@psf/bch-js)
 [![License](https://img.shields.io/npm/l/@psf/bch-js)](https://github.com/Permissionless-Software-Foundation/bch-js/blob/master/LICENSE.md)
-[![js-standard-style](https://img.shields.io/badge/javascript-standard%20code%20style-green.svg?style=flat-square)](https://github.com/feross/standard)
+[![js-standard-style](https://img.shields.io/badge/javascript-standard%20code%20style-green.svg?style=flat-square)](https://github.com/feross/standard) [![Join the chat at https://gitter.im/Permissionless-Software-Foundation/bch-js](https://badges.gitter.im/Permissionless-Software-Foundation/bch-js.svg)](https://gitter.im/Permissionless-Software-Foundation/bch-js?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-[bch-js](https://www.npmjs.com/package/@psf/bch-js) is a JavaScript npm library for creating web and mobile apps that can interact with the Bitcoin Cash (BCH) blockchains. It can be used for free, but requires an account on [FullStack.cash](https://fullstack.cash) for increased rate limits. Learn more from [this article](https://troutsblog.com/research/bitcoin-cash/how-to-bch-full-stack-developer) about Full Stack Bitcoin Cash development.
+[bch-js](https://www.npmjs.com/package/@psf/bch-js) is a JavaScript npm library for creating web and mobile apps that can interact with the Bitcoin Cash (BCH) and eCash (XEC) blockchains. bch-js contains a toolbox of handy tools, and an easy API for talking with [bch-api REST API](https://github.com/Permissionless-Software-Foundation/bch-api). [FullStack.cash](https://fullstack.cash) offers paid cloud access to bch-api. You can run your own infrastructure by following documentation on [CashStack.info](https://cashstack.info).
 
 ### Quick Start Videos:
 
@@ -23,6 +23,7 @@ Here are two YouTube walk-through videos to help you get started:
 - [FullStack.cash](https://fullstack.cash) - cloud-based infrastructure for application developers.
 - [FullStack.cash Account](https://fullstack.cash/login) - Get your API key to unlock increased rate limits.
 - [Permissionless Software Foundation](https://psfoundation.cash) - The organization that maintains this library.
+- [CashStack.info](https://cashstack.info) - bch-js is part of the Cash Stack, a JavaScript framework for writing web 2 and web 3 business applications.
 
 ### Quick Notes
 
@@ -42,10 +43,10 @@ the [bch-api](https://github.com/Permissionless-Software-Foundation/bch-api) RES
 - ABC Mainnet REST API server: https://abc.fullstack.cash/v5/
 - Check server status: https://metrics.fullstack.cash
 
-### API Key
+### API Key (JWT Token)
 
 The [bch-api](https://github.com/Permissionless-Software-Foundation/bch-api) REST API hosted by [FullStack.cash](https://fullstack.cash) uses JWT tokens to pay for increased
-rate limits when interacting with the back end server. See [this article](https://troutsblog.com/research/bitcoin-cash/how-to-bch-full-stack-developer) if you want to understand the system-as-a-whole. The JWT token can be fed to bch-js _implicitly_ or _explicitly_.
+rate limits when interacting with the back end server. See [this article](https://cashstack.info) if you want to understand the system-as-a-whole. The JWT token can be fed to bch-js _implicitly_ or _explicitly_.
 
 - Implicitly: bch-js will detect your JWT token if you set the `BCHJSTOKEN` environment variable.
 - Explicitly: You can directly feed in the JWT token with the `apiToken` property when instantiating the library. Here is an example:
@@ -58,38 +59,25 @@ let bchjs = new BCHJS({
 })
 ```
 
-### Gatsby
+### Gatsby & Web Apps
 
-bch-js is included in this [gatsby-ipfs-template](https://github.com/Permissionless-Software-Foundation/gatsby-ipfs-template) for building uncensorable web apps that can interact with the blockchain. When building a Gatsby (or other front-end app that uses Webpack), you'll need to add these lines to your `gatsby-node.js` file, as per [this issue](https://github.com/gatsbyjs/gatsby/issues/564):
+[minimal-slp-wallet](https://www.npmjs.com/package/minimal-slp-wallet) is a minimal wallet 'engine' that incorporates bch-js. It's compiled with Browserify for front end apps.
 
-```
-exports.onCreateWebpackConfig = ({ actions }) => {
-  actions.setWebpackConfig({
-    node: {
-      fs: 'empty'
-    }
-  })
-}
-```
+[gatsby-theme-bch-wallet](https://github.com/Permissionless-Software-Foundation/gatsby-theme-bch-wallet) is a Gatsby Theme and [bch-wallet-starter](https://github.com/Permissionless-Software-Foundation/bch-wallet-starter) is a Gatsby Starter for building web wallets using minimal-slp-wallet.
 
-This is because the new IPFS class in bch-js uses the fs library for uploading files, which is not supported by Gatsby.
-
-We also provide [minimal-slp-wallet-web](https://www.npmjs.com/package/minimal-slp-wallet-web) as a basic Bitcoin Cash wallet with SLP support, for front end projects. bch-js is encapsulated inside the instantiation of the library Class.
+[This gist](https://gist.github.com/christroutner/6cb9d1b615f3f9363af79723157bc434) shows how to include minimal-slp-wallet into a basic web page without using a framework.
 
 ## Features
 
 - [ECMAScript 2017 standard JavaScript](https://en.wikipedia.org/wiki/ECMAScript#8th_Edition_-_ECMAScript_2017) used instead of TypeScript. Works
   natively with node.js v10 or higher.
 
-- Full SLP tokens support: bch-js has full support for all SLP token functionality, including send, mint, and genesis transactions. It also fully support all aspects of [non-fugible tokans (NFTs)](https://www.youtube.com/watch?v=vvlpYUx6HRs).
+- Full SLP tokens support: bch-js has full support for all SLP token functionality, including send, mint, and genesis transactions. It also fully supports all aspects of [non-fugible tokans (NFTs)](https://www.youtube.com/watch?v=vvlpYUx6HRs).
 
 - [Semantic Release](https://github.com/semantic-release/semantic-release) for
   continuous delivery using semantic versioning.
 
-- [Greenkeeper](https://greenkeeper.io/) automatic dependency management for
-  automatically maintaining the latest, most secure dependencies.
-
-- [IPFS uploads](https://ipfs.io) of all files and dependencies, to backup
+- [IPFS](https://ipfs.io) and [Radicle](https://radicle.xyz) uploads of all files and dependencies, to backup
   dependencies in case they are ever inaccessible from GitHub or npm.
 
 ## Documentation:
@@ -109,14 +97,26 @@ live in the same repository. To generate the documentation:
 Have questions? Need help? Join our community support
 [Telegram channel](https://t.me/bch_js_toolkit)
 
-## IPFS Releases
+## Donate
+
+This open source software is developed and maintained by the [Permissionless Software Foundation](https://psfoundation.cash). If this library provides value to you, please consider making a donation to support the PSF developers:
+
+<div align="center">
+<img src="./img/donation-qr.png" />
+<p>bitcoincash:qqsrke9lh257tqen99dkyy2emh4uty0vky9y0z0lsr</p>
+</div>
+
+
+## IPFS & Radicle Releases
 
 Copies of this repository are also published on [IPFS](https://ipfs.io).
 
-- v4.5.4: QmWv3pxJy3MH8vU5nLUVyzqFxfNKXLQQEnz1rgStNuQijd
+- v6.2.10: `bafybeifsioj3ba77u2763nsyuzq53gtbdxsnqpoipvdl4immj6ytznjaoy`
+- (with dependencies, node v14.18.2 and npm v8.8.0): `bafybeihfendd4oj6uxvvecm7sluobwwhpb5wdcxhvhmx56e667nxdncd4a`
+
+They are also posted to the Radicle:
+- v6.2.10: `rad:git:hnrkkroqnbfwj6uxpfjuhspoxnfm4i8e6oqwy`
 
 ## License
 
 [MIT](LICENSE.md)
-
-test

package.json

@@ -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>",
@@ -18,7 +18,7 @@
     "test:integration:local:abc": "export RESTURL=http://localhost:3000/v5/ && mocha --timeout 30000 test/integration && mocha --timeout 30000 test/integration/chains/abc/",
     "test:integration:local:bchn": "export RESTURL=http://localhost:3000/v5/ && mocha --timeout 30000 test/integration/ && mocha --timeout 30000 test/integration/chains/bchn/",
     "test:integration:local:testnet": "RESTURL=http://localhost:4000/v5/ mocha --timeout 30000 test/integration/chains/testnet",
-    "test:integration:decatur:bchn": "export RESTURL=http://192.168.2.139:3000/v5/ && mocha --timeout 30000 test/integration/ && mocha --timeout 30000 test/integration/chains/bchn/",
+    "test:integration:decatur:bchn": "export RESTURL=http://192.168.2.129:3000/v5/ && mocha --timeout 30000 test/integration/ && mocha --timeout 30000 test/integration/chains/bchn/",
     "test:integration:decatur:abc": "export RESTURL=http://192.168.2.141:3000/v5/ && mocha --timeout 30000 test/integration && mocha --timeout 30000 test/integration/chains/abc/",
     "test:integration:temp:bchn": "export RESTURL=http://157.90.174.219:3000/v5/ && mocha --timeout 30000 test/integration/",
     "test:temp": "export RESTURL=http://localhost:3000/v5/ && mocha --timeout 30000 -g '#Encryption' test/integration/",
@@ -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"
   },

src/bch-js.js

@@ -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)
 

src/electrumx.js

@@ -44,7 +44,7 @@ class ElectrumX {
    * @apiDescription Return a list of uxtos for an address.
    *
    * @apiExample Example usage:
-   *    (async () => {
+   * (async () => {
    *   try {
    *     let utxo = await bchjs.Electrumx.utxo('bitcoincash:qqh793x9au6ehvh7r2zflzguanlme760wuzehgzjh9');
    *     console.log(utxo);
@@ -638,13 +638,24 @@ class ElectrumX {
   // Sort confirmed Transactions by the block height
   sortConfTxs (txs, sortingOrder = 'DESCENDING') {
     try {
+      // console.log(`sortConfTxs txs: ${JSON.stringify(txs, null, 2)}`)
+
       // Filter out unconfirmed transactions, with a height of 0 or less.
       txs = txs.filter(elem => elem.height > 0)
 
       if (sortingOrder === 'DESCENDING') {
-        return txs.sort((a, b) => b.height - a.height)
+        // console.log('Sorting in descending order')
+        return txs.sort((a, b) => {
+          // console.log(`descending b.height: ${b.height}, a.height: ${a.height}`)
+          return b.height - a.height
+        })
       }
-      return txs.sort((a, b) => a.height - b.height)
+
+      // console.log('Sorting in ascending order')
+      return txs.sort((a, b) => {
+        // console.log(`ascending b.height: ${b.height}, a.height: ${a.height}`)
+        return a.height - b.height
+      })
     } catch (err) {
       console.log('Error in util.js/sortConfTxs()')
       throw err
@@ -685,6 +696,8 @@ class ElectrumX {
   // Substitute zero-conf txs with the current block-height + 1
   async sortAllTxs (txs, sortingOrder = 'DESCENDING') {
     try {
+      // console.log(`sortingOrder: ${sortingOrder}`)
+
       // Calculate the height of the next block
       const nextBlock = (await this.blockchain.getBlockCount()) + 1
 

src/ipfs.js

@@ -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

src/psf-slp-indexer.js

@@ -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)
    *   }
@@ -132,7 +132,8 @@ class PsfSlpIndexer {
    */
   async balance (address) {
     try {
-      console.log('balance() address: ', address)
+      // console.log('balance() address: ', address)
+
       // Handle single address.
       if (typeof address === 'string') {
         const response = await axios.post(
@@ -154,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)
    *   }
@@ -193,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
@@ -220,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)
    *   }
@@ -285,6 +288,8 @@ class PsfSlpIndexer {
    */
   async tx (txid) {
     try {
+      // console.log('txid: ', txid)
+
       // Handle single address.
       if (typeof txid === 'string') {
         const response = await axios.post(
@@ -292,8 +297,11 @@ class PsfSlpIndexer {
           { txid },
           this.axiosOptions
         )
+        // console.log('response: ', response)
+
         return response.data
       }
+
       throw new Error('Input txid must be a string.')
     } catch (error) {
       // console.log('error: ', error)
@@ -313,6 +321,7 @@ class PsfSlpIndexer {
 
         // Check if this txid belongs to a blacklisted token.
         const isInBlacklist = await this.checkBlacklist(txid)
+        // console.log('isInBlacklist: ', isInBlacklist)
 
         // Get the TX Details from the full node.
         const txDetails = await this.rawTransaction.getTxData(txid)
@@ -365,6 +374,73 @@ class PsfSlpIndexer {
       return false
     }
   }
+
+  /**
+   * @api PsfSlpIndexer.getTokenData()  getTokenData()
+   * @apiName Token Data
+   * @apiGroup PSF SLP
+   * @apiDescription Get mutable and immutable data if the token contains them.
+   *
+   * @apiExample Example usage:
+   * (async () => {
+   *   try {
+   *     let tokenData = await bchjs.PsfSlpIndexer.getTokenData('a4fb5c2da1aa064e25018a43f9165040071d9e984ba190c222a7f59053af84b2')
+   *     console.log(tokenData)
+   *   } catch(error) {
+   *    console.error(error)
+   *   }
+   * })()
+   *
+   * {
+   *   genesisData: {
+   *     type: 1,
+   *     ticker: 'TROUT',
+   *     name: "Trout's test token",
+   *     tokenId: 'a4fb5c2da1aa064e25018a43f9165040071d9e984ba190c222a7f59053af84b2',
+   *     documentUri: 'troutsblog.com',
+   *     documentHash: '',
+   *     decimals: 2,
+   *     mintBatonIsActive: true,
+   *     tokensInCirculationBN: '100098953386',
+   *     tokensInCirculationStr: '100098953386',
+   *     blockCreated: 622414,
+   *     totalBurned: '1046614',
+   *     totalMinted: '100100000000'
+   *     ]
+   *   },
+   *  immutableData :{
+   *     issuer:"FullStack.cash.",
+   *     website:"https://fullstack.cash/",
+   *     dateCreated:"2022-01-11"
+   *   },
+   *  mutableData :{
+   *    "tokenIcon":"https://gateway.ipfs.io/ipfs/bafybeiehitanirn5gmhqjg44xrmdtomn4n5lu5yjoepsvgpswk5mggaw6i/LP_logo-1.png",
+   *    "about":"Mutable data managed with npm package: https://www.npmjs.com/package/slp-mutable-data"
+   *   }
+   * }
+   *
+   */
+  async getTokenData (tokenId) {
+    try {
+      const url = `${this.restURL}psf/slp/token/data`
+      // console.log(`url: ${url}`)
+
+      // Handle single address.
+      if (typeof tokenId === 'string') {
+        const response = await axios.post(
+          // 'https://bchn.fullstack.cash/v5/psf/slp/token/data/',
+          url,
+          { tokenId },
+          this.axiosOptions
+        )
+        return response.data
+      }
+      throw new Error('Input tokenId must be a string.')
+    } catch (error) {
+      if (error.response && error.response.data) throw error.response.data
+      else throw error
+    }
+  }
 }
 
 module.exports = PsfSlpIndexer

src/raw-transactions.js

@@ -381,6 +381,8 @@ class RawTransactions {
   // Appends the BCH address to the inputs of the transaction.
   async getTxData (txid) {
     try {
+      // console.log('getTxData() txid: ', txid)
+
       if (typeof txid !== 'string') {
         throw new Error(
           'Input to raw-transaction.js/getTxData() must be a string containg a TXID.'
@@ -391,17 +393,24 @@ class RawTransactions {
       const txDetails = await this.getRawTransaction(txid, true)
       // console.log(`txDetails: ${JSON.stringify(txDetails, null, 2)}`)
 
-      const inAddrs = await this._getInputAddrs(txDetails)
-      // console.log(`inAddrs: ${JSON.stringify(inAddrs, null, 2)}`)
+      try {
+        const inAddrs = await this._getInputAddrs(txDetails)
+        // console.log(`inAddrs: ${JSON.stringify(inAddrs, null, 2)}`)
 
-      // Add the input address to the transaction data.
-      for (let i = 0; i < inAddrs.length; i++) {
-        txDetails.vin[i].address = inAddrs[i].address
-        txDetails.vin[i].value = inAddrs[i].value
+        // Add the input address to the transaction data.
+        for (let i = 0; i < inAddrs.length; i++) {
+          txDetails.vin[i].address = inAddrs[i].address
+          txDetails.vin[i].value = inAddrs[i].value
+        }
+      } catch (err) {
+        // Coinbase transactions will throw an error. Just ignore them and
+        // pass back the raw transaction data.
+        /* exit quietly */
       }
 
       return txDetails
     } catch (error) {
+      // console.log('error: ', error)
       if (error.error) throw new Error(error.error)
 
       // This case handles rate limit errors.

src/slp/nft1.js

@@ -147,7 +147,7 @@ class Nft1 {
     // Loop through the tokenUtxos array and find the minting baton.
     let mintBatonUtxo
     for (let i = 0; i < tokenUtxos.length; i++) {
-      if (tokenUtxos[i].utxoType === 'minting-baton') {
+      if (tokenUtxos[i].utxoType === 'minting-baton' || tokenUtxos[i].type === 'baton') {
         mintBatonUtxo = tokenUtxos[i]
       }
     }

src/slp/tokentype1.js

@@ -375,11 +375,14 @@ class TokenType1 {
       if (!Array.isArray(tokenUtxos)) {
         throw new Error('tokenUtxos must be an array.')
       }
+      if (!mintQty) {
+        throw new Error('mintQty must be a positive number.')
+      }
 
       // Loop through the tokenUtxos array and find the minting baton.
       let mintBatonUtxo
       for (let i = 0; i < tokenUtxos.length; i++) {
-        if (tokenUtxos[i].utxoType === 'minting-baton') {
+        if (tokenUtxos[i].utxoType === 'minting-baton' || tokenUtxos[i].type === 'baton') {
           mintBatonUtxo = tokenUtxos[i]
         }
       }
@@ -395,7 +398,7 @@ class TokenType1 {
       if (!tokenId) {
         throw new Error('tokenId property not found in mint-baton UTXO.')
       }
-      if (!decimals) {
+      if (!decimals && decimals !== 0) {
         throw new Error('decimals property not found in mint-baton UTXO.')
       }
 
@@ -404,6 +407,8 @@ class TokenType1 {
       baseQty = Math.floor(baseQty)
       baseQty = baseQty.toString()
 
+      if (isNaN(baseQty)) throw new Error('baseQty is non a number!')
+
       // Signal that the baton should be passed or detroyed.
       let batonVout = 2
       if (destroyBaton) batonVout = null

src/transaction.js

@@ -3,7 +3,7 @@
 */
 
 // Global npm libraries
-const BigNumber = require('bignumber.js')
+// const BigNumber = require('bignumber.js')
 
 // Local libraries
 const RawTransaction = require('./raw-transactions')
@@ -20,11 +20,6 @@ class Transaction {
     this.psfSlpIndexer = new PsfSlpIndexer(config)
   }
 
-  // Proxy the call to the psf-slp-indexer.
-  async get (txid) {
-    return await this.psfSlpIndexer.tx(txid)
-  }
-
   /**
    * @api Transaction.get() get()
    * @apiName get
@@ -34,8 +29,6 @@ class Transaction {
    * If it is a SLP token transaction, the token information for inputs and
    * outputs will also be included.
    *
-   * This is an API heavy call. This function will only work with a single txid.
-   * It does not yet support an array of TXIDs.
    *
    * @apiExample Example usage:
    * (async () => {
@@ -47,481 +40,31 @@ class Transaction {
    * }
    * })()
    */
-
-  // CT 10/31/21: TODO: this function should be refactored to use get2(), but
-  // add waterfall validation of the TX and its inputs.
-
-  async getOld (txid) {
-    try {
-      if (typeof txid !== 'string') {
-        throw new Error(
-          'Input to Transaction.get() must be a string containing a TXID.'
-        )
-      }
-
-      const txDetails = await this.rawTransaction.getTxData(txid)
-      // console.log(`txDetails: ${JSON.stringify(txDetails, null, 2)}`)
-
-      // Setup default SLP properties.
-      txDetails.isValidSLPTx = false
-
-      // First get the token information for the output. If that fails, then
-      // this is not an SLP transaction, and this method can return false.
-      let outTokenData
-      try {
-        outTokenData = await this.slpUtils.decodeOpReturn(txid)
-        // console.log(`outTokenData: ${JSON.stringify(outTokenData, null, 2)}`)
-
-        // Get Genesis data for this token.
-        const genesisData = await this.slpUtils.decodeOpReturn(
-          outTokenData.tokenId
-          // decodeOpReturnCache
-          // usrObj // pass user data when making an internal call.
-        )
-        // console.log(`genesisData: ${JSON.stringify(genesisData, null, 2)}`)
-
-        // Add token information to the tx details object.
-        txDetails.tokenTxType = outTokenData.txType
-        txDetails.tokenId = outTokenData.tokenId
-        txDetails.tokenTicker = genesisData.ticker
-        txDetails.tokenName = genesisData.name
-        txDetails.tokenDecimals = genesisData.decimals
-        txDetails.tokenUri = genesisData.documentUri
-        txDetails.tokenDocHash = genesisData.documentHash
-
-        // Add the token quantity to each output.
-        for (let i = 0; i < outTokenData.amounts.length; i++) {
-          const rawQty = outTokenData.amounts[i]
-          // const realQty = Number(rawQty) / Math.pow(10, txDetails.tokenDecimals)
-
-          // Calculate the real quantity using a BigNumber, then convert it to a
-          // floating point number.
-          let realQty = new BigNumber(rawQty).dividedBy(
-            10 ** parseInt(txDetails.tokenDecimals)
-          )
-          realQty = realQty.toString()
-          // realQty = parseFloat(realQty)
-
-          txDetails.vout[i + 1].tokenQtyStr = realQty
-          txDetails.vout[i + 1].tokenQty = parseFloat(realQty)
-        }
-
-        // Add tokenQty = null to any outputs that don't have a value.
-        for (let i = 0; i < txDetails.vout.length; i++) {
-          const thisVout = txDetails.vout[i]
-
-          if (!thisVout.tokenQty && thisVout.tokenQty !== 0) {
-            thisVout.tokenQty = null
-          }
-        }
-
-        // Loop through each input and retrieve the token data.
-        for (let i = 0; i < txDetails.vin.length; i++) {
-          const thisVin = txDetails.vin[i]
-          // console.log(`thisVin: ${JSON.stringify(thisVin, null, 2)}`)
-
-          try {
-            // If decodeOpReturn() throws an error, then this input is not
-            // from an SLP transaction and can be ignored.
-            const inTokenData = await this.slpUtils.decodeOpReturn(thisVin.txid)
-            // console.log(
-            //   `vin[${i}] tokenData: ${JSON.stringify(inTokenData, null, 2)}`
-            // )
-
-            let tokenQty = 0
-
-            // Validate the input. Mark qty as null if not valid.
-            const vinIsValid = await this.slpUtils.waterfallValidateTxid(
-              thisVin.txid
-            )
-
-            if (!vinIsValid) {
-              // If the input is not a valid, then set qty as null.
-              tokenQty = null
-            } else if (inTokenData.txType === 'SEND') {
-              // Get the appropriate vout token amount. This may throw an error,
-              // which means this Vin is not actually a token UTXO, it was just
-              // associated with a previous token TX.
-              tokenQty = inTokenData.amounts[thisVin.vout - 1]
-              // console.log(`tokenQty: ${JSON.stringify(tokenQty, null, 2)}`)
-
-              //
-            } else if (inTokenData.txType === 'GENESIS') {
-              // Only vout[1] of a Genesis transaction represents the tokens.
-              // Any other outputs in that transaction are normal BCH UTXOs.
-              if (thisVin.vout === 1) {
-                tokenQty = inTokenData.qty
-                // console.log(`tokenQty: ${JSON.stringify(tokenQty, null, 2)}`)
-              }
-            } else if (inTokenData.txType === 'MINT') {
-              // vout=1 (second output) recieves the newly minted tokens.
-              if (thisVin.vout === 1) {
-                tokenQty = inTokenData.qty
-              } else {
-                tokenQty = null
-              }
-
-              //
-            } else {
-              console.log(
-                'Unexpected code path in Transaction.get(). What is the txType?'
-              )
-              console.log(inTokenData)
-              throw new Error('Unexpected code path')
-            }
-
-            if (tokenQty) {
-              // const realQty =
-              //   Number(tokenQty) / Math.pow(10, txDetails.tokenDecimals)
-
-              // Calculate the real quantity using a BigNumber, then convert it to a
-              // floating point number.
-              let realQty = new BigNumber(tokenQty).dividedBy(
-                10 ** parseInt(txDetails.tokenDecimals)
-              )
-              realQty = realQty.toString()
-              // realQty = parseFloat(realQty)
-
-              thisVin.tokenQtyStr = realQty
-              thisVin.tokenQty = parseFloat(realQty)
-              // txDetails.vin[i].tokenQty = tokenQty
-
-              // Add token ID to input
-              thisVin.tokenId = inTokenData.tokenId
-            } else {
-              thisVin.tokenQty = null
-            }
-          } catch (err) {
-            // If decodeOpReturn() throws an error, then this input is not
-            // from an SLP transaction and can be ignored.
-            // thisVin.tokenQty = null
-            thisVin.tokenQty = null
-            continue
-          }
-        }
-
-        // Finally, validate the SLP TX.
-        // this.slpUtils.waterfallValidateTxid(txid, usrObj)
-        txDetails.isValidSLPTx = await this.slpUtils.waterfallValidateTxid(txid)
-
-        // TODO: Convert the block hash to a block height. Add block height
-        // value to the transaction.
-      } catch (err) {
-        // console.log('Error: ', err)
-
-        // This case handles rate limit errors.
-        if (err.response && err.response.data && err.response.data.error) {
-          throw new Error(err.response.data.error)
-        }
-
-        // If decoding the op_return fails, then it's not an SLP transaction,
-        // and the non-hyrated TX details can be returned.
-        return txDetails
-      }
-
-      return txDetails
-    } catch (err) {
-      // console.error('Error in transactions.js/get(): ', err)
-
-      // This case handles rate limit errors.
-      if (err.response && err.response.data && err.response.data.error) {
-        throw new Error(err.response.data.error)
-      }
-
-      if (err.error) throw new Error(err.error)
-      throw err
-    }
+  async get (txid) {
+    // console.log('transaction.get() txid: ', txid)
+    return await this.psfSlpIndexer.tx(txid)
   }
 
   /**
-   * @api Transaction.get3() get3()
-   * @apiName get3
+   * @api Transaction.getTokenInfo() getTokenInfo()
+   * @apiName getTokenInfo
    * @apiGroup Transaction
    * @apiDescription
-   * Returns an object of transaction data, including addresses for input UTXOs.
-   * If it is a SLP token transaction, the token information for inputs and
-   * outputs will also be included.
+   * Given the TXID of a token transaction, it will return data about that
+   * token by retrieving the data from the Genesis transaction and docoding
+   * the OP_RETURN.
    *
-   * This is an API heavy call. This function will only work with a single txid.
-   * It does not yet support an array of TXIDs.
-   *
-   * This is the same as get(), except it omits DAG validation of the TXID.
    *
    * @apiExample Example usage:
    * (async () => {
    * try {
-   *  let txData = await bchjs.Transaction.get2("0e3e2357e806b6cdb1f70b54c3a3a17b6714ee1f0e68bebb44a74b1efd512098");
+   *  let txData = await bchjs.Transaction.getTokenInfo("0e3e2357e806b6cdb1f70b54c3a3a17b6714ee1f0e68bebb44a74b1efd512098");
    *  console.log(txData);
    * } catch(error) {
    * console.error(error)
    * }
    * })()
    */
-  async get3 (txid) {
-    try {
-      if (typeof txid !== 'string') {
-        throw new Error(
-          'Input to Transaction.get() must be a string containing a TXID.'
-        )
-      }
-
-      // Get TX data
-      const txDetails = await this.rawTransaction.getTxData(txid)
-      // console.log(`txDetails: ${JSON.stringify(txDetails, null, 2)}`)
-
-      // Get the block height the transaction was mined in.
-      const blockHeader = await this.blockchain.getBlockHeader(
-        txDetails.blockhash
-      )
-      txDetails.blockheight = blockHeader.height
-      // console.log(`blockHeader: ${JSON.stringify(blockHeader, null, 2)}`)
-
-      // Set default as not an SLP tx
-      txDetails.isSlpTx = false
-
-      // Get Token Data
-      const txTokenData = await this.getTokenInfo(txid)
-      // console.log(`txTokenData: ${JSON.stringify(txTokenData, null, 2)}`)
-
-      // If not a token, return the tx data. Processing is complete.
-      if (!txTokenData) return txDetails
-
-      // Mark TX as an SLP tx. This does not mean it's valid, it just means
-      // the OP_RETURN passes a basic check.
-      txDetails.isSlpTx = true
-
-      // Get Genesis data
-      const genesisData = await this.getTokenInfo(txTokenData.tokenId)
-      // console.log(`genesisData: ${JSON.stringify(genesisData, null, 2)}`)
-
-      // Add token information to the tx details object.
-      txDetails.tokenTxType = txTokenData.txType
-      txDetails.tokenId = txTokenData.tokenId
-      txDetails.tokenTicker = genesisData.ticker
-      txDetails.tokenName = genesisData.name
-      txDetails.tokenDecimals = genesisData.decimals
-      txDetails.tokenUri = genesisData.documentUri
-      txDetails.tokenDocHash = genesisData.documentHash
-      // console.log(`txDetails before processing input and outputs: ${JSON.stringify(txDetails, null, 2)}`)
-
-      // Process TX Outputs
-      // Add the token quantity to each output.
-      // 'i' starts at 1, because vout[0] is the OP_RETURN
-      for (let i = 0; i < txDetails.vout.length; i++) {
-        const thisVout = txDetails.vout[i]
-        if (txTokenData.txType === 'SEND') {
-          // console.log(
-          //   `output txTokenData: ${JSON.stringify(txTokenData, null, 2)}`
-          // )
-
-          // First output is OP_RETURN, so tokenQty is null.
-          if (i === 0) {
-            thisVout.tokenQty = null
-            thisVout.tokenQtyStr = null
-            continue
-          }
-
-          // Non SLP outputs.
-          if (i > txTokenData.amounts.length) {
-            thisVout.tokenQty = null
-            thisVout.tokenQtyStr = null
-            continue
-          }
-
-          const rawQty = txTokenData.amounts[i - 1]
-
-          // Calculate the real quantity using a BigNumber, then convert it to a
-          // floating point number.
-          let realQty = new BigNumber(rawQty).dividedBy(
-            10 ** parseInt(txDetails.tokenDecimals)
-          )
-          realQty = realQty.toString()
-          // realQty = parseFloat(realQty)
-
-          txDetails.vout[i].tokenQtyStr = realQty
-          txDetails.vout[i].tokenQty = parseFloat(realQty)
-
-          // console.log(
-          //   `thisVout ${i}: ${JSON.stringify(txDetails.vout[i], null, 2)}`
-          // )
-        } else if (
-          txTokenData.txType === 'GENESIS' ||
-          txTokenData.txType === 'MINT'
-        ) {
-          // console.log(
-          //   `output txTokenData: ${JSON.stringify(txTokenData, null, 2)}`
-          // )
-
-          let tokenQty = 0 // Default value
-
-          // Only vout[1] of a Genesis or Mint transaction represents the tokens.
-          // Any other outputs in that transaction are normal BCH UTXOs.
-          if (i === 1) {
-            tokenQty = txTokenData.qty
-            // console.log(`tokenQty: ${JSON.stringify(tokenQty, null, 2)}`)
-
-            // Calculate the real quantity using a BigNumber, then convert it to a
-            // floating point number.
-            let realQty = new BigNumber(tokenQty).dividedBy(
-              10 ** parseInt(txDetails.tokenDecimals)
-            )
-            realQty = realQty.toString()
-            // realQty = parseFloat(realQty)
-
-            thisVout.tokenQtyStr = realQty
-            thisVout.tokenQty = parseFloat(realQty)
-            // console.log(`thisVout[${i}]: ${JSON.stringify(thisVout, null, 2)}`)
-          } else if (i === txTokenData.mintBatonVout) {
-            // Optional Mint baton
-            thisVout.tokenQtyStr = '0'
-            thisVout.tokenQty = 0
-            thisVout.isMintBaton = true
-          } else {
-            thisVout.tokenQtyStr = '0'
-            thisVout.tokenQty = 0
-          }
-        } else {
-          throw new Error('Unknown SLP TX type for TX')
-        }
-      }
-
-      // Process TX inputs
-      for (let i = 0; i < txDetails.vin.length; i++) {
-        const thisVin = txDetails.vin[i]
-        // console.log(`thisVin[${i}]: ${JSON.stringify(thisVin, null, 2)}`)
-
-        const vinTokenData = await this.getTokenInfo(thisVin.txid)
-        // console.log(
-        //   `vinTokenData ${i}: ${JSON.stringify(vinTokenData, null, 2)}`
-        // )
-
-        // Corner case: Ensure the token ID is the same.
-        const vinTokenIdIsTheSame = vinTokenData.tokenId === txDetails.tokenId
-
-        // If the input is not a token input, or if the tokenID is not the same,
-        // then mark the token output as null.
-        if (!vinTokenData || !vinTokenIdIsTheSame) {
-          thisVin.tokenQty = 0
-          thisVin.tokenQtyStr = '0'
-          thisVin.tokenId = null
-          continue
-        }
-
-        if (vinTokenData.txType === 'SEND') {
-          // console.log(
-          //   `SEND vinTokenData ${i}: ${JSON.stringify(vinTokenData, null, 2)}`
-          // )
-
-          const tokenQty = vinTokenData.amounts[thisVin.vout - 1]
-          // console.log(`tokenQty: ${JSON.stringify(tokenQty, null, 2)}`)
-
-          // Calculate the real quantity using a BigNumber, then convert it to a
-          // floating point number.
-          let realQty = new BigNumber(tokenQty).dividedBy(
-            10 ** parseInt(txDetails.tokenDecimals)
-          )
-          realQty = realQty.toString()
-          // realQty = parseFloat(realQty)
-
-          thisVin.tokenQtyStr = realQty
-          thisVin.tokenQty = parseFloat(realQty)
-          thisVin.tokenId = vinTokenData.tokenId
-        } else if (vinTokenData.txType === 'MINT') {
-          // console.log(
-          //   `MINT vinTokenData ${i}: ${JSON.stringify(vinTokenData, null, 2)}`
-          // )
-
-          let tokenQty = 0 // Default value
-
-          // Only vout[1] of a Genesis transaction represents the tokens.
-          // Any other outputs in that transaction are normal BCH UTXOs.
-          if (thisVin.vout === 1) {
-            tokenQty = vinTokenData.qty
-            // console.log(`tokenQty: ${JSON.stringify(tokenQty, null, 2)}`)
-
-            // Calculate the real quantity using a BigNumber, then convert it to a
-            // floating point number.
-            let realQty = new BigNumber(tokenQty).dividedBy(
-              10 ** parseInt(txDetails.tokenDecimals)
-            )
-            realQty = realQty.toString()
-            // realQty = parseFloat(realQty)
-
-            thisVin.tokenQtyStr = realQty
-            thisVin.tokenQty = parseFloat(realQty)
-            thisVin.tokenId = vinTokenData.tokenId
-          } else if (thisVin.vout === vinTokenData.mintBatonVout) {
-            // Optional Mint baton
-            thisVin.tokenQtyStr = '0'
-            thisVin.tokenQty = 0
-            thisVin.tokenId = vinTokenData.tokenId
-            thisVin.isMintBaton = true
-          } else {
-            thisVin.tokenQtyStr = '0'
-            thisVin.tokenQty = 0
-            thisVin.tokenId = null
-          }
-        } else if (vinTokenData.txType === 'GENESIS') {
-          // console.log(
-          //   `GENESIS vinTokenData ${i}: ${JSON.stringify(
-          //     vinTokenData,
-          //     null,
-          //     2
-          //   )}`
-          // )
-
-          let tokenQty = 0 // Default value
-
-          // Only vout[1] of a Genesis transaction represents the tokens.
-          // Any other outputs in that transaction are normal BCH UTXOs.
-          if (thisVin.vout === 1) {
-            tokenQty = vinTokenData.qty
-            // console.log(`tokenQty: ${JSON.stringify(tokenQty, null, 2)}`)
-
-            // Calculate the real quantity using a BigNumber, then convert it to a
-            // floating point number.
-            let realQty = new BigNumber(tokenQty).dividedBy(
-              10 ** parseInt(txDetails.tokenDecimals)
-            )
-            realQty = realQty.toString()
-            // realQty = parseFloat(realQty)
-
-            thisVin.tokenQtyStr = realQty
-            thisVin.tokenQty = parseFloat(realQty)
-            thisVin.tokenId = vinTokenData.tokenId
-          } else if (thisVin.vout === vinTokenData.mintBatonVout) {
-            // Optional Mint baton
-            thisVin.tokenQtyStr = '0'
-            thisVin.tokenQty = 0
-            thisVin.tokenId = vinTokenData.tokenId
-            thisVin.isMintBaton = true
-          } else {
-            thisVin.tokenQtyStr = '0'
-            thisVin.tokenQty = 0
-            thisVin.tokenId = null
-          }
-        } else {
-          console.log(
-            `Unknown vinTokenData: ${JSON.stringify(vinTokenData, null, 2)}`
-          )
-          throw new Error('Unknown token type in input')
-        }
-      }
-
-      return txDetails
-    } catch (err) {
-      console.error('Error in get3()')
-
-      // This case handles rate limit errors.
-      if (err.response && err.response.data && err.response.data.error) {
-        throw new Error(err.response.data.error)
-      }
-
-      if (err.error) throw new Error(err.error)
-      throw err
-    }
-  }
-
   // A wrapper for decodeOpReturn(). Returns false if txid is not an SLP tx.
   // Returns the token data if the txid is an SLP tx.
   async getTokenInfo (txid) {

src/util.js

@@ -150,6 +150,56 @@ class Util {
     }
   }
 
+  /**
+   * @api Util.chunk100() chunk100()
+   * @apiName chunk100
+   * @apiGroup Util
+   * @apiDescription chunk up an array into multiple arrays of 100 elements each.
+   * Input: arrayToSlice - a one-dimensional array of elements.
+   * Returns a two-dimensional array. An array of 100-element arrays.
+   *
+   * @apiExample Example usage:
+   * (async () => {
+   *   try {
+   *      const bigArray = [0,1,2,3,4,5,6,7,8,9,10,...,148, 149, 150]
+   *
+   *      const chunked = bchjs.Util.chunk20(bigArray)
+   *      console.log(chunked)
+   *   } catch(error) {
+   *      console.error(error)
+   *   }
+   * })()
+   *
+   * // returns
+   *  [
+   *    [0,1,2,3,4,5,6,7,8,9,10,11,...,98,99],
+   *    [100,101,102,...,148,149,150]
+   *  ]
+   */
+  chunk100 (arrayToSlice) {
+    try {
+      // Validate inputs
+      if (!Array.isArray(arrayToSlice)) {
+        throw new Error('input must be an array')
+      }
+
+      let offset = 0
+      const result = []
+
+      // Loop over the array and slice off chunks of 100 elements.
+      while (offset < arrayToSlice.length) {
+        const chunk = arrayToSlice.slice(offset, offset + 100)
+        result.push(chunk)
+        offset = offset + 100
+      }
+
+      return result
+    } catch (err) {
+      console.error('Error in chunk100()')
+      throw err
+    }
+  }
+
   /**
    * @api Util.sleep() sleep()
    * @apiName sleep
@@ -231,16 +281,17 @@ class Util {
 
         // Array of blocks.
       } else if (Array.isArray(address)) {
-        const options = {
+        const options1 = {
           method: 'POST',
           url: `${this.restURL}util/validateAddress`,
           data: {
             addresses: address
-          },
-          headers: {
-            authorization: `Token ${this.apiToken}`
           }
+          // headers: {
+          //   authorization: `Token ${this.apiToken}`
+          // }
         }
+        const options = Object.assign({}, options1, this.axiosOptions)
         const response = await axios(options)
 
         return response.data

src/utxo.js

@@ -9,6 +9,7 @@
 const Electrumx = require('./electrumx')
 const Slp = require('./slp/slp')
 const PsfSlpIndexer = require('./psf-slp-indexer')
+const BigNumber = require('bignumber.js')
 
 class UTXO {
   constructor (config = {}) {
@@ -16,276 +17,7 @@ class UTXO {
     this.electrumx = new Electrumx(config)
     this.slp = new Slp(config)
     this.psfSlpIndexer = new PsfSlpIndexer(config)
-  }
-
-  /**
-   * @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
-    }
+    this.BigNumber = BigNumber
   }
 
   /**
@@ -309,10 +41,6 @@ class UTXO {
    *     - 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 () => {
@@ -359,10 +87,22 @@ class UTXO {
       // console.log(`utxoData: ${JSON.stringify(utxoData, null, 2)}`)
       const utxos = utxoData.utxos
 
+      let slpUtxos = []
+
       // Get SLP UTXOs from the psf-slp-indexer
-      const slpUtxoData = await this.psfSlpIndexer.balance(addr)
-      // console.log(`slpUtxoData: ${JSON.stringify(slpUtxoData, null, 2)}`)
-      const slpUtxos = slpUtxoData.balance.utxos
+      try {
+        const slpUtxoData = await this.psfSlpIndexer.balance(addr)
+        // console.log(`slpUtxoData: ${JSON.stringify(slpUtxoData, null, 2)}`)
+
+        slpUtxos = slpUtxoData.balance.utxos
+      } catch (err) {
+        // console.log('err: ', err)
+
+        // Exit quietly if address has no SLP UTXOs. Otherwise, throw the error.
+        if (err.error && !err.error.includes('Key not found in database')) {
+          throw err
+        }
+      }
 
       // Loop through the Fulcrum UTXOs.
       for (let i = 0; i < utxos.length; i++) {
@@ -385,6 +125,7 @@ class UTXO {
             thisUtxo.qty = thisSlpUtxo.qty
             thisUtxo.tokenId = thisSlpUtxo.tokenId
             thisUtxo.address = thisSlpUtxo.address
+            thisUtxo.tokenType = thisSlpUtxo.tokenType
 
             break
           }
@@ -394,18 +135,55 @@ 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}`)
         }
       }
 
+      // Get token UTXOs
+      let type1TokenUtxos = utxos.filter(
+        x => x.isSlp === true && x.type === 'token' && x.tokenType === 1
+      )
+
+      // Hydrate the UTXOs with additional token data.
+      type1TokenUtxos = await this.hydrateTokenData(type1TokenUtxos)
+
+      // Collect and hydrate any type1 baton UTXOs
       const bchUtxos = utxos.filter(x => x.isSlp === false)
-      const type1TokenUtxos = utxos.filter(
-        x => x.isSlp === true && x.type === 'token'
+      let type1BatonUtxos = utxos.filter(
+        x => x.isSlp === true && x.type === 'baton' && x.tokenType === 1
       )
-      const type1BatonUtxos = utxos.filter(
-        x => x.isSlp === true && x.type === 'baton'
+      type1BatonUtxos = await this.hydrateTokenData(type1BatonUtxos)
+
+      // Collect and hydrate NFT Group tokens
+      let nftGroupTokenUtxos = utxos.filter(
+        x => x.isSlp === true && x.type === 'token' && x.tokenType === 129
       )
+      nftGroupTokenUtxos = await this.hydrateTokenData(nftGroupTokenUtxos)
+
+      // Collect and hydrate any Group baton UTXOs
+      let groupBatonUtxos = utxos.filter(
+        x => x.isSlp === true && x.type === 'baton' && x.tokenType === 129
+      )
+      groupBatonUtxos = await this.hydrateTokenData(groupBatonUtxos)
+
+      // Collect and hydrate NFT child tokens
+      let nftChildTokenUtxos = utxos.filter(
+        x => x.isSlp === true && x.type === 'token' && x.tokenType === 65
+      )
+      nftChildTokenUtxos = await this.hydrateTokenData(nftChildTokenUtxos)
+
+      // Isolate any UTXOs that are marked null by the SLP indexer.
       const nullUtxos = utxos.filter(x => x.isSlp === null)
 
       const outObj = {
@@ -416,20 +194,85 @@ class UTXO {
             tokens: type1TokenUtxos,
             mintBatons: type1BatonUtxos
           },
-          nft: {} // Allocated for future support of NFT spec.
+          group: {
+            tokens: nftGroupTokenUtxos,
+            mintBatons: groupBatonUtxos
+          },
+          nft: {
+            tokens: nftChildTokenUtxos
+          }
         },
         nullUtxos
       }
 
       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
     }
   }
 
+  // Hydrate an array of token UTXOs with token information.
+  // Returns an array of token UTXOs with additional data.
+  async hydrateTokenData (utxoAry) {
+    try {
+      // console.log('utxoAry: ', utxoAry)
+
+      // Create a list of token IDs without duplicates.
+      let tokenIds = utxoAry.map(x => x.tokenId)
+
+      // Remove duplicates. https://stackoverflow.com/questions/9229645/remove-duplicate-values-from-js-array
+      tokenIds = [...new Set(tokenIds)]
+      // console.log('tokenIds: ', tokenIds)
+
+      // Get Genesis data for each tokenId
+      const genesisData = []
+      for (let i = 0; i < tokenIds.length; i++) {
+        const thisTokenId = tokenIds[i]
+        const thisTokenData = await this.psfSlpIndexer.tokenStats(thisTokenId)
+        // console.log('thisTokenData: ', thisTokenData)
+
+        genesisData.push(thisTokenData)
+      }
+      // console.log('genesisData: ', genesisData)
+
+      // Hydrate each token UTXO with data from the genesis transaction.
+      for (let i = 0; i < utxoAry.length; i++) {
+        const thisUtxo = utxoAry[i]
+
+        // Get the genesis data for this token.
+        const genData = genesisData.filter(
+          x => x.tokenData.tokenId === thisUtxo.tokenId
+        )
+        // console.log('genData: ', genData)
+
+        thisUtxo.ticker = genData[0].tokenData.ticker
+        thisUtxo.name = genData[0].tokenData.name
+        thisUtxo.documentUri = genData[0].tokenData.documentUri
+        thisUtxo.documentHash = genData[0].tokenData.documentHash
+        thisUtxo.decimals = genData[0].tokenData.decimals
+
+        if (thisUtxo.type !== 'baton') {
+          // Calculate the real token quantity
+          const qty = new BigNumber(thisUtxo.qty).dividedBy(
+            10 ** parseInt(thisUtxo.decimals)
+          )
+          thisUtxo.qtyStr = qty.toString()
+
+          // tokenQty is property expected by SLP.tokentype1.js library
+          thisUtxo.tokenQty = thisUtxo.qtyStr
+        }
+      }
+
+      return utxoAry
+    } catch (err) {
+      console.log('Error in hydrateTokenData()')
+      throw err
+    }
+  }
+
   /**
    * @api Utxo.findBiggestUtxo() findBiggestUtxo()
    * @apiName findBiggestUtxo

test/integration/chains/abc/slp.js

@@ -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))
-}

test/integration/chains/abc/utxo-integration.js

@@ -2,10 +2,10 @@
   Integration tests for the utxo.js library.
 */
 
-const assert = require('chai').assert
+// const assert = require('chai').assert
 
-const BCHJS = require('../../../../src/bch-js')
-const bchjs = new BCHJS()
+// const BCHJS = require('../../../../src/bch-js')
+// const bchjs = new BCHJS()
 
 describe('#UTXO', () => {
   beforeEach(async () => {
@@ -14,6 +14,7 @@ describe('#UTXO', () => {
     if (process.env.IS_USING_FREE_TIER) await sleep(1500)
   })
 
+  /*
   describe('#get', () => {
     it('should get hydrated and filtered UTXOs for an address', async () => {
       // const addr = 'bitcoincash:qqh793x9au6ehvh7r2zflzguanlme760wuzehgzjh9'
@@ -31,6 +32,7 @@ describe('#UTXO', () => {
       assert.isArray(result[0].nullUtxos)
     })
   })
+  */
 })
 
 function sleep (ms) {

test/integration/chains/bchn-no-wl-slpdb/rawtransaction.js

@@ -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))
-}

test/integration/chains/bchn-no-wl-slpdb/slp.js

@@ -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))
-}

test/integration/chains/bchn-no-wl-slpdb/utxo-integration.js

@@ -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))
-}

test/integration/chains/bchn/psf-slp-indexer.integration.js

@@ -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')
@@ -113,6 +124,24 @@ describe('#psf-slp-indexer', () => {
       }
     })
   })
+
+  describe('#getTokenData', () => {
+    it('should get token data', async () => {
+      const tokenId =
+        'f055256b938f1ecfa270459d6f12c7c8c82b66d3263c03d5074445a2b1a498a3'
+
+      const result = await bchjs.PsfSlpIndexer.getTokenData(tokenId)
+      // console.log('result: ', result)
+
+      assert.property(result, 'genesisData')
+      assert.property(result, 'immutableData')
+      assert.property(result, 'mutableData')
+
+      assert.isObject(result.genesisData)
+      assert.isObject(result.immutableData)
+      assert.isObject(result.mutableData)
+    })
+  })
 })
 
 // Promise-based sleep function

test/integration/chains/bchn/transaction-integration.js

@@ -0,0 +1,37 @@
+/*
+  Integration tests for the transaction.js library.
+*/
+
+const assert = require('chai').assert
+const BCHJS = require('../../../../src/bch-js')
+const bchjs = new BCHJS()
+
+describe('#Transaction', () => {
+  beforeEach(async () => {
+    if (process.env.IS_USING_FREE_TIER) await bchjs.Util.sleep(1000)
+  })
+
+  describe('#get', () => {
+    it('should get a tx details for a non-SLP TX with an OP_RETURN', async () => {
+      const txid =
+        '01517ff1587fa5ffe6f5eb91c99cf3f2d22330cd7ee847e928ce90ca95bf781b'
+
+      const result = await bchjs.Transaction.get(txid)
+      // console.log('result: ', result)
+
+      assert.property(result.txData, 'txid')
+      assert.property(result.txData, 'vin')
+      assert.property(result.txData, 'vout')
+      assert.equal(result.txData.isValidSlp, false)
+    })
+
+    it('should handle a coinbase transaction', async () => {
+      const txid = 'cca1d2dd3a533d2f501448dec03face2cb2814afd59a533a611e9a2909f2302b'
+
+      const details = await bchjs.Transaction.get(txid)
+      // console.log(`details: ${JSON.stringify(details, null, 2)}`)
+
+      assert.property(details.txData, 'txid')
+    })
+  })
+})

test/integration/chains/bchn/utxo-integration.js

@@ -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 () => {
@@ -13,84 +14,55 @@ describe('#UTXO', () => {
 
     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'
+  describe('#hydrateTokenData', () => {
+    it('should hydrate token UTXOs', async () => {
+      const utxos = [
+        {
+          txid: '384e1b8197e8de7d38f98317af2cf5f6bcb50007c46943b3498a6fab6e8aeb7c',
+          vout: 1,
+          type: 'token',
+          qty: '10000000',
+          tokenId: 'a436c8e1b6bee3d701c6044d190f76f774be83c36de8d34a988af4489e86dd37',
+          address: 'bitcoincash:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvg8nfhq4m'
+        },
+        {
+          txid: '4fc789405d58ec612c69eba29aa56cf0c7f228349801114138424eb68df4479d',
+          vout: 1,
+          type: 'token',
+          qty: '100000000',
+          tokenId: 'df808a41672a0a0ae6475b44f272a107bc9961b90f29dc918d71301f24fe92fb',
+          address: 'bitcoincash:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvg8nfhq4m'
+        },
+        {
+          txid: '42054bba4d69bfe7801ece0cffc754194b04239034fdfe9dbe321ef76c9a2d93',
+          vout: 5,
+          type: 'token',
+          qty: '4764',
+          tokenId: 'f05faf13a29c7f5e54ab921750aafb6afaa953db863bd2cf432e918661d4132f',
+          address: 'bitcoincash:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvg8nfhq4m'
+        },
+        {
+          txid: '06938d0a0d15aa76524ffe61fe111d6d2b2ea9dd8dcd4c7c7744614ced370861',
+          vout: 5,
+          type: 'token',
+          qty: '238',
+          tokenId: 'f05faf13a29c7f5e54ab921750aafb6afaa953db863bd2cf432e918661d4132f',
+          address: 'bitcoincash:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvg8nfhq4m'
+        }
       ]
 
-      const result = await bchjs.Utxo.get(addr)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
+      const result = await bchjs.Utxo.hydrateTokenData(utxos)
+      // console.log('result: ', result)
 
-      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)
-    })
-
-    it('should use the whitelist when flag is set', async () => {
-      const addr = 'simpleledger:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvyucjzqt9'
-      const useWhitelist = true
-
-      const result = await bchjs.Utxo.get(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)
+      assert.property(result[0], 'ticker')
+      assert.property(result[0], 'name')
+      assert.property(result[0], 'qtyStr')
+      assert.property(result[0], 'documentUri')
+      assert.property(result[0], 'documentHash')
     })
   })
-*/
+
   describe('#get', () => {
     it('should hydrate address with BCH and SLP UTXOs', async () => {
       const addr = 'simpleledger:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvyucjzqt9'
@@ -111,10 +83,8 @@ describe('#UTXO', () => {
       assert.equal(result.slpUtxos.type1.mintBatons.length, 0)
     })
 
-    // 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 () => {
-      const addr = 'simpleledger:qrm0c67wwqh0w7wjxua2gdt2xggnm90xwsr5k22euj'
+    it('should handle Type1 minting batons', async () => {
+      const addr = 'simpleledger:qz5l5yzz9r09hw9aadcz53elp2knx6gyg5qk3s8md7'
 
       const result = await bchjs.Utxo.get(addr)
       // console.log(`result: ${JSON.stringify(result, null, 2)}`)
@@ -122,36 +92,36 @@ describe('#UTXO', () => {
       // Assert that minting batons are correctly identified.
       assert.isAbove(result.slpUtxos.type1.mintBatons.length, 0)
     })
-  })
-  /*
-  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)}`)
+    it('should return UTXOs for address with no SLP tokens', async () => {
+      const addr = 'bitcoincash:qp3sn6vlwz28ntmf3wmyra7jqttfx7z6zgtkygjhc7'
 
-      const result = bchjs.Utxo.findBiggestUtxo(electrumxUtxos.utxos)
+      const result = await bchjs.Utxo.get(addr)
       // console.log(`result: ${JSON.stringify(result, null, 2)}`)
 
-      assert.property(result, 'satoshis')
-      assert.equal(result.satoshis, 800)
+      assert.isAbove(result.bchUtxos.length, 0)
+      assert.equal(result.slpUtxos.type1.tokens.length, 0)
     })
 
-    it('should sort UTXOs from Utxos.get()', async () => {
-      const addr = 'bitcoincash:qq54fgjn3hz0357n8a6guy4demw9xfkjk5jcj0xr0z'
+    it('should filter Group tokens and mint batons', async () => {
+      const addr = 'bitcoincash:qzeqcrpe5fcnslv8rfqjq4gh4gzdwytmdc4qmh0ztv'
 
-      const utxos = await bchjs.Utxo.get(addr)
-      // console.log(`utxos: ${JSON.stringify(utxos, null, 2)}`)
-
-      const result = bchjs.Utxo.findBiggestUtxo(utxos[0].bchUtxos)
+      const result = await bchjs.Utxo.get(addr)
       // console.log(`result: ${JSON.stringify(result, null, 2)}`)
 
-      assert.property(result, 'satoshis')
-      assert.equal(result.satoshis, 800)
+      assert.isAbove(result.slpUtxos.group.tokens.length, 0)
+      assert.isAbove(result.slpUtxos.group.mintBatons.length, 0)
+    })
+
+    it('should filter NFTs', async () => {
+      const addr = 'simpleledger:qq7vp2kvejsql898a2760kuq6xz00h0a5vuwu9lywu'
+
+      const result = await bchjs.Utxo.get(addr)
+      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
+
+      assert.isAbove(result.slpUtxos.nft.tokens.length, 0)
     })
   })
-*/
 })
 
 function sleep (ms) {

test/integration/slp.js

@@ -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 () => {

test/unit/fixtures/psf-slp-indexer-mock.js

@@ -144,10 +144,23 @@ const tokenData01 = {
   qty: {}
 }
 
+const tokenData = {
+  genesisData: tokenStats.tokenData,
+  immutableData: {
+    issuer: 'Launchpad Intellectual Property, Inc.',
+    website: 'http://launchpadip.com/',
+    dateCreated: '2022-01-11'
+  },
+  mutableData: {
+    tokenIcon: 'https://gateway.ipfs.io/ipfs/bafybeiehitanirn5gmhqjg44xrmdtomn4n5lu5yjoepsvgpswk5mggaw6i/LP_logo-1.png',
+    about: 'Mutable data managed with npm package: https://www.npmjs.com/package/slp-mutable-data'
+  }
+}
 module.exports = {
   tokenStats,
   txData,
   balance,
   status,
-  tokenData01
+  tokenData01,
+  tokenData
 }

test/unit/fixtures/utxo-mocks.js

@@ -328,6 +328,19 @@ const fulcrumUtxos01 = {
   ]
 }
 
+const fulcrumUtxos02 = {
+  success: true,
+  utxos: [
+    {
+      height: 674513,
+      tx_hash:
+        '705bcc442e5a2770e560b528f52a47b1dcc9ce9ab6a8de9dfdefa55177f00d04',
+      tx_pos: 3,
+      value: 38134
+    }
+  ]
+}
+
 const psfSlpIndexerUtxos01 = {
   balance: {
     utxos: [
@@ -368,6 +381,101 @@ const psfSlpIndexerUtxos01 = {
   }
 }
 
+const tokenUtxos01 = [
+  {
+    txid: '384e1b8197e8de7d38f98317af2cf5f6bcb50007c46943b3498a6fab6e8aeb7c',
+    vout: 1,
+    type: 'token',
+    qty: '10000000',
+    tokenId: 'a436c8e1b6bee3d701c6044d190f76f774be83c36de8d34a988af4489e86dd37',
+    address: 'bitcoincash:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvg8nfhq4m'
+  },
+  {
+    txid: '4fc789405d58ec612c69eba29aa56cf0c7f228349801114138424eb68df4479d',
+    vout: 1,
+    type: 'token',
+    qty: '100000000',
+    tokenId: 'df808a41672a0a0ae6475b44f272a107bc9961b90f29dc918d71301f24fe92fb',
+    address: 'bitcoincash:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvg8nfhq4m'
+  },
+  {
+    txid: '42054bba4d69bfe7801ece0cffc754194b04239034fdfe9dbe321ef76c9a2d93',
+    vout: 5,
+    type: 'token',
+    qty: '4764',
+    tokenId: 'f05faf13a29c7f5e54ab921750aafb6afaa953db863bd2cf432e918661d4132f',
+    address: 'bitcoincash:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvg8nfhq4m'
+  },
+  {
+    txid: '06938d0a0d15aa76524ffe61fe111d6d2b2ea9dd8dcd4c7c7744614ced370861',
+    vout: 5,
+    type: 'token',
+    qty: '238',
+    tokenId: 'f05faf13a29c7f5e54ab921750aafb6afaa953db863bd2cf432e918661d4132f',
+    address: 'bitcoincash:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvg8nfhq4m'
+  }
+]
+
+const genesisData01 = {
+  tokenData: {
+    type: 1,
+    ticker: 'sleven',
+    name: 'sleven',
+    tokenId: 'a436c8e1b6bee3d701c6044d190f76f774be83c36de8d34a988af4489e86dd37',
+    documentUri: 'sleven',
+    documentHash: '',
+    decimals: 7,
+    mintBatonIsActive: false,
+    tokensInCirculationBN: '770059999999',
+    tokensInCirculationStr: '770059999999',
+    blockCreated: 555483,
+    totalBurned: '7711234568',
+    totalMinted: '777771234567'
+  }
+}
+
+const genesisData02 = {
+  tokenData: {
+    type: 1,
+    ticker: 'NAKAMOTO',
+    name: 'NAKAMOTO',
+    tokenId: 'df808a41672a0a0ae6475b44f272a107bc9961b90f29dc918d71301f24fe92fb',
+    documentUri: '',
+    documentHash: '',
+    decimals: 8,
+    mintBatonIsActive: false,
+    tokensInCirculationBN: '2099260968799900',
+    tokensInCirculationStr: '2099260968799900',
+    blockCreated: 555671,
+    totalBurned: '739031200100',
+    totalMinted: '2100000000000000'
+  }
+}
+
+const genesisData03 = {
+  tokenData: {
+    type: 1,
+    ticker: 'AUDC',
+    name: 'AUD Coin',
+    tokenId: 'f05faf13a29c7f5e54ab921750aafb6afaa953db863bd2cf432e918661d4132f',
+    documentUri: 'audcoino@gmail.com',
+    documentHash: '',
+    decimals: 6,
+    mintBatonIsActive: false,
+    tokensInCirculationBN: '974791786216512742',
+    tokensInCirculationStr: '974791786216512742',
+    blockCreated: 603311,
+    totalBurned: '1025208213783487258',
+    totalMinted: '2000000000000000000'
+  }
+}
+
+const noUtxoErr = {
+  success: false,
+  error:
+    'Key not found in database [bitcoincash:qp3sn6vlwz28ntmf3wmyra7jqttfx7z6zgtkygjhc7]'
+}
+
 module.exports = {
   mockUtxoData,
   mockHydratedUtxos,
@@ -375,5 +483,11 @@ module.exports = {
   mockEveryUtxoType,
   electrumxUtxos,
   fulcrumUtxos01,
-  psfSlpIndexerUtxos01
+  fulcrumUtxos02,
+  psfSlpIndexerUtxos01,
+  tokenUtxos01,
+  genesisData01,
+  genesisData02,
+  genesisData03,
+  noUtxoErr
 }

test/unit/ipfs.js

@@ -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')
-      }
-    })
-  })
-})

test/unit/psf-slp-indexer.js

@@ -336,4 +336,79 @@ describe('#PsfSlpIndexer', () => {
       assert.equal(result, false)
     })
   })
+
+  describe('#getTokenData', () => {
+    it('should GET token data', async () => {
+      // Stub the network call.
+      sandbox.stub(axios, 'post').resolves({ data: mockData.tokenData })
+
+      const tokenId =
+        'a4fb5c2da1aa064e25018a43f9165040071d9e984ba190c222a7f59053af84b2'
+      const result = await bchjs.PsfSlpIndexer.getTokenData(tokenId)
+      assert.property(result, 'genesisData')
+      assert.property(result, 'immutableData')
+      assert.property(result, 'mutableData')
+
+      assert.isObject(result.genesisData)
+      assert.isObject(result.immutableData)
+      assert.isObject(result.mutableData)
+
+      assert.property(result.genesisData, 'type')
+      assert.property(result.genesisData, 'ticker')
+      assert.property(result.genesisData, 'name')
+      assert.property(result.genesisData, 'tokenId')
+      assert.property(result.genesisData, 'documentUri')
+      assert.property(result.genesisData, 'documentHash')
+      assert.property(result.genesisData, 'decimals')
+      assert.property(result.genesisData, 'mintBatonIsActive')
+      assert.property(result.genesisData, 'tokensInCirculationBN')
+      assert.property(result.genesisData, 'tokensInCirculationStr')
+      assert.property(result.genesisData, 'blockCreated')
+      assert.property(result.genesisData, 'totalBurned')
+      assert.property(result.genesisData, 'totalMinted')
+    })
+
+    it('should throw an error for improper input', async () => {
+      try {
+        const tokenId = 12345
+
+        await bchjs.PsfSlpIndexer.getTokenData(tokenId)
+        assert.equal(true, false, 'Unexpected result!')
+      } catch (err) {
+        // console.log(`err: `, err)
+        assert.include(err.message, 'Input tokenId must be a string.')
+      }
+    })
+
+    it('should handle axios error', async () => {
+      try {
+        // Stub the network call.
+        sandbox.stub(axios, 'post').throws(new Error('test error'))
+
+        const tokenId =
+          'a4fb5c2da1aa064e25018a43f9165040071d9e984ba190c222a7f59053af84b2'
+        await bchjs.PsfSlpIndexer.getTokenData(tokenId)
+        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
+        assert.equal(true, false, 'Unexpected result!')
+      } catch (err) {
+        assert.include(err.message, 'test error')
+      }
+    })
+
+    it('should handle request error', async () => {
+      try {
+        // Stub the network call.
+        const testErr = new Error()
+        testErr.response = { data: { status: 422 } }
+        sandbox.stub(axios, 'post').throws(testErr)
+
+        const tokenId =
+          'a4fb5c2da1aa064e25018a43f9165040071d9e984ba190c222a7f59053af84b2'
+        await bchjs.PsfSlpIndexer.getTokenData(tokenId)
+        assert.equal(true, false, 'Unexpected result!')
+      } catch (err) {
+        assert.equal(err.status, 422)
+      }
+    })
+  })
 })

test/unit/transaction-unit.js

@@ -5,707 +5,23 @@
 // Public npm libraries
 const assert = require('chai').assert
 const sinon = require('sinon')
-const cloneDeep = require('lodash.clonedeep')
+// const cloneDeep = require('lodash.clonedeep')
 
 const BCHJS = require('../../src/bch-js')
 const bchjs = new BCHJS()
 
-const mockDataLib = require('./fixtures/transaction-mock.js')
+// const mockDataLib = require('./fixtures/transaction-mock.js')
 
 describe('#TransactionLib', () => {
-  let sandbox, mockData
+  let sandbox
 
   beforeEach(() => {
     sandbox = sinon.createSandbox()
 
-    mockData = cloneDeep(mockDataLib)
+    // mockData = cloneDeep(mockDataLib)
   })
   afterEach(() => sandbox.restore())
 
-  describe('#getOld', () => {
-    it('should throw an error if txid is not specified', async () => {
-      try {
-        await bchjs.Transaction.getOld()
-
-        assert.fail('Unexpected code path!')
-      } catch (err) {
-        assert.include(
-          err.message,
-          'Input to Transaction.get() must be a string containing a TXID.'
-        )
-      }
-    })
-
-    it('should get details about a non-SLP transaction', async () => {
-      const txid =
-        '2b37bdb3b63dd0bca720437754a36671431a950e684b64c44ea910ea9d5297c7'
-
-      // Mock dependencies
-      sandbox
-        .stub(bchjs.Transaction.rawTransaction, 'getTxData')
-        .resolves(mockData.nonSlpTxDetails)
-
-      const result = await bchjs.Transaction.getOld(txid)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      // Assert that there are stanardized properties.
-      assert.property(result, 'txid')
-      assert.property(result, 'vin')
-      assert.property(result, 'vout')
-      assert.property(result.vout[0], 'value')
-      assert.property(result.vout[0].scriptPubKey, 'addresses')
-
-      // Assert that added properties exist.
-      assert.property(result.vin[0], 'address')
-      assert.property(result.vin[0], 'value')
-      assert.property(result, 'isValidSLPTx')
-      assert.equal(result.isValidSLPTx, false)
-    })
-
-    it('should get details about a SLP transaction', async () => {
-      // Mock dependencies
-      sandbox
-        .stub(bchjs.Transaction.rawTransaction, 'getTxData')
-        .resolves(mockData.slpTxDetails)
-      sandbox
-        .stub(bchjs.Transaction.slpUtils, 'decodeOpReturn')
-        .onCall(0)
-        .resolves(mockData.mockOpReturnData01)
-        .onCall(1)
-        .resolves(mockData.mockOpReturnData02)
-        .onCall(2)
-        .resolves(mockData.mockOpReturnData03)
-        .onCall(3)
-        .rejects(new Error('No OP_RETURN'))
-      sandbox
-        .stub(bchjs.Transaction.slpUtils, 'waterfallValidateTxid')
-        .resolves(true)
-
-      const txid =
-        '266844d53e46bbd7dd37134688dffea6e54d944edff27a0add63dd0908839bc1'
-
-      const result = await bchjs.Transaction.getOld(txid)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      // Assert that there are stanardized properties.
-      assert.property(result, 'txid')
-      assert.property(result, 'vin')
-      assert.property(result, 'vout')
-      assert.property(result.vout[0], 'value')
-      assert.property(result.vout[1].scriptPubKey, 'addresses')
-
-      // Assert that added properties exist.
-      assert.property(result.vout[0], 'tokenQty')
-      assert.equal(result.vout[0].tokenQty, null)
-      assert.property(result.vin[0], 'address')
-      assert.property(result.vin[0], 'value')
-      assert.property(result.vin[0], 'tokenQty')
-      assert.property(result, 'isValidSLPTx')
-      assert.equal(result.isValidSLPTx, true)
-    })
-
-    it('should catch and throw error on network error', async () => {
-      try {
-        const txid =
-          '2b37bdb3b63dd0bca720437754a36671431a950e684b64c44ea910ea9d5297c7'
-
-        // Force an error
-        sandbox
-          .stub(bchjs.Transaction.rawTransaction, 'getTxData')
-          .rejects(new Error('test error'))
-
-        await bchjs.Transaction.getOld(txid)
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'test error')
-      }
-    })
-
-    // This test case was created in response to a bug. When the input TX
-    // was a Genesis SLP transaction, the inputs of the transaction were not
-    // being hydrated properly.
-    it('should get input details when input is a genesis tx', async () => {
-      // Mock dependencies
-      sandbox
-        .stub(bchjs.Transaction.rawTransaction, 'getTxData')
-        .resolves(mockData.genesisTestInputTx)
-      sandbox
-        .stub(bchjs.Transaction.slpUtils, 'decodeOpReturn')
-        .onCall(0)
-        .resolves(mockData.genesisTestOpReturnData01)
-        .onCall(1)
-        .resolves(mockData.genesisTestOpReturnData02)
-        .onCall(2)
-        .resolves(mockData.genesisTestOpReturnData02)
-        .onCall(3)
-        .resolves(mockData.genesisTestOpReturnData02)
-      sandbox
-        .stub(bchjs.Transaction.slpUtils, 'waterfallValidateTxid')
-        .resolves(true)
-
-      const txid =
-        '874306bda204d3a5dd15e03ea5732cccdca4c33a52df35162cdd64e30ea7f04e'
-
-      const result = await bchjs.Transaction.getOld(txid)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      // Assert that there are stanardized properties.
-      assert.property(result, 'txid')
-      assert.property(result, 'vin')
-      assert.property(result, 'vout')
-      assert.property(result.vout[0], 'value')
-      assert.property(result.vout[1].scriptPubKey, 'addresses')
-
-      // Assert that added properties exist.
-      assert.property(result.vout[0], 'tokenQty')
-      assert.equal(result.vout[0].tokenQty, null)
-      assert.property(result.vin[0], 'address')
-      assert.property(result.vin[0], 'value')
-      assert.property(result.vin[0], 'tokenQty')
-      assert.property(result, 'isValidSLPTx')
-      assert.equal(result.isValidSLPTx, true)
-
-      // Assert inputs values unique to a Genesis input have the proper values.
-      assert.equal(result.vin[0].tokenQty, 10000000)
-      assert.equal(result.vin[1].tokenQty, null)
-    })
-
-    it('should get input details when input is a mint tx', async () => {
-      // Mock dependencies
-      sandbox
-        .stub(bchjs.Transaction.rawTransaction, 'getTxData')
-        .resolves(mockData.mintTestInputTx)
-      sandbox
-        .stub(bchjs.Transaction.slpUtils, 'decodeOpReturn')
-        .onCall(0)
-        .resolves(mockData.mintTestOpReturnData01)
-        .onCall(1)
-        .resolves(mockData.mintTestOpReturnData02)
-        .onCall(2)
-        .resolves(mockData.mintTestOpReturnData02)
-        .onCall(3)
-        .resolves(mockData.mintTestOpReturnData03)
-        .onCall(4)
-        .resolves(mockData.mintTestOpReturnData03)
-      sandbox
-        .stub(bchjs.Transaction.slpUtils, 'waterfallValidateTxid')
-        .resolves(true)
-
-      const txid =
-        '4640a734063ea79fa587a3cac38a70a2f6f3db0011e23514024185982110d0fa'
-
-      const result = await bchjs.Transaction.getOld(txid)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      // Assert that there are stanardized properties.
-      assert.property(result, 'txid')
-      assert.property(result, 'vin')
-      assert.property(result, 'vout')
-      assert.property(result.vout[0], 'value')
-      assert.property(result.vout[1].scriptPubKey, 'addresses')
-
-      // Assert that added properties exist.
-      assert.property(result.vout[0], 'tokenQty')
-      assert.equal(result.vout[0].tokenQty, null)
-      assert.property(result.vin[0], 'address')
-      assert.property(result.vin[0], 'value')
-      assert.property(result.vin[0], 'tokenQty')
-      assert.property(result, 'isValidSLPTx')
-      assert.equal(result.isValidSLPTx, true)
-
-      // Assert inputs values unique to a Mint input have the proper values.
-      assert.equal(result.vin[0].tokenQty, 43545.34534)
-      assert.equal(result.vin[1].tokenQty, 2.34123)
-      assert.equal(result.vin[2].tokenQty, null)
-    })
-
-    // This test case was generated from the problematic transaction that
-    // used inputs in a 'non-standard' way.
-    it('should correctly assign quantities to mixed mint inputs', async () => {
-      // Mock dependencies
-      sandbox
-        .stub(bchjs.Transaction.rawTransaction, 'getTxData')
-        .resolves(mockData.sendTestInputTx01)
-      sandbox
-        .stub(bchjs.Transaction.slpUtils, 'decodeOpReturn')
-        .onCall(0)
-        .resolves(mockData.sendTestOpReturnData01)
-        .onCall(1)
-        .resolves(mockData.sendTestOpReturnData02)
-        .onCall(2)
-        .resolves(mockData.sendTestOpReturnData03)
-        .onCall(3)
-        .resolves(mockData.sendTestOpReturnData03)
-        .onCall(4)
-        .resolves(mockData.sendTestOpReturnData04)
-      sandbox
-        .stub(bchjs.Transaction.slpUtils, 'waterfallValidateTxid')
-        .resolves(true)
-
-      const txid =
-        '6bc111fbf5b118021d68355ca19a0e77fa358dd931f284b2550f79a51ab4792a'
-
-      const result = await bchjs.Transaction.getOld(txid)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      // Assert that there are stanardized properties.
-      assert.property(result, 'txid')
-      assert.property(result, 'vin')
-      assert.property(result, 'vout')
-      assert.property(result.vout[0], 'value')
-      assert.property(result.vout[1].scriptPubKey, 'addresses')
-
-      // Assert that added properties exist.
-      assert.property(result.vout[0], 'tokenQty')
-      assert.equal(result.vout[0].tokenQty, null)
-      assert.property(result.vin[0], 'address')
-      assert.property(result.vin[0], 'value')
-      assert.property(result.vin[0], 'tokenQty')
-      assert.property(result, 'isValidSLPTx')
-      assert.equal(result.isValidSLPTx, true)
-
-      // Assert inputs values unique to a Mint input have the proper values.
-      assert.equal(result.vin[0].tokenQty, 100000000)
-      assert.equal(result.vin[1].tokenQty, null)
-      assert.equal(result.vin[2].tokenQty, 99000000)
-    })
-  })
-
-  describe('#get3', () => {
-    it('should throw an error if txid is not specified', async () => {
-      try {
-        await bchjs.Transaction.get3()
-
-        assert.fail('Unexpected code path!')
-      } catch (err) {
-        assert.include(
-          err.message,
-          'Input to Transaction.get() must be a string containing a TXID.'
-        )
-      }
-    })
-
-    it('should get details about a non-SLP transaction', async () => {
-      const txid =
-        '2b37bdb3b63dd0bca720437754a36671431a950e684b64c44ea910ea9d5297c7'
-
-      // Mock dependencies
-      sandbox
-        .stub(bchjs.Transaction.rawTransaction, 'getTxData')
-        .resolves(mockData.nonSlpTxDetails)
-      sandbox
-        .stub(bchjs.Transaction.blockchain, 'getBlockHeader')
-        .resolves({ height: 602405 })
-      sandbox.stub(bchjs.Transaction, 'getTokenInfo').resolves(false)
-
-      const result = await bchjs.Transaction.get3(txid)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      // Assert that there are stanardized properties.
-      assert.property(result, 'txid')
-      assert.property(result, 'vin')
-      assert.property(result, 'vout')
-      assert.property(result.vout[0], 'value')
-      assert.property(result.vout[0].scriptPubKey, 'addresses')
-
-      // Assert that added properties exist.
-      assert.property(result.vin[0], 'address')
-      assert.property(result.vin[0], 'value')
-
-      // Assert blockheight is added
-      assert.equal(result.blockheight, 602405)
-      assert.equal(result.isSlpTx, false)
-    })
-
-    it('should get details about a SLP SEND tx with SEND input', async () => {
-      // Mock dependencies
-      sandbox
-        .stub(bchjs.Transaction.rawTransaction, 'getTxData')
-        .resolves(mockData.slpTxDetails)
-      sandbox
-        .stub(bchjs.Transaction.blockchain, 'getBlockHeader')
-        .resolves({ height: 603424 })
-      sandbox
-        .stub(bchjs.Transaction.slpUtils, 'decodeOpReturn')
-        .onCall(0)
-        .resolves(mockData.mockOpReturnData01)
-        .onCall(1)
-        .resolves(mockData.mockOpReturnData02)
-        .onCall(2)
-        .resolves(mockData.mockOpReturnData03)
-        .onCall(3)
-        .rejects(new Error('No OP_RETURN'))
-
-      const txid =
-        '266844d53e46bbd7dd37134688dffea6e54d944edff27a0add63dd0908839bc1'
-
-      const result = await bchjs.Transaction.get3(txid)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      // Assert that there are stanardized properties.
-      assert.property(result, 'txid')
-      assert.property(result, 'vin')
-      assert.property(result, 'vout')
-      assert.property(result.vout[0], 'value')
-      assert.property(result.vout[1].scriptPubKey, 'addresses')
-
-      // Assert outputs have expected properties
-      assert.equal(result.vout[0].tokenQty, null)
-      assert.equal(result.vout[0].tokenQtyStr, null)
-      assert.equal(result.vout[1].tokenQty, 1)
-      assert.equal(result.vout[1].tokenQtyStr, '1')
-      assert.equal(result.vout[2].tokenQty, 998833)
-      assert.equal(result.vout[2].tokenQtyStr, '998833')
-      assert.equal(result.vout[3].tokenQty, null)
-      assert.equal(result.vout[3].tokenQtyStr, null)
-
-      // Assert that inputs have expected properties
-      assert.equal(result.vin[0].tokenQtyStr, '998834')
-      assert.equal(result.vin[0].tokenQty, 998834)
-      assert.equal(
-        result.vin[0].tokenId,
-        '497291b8a1dfe69c8daea50677a3d31a5ef0e9484d8bebb610dac64bbc202fb7'
-      )
-      assert.equal(result.vin[1].tokenQtyStr, '0')
-      assert.equal(result.vin[1].tokenQty, 0)
-      assert.equal(result.vin[1].tokenId, null)
-
-      // Assert blockheight is added
-      assert.equal(result.blockheight, 603424)
-      assert.equal(result.isSlpTx, true)
-    })
-
-    it('should catch and throw error on network error', async () => {
-      try {
-        const txid =
-          '2b37bdb3b63dd0bca720437754a36671431a950e684b64c44ea910ea9d5297c7'
-
-        // Force an error
-        sandbox
-          .stub(bchjs.Transaction.rawTransaction, 'getTxData')
-          .rejects(new Error('test error'))
-
-        await bchjs.Transaction.get3(txid)
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'test error')
-      }
-    })
-
-    // This test case was created in response to a bug. When the input TX
-    // was a Genesis SLP transaction, the inputs of the transaction were not
-    // being hydrated properly.
-    it('should get details about a SLP SEND tx with GENSIS input', async () => {
-      // Mock dependencies
-      sandbox
-        .stub(bchjs.Transaction.rawTransaction, 'getTxData')
-        .resolves(mockData.genesisTestInputTx)
-      sandbox
-        .stub(bchjs.Transaction.blockchain, 'getBlockHeader')
-        .resolves({ height: 543409 })
-      sandbox
-        .stub(bchjs.Transaction.slpUtils, 'decodeOpReturn')
-        .onCall(0)
-        .resolves(mockData.genesisTestOpReturnData01)
-        .onCall(1)
-        .resolves(mockData.genesisTestOpReturnData02)
-        .onCall(2)
-        .resolves(mockData.genesisTestOpReturnData02)
-        .onCall(3)
-        .resolves(mockData.genesisTestOpReturnData02)
-
-      const txid =
-        '874306bda204d3a5dd15e03ea5732cccdca4c33a52df35162cdd64e30ea7f04e'
-
-      const result = await bchjs.Transaction.get3(txid)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      // Assert that there are stanardized properties.
-      assert.property(result, 'txid')
-      assert.property(result, 'vin')
-      assert.property(result, 'vout')
-      assert.property(result.vout[0], 'value')
-      assert.property(result.vout[1].scriptPubKey, 'addresses')
-
-      // Assert outputs have expected properties and values
-      assert.equal(result.vout[0].tokenQty, null)
-      assert.equal(result.vout[0].tokenQtyStr, null)
-      assert.equal(result.vout[1].tokenQty, 5000000)
-      assert.equal(result.vout[1].tokenQtyStr, '5000000')
-      assert.equal(result.vout[2].tokenQty, 5000000)
-      assert.equal(result.vout[2].tokenQtyStr, '5000000')
-      assert.equal(result.vout[3].tokenQty, null)
-      assert.equal(result.vout[3].tokenQtyStr, null)
-
-      // Assert inputs have expected properties and values
-      assert.equal(result.vin[0].tokenQty, 10000000)
-      assert.equal(result.vin[0].tokenQtyStr, '10000000')
-      assert.equal(
-        result.vin[0].tokenId,
-        '323a1e35ae0b356316093d20f2d9fbc995d19314b5c0148b78dc8d9c0dab9d35'
-      )
-      assert.equal(result.vin[1].tokenQty, 0)
-      assert.equal(result.vin[1].tokenQtyStr, '0')
-      assert.equal(result.vin[1].tokenId, null)
-
-      // Assert blockheight is added
-      assert.equal(result.blockheight, 543409)
-      assert.equal(result.isSlpTx, true)
-    })
-
-    it('should get details about a SLP SEND tx with MINT (and GENESIS) input', async () => {
-      // Mock dependencies
-      sandbox
-        .stub(bchjs.Transaction.rawTransaction, 'getTxData')
-        .resolves(mockData.mintTestInputTx)
-      sandbox
-        .stub(bchjs.Transaction.blockchain, 'getBlockHeader')
-        .resolves({ height: 543614 })
-      sandbox
-        .stub(bchjs.Transaction.slpUtils, 'decodeOpReturn')
-        .onCall(0)
-        .resolves(mockData.mintTestOpReturnData01)
-        .onCall(1)
-        .resolves(mockData.mintTestOpReturnData02)
-        .onCall(2)
-        .resolves(mockData.mintTestOpReturnData02)
-        .onCall(3)
-        .resolves(mockData.mintTestOpReturnData03)
-        .onCall(4)
-        .resolves(mockData.mintTestOpReturnData03)
-
-      const txid =
-        '4640a734063ea79fa587a3cac38a70a2f6f3db0011e23514024185982110d0fa'
-
-      const result = await bchjs.Transaction.get3(txid)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      // Assert that there are stanardized properties.
-      assert.property(result, 'txid')
-      assert.property(result, 'vin')
-      assert.property(result, 'vout')
-      assert.property(result.vout[0], 'value')
-      assert.property(result.vout[1].scriptPubKey, 'addresses')
-
-      // Assert expected output properties and values exist.
-      assert.equal(result.vout[0].tokenQty, null)
-      assert.equal(result.vout[1].tokenQty, 43547.68657)
-      assert.equal(result.vout[1].tokenQtyStr, '43547.68657')
-      assert.equal(result.vout[2].tokenQty, null)
-
-      // Assert expected input properties and values exist.
-      assert.equal(result.vin[0].tokenQty, 43545.34534)
-      assert.equal(result.vin[0].tokenQtyStr, '43545.34534')
-      assert.equal(
-        result.vin[0].tokenId,
-        '938cc18e618967d787897bbc64b9a8d201b94ec7c69b1a9949eab0433ba5cdf8'
-      )
-      assert.equal(result.vin[1].tokenQty, 2.34123)
-      assert.equal(result.vin[1].tokenQtyStr, '2.34123')
-      assert.equal(
-        result.vin[1].tokenId,
-        '938cc18e618967d787897bbc64b9a8d201b94ec7c69b1a9949eab0433ba5cdf8'
-      )
-      assert.equal(result.vin[2].tokenQty, 0)
-      assert.equal(result.vin[2].tokenQtyStr, '0')
-      assert.equal(result.vin[2].tokenId, null)
-
-      // Assert blockheight is added
-      assert.equal(result.blockheight, 543614)
-      assert.equal(result.isSlpTx, true)
-    })
-
-    // This test case was generated from the problematic transaction that
-    // used inputs in a 'non-standard' way.
-    it('should get details about a SLP SEND tx with MINT (and SEND) input', async () => {
-      // Mock dependencies
-      sandbox
-        .stub(bchjs.Transaction.rawTransaction, 'getTxData')
-        .resolves(mockData.sendTestInputTx01)
-      sandbox
-        .stub(bchjs.Transaction.blockchain, 'getBlockHeader')
-        .resolves({ height: 543957 })
-      sandbox
-        .stub(bchjs.Transaction.slpUtils, 'decodeOpReturn')
-        .onCall(0)
-        .resolves(mockData.sendTestOpReturnData01)
-        .onCall(1)
-        .resolves(mockData.sendTestOpReturnData02)
-        .onCall(2)
-        .resolves(mockData.sendTestOpReturnData03)
-        .onCall(3)
-        .resolves(mockData.sendTestOpReturnData03)
-        .onCall(4)
-        .resolves(mockData.sendTestOpReturnData04)
-
-      const txid =
-        '6bc111fbf5b118021d68355ca19a0e77fa358dd931f284b2550f79a51ab4792a'
-
-      const result = await bchjs.Transaction.get3(txid)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      // Assert that there are stanardized properties.
-      assert.property(result, 'txid')
-      assert.property(result, 'vin')
-      assert.property(result, 'vout')
-      assert.property(result.vout[0], 'value')
-      assert.property(result.vout[1].scriptPubKey, 'addresses')
-
-      // Assert the outputs have expected properties and values.
-      assert.equal(result.vout[0].tokenQty, null)
-      assert.equal(result.vout[1].tokenQty, 1000000)
-      assert.equal(result.vout[1].tokenQtyStr, '1000000')
-      assert.equal(result.vout[2].tokenQty, 198000000)
-      assert.equal(result.vout[2].tokenQtyStr, '198000000')
-      assert.equal(result.vout[3].tokenQty, null)
-
-      // Assert the inputs have expected properties and values.
-      assert.equal(result.vin[0].tokenQty, 100000000)
-      assert.equal(result.vin[0].tokenQtyStr, '100000000')
-      assert.equal(
-        result.vin[0].tokenId,
-        '550d19eb820e616a54b8a73372c4420b5a0567d8dc00f613b71c5234dc884b35'
-      )
-      assert.equal(result.vin[1].tokenQty, 0)
-      assert.equal(result.vin[1].tokenQtyStr, 0)
-      assert.equal(result.vin[1].tokenId, null)
-      assert.equal(result.vin[2].tokenQty, 99000000)
-      assert.equal(result.vin[2].tokenQtyStr, '99000000')
-      assert.equal(
-        result.vin[2].tokenId,
-        '550d19eb820e616a54b8a73372c4420b5a0567d8dc00f613b71c5234dc884b35'
-      )
-
-      // Assert blockheight is added
-      assert.equal(result.blockheight, 543957)
-      assert.equal(result.isSlpTx, true)
-    })
-
-    // This was a problematic TX
-    it('should process MINT TX with GENESIS input', async () => {
-      // Mock dependencies
-      sandbox
-        .stub(bchjs.Transaction.rawTransaction, 'getTxData')
-        .resolves(mockData.mintTestInputTx02)
-      sandbox
-        .stub(bchjs.Transaction.blockchain, 'getBlockHeader')
-        .resolves({ height: 543614 })
-      sandbox
-        .stub(bchjs.Transaction.slpUtils, 'decodeOpReturn')
-        .onCall(0)
-        .resolves(mockData.mintTestOpReturnData04)
-        .onCall(1)
-        .resolves(mockData.mintTestOpReturnData05)
-        .onCall(2)
-        .resolves(mockData.mintTestOpReturnData05)
-        .onCall(3)
-        .resolves(mockData.mintTestOpReturnData05)
-        .onCall(4)
-        .resolves(mockData.mintTestOpReturnData05)
-        .onCall(5)
-        .resolves(mockData.mintTestOpReturnData05)
-
-      const txid =
-        'ee9d3cf5153599c134147e3fac9844c68e216843f4452a1ce15a29452af6db34'
-
-      const result = await bchjs.Transaction.get3(txid)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      // Assert that there are stanardized properties.
-      assert.property(result, 'txid')
-      assert.property(result, 'vin')
-      assert.property(result, 'vout')
-      assert.property(result.vout[0], 'value')
-      assert.property(result.vout[1].scriptPubKey, 'addresses')
-
-      // Assert outputs have expected properties and values
-      assert.equal(result.vout[0].tokenQty, 0)
-      assert.equal(result.vout[0].tokenQty, '0')
-      assert.equal(result.vout[1].tokenQty, 2.34123)
-      assert.equal(result.vout[1].tokenQty, '2.34123')
-      assert.equal(result.vout[2].tokenQty, 0)
-      assert.equal(result.vout[2].tokenQty, '0')
-      assert.equal(result.vout[2].isMintBaton, true)
-      assert.equal(result.vout[3].tokenQty, 0)
-      assert.equal(result.vout[3].tokenQty, '0')
-
-      // Assert inputs have expected properties and values
-      assert.equal(result.vin[0].tokenQty, 0)
-      assert.equal(result.vin[0].tokenQtyStr, '0')
-      assert.equal(result.vin[0].tokenId, null)
-      assert.equal(result.vin[1].tokenQty, 0)
-      assert.equal(result.vin[1].tokenQtyStr, '0')
-      assert.equal(
-        result.vin[1].tokenId,
-        '938cc18e618967d787897bbc64b9a8d201b94ec7c69b1a9949eab0433ba5cdf8'
-      )
-      assert.equal(result.vin[1].isMintBaton, true)
-
-      // Assert added TX data exists.
-      assert.equal(result.blockheight, 543614)
-      assert.equal(result.isSlpTx, true)
-    })
-
-    // It should process a GENESIS tx
-    it('should process a GENESIS tx', async () => {
-      // Mock dependencies
-      sandbox
-        .stub(bchjs.Transaction.rawTransaction, 'getTxData')
-        .resolves(mockData.genesisTestInputTx02)
-      sandbox
-        .stub(bchjs.Transaction.blockchain, 'getBlockHeader')
-        .resolves({ height: 571212 })
-      sandbox
-        .stub(bchjs.Transaction, 'getTokenInfo')
-        .onCall(0)
-        .resolves(mockData.genesisTestOpReturn03)
-        .onCall(1)
-        .resolves(mockData.genesisTestOpReturn03)
-        .onCall(2)
-        .resolves(false)
-        .onCall(3)
-        .resolves(false)
-        .onCall(4)
-        .resolves(false)
-
-      const txid =
-        '4de69e374a8ed21cbddd47f2338cc0f479dc58daa2bbe11cd604ca488eca0ddf'
-
-      const result = await bchjs.Transaction.get3(txid)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      // Assert that there are stanardized properties.
-      assert.property(result, 'txid')
-      assert.property(result, 'vin')
-      assert.property(result, 'vout')
-      assert.property(result.vout[0], 'value')
-      assert.property(result.vout[1].scriptPubKey, 'addresses')
-
-      // Assert output have expected properties and values
-      assert.equal(result.vout[0].tokenQty, 0)
-      assert.equal(result.vout[0].tokenQtyStr, '0')
-      assert.equal(result.vout[0].isMintBaton, true)
-      assert.equal(result.vout[1].tokenQty, 1000000000)
-      assert.equal(result.vout[1].tokenQtyStr, '1000000000')
-      assert.equal(result.vout[2].tokenQty, 0)
-      assert.equal(result.vout[2].tokenQtyStr, '0')
-
-      // Assert input have expected properties and values
-      assert.equal(result.vin[0].tokenQty, 0)
-      assert.equal(result.vin[0].tokenQtyStr, '0')
-      assert.equal(result.vin[0].tokenId, null)
-      assert.equal(result.vin[1].tokenQty, 0)
-      assert.equal(result.vin[1].tokenQtyStr, '0')
-      assert.equal(result.vin[1].tokenId, null)
-
-      // Assert added TX data exists.
-      assert.equal(result.blockheight, 571212)
-      assert.equal(result.isSlpTx, true)
-    })
-  })
-
   describe('#get', () => {
     it('should proxy psf-slp-indexer', async () => {
       // console.log('bchjs.Transaction: ', bchjs.Transaction)

test/unit/utxo-unit.js

@@ -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 {
@@ -189,6 +58,45 @@ describe('#utxo', () => {
     })
   })
 
+  describe('#hydrateTokenData', () => {
+    it('should hydrate token UTXOs', async () => {
+      // Mock dependencies
+      sandbox
+        .stub(bchjs.Utxo.psfSlpIndexer, 'tokenStats')
+        .onCall(0)
+        .resolves(mockData.genesisData01)
+        .onCall(1)
+        .resolves(mockData.genesisData02)
+        .onCall(2)
+        .resolves(mockData.genesisData03)
+
+      const result = await bchjs.Utxo.hydrateTokenData(mockData.tokenUtxos01)
+      // console.log('result: ', result)
+
+      assert.equal(result.length, 4)
+      assert.property(result[0], 'qtyStr')
+      assert.property(result[0], 'ticker')
+      assert.property(result[0], 'name')
+      assert.property(result[0], 'documentUri')
+      assert.property(result[0], 'documentHash')
+    })
+
+    it('should should catch and throw errors', async () => {
+      try {
+        // Force error
+        sandbox
+          .stub(bchjs.Utxo.psfSlpIndexer, 'tokenStats')
+          .rejects(new Error('test error'))
+
+        await bchjs.Utxo.hydrateTokenData(mockData.tokenUtxos01)
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
+        assert.equal(err.message, 'test error')
+      }
+    })
+  })
+
   describe('#get', () => {
     it('should throw an error if input is not a string', async () => {
       try {
@@ -210,6 +118,12 @@ 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)
 
       const addr = 'simpleledger:qrm0c67wwqh0w7wjxua2gdt2xggnm90xwsr5k22euj'
 
@@ -231,5 +145,33 @@ describe('#utxo', () => {
       assert.equal(result.slpUtxos.type1.mintBatons.length, 1)
       assert.equal(result.nullUtxos.length, 0)
     })
+
+    it('should handle an address with no SLP UTXOs', async () => {
+      // mock dependencies
+      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
+        .stub(bchjs.Utxo.psfSlpIndexer, 'balance')
+        .rejects(mockData.noUtxoErr)
+
+      // Mock function to return the same input. Good enough for this test.
+      sandbox.stub(bchjs.Utxo, 'hydrateTokenData').resolves(() => [])
+
+      const addr = 'simpleledger:qrm0c67wwqh0w7wjxua2gdt2xggnm90xwsr5k22euj'
+
+      const result = await bchjs.Utxo.get(addr)
+      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
+
+      assert.equal(result.bchUtxos.length, 1)
+      assert.equal(result.slpUtxos.type1.tokens.length, 0)
+      assert.equal(result.slpUtxos.type1.mintBatons.length, 0)
+      assert.equal(result.nullUtxos.length, 0)
+    })
   })
 })