Merge branch 'master' into free

.gitignore

@@ -17,16 +17,12 @@ test-fullstack-main.sh
 start-fullstack-main.sh
 start-fullstack-test.sh
 start-free-main.sh
+free-bch-api-main.sh
+free-bch-api-test.sh
 start-local-mainnet.sh.save
 start-local-testnet.sh.save
 temp.sh
 test-fullstack-test.sh
-start-sweet-main.sh
-test-sweet-main.sh
-test-fullstack-abc.sh
-test-fullstack-bchn.sh
-start-fullstack-abc.sh
-start-fullstack-bchn.sh
 
 coverage
 start-my-infra

deploy-production.sh

@@ -1,27 +1,17 @@
-#!/bin/bash
 # Triggers a webhook to update the staging server at staging.fullstack.cash.
 
+#!/bin/bash
 #echo $DEPLOY_SECRET
 
-# This if statement will only deploy on Jenkins when its testing the master branch.
-echo "-->$GIT_BRANCH<--"
-if [[ $GIT_BRANCH =~ "master" ]]
-  then
+echo "Deploy to production...."
 
-    echo "Deploying to production...."
+export DATA="{\"ref\":\"$DEPLOY_SECRET\"}"
 
-    export DATA="{\"ref\":\"$DEPLOY_SECRET\"}"
+#echo $DATA
 
-    #echo $DATA
+curl -X POST http://fullstack.cash:9000/hooks/bch-api-mainnet -H "Content-Type: application/json" -d $DATA
+curl -X POST http://fullstack.cash:9000/hooks/bch-api-testnet -H "Content-Type: application/json" -d $DATA
+curl -X POST http://$FREE_SERVER:9000/hooks/bch-api-testnet -H "Content-Type: application/json" -d $DATA
+curl -X POST http://$FREE_SERVER:9000/hooks/bch-api-mainnet -H "Content-Type: application/json" -d $DATA
 
-    curl -X POST http://fullstack.cash:9000/hooks/bch-api-mainnet -H "Content-Type: application/json" -d $DATA
-    curl -X POST http://fullstack.cash:9000/hooks/bch-api-testnet -H "Content-Type: application/json" -d $DATA
-    #curl -X POST http://$FREE_SERVER:9000/hooks/bch-api-testnet -H "Content-Type: application/json" -d $DATA
-    #curl -X POST http://$FREE_SERVER:9000/hooks/bch-api-mainnet -H "Content-Type: application/json" -d $DATA
-    curl -X POST http://$BCHN_BCHAPI:9000/hooks/bch-api-bchn -H "Content-Type: application/json" -d $DATA
-
-    echo "...Finished deploying to production."
-
-  else
-    echo "Not master, so not deploying."
-fi
+echo "...Finished deploying to production."

docker/mainnet/Dockerfile

@@ -18,6 +18,7 @@ USER safeuser
 WORKDIR /home/safeuser
 RUN git clone https://github.com/Permissionless-Software-Foundation/bch-api
 WORKDIR /home/safeuser/bch-api
+RUN git checkout free
 RUN npm install --silent
 
 # Generate documentation

docker/testnet/Dockerfile

@@ -15,12 +15,13 @@ USER safeuser
 WORKDIR /home/safeuser
 RUN git clone https://github.com/Permissionless-Software-Foundation/bch-api
 WORKDIR /home/safeuser/bch-api
+RUN git checkout free
 RUN npm install --silent
 
 # Generate documentation
 RUN npm run docs
 
-EXPOSE 3000
+EXPOSE 4000
 
 COPY start-local-testnet.sh start-local-testnet.sh
 CMD ["./start-local-testnet.sh"]

docker/testnet/docker-compose.yml

@@ -6,9 +6,9 @@ bch-api-test:
   links:
     - redis-test
   ports:
-    - "4000:3000"
+    - "4000:4000"
   volumes:
-    - ../../logs:/home/safeuser/bch-api/logs    
+    - ../../logs:/home/safeuser/bch-api/logs
   restart: always
 
 redis-test:

package.json

@@ -17,7 +17,7 @@
     "test": "npm run lint && npm run test-v3",
     "lint": "standard --env mocha --fix",
     "test-v3": "export NETWORK=mainnet && nyc --reporter=text mocha --timeout 60000 test/v3/",
-    "test:temp": "export NETWORK=mainnet && export TEST=integration && mocha --timeout 25000 test/v3/encryption.js",
+    "test:temp": "export NETWORK=mainnet && mocha --timeout 25000 test/v3/slp.js",
     "test:integration": "mocha test/v3/integration",
     "test:integration:slpdb": "mocha --timeout 25000 -g '#validate2Single' test/v3/integration/slp*.js",
     "coverage": "nyc report --reporter=text-lcov | coveralls",

src/middleware/route-ratelimit.js

