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

fix(getTokenData2()): Adding updateCache input argument
2026-09-21 16:51:59 -07:00 · 2023-01-26 17:49:48 -08:00 · 2023-01-26 17:48:11 -08:00 · 2023-01-22 09:41:03 -08:00 · 2023-01-22 09:39:03 -08:00 · 2023-01-13 07:21:15 -08:00
33 changed files with 9194 additions and 15540 deletions
@@ -4,6 +4,7 @@ wallet-info.txt
 wallet.json
 integration-test-sweet.sh
 integration-test-ss.sh
+integration-test-bitfinex.sh

 docs/
 coverage/
@@ -0,0 +1,8 @@
+[
+  {
+    "srcDir": "",
+    "destDir": "",
+    "files": "**/*.js",
+    "command": "npm run lint"
+  }
+]
@@ -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
@@ -12,14 +12,14 @@
    "test": "nyc mocha --trace-warnings --unhandled-rejections=strict --timeout 30000 test/unit/",
    "test:integration": "npm run test:integration:bchn",
    "test:integration:nft": "export RESTURL=https://bchn.fullstack.cash/v5/ && export IS_USING_FREE_TIER=true && mocha --timeout 30000 -g '#nft1' test/integration/chains/bchn/slp.js",
-    "test:integration:abc": "export RESTURL=https://abc.fullstack.cash/v5/ && export IS_USING_FREE_TIER=true && mocha --timeout 30000 test/integration/ && mocha --timeout 30000 test/integration/chains/abc/",
+    "test:integration:abc": "export RESTURL=https://abc.fullstack.cash/v5/ && mocha --timeout 30000 test/integration/ && mocha --timeout 30000 test/integration/chains/abc/",
    "test:integration:bchn": "export RESTURL=https://bchn.fullstack.cash/v5/ && export IS_USING_FREE_TIER=true && mocha --timeout 30000 test/integration/ && mocha --timeout 30000 test/integration/chains/bchn/",
    "test:integration:bchn:slpdb": "export TESTSLP=1 && export RESTURL=https://bchn.fullstack.cash/v5/ && export IS_USING_FREE_TIER=true && mocha --timeout 30000 test/integration/ && mocha --timeout 30000 test/integration/chains/bchn/",
    "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.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:decatur:abc": "export RESTURL=http://192.168.2.142: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/",
    "test:temp2": "mocha --timeout=30000 -g '#TransactionLib' test/unit/",
@@ -40,9 +40,9 @@
    "@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/bitcoincashjs-lib": "4.0.3",
    "@psf/coininfo": "4.0.0",
-    "axios": "^0.21.4",
+    "axios": "0.26.1",
    "bc-bip68": "1.0.5",
    "bchaddrjs-slp": "0.2.5",
    "bigi": "1.4.2",
