lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/releases/v10.2' into chore/merge-release-10.2

Browse source
This commit is contained in:
Rafael Taranto 2025-04-23 09:08:57 +01:00
commit 6c57ede976
6 changed files with 40 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

51
lib/plugins.js
View file

@ -460,6 +460,15 @@ function plugins (settings, deviceId) {
* Trader functions
*/
function toMarketString (fiatCode, cryptoCode) {
return [fiatCode, cryptoCode].join('-')
}
function fromMarketString (market) {
const [fiatCode, cryptoCode] = market.split('-')
return { fiatCode, cryptoCode }
}
function buy (rec, tx) {
return buyAndSell(rec, true, tx)
}
@ -470,14 +479,14 @@ function plugins (settings, deviceId) {
function buyAndSell (rec, doBuy, tx) {
const cryptoCode = rec.cryptoCode
if (!exchange.active(settings, cryptoCode)) return
return exchange.fetchExchange(settings, cryptoCode)
.then(_exchange => {
const fiatCode = _exchange.account.currencyMarket
const cryptoAtoms = doBuy ? commissionMath.fiatToCrypto(tx, rec, deviceId, settings.config) : rec.cryptoAtoms.negated()
const market = [fiatCode, cryptoCode].join('')
if (!exchange.active(settings, cryptoCode)) return
const market = toMarketString(fiatCode, cryptoCode)
const direction = doBuy ? 'cashIn' : 'cashOut'
const internalTxId = tx ? tx.id : rec.id
@ -495,7 +504,7 @@ function plugins (settings, deviceId) {
}
function consolidateTrades (cryptoCode, fiatCode) {
const market = [fiatCode, cryptoCode].join('')
const market = toMarketString(fiatCode, cryptoCode)
const marketTradesQueues = tradesQueues[market]
if (!marketTradesQueues || marketTradesQueues.length === 0) return null
@ -543,35 +552,23 @@ function plugins (settings, deviceId) {
}
function executeTrades () {
return machineLoader.getMachines()
.then(devices => {
const deviceIds = devices.map(device => device.deviceId)
const lists = deviceIds.map(deviceId => {
const localeConfig = configManager.getLocale(deviceId, settings.config)
const cryptoCodes = localeConfig.cryptoCurrencies
const pairs = _.map(fromMarketString)(_.keys(tradesQueues))
pairs.forEach(({ fiatCode, cryptoCode }) => {
try {
executeTradesForMarket(settings, fiatCode, cryptoCode)
} catch (err) {
logger.error(err)
}
})
return Promise.all(cryptoCodes.map(cryptoCode => {
return exchange.fetchExchange(settings, cryptoCode)
.then(exchange => ({
fiatCode: exchange.account.currencyMarket,
cryptoCode
}))
}))
})
return Promise.all(lists)
})
.then(lists => {
return Promise.all(_.uniq(_.flatten(lists))
.map(r => executeTradesForMarket(settings, r.fiatCode, r.cryptoCode)))
})
.catch(logger.error)
// Poller expects a promise
return Promise.resolve()
}
function executeTradesForMarket (settings, fiatCode, cryptoCode) {
if (!exchange.active(settings, cryptoCode)) return
const market = [fiatCode, cryptoCode].join('')
const market = toMarketString(fiatCode, cryptoCode)
const tradeEntry = consolidateTrades(cryptoCode, fiatCode)
if (tradeEntry === null || tradeEntry.cryptoAtoms.eq(0)) return