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

fix(validateTxid3): Throwing an error when rate limit encountered.

README.md

@@ -57,7 +57,7 @@ rate limits when interacting with the back end server. See [this article](https:
 ```
 const BCHJS = require("@psf/bch-js")
 let bchjs = new BCHJS({
-  restURL: 'https://bchn.fullstack.cash/v3/',
+  restURL: 'https://bchn.fullstack.cash/v5/',
   apiToken: 'eyJhbGciO...' // Your JWT token here.
 })
 ```

src/raw-transactions.js

@@ -1,6 +1,6 @@
 const axios = require('axios')
 
-let _this
+// let _this
 
 class RawTransactions {
   constructor (config) {
@@ -27,7 +27,7 @@ class RawTransactions {
     // Encapsulate dependencies
     this.axios = axios
 
-    _this = this
+    // this = this
   }
 
   /**
@@ -98,7 +98,7 @@ class RawTransactions {
       if (typeof hex === 'string') {
         const response = await axios.get(
           `${this.restURL}rawtransactions/decodeRawTransaction/${hex}`,
-          _this.axiosOptions
+          this.axiosOptions
         )
 
         return response.data
@@ -111,7 +111,7 @@ class RawTransactions {
           data: {
             hexes: hex
           },
-          headers: _this.axiosOptions.headers
+          headers: this.axiosOptions.headers
         }
         const response = await axios(options)
 
@@ -166,7 +166,7 @@ class RawTransactions {
       if (typeof script === 'string') {
         const response = await axios.get(
           `${this.restURL}rawtransactions/decodeScript/${script}`,
-          _this.axiosOptions
+          this.axiosOptions
         )
 
         return response.data
@@ -177,7 +177,7 @@ class RawTransactions {
           data: {
             hexes: script
           },
-          headers: _this.axiosOptions.headers
+          headers: this.axiosOptions.headers
         }
         const response = await axios(options)
 
@@ -261,7 +261,7 @@ class RawTransactions {
       if (typeof txid === 'string') {
         const response = await axios.get(
           `${this.restURL}rawtransactions/getRawTransaction/${txid}?verbose=${verbose}`,
-          _this.axiosOptions
+          this.axiosOptions
         )
 
         return response.data
@@ -274,7 +274,7 @@ class RawTransactions {
             verbose: verbose,
             usrObj // pass user data when making an internal call.
           },
-          headers: _this.axiosOptions.headers
+          headers: this.axiosOptions.headers
         }
         const response = await axios(options)
 
@@ -365,7 +365,9 @@ class RawTransactions {
   async getTxData (txid) {
     try {
       if (typeof txid !== 'string') {
-        throw new Error('Input must be a string or array of strings.')
+        throw new Error(
+          'Input to raw-transaction.js/getTxData() must be a string containg a TXID.'
+        )
       }
 
       // Get the TX details for the transaction under consideration.
@@ -427,7 +429,7 @@ class RawTransactions {
       if (typeof hex === 'string') {
         const response = await this.axios.get(
           `${this.restURL}rawtransactions/sendRawTransaction/${hex}`,
-          _this.axiosOptions
+          this.axiosOptions
         )
 
         if (response.data === '66: insufficient priority') {
@@ -448,9 +450,9 @@ class RawTransactions {
           data: {
             hexes: hex
           },
-          headers: _this.axiosOptions.headers
+          headers: this.axiosOptions.headers
         }
-        const response = await _this.axios(options)
+        const response = await this.axios(options)
 
         return response.data
       }

src/slp/utils.js

@@ -680,6 +680,14 @@ class Utils {
 
       return validatedTxids
     } catch (error) {
+      // console.log('validateTxid3 error: ', error)
+
+      // This case handles rate limit errors.
+      if (error.response && error.response.data && error.response.data.error) {
+        throw new Error(error.response.data.error)
+      }
+
+      // Not sure if this can be safely deprecated?
       if (error.response && error.response.data) throw error.response.data
       throw error
     }

src/transaction.js

@@ -37,7 +37,9 @@ class Transaction {
   async get (txid) {
     try {
       if (typeof txid !== 'string') {
-        throw new Error('Input must be a string or array of strings.')
+        throw new Error(
+          'Input to Transaction.get() must be a string containing a TXID.'
+        )
       }
 
       const txDetails = await this.rawTransaction.getTxData(txid)
@@ -136,7 +138,7 @@ class Transaction {
 
       return txDetails
     } catch (err) {
-      console.error('Error in transactions.js/get()')
+      // console.error('Error in transactions.js/get(): ', err)
 
       if (err.error) throw new Error(err.error)
       throw err

test/unit/raw-tranactions.js

@@ -171,10 +171,15 @@ describe('#RawTransactions', () => {
   describe('#getTxData', () => {
     it('should return tx data with input addresses', async () => {
       // Mock dependencies
-      sandbox.stub(bchjs.RawTransactions, 'getRawTransaction').resolves(mockData.mockTx)
-      sandbox.stub(bchjs.RawTransactions, '_getInputAddrs').resolves(mockData.mockGetInputAddrsOutput)
+      sandbox
+        .stub(bchjs.RawTransactions, 'getRawTransaction')
+        .resolves(mockData.mockTx)
+      sandbox
+        .stub(bchjs.RawTransactions, '_getInputAddrs')
+        .resolves(mockData.mockGetInputAddrsOutput)
 
-      const txid = '05f7d4a4e25f53d63a360434eb54f221abf159112b7fffc91da1072a079cded3'
+      const txid =
+        '05f7d4a4e25f53d63a360434eb54f221abf159112b7fffc91da1072a079cded3'
 
       const result = await bchjs.RawTransactions.getTxData(txid)
       // console.log(`result: ${JSON.stringify(result, null, 2)}`)
@@ -190,7 +195,10 @@ describe('#RawTransactions', () => {
       } catch (err) {
         // console.log(err)
 
-        assert2.include(err.message, 'Input must be a string or array of strings')
+        assert2.include(
+          err.message,
+          'Input to raw-transaction.js/getTxData() must be a string containg a TXID.'
+        )
       }
     })
 
@@ -201,7 +209,8 @@ describe('#RawTransactions', () => {
           .stub(bchjs.RawTransactions, 'getRawTransaction')
           .rejects(new Error('test error'))
 
-        const txid = '05f7d4a4e25f53d63a360434eb54f221abf159112b7fffc91da1072a079cded3'
+        const txid =
+          '05f7d4a4e25f53d63a360434eb54f221abf159112b7fffc91da1072a079cded3'
 
         await bchjs.RawTransactions.getTxData(txid)
 

test/unit/transaction-unit.js

@@ -25,7 +25,7 @@ describe('#TransactionLib', () => {
       } catch (err) {
         assert.include(
           err.message,
-          'Input must be a string or array of strings.'
+          'Input to Transaction.get() must be a string containing a TXID.'
         )
       }
     })