mirror of
https://github.com/fullstack-cash/bch-api.git
synced 2026-09-21 16:52:04 -07:00
fix(bch-js): Bumping to v4.15.8
This commit is contained in:
@@ -116,7 +116,7 @@ class RateLimits {
|
||||
//
|
||||
} 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
|
||||
// bch-js, like hydrateUtxo(), which passes the user object from the
|
||||
// original API call.
|
||||
|
||||
try {
|
||||
@@ -153,23 +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.
|
||||
|
||||
// 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}`)
|
||||
// console.log(`key: ${key}`)
|
||||
|
||||
// const pointsToConsume = userId ? 1 : 30
|
||||
decoded.resource = resource
|
||||
|
||||
@@ -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)}`)
|
||||
|
||||
|
||||
@@ -1980,9 +1980,10 @@ class Slp {
|
||||
const utxos = req.body.utxos
|
||||
|
||||
// console.log('req: ', req)
|
||||
console.log(`req._remoteAddress: ${req._remoteAddress}`)
|
||||
// const ip = req._remoteAddress
|
||||
// console.log(`req._remoteAddress: ${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,
|
||||
|
||||
Reference in New Issue
Block a user