@@ -1,15 +1,3 @@
-/*
-  Sets the rate limits for the anonymous and paid tiers. Current rate limits:
-  - 1000 points in 60 seconds
-  - 10 points per call for paid tier (100 RPM)
-  - 50 points per call for anonymous tier (20 RPM)
-
-  Background:
-  The rate limits below were originially coded with the idea of charging on a
-  per-resource basis. However, that was confusing to end users trying to purchase
-  a subscription. So everything was simplied to two tiers: paid and anonymous
-*/
-
 'use strict'
 
 const wlogger = require('../util/winston-logging')
@@ -110,8 +98,8 @@ class RateLimits {
         wlogger.debug('No JWT token found!')
       }
 
-      // Default value is 50 points per request = 20 RPM
-      let rateLimit = 50
+      // Used for displaying error message. Default value is 30.
+      let rateLimit = 30
 
       // Code here for the rate limiter is adapted from this example:
       // https://github.com/animir/node-rate-limiter-flexible/wiki/Overall-example#authorized-and-not-authorized-users
@@ -130,12 +118,9 @@ class RateLimits {
 
         // Retrieve the origin.
         let origin = req.get('origin')
-
-        // Handle calls coming from the intranet.
         if (origin === undefined && key.indexOf('10.0.0.5') > -1) {
           origin = 'slp-api'
         }
-
         wlogger.info(`origin: ${origin}`)
 
         // If the request originates from one of the approved wallet apps, then
@@ -150,7 +135,7 @@ class RateLimits {
           res.locals.pointsToConsume = pointsToConsume // Feedback for tests.
         }
 
-        // For internal calls, increase rate limits to as fast as possible.
+        // Apply paid-access rate limits based on key/IP
         if (
           key.toString().indexOf('172.17.') > -1 ||
           key.toString().indexOf('::ffff:127.0.0.1') > -1
@@ -193,7 +178,7 @@ class RateLimits {
   // Calculates the points consumed, based on the jwt information and the route
   // requested.
   calcPoints (jwtInfo) {
-    let retVal = 50 // By default, use anonymous tier.
+    let retVal = 33 // By default, use anonymous tier.
 
     try {
       // console.log(`jwtInfo: ${JSON.stringify(jwtInfo, null, 2)}`)
@@ -212,12 +197,12 @@ class RateLimits {
         if (level40Routes.includes(resource)) {
           if (apiLevel >= 40) retVal = 10
           // else if (apiLevel >= 10) retVal = 10
-          else retVal = 50
+          else retVal = 33
 
           // Normal indexer routes
         } else if (level30Routes.includes(resource)) {
           if (apiLevel >= 30) retVal = 10
-          else retVal = 50
+          else retVal = 33
 
           // Full node tier
         } else if (apiLevel >= 20) {
@@ -225,7 +210,7 @@ class RateLimits {
 
           // Free tier, full node only.
         } else {
-          retVal = 50
+          retVal = 33
         }
       }
 
@@ -233,7 +218,7 @@ class RateLimits {
     } catch (err) {
       wlogger.error('Error in route-ratelimit.js/calcPoints()')
       // throw err
-      retVal = 50
+      retVal = 33
     }
 
     return retVal

src/routes/v3/encryption.js

@@ -16,10 +16,15 @@ const RouteUtils = require('../../util/route-utils')
 const routeUtils = new RouteUtils()
 
 const BCHJS = require('@psf/bch-js')
-const restURL = process.env.LOCAL_RESTURL
-  ? process.env.LOCAL_RESTURL
-  : 'https://api.fullstack.cash/v3/'
-const bchjs = new BCHJS({ restURL })
+const bchjs = new BCHJS()
+
+// Use Blockbook for getting indexer data.
+const Blockbook = require('./blockbook')
+const blockbook = new Blockbook()
+
+// Use RawTransactions library for getting raw blockchain data.
+const RawTransactions = require('./full-node/rawtransactions')
+const rawTransactions = new RawTransactions()
 
 let _this
 
@@ -31,8 +36,8 @@ class Encryption {
     _this.axios = axios
     _this.routeUtils = routeUtils
     _this.bchjs = bchjs
-    // _this.blockbook = blockbook
-    // _this.rawTransactions = rawTransactions
+    _this.blockbook = blockbook
+    _this.rawTransactions = rawTransactions
 
     _this.router = router
     _this.router.get('/', _this.root)
@@ -110,23 +115,23 @@ class Encryption {
         cashAddr
       )
 
-      const rawTxData = await _this.bchjs.Electrumx.transactions(cashAddr)
-      // console.log(`rawTxData: ${JSON.stringify(rawTxData, null, 2)}`)
+      // Retrieve the transaction history for this address.
+      const balance = await _this.blockbook.balanceFromBlockbook(cashAddr)
+      // console.log(`balance: ${JSON.stringify(balance, null, 2)}`)
 
-      // Extract just the TXIDs
-      const txids = rawTxData.transactions.map((elem) => elem.tx_hash)
-      // console.log(`txids: ${JSON.stringify(txids, null, 2)}`)
+      const txHistory = balance.txids
+      // console.log(`txHistory: ${JSON.stringify(txHistory, null, 2)}`)
 
       // throw error if there is no transaction history.
-      if (!txids || txids.length === 0) {
+      if (!txHistory || txHistory.length === 0) {
         throw new Error('No transaction history.')
       }
 
       // Loop through the transaction history and search for the public key.
-      for (let i = 0; i < txids.length; i++) {
-        const thisTx = txids[i]
+      for (let i = 0; i < txHistory.length; i++) {
+        const thisTx = txHistory[i]
 
-        const txDetails = await _this.bchjs.RawTransactions.getRawTransaction(
+        const txDetails = await _this.rawTransactions.getRawTransactionsFromNode(
           thisTx,
           true
         )

test/v3/encryption.js

@@ -78,11 +78,11 @@ describe('#Encryption Router', () => {
       // Mock the Insight URL for unit tests.
       if (process.env.TEST === 'unit') {
         sandbox
-          .stub(encryptionRoute.bchjs.Electrumx, 'transactions')
-          .resolves(mockData.mockFulcrumTxHistory)
+          .stub(encryptionRoute.blockbook, 'balanceFromBlockbook')
+          .resolves(mockData.mockBalance)
         sandbox
-          .stub(encryptionRoute.bchjs.RawTransactions, 'getRawTransaction')
-          .resolves(mockData.mockTxDetails2)
+          .stub(encryptionRoute.rawTransactions, 'getRawTransactionsFromNode')
+          .resolves(mockData.mockTxDetails)
       }
 
       const result = await encryptionRoute.getPublicKey(req, res)
@@ -105,8 +105,8 @@ describe('#Encryption Router', () => {
       // Mock the Insight URL for unit tests.
       if (process.env.TEST === 'unit') {
         sandbox
-          .stub(encryptionRoute.bchjs.Electrumx, 'transactions')
-          .resolves(mockData.mockFulcrumNoTxHistory)
+          .stub(encryptionRoute.blockbook, 'balanceFromBlockbook')
+          .resolves(mockData.mockNoTxHistory)
       }
 
       const result = await encryptionRoute.getPublicKey(req, res)
@@ -126,10 +126,10 @@ describe('#Encryption Router', () => {
       // Mock the Insight URL for unit tests.
       if (process.env.TEST === 'unit') {
         sandbox
-          .stub(encryptionRoute.bchjs.Electrumx, 'transactions')
-          .resolves(mockData.mockFulcrumNoSendBalance)
+          .stub(encryptionRoute.blockbook, 'balanceFromBlockbook')
+          .resolves(mockData.mockNoSendBalance)
         sandbox
-          .stub(encryptionRoute.bchjs.RawTransactions, 'getRawTransaction')
+          .stub(encryptionRoute.rawTransactions, 'getRawTransactionsFromNode')
           .resolves(mockData.mockNoSendTx)
       }
 

test/v3/mocks/encryption-mocks.js

@@ -2,6 +2,126 @@
   Mock data for the encryption test library
 */
 
+const mockBalance = {
+  page: 1,
+  totalPages: 1,
+  itemsOnPage: 1000,
+  address: 'bitcoincash:qrehqueqhw629p6e57994436w730t4rzasnly00ht0',
+  balance: '582434',
+  totalReceived: '213083250',
+  totalSent: '212500816',
+  unconfirmedBalance: '0',
+  unconfirmedTxs: 0,
+  txs: 12,
+  txids: [
+    'c42f8f16d3baa2ee343ea89ef110dfe094992379d08edd30887b8ca7ee671c9a',
+    '1afcc63b244182647909539ebe3f4a44b8ea4120a95edb8d9eebe5347b9491bb',
+    'e4a0ac48ff3f42fc342717a2a3d34248e5e85bae79d59bd20e1b60e61b1c500f',
+    '0f9b49cafeb9ae1d741cdb12137c92816aa8470944c270a78ba2e610bd59190d',
+    'ceb0cab0e37b59caf3ca29e1a698d19ff47f2827dd09cb2f3b91b9100b1dad1c',
+    '8bc2134c7e48e56e1769b3d7c4c1e3a0acc68e1e58160eee6fa67f3208c07262',
+    'b3792d28377b975560e1b6f09e48aeff8438d4c6969ca578bd406393bd50bd7d',
+    'ecc1b51bac767880382bf3190ff17abf78d0936843a022a943d871116ed50368',
+    '9ea667bcfc9cd337bd6c5583d8094c1b1942bd2015d95b54189deac5070eeff0',
+    '6960255abe64893073921e96bf3c053c82686e0fc22a565494fbe2a31e766975',
+    '7e9aa7a74de2b30200a2d6fc748ff35a0c753221444194f720bb7f61ef1d9153',
+    'eff00a9538487ff44243c75fb13de19b5783454c42c81b9aff9afbfd09cbaec3'
+  ]
+}
+
+const mockTxDetails = {
+  txid: '1afcc63b244182647909539ebe3f4a44b8ea4120a95edb8d9eebe5347b9491bb',
+  hash: '1afcc63b244182647909539ebe3f4a44b8ea4120a95edb8d9eebe5347b9491bb',
+  version: 1,
+  size: 437,
+  locktime: 0,
+  vin: [
+    {
+      txid: 'c42f8f16d3baa2ee343ea89ef110dfe094992379d08edd30887b8ca7ee671c9a',
+      vout: 0,
+      scriptSig: {
+        asm:
+          '30450221008052d3b067418d53585fb8f91e1b57cf3c040dc9c07a70f393ed663b3f7502c50220749aa8e09ac922e78cb474c8097873cfb2634108d7acaa7db32a73a35743da97[ALL|FORKID] 044eb40b025df18409f2a5197b010dd62a9e65d9a74e415e5b10367721a9c4baa7ebfee22d14b8ece1c9bd70c0d9e5e8b00b61b81b88a1b5ce6f24eac6b8a34b2c',
+        hex:
+          '4830450221008052d3b067418d53585fb8f91e1b57cf3c040dc9c07a70f393ed663b3f7502c50220749aa8e09ac922e78cb474c8097873cfb2634108d7acaa7db32a73a35743da974141044eb40b025df18409f2a5197b010dd62a9e65d9a74e415e5b10367721a9c4baa7ebfee22d14b8ece1c9bd70c0d9e5e8b00b61b81b88a1b5ce6f24eac6b8a34b2c'
+      },
+      sequence: 4294967295
+    },
+    {
+      txid: 'e4a0ac48ff3f42fc342717a2a3d34248e5e85bae79d59bd20e1b60e61b1c500f',
+      vout: 1,
+      scriptSig: {
+        asm:
+          '3044022050d7fe7cdcec81eefa0987b88ddb83274d8e9063d927090dc4c2d1db76c512d302207dc1eea439a627476265ed87f59cc9823fb572ffc2640f0218d7bddc9a621c6e[ALL|FORKID] 044eb40b025df18409f2a5197b010dd62a9e65d9a74e415e5b10367721a9c4baa7ebfee22d14b8ece1c9bd70c0d9e5e8b00b61b81b88a1b5ce6f24eac6b8a34b2c',
+        hex:
+          '473044022050d7fe7cdcec81eefa0987b88ddb83274d8e9063d927090dc4c2d1db76c512d302207dc1eea439a627476265ed87f59cc9823fb572ffc2640f0218d7bddc9a621c6e4141044eb40b025df18409f2a5197b010dd62a9e65d9a74e415e5b10367721a9c4baa7ebfee22d14b8ece1c9bd70c0d9e5e8b00b61b81b88a1b5ce6f24eac6b8a34b2c'
+      },
+      sequence: 4294967295
+    }
+  ],
+  vout: [
+    {
+      value: 0.47,
+      n: 0,
+      scriptPubKey: {
+        asm:
+          'OP_DUP OP_HASH160 7ab928d0b41194411a2e87a782b688c7cc69ba46 OP_EQUALVERIFY OP_CHECKSIG',
+        hex: '76a9147ab928d0b41194411a2e87a782b688c7cc69ba4688ac',
+        reqSigs: 1,
+        type: 'pubkeyhash',
+        addresses: ['bitcoincash:qpatj2xsksgegsg696r60q4k3rruc6d6gc3srp333v']
+      }
+    },
+    {
+      value: 0.00531373,
+      n: 1,
+      scriptPubKey: {
+        asm:
+          'OP_DUP OP_HASH160 f3707320bbb4a28759a78a5ad63a77a2f5d462ec OP_EQUALVERIFY OP_CHECKSIG',
+        hex: '76a914f3707320bbb4a28759a78a5ad63a77a2f5d462ec88ac',
+        reqSigs: 1,
+        type: 'pubkeyhash',
+        addresses: ['bitcoincash:qrehqueqhw629p6e57994436w730t4rzasnly00ht0']
+      }
+    }
+  ],
+  hex:
+    '01000000029a1c67eea78c7b8830dd8ed079239994e0df10f19ea83e34eea2bad3168f2fc4000000008b4830450221008052d3b067418d53585fb8f91e1b57cf3c040dc9c07a70f393ed663b3f7502c50220749aa8e09ac922e78cb474c8097873cfb2634108d7acaa7db32a73a35743da974141044eb40b025df18409f2a5197b010dd62a9e65d9a74e415e5b10367721a9c4baa7ebfee22d14b8ece1c9bd70c0d9e5e8b00b61b81b88a1b5ce6f24eac6b8a34b2cffffffff0f501c1be6601b0ed29bd579ae5be8e54842d3a3a2172734fc423fff48aca0e4010000008a473044022050d7fe7cdcec81eefa0987b88ddb83274d8e9063d927090dc4c2d1db76c512d302207dc1eea439a627476265ed87f59cc9823fb572ffc2640f0218d7bddc9a621c6e4141044eb40b025df18409f2a5197b010dd62a9e65d9a74e415e5b10367721a9c4baa7ebfee22d14b8ece1c9bd70c0d9e5e8b00b61b81b88a1b5ce6f24eac6b8a34b2cffffffff02c029cd02000000001976a9147ab928d0b41194411a2e87a782b688c7cc69ba4688acad1b0800000000001976a914f3707320bbb4a28759a78a5ad63a77a2f5d462ec88ac00000000',
+  blockhash: '0000000000000000045e5e52fb4f9746b3d15d3062855fd346aaef3debef4360',
+  confirmations: 71465,
+  time: 1545564654,
+  blocktime: 1545564654
+}
+
+const mockNoTxHistory = {
+  page: 1,
+  totalPages: 1,
+  itemsOnPage: 1000,
+  address: 'bitcoincash:qqwfpk04ecf69wuprj9yjys9rla5mk7rj5j8uthqel',
+  balance: '0',
+  totalReceived: '0',
+  totalSent: '0',
+  unconfirmedBalance: '0',
+  unconfirmedTxs: 0,
+  txs: 0
+}
+
+const mockNoSendBalance = {
+  page: 1,
+  totalPages: 1,
+  itemsOnPage: 1000,
+  address: 'bitcoincash:qq78nwj5x97yh6wtlfd27dtlwjuh70vkjc59h8tgtg',
+  balance: '0',
+  totalReceived: '0',
+  totalSent: '0',
+  unconfirmedBalance: '600',
+  unconfirmedTxs: 1,
+  txs: 0,
+  txids: [
+    'a3b62cd4f4c56ba52139179db14bffd4ab22a2e077f3c62bd5cf0541bfcaf023'
+  ]
+}
+
 const mockNoSendTx = {
   txid: 'a3b62cd4f4c56ba52139179db14bffd4ab22a2e077f3c62bd5cf0541bfcaf023',
   hash: 'a3b62cd4f4c56ba52139179db14bffd4ab22a2e077f3c62bd5cf0541bfcaf023',
@@ -13,10 +133,8 @@ const mockNoSendTx = {
       txid: '681cc1d392975a7e78cbd490b8a940d7eb029c554f2cee332e3a7119d77fb189',
       vout: 1,
       scriptSig: {
-        asm:
-          '30450221008a7c86ce3a9f5765573440143a00631bb5afa9a58b24674a7fa794bb11ffffc30220397dd4c672c3e0dbe0c4eb6390b5727c5fdc3a42cf3ae275ac13b44d27bb234f[ALL|FORKID] 02bc9fc26ae2bd9a9a14e9baeda4b4fdd95a00bcbf375732c647488b3ce82a2fd7',
-        hex:
-          '4830450221008a7c86ce3a9f5765573440143a00631bb5afa9a58b24674a7fa794bb11ffffc30220397dd4c672c3e0dbe0c4eb6390b5727c5fdc3a42cf3ae275ac13b44d27bb234f412102bc9fc26ae2bd9a9a14e9baeda4b4fdd95a00bcbf375732c647488b3ce82a2fd7'
+        asm: '30450221008a7c86ce3a9f5765573440143a00631bb5afa9a58b24674a7fa794bb11ffffc30220397dd4c672c3e0dbe0c4eb6390b5727c5fdc3a42cf3ae275ac13b44d27bb234f[ALL|FORKID] 02bc9fc26ae2bd9a9a14e9baeda4b4fdd95a00bcbf375732c647488b3ce82a2fd7',
+        hex: '4830450221008a7c86ce3a9f5765573440143a00631bb5afa9a58b24674a7fa794bb11ffffc30220397dd4c672c3e0dbe0c4eb6390b5727c5fdc3a42cf3ae275ac13b44d27bb234f412102bc9fc26ae2bd9a9a14e9baeda4b4fdd95a00bcbf375732c647488b3ce82a2fd7'
       },
       sequence: 4294967295
     }
@@ -26,157 +144,36 @@ const mockNoSendTx = {
       value: 0.000006,
       n: 0,
       scriptPubKey: {
-        asm:
-          'OP_DUP OP_HASH160 3c79ba54317c4be9cbfa5aaf357f74b97f3d9696 OP_EQUALVERIFY OP_CHECKSIG',
+        asm: 'OP_DUP OP_HASH160 3c79ba54317c4be9cbfa5aaf357f74b97f3d9696 OP_EQUALVERIFY OP_CHECKSIG',
         hex: '76a9143c79ba54317c4be9cbfa5aaf357f74b97f3d969688ac',
         reqSigs: 1,
         type: 'pubkeyhash',
-        addresses: ['bitcoincash:qq78nwj5x97yh6wtlfd27dtlwjuh70vkjc59h8tgtg']
+        addresses: [
+          'bitcoincash:qq78nwj5x97yh6wtlfd27dtlwjuh70vkjc59h8tgtg'
+        ]
       }
     },
     {
       value: 0.00003664,
       n: 1,
       scriptPubKey: {
-        asm:
-          'OP_DUP OP_HASH160 58502a73888e0a386fc69b44850af4b2a86ac9a6 OP_EQUALVERIFY OP_CHECKSIG',
+        asm: 'OP_DUP OP_HASH160 58502a73888e0a386fc69b44850af4b2a86ac9a6 OP_EQUALVERIFY OP_CHECKSIG',
         hex: '76a91458502a73888e0a386fc69b44850af4b2a86ac9a688ac',
         reqSigs: 1,
         type: 'pubkeyhash',
-        addresses: ['bitcoincash:qpv9q2nn3z8q5wr0c6d5fpg27je2s6kf5cavp4ney0']
+        addresses: [
+          'bitcoincash:qpv9q2nn3z8q5wr0c6d5fpg27je2s6kf5cavp4ney0'
+        ]
       }
     }
   ],
-  hex:
-    '020000000189b17fd719713a2e33ee2c4f559c02ebd740a9b890d4cb787e5a9792d3c11c68010000006b4830450221008a7c86ce3a9f5765573440143a00631bb5afa9a58b24674a7fa794bb11ffffc30220397dd4c672c3e0dbe0c4eb6390b5727c5fdc3a42cf3ae275ac13b44d27bb234f412102bc9fc26ae2bd9a9a14e9baeda4b4fdd95a00bcbf375732c647488b3ce82a2fd7ffffffff0258020000000000001976a9143c79ba54317c4be9cbfa5aaf357f74b97f3d969688ac500e0000000000001976a91458502a73888e0a386fc69b44850af4b2a86ac9a688ac00000000'
-}
-
-const mockFulcrumTxHistory = {
-  success: true,
-  transactions: [
-    {
-      height: 511463,
-      tx_hash:
-        'eff00a9538487ff44243c75fb13de19b5783454c42c81b9aff9afbfd09cbaec3'
-    },
-    {
-      height: 511464,
-      tx_hash:
-        '7e9aa7a74de2b30200a2d6fc748ff35a0c753221444194f720bb7f61ef1d9153'
-    },
-    {
-      height: 513373,
-      tx_hash:
-        '6960255abe64893073921e96bf3c053c82686e0fc22a565494fbe2a31e766975'
-    },
-    {
-      height: 513373,
-      tx_hash:
-        '9ea667bcfc9cd337bd6c5583d8094c1b1942bd2015d95b54189deac5070eeff0'
-    },
-    {
-      height: 560481,
-      tx_hash:
-        'ecc1b51bac767880382bf3190ff17abf78d0936843a022a943d871116ed50368'
-    },
-    {
-      height: 560615,
-      tx_hash:
-        'b3792d28377b975560e1b6f09e48aeff8438d4c6969ca578bd406393bd50bd7d'
-    },
-    {
-      height: 561568,
-      tx_hash:
-        '8bc2134c7e48e56e1769b3d7c4c1e3a0acc68e1e58160eee6fa67f3208c07262'
-    },
-    {
-      height: 561569,
-      tx_hash:
-        'ceb0cab0e37b59caf3ca29e1a698d19ff47f2827dd09cb2f3b91b9100b1dad1c'
-    },
-    {
-      height: 561572,
-      tx_hash:
-        '0f9b49cafeb9ae1d741cdb12137c92816aa8470944c270a78ba2e610bd59190d'
-    },
-    {
-      height: 561582,
-      tx_hash:
-        'e4a0ac48ff3f42fc342717a2a3d34248e5e85bae79d59bd20e1b60e61b1c500f'
-    },
-    {
-      height: 562106,
-      tx_hash:
-        '1afcc63b244182647909539ebe3f4a44b8ea4120a95edb8d9eebe5347b9491bb'
-    },
-    {
-      height: 562106,
-      tx_hash:
-        'c42f8f16d3baa2ee343ea89ef110dfe094992379d08edd30887b8ca7ee671c9a'
-    }
-  ]
-}
-
-const mockTxDetails2 = {
-  txid: '7e9aa7a74de2b30200a2d6fc748ff35a0c753221444194f720bb7f61ef1d9153',
-  hash: '7e9aa7a74de2b30200a2d6fc748ff35a0c753221444194f720bb7f61ef1d9153',
-  version: 1,
-  size: 221,
-  locktime: 0,
-  vin: [
-    {
-      txid: 'eff00a9538487ff44243c75fb13de19b5783454c42c81b9aff9afbfd09cbaec3',
-      vout: 0,
-      scriptSig: {
-        asm:
-          '30440220150e7c9b646fe1f7f576456c9808c89a710e8fbb753e9f5ca6ed2d39a0b69ba602202212968163d8dfe35eec5975fce38440082029cb2691a3e0ad1714f9c412c47a[ALL|FORKID] 044eb40b025df18409f2a5197b010dd62a9e65d9a74e415e5b10367721a9c4baa7ebfee22d14b8ece1c9bd70c0d9e5e8b00b61b81b88a1b5ce6f24eac6b8a34b2c',
-        hex:
-          '4730440220150e7c9b646fe1f7f576456c9808c89a710e8fbb753e9f5ca6ed2d39a0b69ba602202212968163d8dfe35eec5975fce38440082029cb2691a3e0ad1714f9c412c47a4141044eb40b025df18409f2a5197b010dd62a9e65d9a74e415e5b10367721a9c4baa7ebfee22d14b8ece1c9bd70c0d9e5e8b00b61b81b88a1b5ce6f24eac6b8a34b2c'
-      },
-      sequence: 4294967295
-    }
-  ],
-  vout: [
-    {
-      value: 0.01266023,
-      n: 0,
-      scriptPubKey: {
-        asm: 'OP_HASH160 91bacd6785e3f8c78d5f29b4020b94c753444130 OP_EQUAL',
-        hex: 'a91491bacd6785e3f8c78d5f29b4020b94c75344413087',
-        reqSigs: 1,
-        type: 'scripthash',
-        addresses: ['bitcoincash:pzgm4nt8sh3l33udtu5mgqstjnr4x3zpxqrrrndnw5']
-      }
-    }
-  ],
-  hex:
-    '0100000001c3aecb09fdfb9aff9a1bc8424c4583579be13db15fc74342f47f4838950af0ef000000008a4730440220150e7c9b646fe1f7f576456c9808c89a710e8fbb753e9f5ca6ed2d39a0b69ba602202212968163d8dfe35eec5975fce38440082029cb2691a3e0ad1714f9c412c47a4141044eb40b025df18409f2a5197b010dd62a9e65d9a74e415e5b10367721a9c4baa7ebfee22d14b8ece1c9bd70c0d9e5e8b00b61b81b88a1b5ce6f24eac6b8a34b2cffffffff01675113000000000017a91491bacd6785e3f8c78d5f29b4020b94c7534441308700000000',
-  blockhash: '000000000000000001aab6818b4ad0379a3f7a13940d9b3d4838b3dea1d0a083',
-  confirmations: 149222,
-  time: 1515088493,
-  blocktime: 1515088493
-}
-
-const mockFulcrumNoTxHistory = {
-  success: true,
-  transactions: []
-}
-
-const mockFulcrumNoSendBalance = {
-  success: true,
-  transactions: [
-    {
-      height: 633578,
-      tx_hash:
-        'a3b62cd4f4c56ba52139179db14bffd4ab22a2e077f3c62bd5cf0541bfcaf023'
-    }
-  ]
+  hex: '020000000189b17fd719713a2e33ee2c4f559c02ebd740a9b890d4cb787e5a9792d3c11c68010000006b4830450221008a7c86ce3a9f5765573440143a00631bb5afa9a58b24674a7fa794bb11ffffc30220397dd4c672c3e0dbe0c4eb6390b5727c5fdc3a42cf3ae275ac13b44d27bb234f412102bc9fc26ae2bd9a9a14e9baeda4b4fdd95a00bcbf375732c647488b3ce82a2fd7ffffffff0258020000000000001976a9143c79ba54317c4be9cbfa5aaf357f74b97f3d969688ac500e0000000000001976a91458502a73888e0a386fc69b44850af4b2a86ac9a688ac00000000'
 }
 
 module.exports = {
-  mockNoSendTx,
-  mockFulcrumTxHistory,
-  mockTxDetails2,
-  mockFulcrumNoTxHistory,
-  mockFulcrumNoSendBalance
+  mockBalance,
+  mockTxDetails,
+  mockNoTxHistory,
+  mockNoSendBalance,
+  mockNoSendTx
 }

test/v3/rate-limits.js

@@ -105,14 +105,14 @@ describe('#route-ratelimits & jwt-auth', () => {
   })
 
   describe('#calcPoints', () => {
-    it('should return 50 points for anonymous user', () => {
+    it('should return 300 points for anonymous user', () => {
       const result = rateLimits.calcPoints()
       // console.log(`result: ${result}`)
 
-      assert.equal(result, 50)
+      assert.equal(result, 300)
     })
 
-    it('should return 50 points for free tier requesting full node access', () => {
+    it('should return 100 points for free tier requesting full node access', () => {
       const jwtInfo = {
         apiLevel: 10,
         resource: 'blockchain',
@@ -120,10 +120,10 @@ describe('#route-ratelimits & jwt-auth', () => {
       }
 
       const result = rateLimits.calcPoints(jwtInfo)
-      assert.equal(result, 50)
+      assert.equal(result, 100)
     })
 
-    it('should return 50 points for free tier requesting indexer access', () => {
+    it('should return 100 points for free tier requesting indexer access', () => {
       const jwtInfo = {
         apiLevel: 10,
         resource: 'blockbook',
@@ -131,10 +131,10 @@ describe('#route-ratelimits & jwt-auth', () => {
       }
 
       const result = rateLimits.calcPoints(jwtInfo)
-      assert.equal(result, 50)
+      assert.equal(result, 100)
     })
 
-    it('should return 50 points for free tier requesting SLPDB access', () => {
+    it('should return 100 points for free tier requesting SLPDB access', () => {
       const jwtInfo = {
         apiLevel: 10,
         resource: 'slp',
@@ -142,7 +142,7 @@ describe('#route-ratelimits & jwt-auth', () => {
       }
 
       const result = rateLimits.calcPoints(jwtInfo)
-      assert.equal(result, 50)
+      assert.equal(result, 100)
     })
 
     it('should return 10 points for full node tier requesting full node access', () => {
@@ -156,7 +156,7 @@ describe('#route-ratelimits & jwt-auth', () => {
       assert.equal(result, 10)
     })
 
-    it('should return 50 points for full-node tier requesting indexer access', () => {
+    it('should return 100 points for full-node tier requesting indexer access', () => {
       const jwtInfo = {
         apiLevel: 20,
         resource: 'blockbook',
@@ -164,10 +164,10 @@ describe('#route-ratelimits & jwt-auth', () => {
       }
 
       const result = rateLimits.calcPoints(jwtInfo)
-      assert.equal(result, 50)
+      assert.equal(result, 100)
     })
 
-    it('should return 50 points for full node tier requesting SLPDB access', () => {
+    it('should return 100 points for full node tier requesting SLPDB access', () => {
       const jwtInfo = {
         apiLevel: 20,
         resource: 'slp',
@@ -175,7 +175,7 @@ describe('#route-ratelimits & jwt-auth', () => {
       }
 
       const result = rateLimits.calcPoints(jwtInfo)
-      assert.equal(result, 50)
+      assert.equal(result, 100)
     })
 
     it('should return 10 point for indexer tier requesting full node access', () => {
@@ -200,7 +200,7 @@ describe('#route-ratelimits & jwt-auth', () => {
       assert.equal(result, 10)
     })
 
-    it('should return 50 points for indexer tier requesting SLPDB access', () => {
+    it('should return 100 points for indexer tier requesting SLPDB access', () => {
       const jwtInfo = {
         apiLevel: 30,
         resource: 'slp',
@@ -208,7 +208,7 @@ describe('#route-ratelimits & jwt-auth', () => {
       }
 
       const result = rateLimits.calcPoints(jwtInfo)
-      assert.equal(result, 50)
+      assert.equal(result, 100)
     })
 
     it('should return 10 point for SLP tier requesting full node access', () => {
@@ -319,7 +319,7 @@ describe('#route-ratelimits & jwt-auth', () => {
       )
     })
 
-    it('should trigger rate-limit for free tier after 20 RPM', async () => {
+    it('should trigger rate-limit for free tier after 10 RPM', async () => {
       // Create a new instance of the rate limit so we start with zeroed tracking.
       rateLimits = new RateLimits()
 
@@ -338,7 +338,7 @@ describe('#route-ratelimits & jwt-auth', () => {
       // Mock the call to the jwt library.
       sandbox.stub(rateLimits.jwt, 'verify').returns(jwtInfo)
 
-      for (let i = 0; i < 22; i++) {
+      for (let i = 0; i < 12; i++) {
         next.reset() // reset the stubbed next() function.
 
         await rateLimits.rateLimitByResource(req, res, next)
@@ -442,7 +442,7 @@ describe('#route-ratelimits & jwt-auth', () => {
 
       // Issues with token secret should treat incoming requests as anonymous
       // calls with 30 points or 3 RPM.
-      assert.equal(res.locals.pointsToConsume, 50)
+      assert.equal(res.locals.pointsToConsume, 300)
     })
   })
 })

test/v3/raw-transactions.js

@@ -975,7 +975,6 @@ describe('#Raw-Transactions', () => {
       // Restore the saved URL.
       process.env.RPC_BASEURL = savedUrl2
     })
-
     it('should submit hex encoded transaction', async () => {
       // This is a difficult test to run as transaction hex is invalid after a
       // block confirmation. So the unit tests simulates what the output 'should'
@@ -1004,13 +1003,8 @@ describe('#Raw-Transactions', () => {
 
         // Integration test
       } else {
-        if (process.env.ISBCHN) {
-          assert.hasAllKeys(result, ['error'])
-          assert.include(result.error, 'Missing inputs')
-        } else {
-          assert.hasAllKeys(result, ['error'])
-          assert.include(result.error, 'bad-txns-inputs-missingorspent')
-        }
+        assert.hasAllKeys(result, ['error'])
+        assert.include(result.error, 'Missing inputs')
       }
     })
   })
@@ -1164,13 +1158,8 @@ describe('#Raw-Transactions', () => {
 
         // Integration test
       } else {
-        if (process.env.ISBCHN) {
-          assert.hasAllKeys(result, ['error'])
-          assert.include(result.error, 'Missing inputs')
-        } else {
-          assert.hasAllKeys(result, ['error'])
-          assert.include(result.error, 'bad-txns-inputs-missingorspent')
-        }
+        assert.hasAllKeys(result, ['error'])
+        assert.include(result.error, 'Missing inputs')
       }
     })
   })