@@ -63,7 +63,7 @@
    "wif": "2.0.6"
  },
  "devDependencies": {
-    "apidoc": "^0.50.5",
+    "apidoc": "0.50.5",
    "assert": "2.0.0",
    "chai": "4.1.2",
    "coveralls": "3.0.2",
@@ -73,9 +73,9 @@
    "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.2.1",
+    "mocha": "9.2.1",
    "node-mocks-http": "1.7.0",
    "nyc": "15.1.0",
    "semantic-release": "^19.0.2",
@@ -133,7 +133,7 @@ class Address {
   * @api Address.toEcashAddress() toEcashAddress()
   * @apiName toEcashAddress
   * @apiGroup Address
-   * @apiDescription Convert legacy to cashAddress format
+   * @apiDescription Convert legacy to eCash (XEC) format
   *
   * @apiExample Example usage:
   * // mainnet
@@ -158,6 +158,35 @@ class Address {
    return ecashAddress.split(':')[1]
  }

+  /**
+   * @api Address.toEtokenAddress() toEtokenAddress()
+   * @apiName toEtokenAddress
+   * @apiGroup Address
+   * @apiDescription Convert legacy to eToken (XEC) format
+   *
+   * @apiExample Example usage:
+   * // mainnet
+   * bchjs.Address.toEtokenAddress('bitcoincash:qq50d800hgunr8u4trz3uuppspk3mds0dy9978plt2')
+   * // etoken:qq50d800hgunr8u4trz3uuppspk3mds0dyug2v69da
+   *
+   * // mainnet no prefix
+   * bchjs.Address.toEtokenAddress('bitcoincash:qq50d800hgunr8u4trz3uuppspk3mds0dy9978plt2', false)
+   * // qq50d800hgunr8u4trz3uuppspk3mds0dyug2v69da
+   *
+   */
+  toEtokenAddress (address, prefix = true) {
+    const decoded = this._decode(address)
+
+    const etokenAddress = cashaddr.encode(
+      'etoken',
+      decoded.type,
+      decoded.hash
+    )
+
+    if (prefix) return etokenAddress
+    return etokenAddress.split(':')[1]
+  }
+
  /**
   * @api Address.ecashtoCashAddress() ecashtoCashAddress()
   * @apiName ecashtoCashAddress
@@ -7,6 +7,7 @@ const axios = require('axios')

 // Local libraries.
 const Blockchain = require('./blockchain')
+// const Address = require('./address')

 // let _this

@@ -32,7 +33,9 @@ class ElectrumX {
      }
    }

+    // Encapsulate dependencies
    this.blockchain = new Blockchain(config)
+    // this.address = new Address(config)

    // _this = this
  }
@@ -44,7 +47,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);
@@ -104,6 +107,8 @@ class ElectrumX {
   */
  async utxo (address) {
    try {
+      // console.log(`electrumx.js/utxo() restURL: ${this.restURL}`)
+
      // Handle single address.
      if (typeof address === 'string') {
        const response = await axios.get(
@@ -32,6 +32,28 @@ class Encryption {
    _this = this
  }

+  /**
+   * @api encryption.getPubKey() getPubKey()
+   * @apiName Encryption getPubKey()
+   * @apiGroup Encryption
+   * @apiDescription Get the public key for an address
+   * Given an address, the command will search the blockchain for a public
+   * key associated with that address. The address needs to have made at least
+   * one spend transaction, in order for its public key to be retrievable.
+   *
+   * @apiExample Example usage:
+   *(async () => {
+   *  try {
+   *    const addr = 'bitcoincash:qqlrzp23w08434twmvr4fxw672whkjy0py26r63g3d'
+   *    const pubkey = await bchjs.encryption.getPubKey(addr);
+   *    console.log(pubkey);
+   *  } catch(err) {
+   *   console.error(err)
+   *  }
+   *})()
+   *
+   */
+
  // Search the blockchain for a public key associated with a BCH address.
  async getPubKey (addr) {
    try {
@@ -30,19 +30,19 @@ class Price {
  }

  // This endpoint is deprecated. Documentation removed.
-  async current (currency = 'usd') {
-    try {
-      const response = await this.axios.get(
-        `https://index-api.bitcoin.com/api/v0/cash/price/${currency.toLowerCase()}`
-      )
-      // console.log(`response.data: ${JSON.stringify(response.data, null, 2)}`)
-
-      return response.data.price
-    } catch (err) {
-      if (err.response && err.response.data) throw err.response.data
-      else throw err
-    }
-  }
+  // async current (currency = 'usd') {
+  //   try {
+  //     const response = await this.axios.get(
+  //       `https://index-api.bitcoin.com/api/v0/cash/price/${currency.toLowerCase()}`
+  //     )
+  //     // console.log(`response.data: ${JSON.stringify(response.data, null, 2)}`)
+  //
+  //     return response.data.price
+  //   } catch (err) {
+  //     if (err.response && err.response.data) throw err.response.data
+  //     else throw err
+  //   }
+  // }

  /**
   * @api price.getUsd() getUsd()
@@ -41,7 +41,7 @@ class PsfSlpIndexer {
    this.rawTransaction = new RawTransaction(config)
    this.slpUtils = new SlpUtils(config)

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

  /**
@@ -194,6 +194,7 @@ class PsfSlpIndexer {
   *   }
   * }
   *
+   *
   */

  async tokenStats (tokenId, withTxHistory = false) {
@@ -288,6 +289,8 @@ class PsfSlpIndexer {
   */
  async tx (txid) {
    try {
+      // console.log('txid: ', txid)
+
      // Handle single address.
      if (typeof txid === 'string') {
        const response = await axios.post(
@@ -295,8 +298,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)
@@ -316,6 +322,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)
@@ -368,6 +375,168 @@ 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, withTxHistory = false) {
+    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, withTxHistory },
+          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
+    }
+  }
+
+  /**
+   * @api PsfSlpIndexer.getTokenData2()  getTokenData2()
+   * @apiName Token Data
+   * @apiGroup PSF SLP
+   * @apiDescription Get token icon and other media associated with a token.
+   *
+   * Get the icon for a token, given it's token ID.
+   * This function expects a string input of a token ID property.
+   * This function returns an object with a tokenIcon property that contains
+   * the URL to the icon.
+   *
+   * The output object always have these properties:
+   * - tokenIcon: A url to the token icon, if it exists.
+   * - tokenStats: Data about the token from psf-slp-indexer.
+   * - optimizedTokenIcon: An alternative, potentially more optimal, url to the token icon, if it exists.
+   * - iconRepoCompatible: true if the token icon is available via token.bch.sx
+   * - ps002Compatible: true if the token icon is compatible with PS007 specification.
+   *
+   * @apiExample Example usage:
+   * (async () => {
+   *   try {
+   *     let tokenData = await bchjs.PsfSlpIndexer.getTokenData2('a4fb5c2da1aa064e25018a43f9165040071d9e984ba190c222a7f59053af84b2')
+   *     console.log(tokenData)
+   *   } catch(error) {
+   *    console.error(error)
+   *   }
+   * })()
+   *
+   * {
+   *   tokenStats: {
+   *     type: 1,
+   *     ticker: 'CTAIA006',
+   *     name: 'CTAIA006 - AI Art by Chris Troutner',
+   *     tokenId: '0e4543f820699294ab57e02ee2b1815a8bbc7b17a4333e4a138034e4b2324a61',
+   *     documentUri: 'ipfs://bafybeia5yuq7rg6jmwquako7t277cwrobcunz7cumqrv4wn6bgfvthemku',
+   *     documentHash: '78a00e9db312b8fff4e5c37cf592be83e6bab7f3bd5a54c9545bad5d4f3ee0f5',
+   *     decimals: 0,
+   *     mintBatonIsActive: false,
+   *     tokensInCirculationBN: '1',
+   *     tokensInCirculationStr: '1',
+   *     blockCreated: 757507,
+   *     totalBurned: '0',
+   *     totalMinted: '1'
+   *   },
+   *   mutableData: {
+   *     tokenIcon: 'https://bafybeihiv5jvlhoymmbous3h2akotogj6b7hruhjcj3zq7dsfteimuuttm.ipfs.w3s.link/whale-night-sky-01.png',
+   *     fullSizedUrl: '',
+   *     about: 'This NFT was created using the PSF Token Studio at https://nft-creator.fullstack.cash',
+   *     userData: ''
+   *   },
+   *   immutableData: {
+   *     issuer: 'http://psfoundation.cash',
+   *     website: 'https://nft-creator.fullstack.cash',
+   *     dateCreated: '9/12/2022, 5:17:38 PM',
+   *     userData: '{\n' +
+   *       '  "title": "CTAIA006 - AI Art by Chris Troutner",\n' +
+   *       '  "about": "AI generated art. Generated from DALL-E at https://labs.openai.com",\n' +
+   *       '  "prompt": "whale swimming through a sky full of stars",\n' +
+   *       '  "algorithm": "DALL-E (stable diffusion)",\n' +
+   *       '  "set": "1-of-2"\n' +
+   *       '}'
+   *   },
+   *   tokenIcon: 'https://bafybeihiv5jvlhoymmbous3h2akotogj6b7hruhjcj3zq7dsfteimuuttm.ipfs.w3s.link/whale-night-sky-01.png',
+   *   fullSizedUrl: '',
+   *   optimizedTokenIcon: 'https://p2wdb-gateway-678.fullstack.cash/ipfs/bafybeihiv5jvlhoymmbous3h2akotogj6b7hruhjcj3zq7dsfteimuuttm/whale-night-sky-01.png',
+   *   optimizedFullSizedUrl: '',
+   *   iconRepoCompatible: false,
+   *   ps002Compatible: true
+   * }
+   *
+   */
+  async getTokenData2 (tokenId, updateCache = false) {
+    try {
+      const url = `${this.restURL}psf/slp/token/data2`
+      // 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, updateCache },
+          this.axiosOptions
+        )
+        return response.data
+      }
+
+      throw new Error('Input tokenId must be a string.')
+    } catch (error) {
+      // console.log('error: ', error)
+      if (error.response && error.response.data) throw error.response.data
+      else throw error
+    }
+  }
 }

 module.exports = PsfSlpIndexer
@@ -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.
@@ -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]
      }
    }
@@ -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
@@ -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) {
@@ -281,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
@@ -10,6 +10,7 @@ const Electrumx = require('./electrumx')
 const Slp = require('./slp/slp')
 const PsfSlpIndexer = require('./psf-slp-indexer')
 const BigNumber = require('bignumber.js')
+const Blockchain = require('./blockchain')

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

  /**
@@ -350,7 +82,10 @@ class UTXO {
      }

      // Ensure the address is a BCH address.
-      const addr = this.slp.Address.toCashAddress(address)
+      let addr = address
+      if (!addr.includes('ecash')) {
+        addr = this.slp.Address.toCashAddress(address)
+      }

      // Get the UTXOs associated with the address.
      const utxoData = await this.electrumx.utxo(addr)
@@ -374,6 +109,11 @@ class UTXO {
        }
      }

+      // Get the sync status of the SLP indexer
+      const syncStatus = await this.psfSlpIndexer.status()
+      const slpIndexerHeight = syncStatus.status.syncedBlockHeight
+      const chainBlockHeight = syncStatus.status.chainBlockHeight
+
      // Loop through the Fulcrum UTXOs.
      for (let i = 0; i < utxos.length; i++) {
        const thisUtxo = utxos[i]
@@ -395,6 +135,7 @@ class UTXO {
            thisUtxo.qty = thisSlpUtxo.qty
            thisUtxo.tokenId = thisSlpUtxo.tokenId
            thisUtxo.address = thisSlpUtxo.address
+            thisUtxo.tokenType = thisSlpUtxo.tokenType

            break
          }
@@ -416,21 +157,52 @@ class UTXO {
            thisUtxo.isSlp = false
          }
          // console.log(`thisUtxo.isSlp: ${thisUtxo.isSlp}`)
+
+          // If the SLP indexer more than 1 block behind the full node, then
+          // move any BCH UTXOs of 600 sats or less into the null array. This
+          // protects token UTXOs from being burned accidentally.
+          if (slpIndexerHeight < chainBlockHeight - 1) {
+            if (thisUtxo.value < 601) {
+              thisUtxo.isSlp = null
+            }
+          }
        }
      }

      // Get token UTXOs
      let type1TokenUtxos = utxos.filter(
-        x => x.isSlp === true && x.type === 'token'
+        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 type1BatonUtxos = utxos.filter(
-        x => x.isSlp === true && x.type === 'baton'
+      let type1BatonUtxos = utxos.filter(
+        x => x.isSlp === true && x.type === 'baton' && x.tokenType === 1
      )
+      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 = {
@@ -441,7 +213,13 @@ class UTXO {
            tokens: type1TokenUtxos,
            mintBatons: type1BatonUtxos
          },
-          nft: {} // Allocated for future support of NFT spec.
+          group: {
+            tokens: nftGroupTokenUtxos,
+            mintBatons: groupBatonUtxos
+          },
+          nft: {
+            tokens: nftChildTokenUtxos
+          }
        },
        nullUtxos
      }
@@ -495,11 +273,16 @@ class UTXO {
        thisUtxo.documentHash = genData[0].tokenData.documentHash
        thisUtxo.decimals = genData[0].tokenData.decimals

-        // Calculate the real token quantity
-        const qty = new BigNumber(thisUtxo.qty).dividedBy(
-          10 ** parseInt(thisUtxo.decimals)
-        )
-        thisUtxo.qtyStr = qty.toString()
+        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
@@ -572,6 +355,57 @@ class UTXO {

    return utxos[largestIndex]
  }
+
+  /**
+   * @api Utxo.isValid() isValid()
+   * @apiName isValid
+   * @apiGroup UTXO
+   * @apiDescription Validate that UTXO exists and is still spendable.
+   *
+   * Given a UTXO, this method will return true if the UTXO is still in the
+   * mempool and still valid for spending. It will return false if the UTXO
+   * has been spent.
+   *
+   * @apiExample Example usage:
+   * (async () => {
+   *   try {
+   *     const utxos = await bchjs.Utxo.get('bitcoincash:qq54fgjn3hz0357n8a6guy4demw9xfkjk5jcj0xr0z');
+   *     const isValid = bchjs.Utxo.isValid(utxos.bchUtxos[0])
+   *     console.log(isValid);
+   *   } catch(error) {
+   *    console.error(error)
+   *   }
+   * })()
+   *
+   * // returns
+   *  true
+   */
+  async isValid (utxo) {
+    try {
+      // console.log('utxo: ', utxo)
+
+      // Convert different properties from different indexers
+      const txid = utxo.txid || utxo.tx_hash
+      const vout = utxo.vout | utxo.tx_pos
+
+      // Query the full node
+      const txOut = await this.blockchain.getTxOut(txid, vout, true)
+      // console.log('txOut: ', txOut)
+
+      // Simplify results to either true or false.
+      let isValid = null
+      if (txOut === null) {
+        isValid = false
+      } else {
+        isValid = true
+      }
+
+      return isValid
+    } catch (err) {
+      console.log('Error in Utxo.isValid()')
+      throw err
+    }
+  }
 }

 module.exports = UTXO
@@ -0,0 +1,27 @@
+/*
+  This test is used to interrogate the behavior of bch-js when a psf-slp-indexer
+  panicks and starts indexing from SLP genesis. In this corner-case, bch-js
+  should detect the indexer is out of sync, and protect any token UTXOs by
+  moving any UTXO under 600 sats into the null array.
+
+  TO RUN THIS TEST:
+  - Reset a local instance of psf-slp-indexer to sync from genesis.
+  - Start a local copy of bch-api
+*/
+
+const BCHJS = require('../../../src/bch-js.js')
+const bchjs = new BCHJS({
+  restURL: 'http://localhost:3000/v5/'
+})
+
+async function startTest () {
+  try {
+    const addr = 'bitcoincash:qzkvas58zag9tjry693mflkjze2m20ps7vx7uw7z9d'
+
+    const result = await bchjs.Utxo.get(addr)
+    console.log(`result: ${JSON.stringify(result, null, 2)}`)
+  } catch (err) {
+    console.error('Error in startTest(): ', err)
+  }
+}
+startTest()
@@ -0,0 +1,38 @@
+/*
+  Integration tests for the psf-slp-indexer.js library, specific to the eCash
+  blockchain.
+*/
+
+// Global npm libraries
+const assert = require('chai').assert
+
+// Local libraries
+const BCHJS = require('../../../../src/bch-js')
+let bchjs
+
+describe('#psf-slp-indexer', () => {
+  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('#balance', () => {
+    it('should get token balance for an ecash address', async () => {
+      const addr = 'ecash:qr5c4hfy52zn87484cucvzle5pljz0gtr5vhtw9z09'
+
+      const result = await bchjs.PsfSlpIndexer.balance(addr)
+      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
+
+      assert.property(result.balance, 'utxos')
+      assert.property(result.balance, 'txs')
+      assert.property(result.balance, 'balances')
+    })
+  })
+})
+
+// Promise-based sleep function
+function sleep (ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}
@@ -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,25 +14,23 @@ 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'
-      const addr = 'simpleledger:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvyucjzqt9'
+      const addr = 'ecash:qr5c4hfy52zn87484cucvzle5pljz0gtr5vhtw9z09'
+      // 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)
+      // assert.isArray(result)
+      assert.property(result, 'address')
+      assert.property(result, 'bchUtxos')
+      assert.property(result, 'nullUtxos')
+      assert.property(result, 'slpUtxos')
+      assert.isArray(result.bchUtxos)
+      assert.isArray(result.nullUtxos)
    })
  })
