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

Updating bch-js for improvements to tokenUtxoDetails()

package.json

@@ -28,10 +28,10 @@
     "node": ">=10.15.1"
   },
   "dependencies": {
-    "@psf/bch-js": "^3.7.1",
+    "@psf/bch-js": "^4.1.1",
     "apidoc": "^0.23.0",
     "axios": "^0.19.0",
-    "bitcore-lib-cash": "^8.20.3",
+    "bitcore-lib-cash": "^8.23.1",
     "body-parser": "^1.18.3",
     "cookie-parser": "~1.4.3",
     "cors": "^2.8.3",
@@ -75,7 +75,7 @@
     "proxyquire": "^2.1.0",
     "request": "^2.88.0",
     "request-promise": "^4.2.2",
-    "semantic-release": "^17.0.0",
+    "semantic-release": "^17.3.0",
     "sinon": "^9.0.0",
     "standard": "^14.3.1",
     "typescript": "^3.1.4"

src/routes/v4/slp.js

@@ -1040,6 +1040,15 @@ class Slp {
             })
           }
         })
+      } else {
+        // Corner case: No results were returned from SLPDB. Mark each entry
+        // as 'null'
+        for (let i = 0; i < txids.length; i++) {
+          formattedTokens.push({
+            txid: txids[i],
+            valid: null
+          })
+        }
       }
 
       // Catch a corner case of repeated txids. SLPDB will remove redundent TXIDs,
@@ -1423,7 +1432,7 @@ class Slp {
 
       let formattedTokens = []
 
-      // Combine the arrays. Why? Generally there is nothing in the u array.
+      // Combine the confirmed and unconfirmed collections.
       const concatArray = tokenRes.data.c.concat(tokenRes.data.u)
 
       const tokenIds = []
@@ -1457,6 +1466,15 @@ class Slp {
             })
           }
         })
+      } else {
+        // Corner case: No results were returned from SLPDB. Mark each entry
+        // as 'null'
+        for (let i = 0; i < txids.length; i++) {
+          formattedTokens.push({
+            txid: txids[i],
+            valid: null
+          })
+        }
       }
 
       // Catch a corner case of repeated txids. SLPDB will remove redundent TXIDs,
@@ -1476,6 +1494,10 @@ class Slp {
         formattedTokens = newOutput
       }
 
+      // console.log(
+      //   `formattedTokens: ${JSON.stringify(formattedTokens, null, 2)}`
+      // )
+
       // Put the output array in the same order as the input array.
       const outAry = []
       for (let i = 0; i < txids.length; i++) {

test/v4/slp.js

@@ -732,7 +732,7 @@ describe('#SLP', () => {
 
         // Note: This should change from null to true once SLPDB finishes indexing.
         assert.equal(result[4].txid, txids[4])
-        assert.equal(result[4].valid, null)
+        assert.equal(result[4].valid, true)
 
         assert.equal(result[5].txid, txids[5])
         assert.equal(result[5].valid, null)