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

fix(network): Updates for fork

package.json

@@ -9,14 +9,16 @@
   "main": "src/bch-js",
   "scripts": {
     "test": "nyc mocha --timeout 30000 test/unit/",
-    "test:integration": "IS_USING_FREE_TIER=true mocha --timeout 30000 test/integration/",
+    "test:integration": "bash test/integration/test-free-tier-bchn.sh",
+    "test:integration:abc": "RESTURL=https://abc.fullstack.cash/v3/ IS_USING_FREE_TIER=true mocha --timeout 30000 test/integration/",
     "test:integration:testnet": "IS_USING_FREE_TIER=true mocha --timeout 30000 test/integration/testnet/",
     "test:integration:local": "RESTURL=http://localhost:3000/v3/ mocha --timeout 30000 test/integration",
+    "test:integration:local:bchn": "RESTURL=http://localhost:3000/v3/ bash test/integration/test-free-tier-bchn.sh",
     "test:integration:testnet:local": "RESTURL=http://localhost:4000/v3/ mocha --timeout 30000 test/integration/testnet",
     "test:integration:free": "bash test/integration/test-free-tier.sh",
-    "test:integration:free:bchn": "bash test/integration/test-free-tier-bchn.sh",
+    "test:integration:free:bchn": "IS_USING_FREE_TIER=true bash test/integration/test-free-tier-bchn.sh",
     "test:integration:free:testnet": "bash test/integration/testnet/test-free-tier.sh",
-    "test:temp": "mocha --timeout 30000 -g '#hydrateUtxos' test/integration/",
+    "test:temp": "mocha --timeout 30000 -g '#Encryption' test/integration/",
     "test:integration:api": "RESTURL=https://api.fullstack.cash/v3/ mocha --timeout 30000 test/integration",
     "coverage": "nyc report --reporter=text-lcov | coveralls",
     "coverage:report": "nyc --reporter=html mocha --timeout 25000 test/unit/",

test/e2e/rate-limits/anonymous-rate-limits.js

@@ -4,6 +4,7 @@
 
   To Run Test:
   - Update the RESTURL for bch-api you want to test against.
+  - Ensure the BCHJSTOKEN environment variable is set to an empty string.
 */
 
 const assert = require("chai").assert
@@ -31,11 +32,11 @@ describe("#anonymous rate limits", () => {
 
   it("should throw error when rate limit exceeded", async () => {
     try {
-      for (let i = 0; i < 5; i++) await bchjs.Control.getNetworkInfo()
+      for (let i = 0; i < 22; i++) await bchjs.Control.getNetworkInfo()
 
-      assert.equal(true, false, "unexpected result")
+      assert.fail("Unexpected result")
     } catch (err) {
       assert.include(err.error, "Too many requests")
     }
-  }).timeout(5000)
+  }).timeout(20000)
 })

test/e2e/rate-limits/free-rate-limits.js

@@ -10,7 +10,7 @@
 const assert = require("chai").assert
 
 const JWT_TOKEN =