-  */
 })

 function sleep (ms) {
@@ -1,9 +1,12 @@
 /*
-  Integration tests for the psf-slp-indexer.js library
+  Integration tests for the psf-slp-indexer.js library, specific to the BCH
+  blockchain.
 */

+// Global npm libraries
 const assert = require('chai').assert

+// Local libraries
 const BCHJS = require('../../../../src/bch-js')
 let bchjs

@@ -124,6 +127,57 @@ describe('#psf-slp-indexer', () => {
      }
    })
  })
+
+  describe('#getTokenData', () => {
+    it('should get token data', async () => {
+      const tokenId =
+        'd9aafa7acb514c597caf440ae268b5e4e955f2687e05f044cdf8fd9550d9a27b'
+
+      // bchjs.PsfSlpIndexer.restURL = 'http://localhost:3000/v5/'
+      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.isString(result.immutableData)
+      assert.isString(result.mutableData)
+    })
+
+    it('should get token data with a transaction history', async () => {
+      const tokenId = '43eddfb11c9941edffb8c8815574bb0a43969a7b1de39ad14cd043eaa24fd38d'
+
+      const result = await bchjs.PsfSlpIndexer.getTokenData(tokenId, true)
+      // console.log('result: ', result)
+
+      assert.isArray(result.genesisData.txs)
+    })
+  })
+
+  // This test is commented out because it can not succeed in the BVT without
+  // tripping rate limits.
+  // describe('#getTokenData2', () => {
+  //   it('should get token data', async () => {
+  //     const tokenId =
+  //       'd9aafa7acb514c597caf440ae268b5e4e955f2687e05f044cdf8fd9550d9a27b'
+  //
+  //     // bchjs.PsfSlpIndexer.restURL = 'http://localhost:3000/v5/'
+  //     const result = await bchjs.PsfSlpIndexer.getTokenData2(tokenId)
+  //     // console.log('result: ', result)
+  //
+  //     assert.property(result, 'tokenStats')
+  //     assert.property(result, 'mutableData')
+  //     assert.property(result, 'immutableData')
+  //     assert.property(result, 'tokenIcon')
+  //     assert.property(result, 'fullSizedUrl')
+  //     assert.property(result, 'optimizedTokenIcon')
+  //     assert.property(result, 'optimizedFullSizedUrl')
+  //     assert.property(result, 'iconRepoCompatible')
+  //     assert.property(result, 'ps002Compatible')
+  //   })
+  // })
 })

 // Promise-based sleep function
