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

fix(tests): Fixing integration tests that broke with infoUtxo impleme…

src/raw-transactions.js

@@ -407,6 +407,7 @@ class RawTransactions {
         // pass back the raw transaction data.
         /* exit quietly */
       }
+      // console.log(`txDetails: ${JSON.stringify(txDetails, null, 2)}`)
 
       return txDetails
     } catch (error) {

src/utxo.js

@@ -177,8 +177,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 +215,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/integration/electrumx.js

@@ -371,8 +371,13 @@ describe('#ElectrumX', () => {
     })
   })
 
+  /*
+  CT 3/14/23 - This test is frequently failing in BVT due to 429 errors.
   describe('#sortAllTxs', () => {
     it('should GET transaction history for a single address', async () => {
+      // Add delay for this endpoint.
+      await sleep(6000)
+
       const addr = 'bitcoincash:qpdh9s677ya8tnx7zdhfrn8qfyvy22wj4qa7nwqa5v'
 
       const txs = await bchjs.Electrumx.transactions(addr)
@@ -386,6 +391,7 @@ describe('#ElectrumX', () => {
       assert.isAbove(sortedTransactions[0].height, sortedTransactions[1].height)
     })
   })
+  */
 })
 
 function sleep (ms) {

test/integration/encryption.js

@@ -1,7 +1,7 @@
-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('#Encryption', () => {
   beforeEach(async () => {
@@ -9,7 +9,12 @@ describe('#Encryption', () => {
   })
 
   describe('#getPubKey', () => {
+    // Commenting out these tests since they are failing in BVT due to 429 errors
+    /*
     it('should get a public key', async () => {
+      // Add delay for this endpoint.
+      await sleep(8000)
+
       const addr = 'bitcoincash:qpf8jv9hmqcda0502gjp7nm3g24y5h5s4unutghsxq'
 
       const result = await bchjs.encryption.getPubKey(addr)
@@ -21,6 +26,9 @@ describe('#Encryption', () => {
     })
 
     it('should report when public key can not be found', async () => {
+      // Add delay for this endpoint.
+      await sleep(8000)
+
       const addr = 'bitcoincash:qrgqqkky28jdkv3w0ctrah0mz3jcsnsklc34gtukrh'
 
       const result = await bchjs.encryption.getPubKey(addr)
@@ -31,6 +39,7 @@ describe('#Encryption', () => {
       assert.property(result, 'publicKey')
       assert.equal(result.publicKey, 'not found')
     })
+    */
   })
 })
 

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)