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

fix(minimal-slp-wallet): Fixed code that was breaking minimal-slp-wal…

package-lock.json

@@ -5699,6 +5699,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.1.tgz",
       "integrity": "sha512-epq90L9jlFWCW7+pQa6JOnKn2Xgl2mtI664seYR6MHskvI9agt7AnDqmAlp9TqU4/caMYbA08Hi5DMZAl5zdkA==",
+      "hasInstallScript": true,
       "dependencies": {
         "node-addon-api": "^2.0.0",
         "node-gyp-build": "^4.2.0"
@@ -6989,11 +6990,10 @@
       }
     },
     "node_modules/npm": {
-      "version": "6.14.13",
-      "resolved": "https://registry.npmjs.org/npm/-/npm-6.14.13.tgz",
-      "integrity": "sha512-SRl4jJi0EBHY2xKuu98FLRMo3VhYQSA6otyLnjSEiHoSG/9shXCFNJy9tivpUJvtkN9s6VDdItHa5Rn+fNBzag==",
+      "version": "6.14.14",
+      "resolved": "https://registry.npmjs.org/npm/-/npm-6.14.14.tgz",
+      "integrity": "sha512-4TnYPV3rvwk9m92ON0iFrdXtRyMhrNkGdI8sr3dy1HVE3pVNxR9FyWYbjAw/HjfmHvmHUbxTVbmjAMv8NhIa6Q==",
       "bundleDependencies": [
-        "JSONStream",
         "abbrev",
         "ansicolors",
         "ansistyles",
@@ -7034,6 +7034,7 @@
         "init-package-json",
         "is-cidr",
         "json-parse-better-errors",
+        "JSONStream",
         "lazy-property",
         "libcipm",
         "libnpm",
@@ -7084,11 +7085,11 @@
         "qrcode-terminal",
         "query-string",
         "qw",
-        "read",
         "read-cmd-shim",
         "read-installed",
         "read-package-json",
         "read-package-tree",
+        "read",
         "readable-stream",
         "readdir-scoped-modules",
         "request",
@@ -7228,7 +7229,7 @@
         "sorted-union-stream": "~2.1.3",
         "ssri": "^6.0.2",
         "stringify-package": "^1.0.1",
-        "tar": "^4.4.13",
+        "tar": "^4.4.15",
         "text-table": "~0.2.0",
         "tiny-relative-date": "^1.3.0",
         "uid-number": "0.0.6",
@@ -10983,7 +10984,7 @@
       }
     },
     "node_modules/npm/node_modules/tar": {
-      "version": "4.4.13",
+      "version": "4.4.15",
       "dev": true,
       "inBundle": true,
       "license": "ISC",
@@ -13457,6 +13458,7 @@
       "version": "3.8.0",
       "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.8.0.tgz",
       "integrity": "sha512-k5ke5avRZbtl9Tqx/SA7CbY3NF6Ro+Sj9cZxezFzuBlLDmyqPiL8hJJ+EmzD8Ig4LUDByHJ3/iPOVoRixs/hmw==",
+      "hasInstallScript": true,
       "dependencies": {
         "bindings": "^1.5.0",
         "bip66": "^1.1.5",
@@ -21818,9 +21820,9 @@
       "dev": true
     },
     "npm": {
-      "version": "6.14.13",
-      "resolved": "https://registry.npmjs.org/npm/-/npm-6.14.13.tgz",
-      "integrity": "sha512-SRl4jJi0EBHY2xKuu98FLRMo3VhYQSA6otyLnjSEiHoSG/9shXCFNJy9tivpUJvtkN9s6VDdItHa5Rn+fNBzag==",
+      "version": "6.14.14",
+      "resolved": "https://registry.npmjs.org/npm/-/npm-6.14.14.tgz",
+      "integrity": "sha512-4TnYPV3rvwk9m92ON0iFrdXtRyMhrNkGdI8sr3dy1HVE3pVNxR9FyWYbjAw/HjfmHvmHUbxTVbmjAMv8NhIa6Q==",
       "dev": true,
       "requires": {
         "abbrev": "~1.1.1",
@@ -21932,7 +21934,7 @@
         "sorted-union-stream": "~2.1.3",
         "ssri": "^6.0.2",
         "stringify-package": "^1.0.1",
-        "tar": "^4.4.13",
+        "tar": "^4.4.15",
         "text-table": "~0.2.0",
         "tiny-relative-date": "^1.3.0",
         "uid-number": "0.0.6",
@@ -24863,7 +24865,7 @@
           }
         },
         "tar": {
-          "version": "4.4.13",
+          "version": "4.4.15",
           "bundled": true,
           "dev": true,
           "requires": {

src/slp/utils.js

@@ -1588,31 +1588,25 @@ class Utils {
       // Note: validateTxid3() has the same output as validateTxid().
       // validateTxid2() uses slp-validate, which has a different output format.
 
-      // If the whitelist SLPDB is having issues, the try/catch will skip it
-      // and continue execution.
-      try {
-        // Validate against the whitelist SLPDB first.
-        const whitelistResult = await this.validateTxid3(txid, usrObj)
-        // console.log(
-        //   `whitelist-SLPDB for ${txid}: ${JSON.stringify(
-        //     whitelistResult,
-        //     null,
-        //     2
-        //   )}`
-        // )
+      // Validate against the whitelist SLPDB first.
+      const whitelistResult = await this.validateTxid3(txid, usrObj)
+      // console.log(
+      //   `whitelist-SLPDB for ${txid}: ${JSON.stringify(
+      //     whitelistResult,
+      //     null,
+      //     2
+      //   )}`
+      // )
 
-        // Safely retrieve the returned value.
-        if (whitelistResult[0] !== null) isValid = whitelistResult[0].valid
+      // Safely retrieve the returned value.
+      if (whitelistResult[0] !== null) isValid = whitelistResult[0].valid
 
-        // Exit if isValid is not null.
-        if (isValid !== null) {
-          // Save to the cache.
-          cachedTxValidation[txid] = isValid
+      // Exit if isValid is not null.
+      if (isValid !== null) {
+        // Save to the cache.
+        cachedTxValidation[txid] = isValid
 
-          return isValid
-        }
-      } catch {
-        /* exit quietly */
+        return isValid
       }
 
       // Try the general SLPDB, if the whitelist returned null.

test/integration/blockchain.js

@@ -22,7 +22,7 @@ util.inspect.defaultOptions = {
 
 describe('#blockchain', () => {
   beforeEach(async () => {
-    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+    if (process.env.IS_USING_FREE_TIER) await sleep(1500)
   })
 
   describe('#getBestBlockHash', () => {

test/integration/chains/abc/rawtransaction.js

@@ -20,7 +20,7 @@ util.inspect.defaultOptions = {
 
 describe('#rawtransaction', () => {
   beforeEach(async () => {
-    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+    if (process.env.IS_USING_FREE_TIER) await sleep(1500)
   })
 
   /*

test/integration/chains/abc/slp.js

@@ -25,7 +25,7 @@ describe('#SLP', () => {
 
   beforeEach(async () => {
     // Introduce a delay so that the BVT doesn't trip the rate limits.
-    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+    if (process.env.IS_USING_FREE_TIER) await sleep(1500)
 
     bchjs = new BCHJS({ restURL: process.env.RESTURL })
   })

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

@@ -11,7 +11,7 @@ describe('#UTXO', () => {
   beforeEach(async () => {
     // sandbox = sinon.createSandbox()
 
-    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+    if (process.env.IS_USING_FREE_TIER) await sleep(1500)
   })
 
   describe('#get', () => {

test/integration/chains/testnet/blockchain.js

@@ -29,7 +29,7 @@ util.inspect.defaultOptions = {
 
 describe('#blockchain', () => {
   beforeEach(async () => {
-    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+    if (process.env.IS_USING_FREE_TIER) await sleep(1500)
   })
 
   describe('#getBestBlockHash', () => {

test/integration/chains/testnet/control.js

@@ -14,7 +14,7 @@ const bchjs = new BCHJS({ restURL: RESTURL, apiToken: process.env.BCHJSTOKEN })
 
 describe('#control', () => {
   beforeEach(async () => {
-    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+    if (process.env.IS_USING_FREE_TIER) await sleep(1500)
   })
 
   describe('#getNetworkInfo', () => {

test/integration/chains/testnet/electrumx.js

@@ -16,7 +16,7 @@ describe('#ElectrumX', () => {
   beforeEach(async () => {
     sandbox = sinon.createSandbox()
 
-    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+    if (process.env.IS_USING_FREE_TIER) await sleep(1500)
   })
 
   afterEach(() => sandbox.restore())

test/integration/chains/testnet/ninsight.js

@@ -9,7 +9,7 @@ describe('#Ninsight', () => {
   let sandbox
 
   beforeEach(async () => {
-    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+    if (process.env.IS_USING_FREE_TIER) await sleep(1500)
 
     sandbox = sinon.createSandbox()
   })

test/integration/chains/testnet/rawtransaction.js

@@ -27,7 +27,7 @@ util.inspect.defaultOptions = {
 
 describe('#rawtransaction', () => {
   beforeEach(async () => {
-    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+    if (process.env.IS_USING_FREE_TIER) await sleep(1500)
   })
 
   describe('#decodeRawTransaction', () => {

test/integration/chains/testnet/slp.js

@@ -25,7 +25,7 @@ util.inspect.defaultOptions = {
 describe('#SLP', () => {
   beforeEach(async () => {
     // Introduce a delay so that the BVT doesn't trip the rate limits.
-    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+    if (process.env.IS_USING_FREE_TIER) await sleep(1500)
   })
 
   describe('#util', () => {

test/integration/chains/testnet/util.js

@@ -25,7 +25,7 @@ util.inspect.defaultOptions = {
 
 describe('#util', () => {
   beforeEach(async () => {
-    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+    if (process.env.IS_USING_FREE_TIER) await sleep(1500)
   })
 
   describe('#validateAddress', () => {

test/integration/control.js

@@ -9,7 +9,7 @@ const bchjs = new BCHJS()
 
 describe('#control', () => {
   beforeEach(async () => {
-    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+    if (process.env.IS_USING_FREE_TIER) await sleep(1500)
   })
 
   describe('#getNetworkInfo', () => {

test/integration/electrumx.js

@@ -11,7 +11,7 @@ describe('#ElectrumX', () => {
   beforeEach(async () => {
     sandbox = sinon.createSandbox()
 
-    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+    if (process.env.IS_USING_FREE_TIER) await sleep(1500)
   })
 
   afterEach(() => sandbox.restore())

test/integration/encryption.js

@@ -5,7 +5,7 @@ const bchjs = new BCHJS()
 
 describe('#Encryption', () => {
   beforeEach(async () => {
-    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+    if (process.env.IS_USING_FREE_TIER) await sleep(1500)
   })
 
   describe('#getPubKey', () => {

test/integration/ninsight.js

@@ -11,7 +11,7 @@ describe('#Ninsight', () => {
   beforeEach(async () => {
     sandbox = sinon.createSandbox()
 
-    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+    if (process.env.IS_USING_FREE_TIER) await sleep(1500)
   })
 
   afterEach(() => sandbox.restore())

test/integration/price.js

@@ -4,7 +4,7 @@ const bchjs = new BCHJS()
 
 describe('#price', () => {
   beforeEach(async () => {
-    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+    if (process.env.IS_USING_FREE_TIER) await sleep(1500)
   })
 
   describe('#current', () => {

test/integration/rawtransaction.js

@@ -19,7 +19,7 @@ util.inspect.defaultOptions = {
 
 describe('#rawtransaction', () => {
   beforeEach(async () => {
-    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+    if (process.env.IS_USING_FREE_TIER) await sleep(1500)
   })
 
   describe('#decodeRawTransaction', () => {
@@ -191,8 +191,7 @@ describe('#rawtransaction', () => {
         console.log(`result: ${util.inspect(result)}`)
         assert.equal(true, false, 'Unexpected result!')
       } catch (err) {
-        assert.hasAnyKeys(err, ['error'])
-        assert.include(err.error, 'Array too large')
+        assert.include(err.message, 'Array too large')
       }
     })
   })

test/integration/util.js

@@ -18,7 +18,7 @@ util.inspect.defaultOptions = {
 
 describe('#util', () => {
   beforeEach(async () => {
-    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+    if (process.env.IS_USING_FREE_TIER) await sleep(1500)
   })
 
   describe('#validateAddress', () => {