@@ -24,5 +24,14 @@ describe('#Transaction', () => {
      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')
+    })
  })
 })
@@ -83,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 minting batons', async () => {
-      const addr = 'simpleledger:qrm0c67wwqh0w7wjxua2gdt2xggnm90xwsr5k22euj'
+    it('should handle Type1 minting batons', async () => {
+      const addr = 'simpleledger:qrp4mlmsrtwlvjn4seuchvtmus06tuqmpv4awvv7m7'

      const result = await bchjs.Utxo.get(addr)
      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
@@ -105,13 +103,82 @@ describe('#UTXO', () => {
      assert.equal(result.slpUtxos.type1.tokens.length, 0)
    })

-    it('should handle Group NFTs', async () => {
-      const addr = 'bitcoincash:qrnghwrfgccf3s5e9wnglzxegcnhje9rkcwv2eka33'
+    it('should filter Group tokens and mint batons', async () => {
+      const addr = 'bitcoincash:qrp4mlmsrtwlvjn4seuchvtmus06tuqmpvex9he79q'

      const result = await bchjs.Utxo.get(addr)
      // console.log(`result: ${JSON.stringify(result, null, 2)}`)

-      assert.equal(result.nullUtxos.length, 0)
+      assert.isAbove(result.slpUtxos.group.tokens.length, 0)
+      assert.isAbove(result.slpUtxos.group.mintBatons.length, 0)
+    })
+
+    it('should filter NFTs', async () => {
+      const addr = 'bitcoincash:qrp4mlmsrtwlvjn4seuchvtmus06tuqmpvex9he79q'
+
+      const result = await bchjs.Utxo.get(addr)
+      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
+
+      assert.isAbove(result.slpUtxos.nft.tokens.length, 0)
+    })
+  })
+
+  describe('#isValid', () => {
+    it('should return true for valid UTXO with fullnode properties', async () => {
+      const utxo = {
+        txid: '260d4fb4006a330660c805327c840d569d7547b7e3e9659fb423b3a041c2e254',
+        vout: 0
+      }
+
+      const result = await bchjs.Utxo.isValid(utxo)
+      // console.log('result: ', result)
+
+      assert.equal(result, true)
+    })
+
+    it('should return true for valid UTXO with fulcrum properties', async () => {
+      const utxo = {
+        tx_hash: '260d4fb4006a330660c805327c840d569d7547b7e3e9659fb423b3a041c2e254',
+        tx_pos: 0
+      }
+
+      const result = await bchjs.Utxo.isValid(utxo)
+      // console.log('result: ', result)
+
+      assert.equal(result, true)
+    })
+
+    it('should return true for valid UTXO with fullnode properties', async () => {
+      const utxo = {
+        txid: '17754221b29f189532d4fc2ae89fb467ad2dede30fdec4854eb2129b3ba90d7a',
+        vout: 0
+      }
+
+      const result = await bchjs.Utxo.isValid(utxo)
+      // console.log('result: ', result)
+
+      assert.equal(result, false)
+    })
+
+    it('should return true for valid UTXO with fulcrum properties', async () => {
+      const utxo = {
+        tx_hash: '17754221b29f189532d4fc2ae89fb467ad2dede30fdec4854eb2129b3ba90d7a',
+        tx_pos: 0
+      }
+
+      const result = await bchjs.Utxo.isValid(utxo)
+      // console.log('result: ', result
+
+      assert.equal(result, false)
+    })
+
+    it('should process output of Utxo.get()', async () => {
+      const utxo = await bchjs.Utxo.get('bitcoincash:qqgahqa5zkknmhmvsc98jndpwn3r77gqgc02x03jce')
+      // console.log(`utxo: ${JSON.stringify(utxo, null, 2)}`)
+
+      const result = await bchjs.Utxo.isValid(utxo.bchUtxos[0])
+
+      assert.equal(result, true)
    })
  })
 })
