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

Improved rate-limits with bch-js v4.15.18

.gitignore

@@ -29,6 +29,7 @@ test-fullstack-bchn.sh
 start-fullstack-abc.sh
 start-fullstack-bchn.sh
 start-ss-main.sh
+start-decatur-bchn.sh
 
 coverage
 start-my-infra

package.json

@@ -29,7 +29,7 @@
     "node": ">=10.15.1"
   },
   "dependencies": {
-    "@psf/bch-js": "^4.15.7",
+    "@psf/bch-js": "^4.15.18",
     "apidoc": "^0.26.0",
     "axios": "^0.21.1",
     "bitcore-lib-cash": "^8.23.1",

src/middleware/route-ratelimit.js

@@ -113,6 +113,27 @@ class RateLimits {
             err
           )
         }
+        //
+      } else if (req.body && req.body.usrObj) {
+        // Same as above, but this code path is activated from internal calls to
+        // bch-js, like hydrateUtxo(), which passes the user object from the
+        // original API call.
+
+        try {
+          decoded = _this.jwt.verify(
+            req.body.usrObj.jwtToken,
+            _this.config.apiTokenSecret
+          )
+          // console.log(`decoded: ${JSON.stringify(decoded, null, 2)}`)
+
+          userId = decoded.id
+        } catch (err) {
+          // This handler will be triggered if the JWT token does not match the
+          // token secret.
+          wlogger.error(
+            'Error in route-ratelimit.js trying to decode JWT token in usrObj'
+          )
+        }
       } else {
         wlogger.debug('No JWT token found!')
       }
@@ -132,19 +153,7 @@ class RateLimits {
           // Key will be the JWT ID if it exists, otherwise the IP address of the caller.
           let key = userId || req.ip
           res.locals.key = key // Feedback for tests.
-
+          // console.log(`key: ${key}`)
-          // For internal calls that make a lot of internal calls, like
-          // hydrateUtxoDetails(), the origin of the caller will be passed in
-          // via the POST body.
-          const keyIsLocal =
-            key.includes('172.17.0.1') || key.includes('127.0.0.1')
-          if (req.body && req.body.usrObj && keyIsLocal) {
-            // key = req.body.ip
-            console.log(
-              `route-ratelimit usrObj: ${JSON.stringify(req.body.usrObj, null, 2)}`
-            )
-          }
-          console.log(`key: ${key}`)
 
           // const pointsToConsume = userId ? 1 : 30
           decoded.resource = resource

src/routes/v3/slp.js

@@ -85,7 +85,7 @@ class Slp {
       _this.txsByAddressSingle
     )
     _this.router.post('/generateSendOpReturn', _this.generateSendOpReturn)
-    _this.router.post('/hydrateUtxos', _this.hydrateUtxos)
+    // _this.router.post('/hydrateUtxos', _this.hydrateUtxos)
   }
 
   // DRY error handler.
@@ -1621,6 +1621,7 @@ class Slp {
    *
    *
    */
+
   async hydrateUtxos (req, res, next) {
     try {
       const utxos = req.body.utxos

src/routes/v4/encryption.js

@@ -92,6 +92,15 @@ class Encryption {
         })
       }
 
+      // Generate a user object that can be passed along with internal calls
+      // from bch-js.
+      const usrObj = {
+        ip: req._remoteAddress,
+        jwtToken: req.locals.jwtToken,
+        proLimit: req.locals.proLimit,
+        apiLevel: req.locals.apiLevel
+      }
+
       const cashAddr = _this.bchjs.Address.toCashAddress(address)
 
       // Prevent a common user error. Ensure they are using the correct network address.
@@ -110,7 +119,7 @@ class Encryption {
         cashAddr
       )
 
-      const rawTxData = await _this.bchjs.Electrumx.transactions(cashAddr)
+      const rawTxData = await _this.bchjs.Electrumx.transactions(cashAddr, usrObj)
       // console.log(`rawTxData: ${JSON.stringify(rawTxData, null, 2)}`)
 
       // Extract just the TXIDs
@@ -126,9 +135,12 @@ class Encryption {
       for (let i = 0; i < txids.length; i++) {
         const thisTx = txids[i]
 
+        // CT 2/24/21: I might want to convert this to the POST call, to take
+        // advantage of the usrObj. It does not get passed in a GET call.
         const txDetails = await _this.bchjs.RawTransactions.getRawTransaction(
           thisTx,
-          true
+          true,
+          usrObj
         )
         // console.log(`txDetails: ${JSON.stringify(txDetails, null, 2)}`)
 

src/routes/v4/slp.js

@@ -1980,9 +1980,10 @@ class Slp {
       const utxos = req.body.utxos
 
       // console.log('req: ', req)
-      console.log(`req._remoteAddress: ${req._remoteAddress}`)
+      // console.log(`req._remoteAddress: ${req._remoteAddress}`)
-      // const ip = req._remoteAddress
 
+      // Generate a user object that can be passed along with internal calls
+      // from bch-js.
       const usrObj = {
         ip: req._remoteAddress,
         jwtToken: req.locals.jwtToken,