From 1c88aa7d720add778f6a2ddb1267c7b23ee373d3 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Wed, 24 Feb 2021 16:50:38 -0800 Subject: [PATCH] fix(bch-js): Bumping to v4.15.7 --- package-lock.json | 14 +++++++------- package.json | 2 +- src/middleware/route-ratelimit.js | 14 ++++++++++---- src/routes/v4/slp.js | 12 ++++++++++-- 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 793c8f8..c397f56 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "version": "1.16.0", "license": "MIT", "dependencies": { - "@psf/bch-js": "^4.15.4", + "@psf/bch-js": "^4.15.7", "apidoc": "^0.26.0", "axios": "^0.21.1", "bitcore-lib-cash": "^8.23.1", @@ -458,9 +458,9 @@ } }, "node_modules/@psf/bch-js": { - "version": "4.15.4", - "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-4.15.4.tgz", - "integrity": "sha512-UqUC3uHLZRtmF4eCJ7ABH0tDOH2jKBM5wZ5SRu6qRSaNCSqQsSHlN/y+98muk4c+7RAFER5v0DyekWo/J1HP6w==", + "version": "4.15.7", + "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-4.15.7.tgz", + "integrity": "sha512-8PuPlAksbBiEG4UnLBp7uyPW+EM+qv/T9CQcEiQa66FtXndECEFLCsx0eMC+keVSzVUiwBGzGERK1JPFqd8euw==", "dependencies": { "@psf/bip21": "^2.0.1", "@psf/bip32-utils": "^0.13.1", @@ -18627,9 +18627,9 @@ } }, "@psf/bch-js": { - "version": "4.15.4", - "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-4.15.4.tgz", - "integrity": "sha512-UqUC3uHLZRtmF4eCJ7ABH0tDOH2jKBM5wZ5SRu6qRSaNCSqQsSHlN/y+98muk4c+7RAFER5v0DyekWo/J1HP6w==", + "version": "4.15.7", + "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-4.15.7.tgz", + "integrity": "sha512-8PuPlAksbBiEG4UnLBp7uyPW+EM+qv/T9CQcEiQa66FtXndECEFLCsx0eMC+keVSzVUiwBGzGERK1JPFqd8euw==", "requires": { "@psf/bip21": "^2.0.1", "@psf/bip32-utils": "^0.13.1", diff --git a/package.json b/package.json index 7ba9eae..f183dda 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "node": ">=10.15.1" }, "dependencies": { - "@psf/bch-js": "^4.15.4", + "@psf/bch-js": "^4.15.7", "apidoc": "^0.26.0", "axios": "^0.21.1", "bitcore-lib-cash": "^8.23.1", diff --git a/src/middleware/route-ratelimit.js b/src/middleware/route-ratelimit.js index 0245cb6..41ec3eb 100644 --- a/src/middleware/route-ratelimit.js +++ b/src/middleware/route-ratelimit.js @@ -136,9 +136,13 @@ class RateLimits { // 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.ip && keyIsLocal) { - key = req.body.ip + 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}`) @@ -297,7 +301,9 @@ class RateLimits { return retVal } catch (err) { - wlogger.error('Error in route-ratelimit.js/isInWhitelist(). Returning false by default.') + wlogger.error( + 'Error in route-ratelimit.js/isInWhitelist(). Returning false by default.' + ) return false } } diff --git a/src/routes/v4/slp.js b/src/routes/v4/slp.js index b314d04..5b1aa50 100644 --- a/src/routes/v4/slp.js +++ b/src/routes/v4/slp.js @@ -1979,8 +1979,16 @@ class Slp { try { const utxos = req.body.utxos + // console.log('req: ', req) console.log(`req._remoteAddress: ${req._remoteAddress}`) - const ip = req._remoteAddress + // const ip = req._remoteAddress + + const usrObj = { + ip: req._remoteAddress, + jwtToken: req.locals.jwtToken, + proLimit: req.locals.proLimit, + apiLevel: req.locals.apiLevel + } // Validate inputs if (!Array.isArray(utxos)) { @@ -2016,7 +2024,7 @@ class Slp { const theseUtxos = utxos[i].utxos // Get SLP token details. - const details = await _this.bchjs.SLP.Utils.tokenUtxoDetails(theseUtxos, ip) + const details = await _this.bchjs.SLP.Utils.tokenUtxoDetails(theseUtxos, usrObj) // console.log('details: ', details) // Replace the original UTXO data with the hydrated data.