-  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjVlODhhY2YyMDIyMWMxMDAxMmFkOTQwMSIsImVtYWlsIjoiZGVtb0BkZW1vLmNvbSIsImFwaUxldmVsIjoxMCwicmF0ZUxpbWl0IjozLCJpYXQiOjE1OTA1Mjk2NzgsImV4cCI6MTU5MzEyMTY3OH0.4q5MFDCcVx0FusivJPiEIj3w8nhFG7ZV5IhJS7faUlc"
+  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjVlODhhY2YyMDIyMWMxMDAxMmFkOTQwMSIsImVtYWlsIjoiZGVtb0BkZW1vLmNvbSIsImFwaUxldmVsIjoxMCwicmF0ZUxpbWl0IjozLCJpYXQiOjE2MDQ4NTQ2OTEsImV4cCI6MTYwNzQ0NjY5MX0.iwse0z0KDKHx9graCxcOwj6lSlfKQAb1zLhmjvygvts"
 
 const BCHJS = require("../../../src/bch-js")
 const bchjs = new BCHJS({
@@ -28,19 +28,6 @@ describe("#free rate limits", () => {
     assert.property(result, "balance")
   }).timeout(5000)
 
-  // it("should throw error when rate limit exceeded 3 RPM for indexer endpoints", async () => {
-  //   const addr = "bitcoincash:qrdka2205f4hyukutc2g0s6lykperc8nsu5u2ddpqf"
-  //
-  //   try {
-  //     for (let i = 0; i < 5; i++) await bchjs.Blockbook.balance(addr)
-  //
-  //     assert.equal(true, false, "unexpected result")
-  //   } catch (err) {
-  //     // console.log(`err: `, err)
-  //     assert.include(err.error, "Too many requests")
-  //   }
-  // }).timeout(10000)
-
   it("should allow up to 10 RPM to indexer, then throw error", async () => {
     try {
       const addr = "bitcoincash:qrehqueqhw629p6e57994436w730t4rzasnly00ht0"
@@ -87,4 +74,15 @@ describe("#free rate limits", () => {
       assert.notInclude(err.error, 3)
     }
   }).timeout(20000)
+
+  it("should throw error when rate limit exceeded 20 RPM for indexer endpoints", async () => {
+    try {
+      for (let i = 0; i < 22; i++) await bchjs.Control.getNetworkInfo()
+
+      assert.fail("unexpected result")
+    } catch (err) {
+      // console.log(`err: `, err)
+      assert.include(err.error, "Too many requests")
+    }
+  }).timeout(20000)
 })

test/e2e/rate-limits/full-node-rate-limits.js

@@ -4,17 +4,17 @@
 
   To Run Test:
   - Update the restURL for bch-api you want to test against.
-  - Update the JWT_TOKEN value with a current full-node-level JWT token.
+  - Update the JWT_TOKEN value with a paid tier JWT token.
 */
 
 const assert = require("chai").assert
 
 const JWT_TOKEN =
-  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjVkYmY4MjA1YTYwODliMjliYTlhZjc1OSIsImlhdCI6MTU3MjgzMTgzOSwiZXhwIjoxNTc1NDIzODM5fQ.sFFS4AF04U2aUwmKkBIfnMQIUoygzV9UMVzzQuwctpY"
+  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjVlODhhY2JmMDIyMWMxMDAxMmFkOTNmZiIsImVtYWlsIjoiY2hyaXMudHJvdXRuZXJAZ21haWwuY29tIiwiYXBpTGV2ZWwiOjQwLCJyYXRlTGltaXQiOjMsImlhdCI6MTYwMzIyNzEwNCwiZXhwIjoxNjA1ODE5MTA0fQ.CV36grzdD36Ht3BwZGHG4XU40CVDzMRw9Ars1x1r27M"
 
 const BCHJS = require("../../../src/bch-js")
 const bchjs = new BCHJS({
-  restURL: `https://api.bchjs.cash/v3/`,
+  restURL: `https://api.fullstack.cash/v3/`,
   // restURL: `http://localhost:3000/v3/`,
   apiToken: JWT_TOKEN
 })
@@ -28,21 +28,22 @@ describe("#full node rate limits", () => {
     assert.property(result, "balance")
   }).timeout(5000)
 
-  it("should throw error when rate limit exceeded 3 RPM for indexer endpoints", async () => {
-    const addr = "bitcoincash:qrdka2205f4hyukutc2g0s6lykperc8nsu5u2ddpqf"
+  // CT 11/8/20: New rate limits make this test invalid.
+  // it("should throw error when rate limit exceeded 20 RPM for indexer endpoints", async () => {
+  //   const addr = "bitcoincash:qrdka2205f4hyukutc2g0s6lykperc8nsu5u2ddpqf"
+  //
+  //   try {
+  //     for (let i = 0; i < 22; i++) await bchjs.Electrumx.balance(addr)
+  //
+  //     assert.fail("unexpected result")
+  //   } catch (err) {
+  //     // console.log(`err: `, err)
+  //     assert.include(err.error, "Too many requests")
+  //   }
+  // }).timeout(10000)
 
-    try {
-      for (let i = 0; i < 5; i++) await bchjs.Blockbook.balance(addr)
-
-      assert.equal(true, false, "unexpected result")
-    } catch (err) {
-      // console.log(`err: `, err)
-      assert.include(err.error, "Too many requests")
-    }
-  }).timeout(10000)
-
-  it("should allow more than 10 RPM to full node", async () => {
-    for (let i = 0; i < 20; i++) {
+  it("should allow more than 20 RPM to full node", async () => {
+    for (let i = 0; i < 22; i++) {
       const result = await bchjs.Control.getNetworkInfo()
 
       if (i === 5) {
@@ -55,10 +56,11 @@ describe("#full node rate limits", () => {
         assert.property(result, "version", "more than 10 calls allowed")
       }
     }
-  }).timeout(10000)
+  }).timeout(20000)
 
   it("should throw error for more than 100 RPM to fullnode", async () => {
     try {
+      console.log(`This test usually doesn't pass, because of latency.`)
       for (let i = 0; i < 100; i++) await bchjs.Control.getNetworkInfo()
     } catch (err) {
       // console.log(`validating after 10th call`)
@@ -66,5 +68,5 @@ describe("#full node rate limits", () => {
       assert.include(err.error, "Too many requests")
       assert.include(err.error, 100)
     }
-  }).timeout(30000)
+  }).timeout(45000)
 })

test/e2e/rate-limits/indexer-rate-limits.js

@@ -10,7 +10,7 @@
 const assert = require("chai").assert
 
 const JWT_TOKEN =
-  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjVlODhhY2JmMDIyMWMxMDAxMmFkOTNmZiIsImVtYWlsIjoiY2hyaXMudHJvdXRuZXJAZ21haWwuY29tIiwiYXBpTGV2ZWwiOjQwLCJyYXRlTGltaXQiOjMsImlhdCI6MTU5MDQzMjIxNywiZXhwIjoxNTkzMDI0MjE3fQ.R0Euhutd5FHCxLlSzjq1TYsGjI6iua_AguWIeLK2xCU"
+  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjVlODhhY2JmMDIyMWMxMDAxMmFkOTNmZiIsImVtYWlsIjoiY2hyaXMudHJvdXRuZXJAZ21haWwuY29tIiwiYXBpTGV2ZWwiOjQwLCJyYXRlTGltaXQiOjMsImlhdCI6MTYwMzIyNzEwNCwiZXhwIjoxNjA1ODE5MTA0fQ.CV36grzdD36Ht3BwZGHG4XU40CVDzMRw9Ars1x1r27M"
 
 const BCHJS = require("../../../src/bch-js")
 const bchjs = new BCHJS({
@@ -20,8 +20,8 @@ const bchjs = new BCHJS({
 })
 
 describe("#full node rate limits", () => {
-  it("should allow more than 10 RPM to full node", async () => {
-    for (let i = 0; i < 20; i++) {
+  it("should allow more than 20 RPM to full node", async () => {
+    for (let i = 0; i < 22; i++) {
       const result = await bchjs.Control.getNetworkInfo()
 
       if (i === 5) {
@@ -34,12 +34,12 @@ describe("#full node rate limits", () => {
         assert.property(result, "version", "more than 10 calls allowed")
       }
     }
-  }).timeout(30000)
+  }).timeout(45000)
 
-  it("should allow more than 10 RPM to an indexer", async () => {
+  it("should allow more than 20 RPM to an indexer", async () => {
     const addr = "bitcoincash:qrdka2205f4hyukutc2g0s6lykperc8nsu5u2ddpqf"
 
-    for (let i = 0; i < 20; i++) {
+    for (let i = 0; i < 22; i++) {
       const result = await bchjs.Blockbook.balance(addr)
 
       if (i === 5) {
@@ -52,5 +52,5 @@ describe("#full node rate limits", () => {
         assert.property(result, "balance", "more than 10 calls allowed")
       }
     }
-  }).timeout(30000)
+  }).timeout(45000)
 })

test/integration/bchn/blockbook.js

@@ -1,170 +0,0 @@
-/*
-  Integration tests for the Blockbook library.
-
-*/
-
-const chai = require("chai")
-const assert = chai.assert
-const BCHJS = require("../../../src/bch-js")
-const bchjs = new BCHJS()
-//const axios = require("axios")
-
-// Inspect utility used for debugging.
-const util = require("util")
-util.inspect.defaultOptions = {
-  showHidden: true,
-  colors: true,
-  depth: 3
-}
-
-describe(`#Blockbook`, () => {
-  describe(`#Balance`, () => {
-    it(`should GET balance for a single address`, async () => {
-      const addr = "bitcoincash:qrdka2205f4hyukutc2g0s6lykperc8nsu5u2ddpqf"
-
-      const result = await bchjs.Blockbook.balance(addr)
-      //console.log(`result: ${util.inspect(result)}`)
-
-      assert.hasAnyKeys(result, [
-        "page",
-        "totalPages",
-        "itemsOnPage",
-        "address",
-        "balance",
-        "totalReceived",
-        "totalSent",
-        "unconfirmedBalance",
-        "unconfirmedTxs",
-        "txs",
-        "txids"
-      ])
-      assert.isArray(result.txids)
-    })
-
-    it(`should POST request balances for an array of addresses`, async () => {
-      const addr = [
-        "bitcoincash:qrdka2205f4hyukutc2g0s6lykperc8nsu5u2ddpqf",
-        "bitcoincash:qpdh9s677ya8tnx7zdhfrn8qfyvy22wj4qa7nwqa5v"
-      ]
-
-      const result = await bchjs.Blockbook.balance(addr)
-      //console.log(`result: ${util.inspect(result)}`)
-
-      assert.isArray(result)
-      assert.hasAnyKeys(result[0], [
-        "page",
-        "totalPages",
-        "itemsOnPage",
-        "address",
-        "balance",
-        "totalReceived",
-        "totalSent",
-        "unconfirmedBalance",
-        "unconfirmedTxs",
-        "txs",
-        "txids"
-      ])
-      assert.isArray(result[0].txids)
-    })
-
-    it(`should throw an error for improper input`, async () => {
-      try {
-        const addr = 12345
-
-        await bchjs.Blockbook.balance(addr)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        //console.log(`err: `, err)
-        assert.include(
-          err.message,
-          `Input address must be a string or array of strings`
-        )
-      }
-    })
-
-    it(`should throw error on array size rate limit`, async () => {
-      try {
-        const addr = []
-        for (let i = 0; i < 25; i++)
-          addr.push("bitcoincash:qrdka2205f4hyukutc2g0s6lykperc8nsu5u2ddpqf")
-
-        const result = await bchjs.Blockbook.balance(addr)
-
-        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")
-      }
-    })
-  })
-
-  describe(`#utxo`, () => {
-    it(`should GET utxos for a single address`, async () => {
-      const addr = "bitcoincash:qp3sn6vlwz28ntmf3wmyra7jqttfx7z6zgtkygjhc7"
-
-      const result = await bchjs.Blockbook.utxo(addr)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.isArray(result)
-      assert.hasAnyKeys(result[0], [
-        "txid",
-        "vout",
-        "value",
-        "height",
-        "confirmations"
-      ])
-    })
-
-    it(`should POST utxo details for an array of addresses`, async () => {
-      const addr = [
-        "bitcoincash:qp3sn6vlwz28ntmf3wmyra7jqttfx7z6zgtkygjhc7",
-        "bitcoincash:qz0us0z6ucpqt07jgpad0shgh7xmwxyr3ynlcsq0wr"
-      ]
-
-      const result = await bchjs.Blockbook.utxo(addr)
-      //console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-      assert.isArray(result)
-      assert.isArray(result[0])
-      assert.hasAnyKeys(result[0][0], [
-        "txid",
-        "vout",
-        "value",
-        "height",
-        "confirmations"
-      ])
-    })
-
-    it(`should throw an error for improper input`, async () => {
-      try {
-        const addr = 12345
-
-        await bchjs.Blockbook.utxo(addr)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        //console.log(`err: `, err)
-        assert.include(
-          err.message,
-          `Input address must be a string or array of strings`
-        )
-      }
-    })
-
-    it(`should throw error on array size rate limit`, async () => {
-      try {
-        const addr = []
-        for (let i = 0; i < 25; i++)
-          addr.push("bitcoincash:qz0us0z6ucpqt07jgpad0shgh7xmwxyr3ynlcsq0wr")
-
-        const result = await bchjs.Blockbook.utxo(addr)
-        //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")
-      }
-    })
-  })
-})

test/integration/test-free-tier-bchn.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-export RESTURL=https://bchn-free-main.fullstack.cash/v3/
+#export RESTURL=https://bchn.fullstack.cash/v3/
 #export RESTURL=http://localhost:3000/v3/
-export IS_USING_FREE_TIER=true
+#export IS_USING_FREE_TIER=true
 
 cd test/integration/bchn/
-mocha --timeout 30000 blockchain.js control.js electrumx.js ninsight.js openbazaar.js price.js rawtransaction.js slp.js util.js
+mocha --timeout 30000 blockchain.js control.js encryption.js electrumx.js ninsight.js openbazaar.js price.js rawtransaction.js slp.js util.js

test/integration/testnet/blockbook.js

@@ -8,7 +8,7 @@ const assert = chai.assert
 
 const RESTURL = process.env.RESTURL
   ? process.env.RESTURL
-  : `https://tapi.fullstack.cash/v3/`
+  : `https://testnet3.fullstack.cash/v3/`
 // if (process.env.RESTURL) RESTURL = process.env.RESTURL
 
 const BCHJS = require("../../../src/bch-js")

test/integration/testnet/blockchain.js

@@ -12,7 +12,7 @@ const assert = chai.assert
 
 const RESTURL = process.env.RESTURL
   ? process.env.RESTURL
-  : "https://tapi.fullstack.cash/v3/"
+  : "https://testnet3.fullstack.cash/v3/"
 // if (process.env.RESTURL) RESTURL = process.env.RESTURL
 
 const BCHJS = require("../../../src/bch-js")

test/integration/testnet/control.js

@@ -7,7 +7,7 @@ const assert = chai.assert
 
 const RESTURL = process.env.RESTURL
   ? process.env.RESTURL
-  : `https://tapi.fullstack.cash/v3/`
+  : `https://testnet3.fullstack.cash/v3/`
 
 const BCHJS = require("../../../src/bch-js")
 const bchjs = new BCHJS({ restURL: RESTURL, apiToken: process.env.BCHJSTOKEN })

test/integration/testnet/electrumx.js

@@ -4,7 +4,7 @@ const sinon = require("sinon")
 
 const RESTURL = process.env.RESTURL
   ? process.env.RESTURL
-  : `https://tapi.fullstack.cash/v3/`
+  : `https://testnet3.fullstack.cash/v3/`
 
 const BCHJS = require("../../../src/bch-js")
 const bchjs = new BCHJS({ restURL: RESTURL, apiToken: process.env.BCHJSTOKEN })

test/integration/testnet/rawtransaction.js

@@ -10,7 +10,7 @@ const assert = chai.assert
 
 const RESTURL = process.env.RESTURL
   ? process.env.RESTURL
-  : `https://tapi.fullstack.cash/v3/`
+  : `https://testnet3.fullstack.cash/v3/`
 // if (process.env.RESTURL) RESTURL = process.env.RESTURL
 
 const BCHJS = require("../../../src/bch-js")

test/integration/testnet/slp.js

@@ -7,7 +7,7 @@ const assert = chai.assert
 
 const RESTURL = process.env.RESTURL
   ? process.env.RESTURL
-  : `https://tapi.fullstack.cash/v3/`
+  : `https://testnet3.fullstack.cash/v3/`
 // if (process.env.RESTURL) RESTURL = process.env.RESTURL
 
 const BCHJS = require("../../../src/bch-js")

test/integration/testnet/util.js

@@ -8,7 +8,7 @@ const assert = chai.assert
 
 const RESTURL = process.env.RESTURL
   ? process.env.RESTURL
-  : `https://tapi.fullstack.cash/v3/`
+  : `https://testnet3.fullstack.cash/v3/`
 // if (process.env.RESTURL) RESTURL = process.env.RESTURL
 
 const BCHJS = require("../../../src/bch-js")