@@ -7,14 +7,14 @@ describe('#price', () => {
    if (process.env.IS_USING_FREE_TIER) await sleep(1500)
  })

-  describe('#current', () => {
-    describe('#single currency', () => {
-      it('should get current price for single currency', async () => {
-        const result = await bchjs.Price.current('usd')
-        assert.notEqual(0, result)
-      })
-    })
-  })
+  // describe('#current', () => {
+  //   describe('#single currency', () => {
+  //     it('should get current price for single currency', async () => {
+  //       const result = await bchjs.Price.current('usd')
+  //       assert.notEqual(0, result)
+  //     })
+  //   })
+  // })

  describe('#getUsd', () => {
    it('should get the USD price of BCH', async () => {
@@ -33,6 +33,7 @@ describe('#price', () => {
      assert.isNumber(result)
    })
  })
+
  describe('#getBchUsd', () => {
    it('should get the USD price of BCH', async () => {
      const result = await bchjs.Price.getBchUsd()
@@ -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 () => {
@@ -935,4 +935,44 @@ describe('#address.js', () => {
      })
    })
  })
+
+  describe('#toEcashAddress', () => {
+    it('should convert a BCH address to an eCash address', () => {
+      const cashAddr = 'bitcoincash:qr24z7q6s26d9wr078lr2pxsmxg22cyn9s7yw984vk'
+
+      const result = bchjs.Address.toEcashAddress(cashAddr)
+      // console.log('result: ', result)
+
+      assert.equal(result, 'ecash:qr24z7q6s26d9wr078lr2pxsmxg22cyn9s8f6wu02p')
+    })
+
+    it('should convert a BCH address to an eCash address without a prefix', () => {
+      const cashAddr = 'bitcoincash:qr24z7q6s26d9wr078lr2pxsmxg22cyn9s7yw984vk'
+
+      const result = bchjs.Address.toEcashAddress(cashAddr, false)
+      // console.log('result: ', result)
+
+      assert.equal(result, 'qr24z7q6s26d9wr078lr2pxsmxg22cyn9s8f6wu02p')
+    })
+  })
+
+  describe('#toEtokenAddress', () => {
+    it('should convert a BCH address to an eToken address', () => {
+      const cashAddr = 'bitcoincash:qr24z7q6s26d9wr078lr2pxsmxg22cyn9s7yw984vk'
+
+      const result = bchjs.Address.toEtokenAddress(cashAddr)
+      // console.log('result: ', result)
+
+      assert.equal(result, 'etoken:qr24z7q6s26d9wr078lr2pxsmxg22cyn9sfhnv2gwk')
+    })
+
+    it('should convert a BCH address to an eToken address without a prefix', () => {
+      const cashAddr = 'bitcoincash:qr24z7q6s26d9wr078lr2pxsmxg22cyn9s7yw984vk'
+
+      const result = bchjs.Address.toEtokenAddress(cashAddr, false)
+      // console.log('result: ', result)
+
+      assert.equal(result, 'qr24z7q6s26d9wr078lr2pxsmxg22cyn9sfhnv2gwk')
+    })
+  })
 })
@@ -144,10 +144,71 @@ const tokenData01 = {
  qty: {}
 }

+const tokenData = {
+  genesisData: tokenStats.tokenData,
+  immutableData: 'ipfs://bafybeidzfi3sictag4noy746gniyiwwcgio565xuzelmjfwxnga6qyiyai',
+  mutableData: 'ipfs://bafybeie6t5uyupddc7azms737xg4hxrj7i5t5ov3lb5g2qeehaujj6ak64'
+}
+
+const tokenMedia01 = {
+  tokenStats: {
+    type: 65,
+    ticker: 'TEST02',
+    name: 'How to Send BCH and Tokens',
+    tokenId: 'd9aafa7acb514c597caf440ae268b5e4e955f2687e05f044cdf8fd9550d9a27b',
+    documentUri: 'ipfs://bafybeigjujbb55wqr5lns7z7vleg5cfp4yjwqp4swisxpgxl4xsp5tngai',
+    documentHash: '845f803d8dd3c2b6be94a6cf3a445b54c36f2e01bd5c9ab4c23f37dbd531489e',
+    decimals: 0,
+    mintBatonIsActive: false,
+    tokensInCirculationBN: '0',
+    tokensInCirculationStr: '0',
+    blockCreated: 740089,
+    totalBurned: '1',
+    totalMinted: '1',
+    parentGroupId: 'c9c425f2c6352697c6665a53e035cbad8a44c4b1e36491a1838dc4655479aa09'
+  },
+  mutableData: {
+    updated: '2022-05-14T15:27:44.429Z',
+    tokenIcon: 'https://bafybeiefg3nd5iognbqztkpi5hj34dmwkqfe7v7xeayn2nhhatinmjmzcy.ipfs.dweb.link/send-bch-token-icon.png',
+    tokenInfo: 'https://token.fullstack.cash/?tokenid=d9aafa7acb514c597caf440ae268b5e4e955f2687e05f044cdf8fd9550d9a27b',
+    description: 'This is an NFT representing a video. This is a test token.',
+    issuer: 'Chris Troutner',
+    forSale: false,
+    display: true,
+    currentOwner: {
+      bchAddr: 'bitcoincash:qqy7jcrm3vmtqs96r878hy2kx90mn84f25ujqw9z5h',
+      name: 'Chris Troutner',
+      contactEmail: 'chris.troutner@gmail.com'
+    },
+    content: {
+      youtube: 'https://youtu.be/WZRwkLPtkaI',
+      rumble: 'https://rumble.com/v14n00h-how-to-send-bch-and-tokens.html',
+      odysee: 'https://odysee.com/@trout:5/how-to-send-bch-tokens:0',
+      lbry: 'lbry://@trout#5/how-to-send-bch-tokens#0',
+      ipfs: 'bafybeigf3ky5i6fyxwk5bjmtsr6urqmlx4zq2lqathgguytey67iinh4be',
+      filecoin: 'https://bafybeigf3ky5i6fyxwk5bjmtsr6urqmlx4zq2lqathgguytey67iinh4be.ipfs.dweb.link/send-bch-2022-02-20_08.22.45.mp4'
+    }
+  },
+  immutableData: {
+    creationDate: '2022-05-13T21:32:11.619Z',
+    issuer: 'Chris Troutner',
+    license: 'https://bafybeidnkhjfsbihp4gquwqrs6y35jfpcriafymceszwvkundjkwk546pi.ipfs.dweb.link/copyright.txt',
+    name: 'How to Send BCH and Tokens'
+  },
+  tokenIcon: 'https://bafybeiefg3nd5iognbqztkpi5hj34dmwkqfe7v7xeayn2nhhatinmjmzcy.ipfs.dweb.link/send-bch-token-icon.png',
+  fullSizedUrl: '',
+  optimizedTokenIcon: 'https://p2wdb-gateway-678.fullstack.cash/ipfs/bafybeiefg3nd5iognbqztkpi5hj34dmwkqfe7v7xeayn2nhhatinmjmzcy/send-bch-token-icon.png',
+  optimizedFullSizedUrl: '',
+  iconRepoCompatible: false,
+  ps002Compatible: true
+}
+
 module.exports = {
  tokenStats,
  txData,
  balance,
  status,
-  tokenData01
+  tokenData01,
+  tokenData,
+  tokenMedia01
 }
@@ -19,18 +19,18 @@ describe('#price', () => {

  afterEach(() => sandbox.restore())

-  describe('#current', () => {
-    it('should get current price for single currency', async () => {
-      sandbox
-        .stub(bchjs.Price.axios, 'get')
-        .resolves({ data: { price: 24905 } })
-
-      const result = await bchjs.Price.current('usd')
-      // console.log(result)
-
-      assert.isNumber(result)
-    })
-  })
+  // describe('#current', () => {
+  //   it('should get current price for single currency', async () => {
+  //     sandbox
+  //       .stub(bchjs.Price.axios, 'get')
+  //       .resolves({ data: { price: 24905 } })
+  //
+  //     const result = await bchjs.Price.current('usd')
+  //     // console.log(result)
+  //
+  //     assert.isNumber(result)
+  //   })
+  // })

  describe('#getUsd', () => {
    it('should get the USD price of BCH', async () => {
@@ -336,4 +336,103 @@ 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.isString(result.immutableData)
+      assert.isString(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)
+      }
+    })
+  })
+
+  describe('#getTokenData2', () => {
+    it('should get token data', async () => {
+      // Stub the network call.
+      sandbox.stub(axios, 'post').resolves({ data: mockData.tokenMedia01 })
+
+      const tokenId =
+        'd9aafa7acb514c597caf440ae268b5e4e955f2687e05f044cdf8fd9550d9a27b'
+
+      // bchjs.PsfSlpIndexer.restURL = 'http://localhost:3000/v5/'
+      const result = await bchjs.PsfSlpIndexer.getTokenData2(tokenId)
+      // console.log('result: ', result)
+
+      assert.property(result, 'tokenStats')
+      assert.property(result, 'mutableData')
+      assert.property(result, 'immutableData')
+      assert.property(result, 'tokenIcon')
+      assert.property(result, 'fullSizedUrl')
+      assert.property(result, 'optimizedTokenIcon')
+      assert.property(result, 'optimizedFullSizedUrl')
+      assert.property(result, 'iconRepoCompatible')
+      assert.property(result, 'ps002Compatible')
+    })
+  })
 })
