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

fix(Utxo.get()): Updating documentation

src/blockchain.js

@@ -197,6 +197,9 @@ class Blockchain {
       )
       return response.data
     } catch (error) {
+      console.log('Error in bch-js/blockchain.js/getBlockCount()')
+      console.log('blockchain.js restURL: ', this.restURL)
+
       if (error.response && error.response.data) throw error.response.data
       else throw error
     }

src/electrumx.js

@@ -720,6 +720,8 @@ class ElectrumX {
       return this.sortConfTxs(modifiedTxs, sortingOrder)
     } catch (err) {
       console.log('Error in util.js/sort0ConfTxs')
+      console.log('electrumx.js restURL: ', this.restURL)
+
       throw err
     }
   }

src/utxo.js

@@ -32,6 +32,8 @@ class UTXO {
    * properties:
    * - address: "" - the address these UTXOs are associated with
    * - bchUtxos: [] - UTXOs confirmed to be spendable as normal BCH
+   * - infoUtxos: [] - UTXOs under of 1000 sats or less that can not be categorized
+   *                   as another type of UTXO (like a token).
    * - 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
@@ -177,8 +179,15 @@ class UTXO {
       // Hydrate the UTXOs with additional token data.
       type1TokenUtxos = await this.hydrateTokenData(type1TokenUtxos)
 
+      // Collect BCH UTXOs above 1000 sats
+      const bchUtxos = utxos.filter(x => x.isSlp === false && x.value > 1000)
+
+      // Collect all BCH UTXOs at 1000 sats or smaller
+      // The prevents SLP tokens, BCMR, and other 'colored' UTXOs from being
+      // accidentally included into normal BCH transactions.
+      const infoUtxos = utxos.filter(x => x.isSlp === false && x.value <= 1000)
+
       // Collect and hydrate any type1 baton UTXOs
-      const bchUtxos = utxos.filter(x => x.isSlp === false)
       let type1BatonUtxos = utxos.filter(
         x => x.isSlp === true && x.type === 'baton' && x.tokenType === 1
       )
@@ -208,6 +217,7 @@ class UTXO {
       const outObj = {
         address: addr,
         bchUtxos,
+        infoUtxos,
         slpUtxos: {
           type1: {
             tokens: type1TokenUtxos,

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

@@ -79,6 +79,7 @@ describe('#UTXO', () => {
       assert.property(result, 'nullUtxos')
 
       assert.isAbove(result.bchUtxos.length, 0)
+      assert.isAbove(result.infoUtxos.length, 0)
       assert.isAbove(result.slpUtxos.type1.tokens.length, 0)
       assert.equal(result.slpUtxos.type1.mintBatons.length, 0)
     })

test/unit/utxo-unit.js

@@ -142,7 +142,8 @@ describe('#utxo', () => {
       assert.property(result.slpUtxos, 'nft')
       assert.property(result, 'nullUtxos')
 
-      assert.equal(result.bchUtxos.length, 4)
+      assert.equal(result.bchUtxos.length, 1)
+      assert.equal(result.infoUtxos.length, 3)
       assert.equal(result.slpUtxos.type1.tokens.length, 1)
       assert.equal(result.slpUtxos.type1.mintBatons.length, 1)
       assert.equal(result.nullUtxos.length, 0)