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

fix(electrumx): Adding usrObj to Electrumx.Transactions()

src/electrumx.js

@@ -284,7 +284,7 @@ class ElectrumX {
    *   }
    *
    */
-  async transactions (address) {
+  async transactions (address, usrObj = null) {
     try {
       // Handle single address.
       if (typeof address === 'string') {
@@ -299,7 +299,8 @@ class ElectrumX {
         const response = await axios.post(
           `${this.restURL}electrumx/transactions`,
           {
-            addresses: address
+            addresses: address,
+            usrObj // pass user data when making an internal call.
           },
           _this.axiosOptions
         )

src/raw-transactions.js

@@ -263,7 +263,7 @@ class RawTransactions {
    * //   time: 1547752564,
    * //   blocktime: 1547752564 } ]
    */
-  async getRawTransaction (txid, verbose = false) {
+  async getRawTransaction (txid, verbose = false, usrObj = null) {
     try {
       if (typeof txid === 'string') {
         const response = await axios.get(
@@ -278,7 +278,8 @@ class RawTransactions {
           url: `${this.restURL}rawtransactions/getRawTransaction`,
           data: {
             txids: txid,
-            verbose: verbose
+            verbose: verbose,
+            usrObj // pass user data when making an internal call.
           },
           headers: _this.axiosOptions.headers
         }

src/slp/utils.js

@@ -440,7 +440,7 @@ class Utils {
     const path = `${this.restURL}slp/validateTxid`
 
     // console.log(`txid: ${JSON.stringify(txid, null, 2)}`)
-    console.log(`validateTxid usrObj: ${JSON.stringify(usrObj, null, 2)}`)
+    // console.log(`validateTxid usrObj: ${JSON.stringify(usrObj, null, 2)}`)
 
     // Handle a single TXID or an array of TXIDs.
     let txids
@@ -452,7 +452,7 @@ class Utils {
         path,
         {
           txids: txids,
-          usrObj
+          usrObj // pass user data when making an internal call.
         },
         _this.axiosOptions
       )
@@ -656,7 +656,7 @@ class Utils {
 
     // console.log(`txid: ${JSON.stringify(txid, null, 2)}`)
     // console.log(`path: ${JSON.stringify(path, null, 2)}`)
-    console.log('validateTxid3 usrObj: ', usrObj)
+    // console.log('validateTxid3 usrObj: ', usrObj)
 
     // Handle a single TXID or an array of TXIDs.
     let txids
@@ -668,7 +668,7 @@ class Utils {
         path,
         {
           txids: txids,
-          usrObj
+          usrObj // pass user data when making an internal call.
         },
         _this.axiosOptions
       )
@@ -926,7 +926,7 @@ class Utils {
    *
    */
   // Reimplementation of decodeOpReturn() using slp-parser.
-  async decodeOpReturn (txid, cache = null, ip = null) {
+  async decodeOpReturn (txid, cache = null, usrObj = null) {
     // The cache object is an in-memory cache (JS Object) that can be passed
     // into this function. It helps if multiple vouts from the same TXID are
     // being evaluated. In that case, it can significantly reduce the number
@@ -943,7 +943,7 @@ class Utils {
       if (cachedVal) return cachedVal
     }
 
-    console.log(`decodeOpReturn ip: ${ip}`)
+    // console.log(`decodeOpReturn usrObj: ${JSON.stringify(usrObj, null, 2)}`)
 
     try {
       // Validate the txid input.
@@ -963,7 +963,7 @@ class Utils {
         {
           verbose: true,
           txids: [txid],
-          ip
+          usrObj // pass user data when making an internal call.
         },
         _this.axiosOptions
       )
@@ -1086,7 +1086,7 @@ class Utils {
       // Throw error if input is not an array.
       if (!Array.isArray(utxos)) throw new Error('Input must be an array.')
 
-      console.log(`tokenUtxoDetails usrObj: ${JSON.stringify(usrObj, null, 2)}`)
+      // console.log(`tokenUtxoDetails usrObj: ${JSON.stringify(usrObj, null, 2)}`)
 
       // Loop through each element in the array and validate the input before
       // further processing.
@@ -1243,7 +1243,7 @@ class Utils {
     try {
       const decodeOpReturnCache = {}
 
-      console.log(`_hydrateUtxo usrObj: ${JSON.stringify(usrObj, null, 2)}`)
+      // console.log(`_hydrateUtxo usrObj: ${JSON.stringify(usrObj, null, 2)}`)
 
       // Output Array
       const outAry = []
@@ -1260,7 +1260,7 @@ class Utils {
           slpData = await this.decodeOpReturn(
             utxo.txid,
             decodeOpReturnCache,
-            usrObj
+            usrObj // pass user data when making an internal call.
           )
           // console.log(`slpData: ${JSON.stringify(slpData, null, 2)}`)
         } catch (err) {
@@ -1352,7 +1352,7 @@ class Utils {
             const genesisData = await this.decodeOpReturn(
               slpData.tokenId,
               decodeOpReturnCache,
-              usrObj
+              usrObj // pass user data when making an internal call.
             )
             // console.log(`genesisData: ${JSON.stringify(genesisData, null, 2)}`)
 
@@ -1405,7 +1405,7 @@ class Utils {
             const genesisData = await this.decodeOpReturn(
               slpData.tokenId,
               decodeOpReturnCache,
-              usrObj
+              usrObj // pass user data when making an internal call.
             )
             // console.log(`genesisData: ${JSON.stringify(genesisData, null, 2)}`)