@@ -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)
@@ -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 {
@@ -252,6 +121,8 @@ describe('#utxo', () => {
      sandbox
        .stub(bchjs.Utxo.psfSlpIndexer, 'tx')
        .resolves({ txData: { isValidSlp: false } })
+      sandbox.stub(bchjs.Utxo.psfSlpIndexer, 'status')
+        .resolves({ status: { syncedBlockHeight: 600000, chainBlockHeight: 600000 } })

      // Mock function to return the same input. Good enough for this test.
      sandbox.stub(bchjs.Utxo, 'hydrateTokenData').resolves(x => x)
@@ -285,6 +156,8 @@ describe('#utxo', () => {
      sandbox
        .stub(bchjs.Utxo.psfSlpIndexer, 'tx')
        .resolves({ txData: { isValidSlp: false } })
+      sandbox.stub(bchjs.Utxo.psfSlpIndexer, 'status')
+        .resolves({ status: { syncedBlockHeight: 600000, chainBlockHeight: 600000 } })

      // Force psf-slp-indexer to return no UTXOs
      sandbox
@@ -305,4 +178,36 @@ describe('#utxo', () => {
      assert.equal(result.nullUtxos.length, 0)
    })
  })
+
+  describe('#isValid', () => {
+    it('should return false if getTxOut() returns null', async () => {
+      // Mock dependencies
+      sandbox.stub(bchjs.Utxo.blockchain, 'getTxOut').resolves(null)
+
+      const utxo = {
+        tx_hash: '17754221b29f189532d4fc2ae89fb467ad2dede30fdec4854eb2129b3ba90d7a',
+        tx_pos: 0
+      }
+
+      const result = await bchjs.Utxo.isValid(utxo)
+      // console.log('result: ', result
+
+      assert.equal(result, false)
+    })
+
+    it('should return true if getTxOut() returns non-null output', async () => {
+      // Mock dependencies
+      sandbox.stub(bchjs.Utxo.blockchain, 'getTxOut').resolves({ a: 'b' })
+
+      const utxo = {
+        tx_hash: 'b94e1ff82eb5781f98296f0af2488ff06202f12ee92b0175963b8dba688d1b40',
+        tx_pos: 0
+      }
+
+      const result = await bchjs.Utxo.isValid(utxo)
+      // console.log('result: ', result
+
+      assert.equal(result, true)
+    })
+  })
 })
Author	SHA1	Message	Date
Chris Troutner	eae7172e3d	Merge pull request #257 from Permissionless-Software-Foundation/ct-unstable fix(getTokenData2()): Adding updateCache input argument	2023-01-26 17:49:48 -08:00
Chris Troutner	6dd2a0590f	fix(getTokenData2()): Adding updateCache input argument	2023-01-26 17:48:11 -08:00
Chris Troutner	3152e87b5d	Merge pull request #256 from Permissionless-Software-Foundation/electron fix(bitcoincashjs-lib): Updating to v4.0.3	2023-01-22 09:41:03 -08:00
Chris Troutner	4b66f3841d	fix(bitcoincashjs-lib): Updating to v4.0.3	2023-01-22 09:39:03 -08:00
Chris Troutner	9f98a47682	Merge pull request #255 from Permissionless-Software-Foundation/ct-unstable fix(tests): Fixing broken integration tests	2023-01-13 07:21:15 -08:00
Chris Troutner	0833e8ca78	fix(tests): Fixing broken integration tests	2023-01-13 07:13:47 -08:00
Chris Troutner	e01a18b65e	Merge pull request #253 from Permissionless-Software-Foundation/ct-unstable fix(encryption): Adding documentation for the encryption library	2022-12-14 10:09:43 -08:00
Chris Troutner	055cd7feca	fix(encryption): Adding documentation for the encryption library	2022-12-14 10:05:41 -08:00
Chris Troutner	906d9b2094	Merge pull request #252 from Permissionless-Software-Foundation/ct-unstable fix(utxo.get()): Detecting out-of-sync SLP indexer, protecting tokens	2022-11-01 15:01:44 -07:00
Chris Troutner	9326fd6e59	fix(utxo.get()): Detecting out-of-sync SLP indexer, protecting tokens	2022-11-01 14:58:28 -07:00
Chris Troutner	1d91eed5df	Fixing script in package.json	2022-10-16 13:23:16 -07:00
Chris Troutner	62e56c832b	Merge pull request #251 from Permissionless-Software-Foundation/ct-unstable fix(tests): Removing integration tests that trips rate limit	2022-10-13 10:33:55 -07:00
Chris Troutner	d5b7e4ab1d	fix(tests): Removing integration tests that trips rate limit	2022-10-13 10:31:22 -07:00
Chris Troutner	2137a75fce	Merge pull request #250 from Permissionless-Software-Foundation/ct-unstable fix(getTokenData2): Adding api documentation	2022-10-06 20:43:14 -07:00
Chris Troutner	8966cac210	fix(getTokenData2): Adding api documentation	2022-10-06 20:40:22 -07:00
Chris Troutner	9d32f828bc	Cleaning up screen spam	2022-10-06 20:33:36 -07:00
Chris Troutner	91a7106818	Merge pull request #249 from Permissionless-Software-Foundation/ct-unstable feat(getTokenData2): Adding new endpoint for token icons and other media	2022-10-06 20:27:00 -07:00
Chris Troutner	44e671dfbe	fix(price): Removing dead price endpoint tests	2022-10-06 20:24:17 -07:00
Chris Troutner	979fb481de	feat(getTokenData2): Adding token media endpoint	2022-10-06 18:30:39 -07:00
Chris Troutner	66253ed5a6	feat(bchjs.Price.current): Removing dead endpoint	2022-10-06 17:58:00 -07:00
Chris Troutner	6ef5ac0f7c	feat(getTokenData2): Adding new endpoint for token icons and other media	2022-10-06 17:57:11 -07:00
Chris Troutner	21c322d0df	Merge pull request #247 from Permissionless-Software-Foundation/ct-unstable fix(getTokenData): Adding ability to retrieve tx history	2022-07-12 14:48:22 -07:00
Chris Troutner	1b0e9ef0ff	fix(getTokenData): Adding ability to retrieve tx history	2022-07-12 14:24:09 -07:00
Chris Troutner	78776bee93	Merge pull request #246 from Permissionless-Software-Foundation/ct-unstable fix(deps): npm audit shows now vulns	2022-07-11 07:24:47 -07:00
Chris Troutner	a6e3155f37	fix(deps): npm audit shows now vulns	2022-07-11 07:20:20 -07:00
Chris Troutner	47f60bccde	Merge pull request #245 from Permissionless-Software-Foundation/ct-unstable fix(ecash): Adding token support for ecash	2022-07-11 07:11:36 -07:00
Chris Troutner	d0a3b27682	fix(ecash): Adding token support for ecash	2022-07-11 07:09:44 -07:00
Chris Troutner	372d1b099d	Merge pull request #244 from Permissionless-Software-Foundation/ct-unstable fix(address): Adding toEtokenAddress() function	2022-07-10 09:50:44 -07:00
Chris Troutner	dbfaf9c4ab	fix(address): Adding toEtokenAddress() function	2022-07-10 09:47:49 -07:00
Chris Troutner	eaa08f74e7	Merge pull request #243 from Permissionless-Software-Foundation/ct-unstable fix(test): Updating integration test	2022-05-15 07:53:53 -07:00
Chris Troutner	9ac620ee64	fix(test): Updating integration test	2022-05-15 07:50:57 -07:00
Chris Troutner	ac0a4b0407	Merge pull request #242 from Permissionless-Software-Foundation/ct-unstable feat(Utxo.isValid()): can test if a UTXO has been spent	2022-05-10 09:34:37 -07:00
Chris Troutner	686012037f	feat(Utxo.isValid()): can test if a UTXO has been spent	2022-05-10 09:30:57 -07:00
Chris Troutner	cfb7b9f779	Merge pull request #241 from Permissionless-Software-Foundation/ct-unstable fix(tests): Fixing broken UTXO.get() test	2022-05-09 10:35:21 -07:00
Chris Troutner	06e5af4b5d	fix(tests): Fixing broken UTXO.get() test	2022-05-09 10:33:06 -07:00
Chris Troutner	249e93a3f4	Merge pull request #240 from Permissionless-Software-Foundation/ct-unstable fix(test): Updating UTXO integration tests	2022-05-09 10:25:58 -07:00
Chris Troutner	761a2d226c	fix(test): Updating UTXO integration tests	2022-05-09 10:24:00 -07:00
Chris Troutner	5e5e636831	Merge pull request #239 from Permissionless-Software-Foundation/ct-unstable fix(tests): Fixing broken integration tests for token data	2022-05-09 09:49:02 -07:00
Chris Troutner	2adc2dfebb	fix(tests): Fixing broken integration tests for token data	2022-05-09 09:45:28 -07:00
Chris Troutner	f9bc44ccb7	Merge pull request #238 from Permissionless-Software-Foundation/ct-unstable fix(token data): Returning CID rather than content itself	2022-05-07 20:59:55 -07:00
Chris Troutner	298b8f56ff	Merge branch 'temp-token-data' into ct-unstable	2022-05-07 20:54:49 -07:00
Chris Troutner	139da8cf7b	fix(token data): Returning CID rather than content itself	2022-05-07 20:54:20 -07:00
Chris Troutner	08e03c14d8	Merge pull request #234 from Permissionless-Software-Foundation/dh-psfSlpIndexer feat(slpindexer): Added bchjs.PsfSlpIndexer.getTokenData()	2022-05-07 20:25:15 -07:00
Chris Troutner	7da010e7af	Using config.restURL instead of hard-coded URL	2022-05-07 20:20:30 -07:00
Chris Troutner	7b6eebe7c7	Merge branch 'master' into dh-psfSlpIndexer	2022-05-07 20:05:25 -07:00
Chris Troutner	843f5eacef	Merge pull request #237 from Permissionless-Software-Foundation/ct-unstable fix(Utxo.get()): Added additional integration tests	2022-05-05 12:08:46 -07:00
Chris Troutner	416e302ca5	fix(Utxo.get()): Added additional integration tests	2022-05-05 12:06:59 -07:00
Chris Troutner	1c66da70b6	Merge pull request #236 from Permissionless-Software-Foundation/ct-unstable fix(mintNFTGroupOpReturn()): Updating to use UTXOs from psf-slp-indexer	2022-05-05 10:45:59 -07:00
Chris Troutner	59e92adf0b	fix(mintNFTGroupOpReturn()): Updating to use UTXOs from psf-slp-indexer	2022-05-05 10:43:40 -07:00
Chris Troutner	f369411ccb	Merge pull request #235 from Permissionless-Software-Foundation/ct-unstable Updating Utxo.get()	2022-05-05 10:05:36 -07:00
Chris Troutner	0504cf7b8d	fix(Utxo.get()): Adding filtering for Group batons	2022-05-05 10:03:35 -07:00
Chris Troutner	88ae47cade	fix(Utxo.get()): Adding prototype NFT filtering	2022-05-04 17:44:53 -07:00
Daniel Gonzalez	d144b13500	feat(slpindexer): Added bchjs.PsfSlpIndexer.getTokenData()	2022-05-04 18:29:54 -04:00
Chris Troutner	30d58bc337	Merge pull request #233 from Permissionless-Software-Foundation/ct-unstable fix(readme): Adding backup information	2022-04-30 19:48:24 -07:00
Chris Troutner	651ae3f6ca	fix(readme): Adding backup information	2022-04-30 19:37:30 -07:00
Chris Troutner	04cd90f0f4	Merge pull request #232 from Permissionless-Software-Foundation/ct-unstable Updating README	2022-04-30 16:09:24 -07:00
Chris Troutner	552ee31b79	Adding QR to readme	2022-04-30 16:07:17 -07:00
Chris Troutner	affa9619bb	fix(README): Updating README	2022-04-30 16:04:22 -07:00
Chris Troutner	39bff131af	fix(generateMintOpReturn): Adding additional input validation	2022-04-24 10:28:46 -07:00
Chris Troutner	a84fecfe41	Merge pull request #231 from Permissionless-Software-Foundation/ct-unstable fix(tokentype1.js): Fixing bug in mint OP_RETURN	2022-04-24 09:57:52 -07:00
Chris Troutner	0736c9f2a1	Merge branch 'master' into ct-unstable	2022-04-24 09:55:00 -07:00
Chris Troutner	aa898b31e7	fix(tokentype1.js): Fixing bug in mint OP_RETURN	2022-04-24 09:54:14 -07:00
Chris Troutner	29c3381cc5	Merge pull request #230 from Permissionless-Software-Foundation/ct-unstable fix(Utxo.get()): Hydrating mint batons for tokens	2022-04-24 09:16:59 -07:00
Chris Troutner	f7ba6bb3ae	fix(Utxo.get()): Hydrating mint batons for tokens	2022-04-24 09:15:10 -07:00
Chris Troutner	62056e1ac4	Merge pull request #229 from Permissionless-Software-Foundation/ct-unstable fix(tokentype1.js): Mint OP_RETURN works with output from psf-slp-ind…	2022-04-24 08:57:56 -07:00
Chris Troutner	a60e2fa2da	fix(tokentype1.js): Mint OP_RETURN works with output from psf-slp-indexer	2022-04-24 08:51:49 -07:00
Chris Troutner	37fe679800	Merge pull request #228 from Permissionless-Software-Foundation/ct-unstable fix(util.js): Fixing small bug with Util.validateAddress()	2022-04-23 17:41:04 -07:00
Chris Troutner	4250d841c5	Merge branch 'master' into ct-unstable	2022-04-23 17:36:16 -07:00
Chris Troutner	31079afc35	fix(util.js): Fixing small bug with Util.validateAddress()	2022-04-23 17:18:15 -07:00
Chris Troutner	62b44d5058	Merge pull request #227 from gitter-badger/gitter-badge Add a Gitter chat badge to README.md	2022-04-05 05:31:20 -07:00
The Gitter Badger	150295cb43	Add Gitter badge	2022-04-05 12:10:09 +00:00
Chris Troutner	5de2f71ea5	Merge pull request #226 from Permissionless-Software-Foundation/ct-unstable fix(Transaction.get()): Handling coinbase txs	2022-03-31 07:28:02 -07:00
Chris Troutner	50a1d60229	fix(Transaction.get()): Handling coinbase txs	2022-03-31 07:24:07 -07:00
Chris Troutner	f3e25a0338	Merge pull request #225 from Permissionless-Software-Foundation/ct-unstable fix(npm): Ran npm audit fix. 0 vulns	2022-03-29 16:56:09 -07:00
Chris Troutner	640c582724	fix(npm): Ran npm audit fix. 0 vulns	2022-03-29 16:53:49 -07:00
Chris Troutner	b472fa2673	Merge pull request #224 from Permissionless-Software-Foundation/ct-unstable fix(Utxo.get()): Fixing typo	2022-03-29 16:22:23 -07:00
Chris Troutner	ea83335fd2	fix(Utxo.get()): Moving code to where it needs to be	2022-03-29 16:20:03 -07:00
Chris Troutner	3050819784	fix(Utxo.get()): Fixing typo	2022-03-29 16:15:47 -07:00
Chris Troutner	4ca9b1c00b	Merge pull request #223 from Permissionless-Software-Foundation/ct-unstable fix(Utxo.get()): Adding property expected by SLP.tokentype1 lib	2022-03-29 16:05:22 -07:00
Chris Troutner	bbc1a45a9e	fix(Utxo.get()): Adding property expected by SLP.tokentype1 lib	2022-03-29 15:59:55 -07:00
Chris Troutner	469d08e2b1	Merge pull request #222 from Permissionless-Software-Foundation/ct-unstable Adding API docs for Transaction lib	2022-03-19 07:03:10 -07:00
Chris Troutner	dcadad189b	fix(getTokenInfo): Adding API documentation	2022-03-19 07:00:27 -07:00
Chris Troutner	02f81ee203	fix(transactoin): Adding API documentation	2022-03-19 06:58:49 -07:00
Chris Troutner	972bf604d1	Merge pull request #221 from Permissionless-Software-Foundation/ct-unstable feat(slp): Removing more legacy code that dependended on SLPDB	2022-03-19 06:52:11 -07:00
Chris Troutner	82f084edec	feat(slp): Removing more legacy code that dependended on SLPDB	2022-03-19 06:49:43 -07:00
Chris Troutner	4764463fc5	Merge pull request #220 from Permissionless-Software-Foundation/ct-unstable Removing SLPDB endpoints	2022-03-14 15:54:49 -07:00
Chris Troutner	857458db57	feat(slpdb): Removing endpoints that expect SLPDB interface	2022-03-14 15:50:21 -07:00
Chris Troutner	5f8f05d194	Working on removing slpdb endpoints	2022-03-14 15:13:41 -07:00
Chris Troutner	e455d9efec	fix(dependencies): Ensuring I'm using exact versions. npm audit = 0 vulns	2022-03-14 14:49:28 -07:00