fixes
This commit is contained in:
Josh Harvey
parent
ee0eecbd30
commit
48a9f9d204
14 changed files with 186 additions and 130 deletions
110
lib/plugins.js
110
lib/plugins.js
|
|
@ -1,37 +1,35 @@
|
|||
const uuid = require('uuid')
|
||||
const R = require('ramda')
|
||||
const BigNumber = require('bignumber.js')
|
||||
|
||||
// Needed for BigNumber for now
|
||||
global.crypto = require('crypto')
|
||||
BigNumber.config({CRYPTO: true})
|
||||
const argv = require('minimist')(process.argv.slice(2))
|
||||
const crypto = require('crypto')
|
||||
|
||||
const db = require('./postgresql_interface')
|
||||
const logger = require('./logger')
|
||||
const notifier = require('./notifier')
|
||||
const T = require('./time')
|
||||
const configManager = require('./config-manager')
|
||||
const settingsLoader = require('./settingsLoader')
|
||||
const settingsLoader = require('./settings-loader')
|
||||
const ticker = require('./ticker')
|
||||
const wallet = require('./wallet')
|
||||
const exchange = require('./exchange')
|
||||
const sms = require('./sms')
|
||||
const email = require('./email')
|
||||
|
||||
const CHECK_NOTIFICATION_INTERVAL = T.minute
|
||||
const CHECK_NOTIFICATION_INTERVAL = 30 * T.seconds
|
||||
const ALERT_SEND_INTERVAL = T.hour
|
||||
const INCOMING_TX_INTERVAL = 30 * T.seconds
|
||||
const LIVE_INCOMING_TX_INTERVAL = 5 * T.seconds
|
||||
const STALE_INCOMING_TX_AGE = T.week
|
||||
const STALE_LIVE_INCOMING_TX_AGE = 10 * T.minutes
|
||||
const UNNOTIFIED_INTERVAL = T.minute
|
||||
const UNNOTIFIED_INTERVAL = 10 * T.seconds
|
||||
const MAX_NOTIFY_AGE = 2 * T.days
|
||||
const MIN_NOTIFY_AGE = 5 * T.minutes
|
||||
const TRANSACTION_EXPIRATION = 2 * T.days
|
||||
const SWEEP_LIVE_HD_INTERVAL = T.minute
|
||||
const SWEEP_OLD_HD_INTERVAL = 2 * T.minutes
|
||||
const TRADE_INTERVAL = T.minute
|
||||
const TRADE_TTL = 5 * T.minutes
|
||||
const TRADE_INTERVAL = 10 * T.seconds
|
||||
const TRADE_TTL = 2 * T.minutes
|
||||
const STALE_TICKER = 3 * 60 * 1000
|
||||
const STALE_BALANCE = 3 * 60 * 1000
|
||||
|
||||
|
|
@ -46,7 +44,7 @@ let alertFingerprint = null
|
|||
let lastAlertTime = null
|
||||
|
||||
function buildRates (deviceId, tickers) {
|
||||
const settings = settingsLoader.settings
|
||||
const settings = settingsLoader.settings()
|
||||
const config = configManager.machineScoped(deviceId, settings.config)
|
||||
const cryptoCodes = config.currencies.cryptoCurrencies
|
||||
|
||||
|
|
@ -69,7 +67,7 @@ function buildRates (deviceId, tickers) {
|
|||
}
|
||||
|
||||
function buildBalances (deviceId, balanceRecs) {
|
||||
const settings = settingsLoader.settings
|
||||
const settings = settingsLoader.settings()
|
||||
const config = configManager.machineScoped(deviceId, settings.config)
|
||||
const cryptoCodes = config.currencies.cryptoCurrencies
|
||||
|
||||
|
|
@ -103,7 +101,7 @@ function buildCartridges (cartridges, virtualCartridges, rec) {
|
|||
}
|
||||
|
||||
function pollQueries (deviceTime, deviceId, deviceRec) {
|
||||
const settings = settingsLoader.settings
|
||||
const settings = settingsLoader.settings()
|
||||
const config = configManager.machineScoped(deviceId, settings.config)
|
||||
const fiatCode = config.currencies.fiatCurrency
|
||||
const cryptoCodes = config.currencies.cryptoCurrencies
|
||||
|
|
@ -157,13 +155,11 @@ function trade (deviceId, rawTrade) {
|
|||
const cryptoAtoms = rawTrade.cryptoAtoms
|
||||
|
||||
return db.recordBill(deviceId, rawTrade)
|
||||
.then(() => exchange.active(cryptoCode))
|
||||
.then(active => {
|
||||
if (!active) return
|
||||
|
||||
.then(() => {
|
||||
const market = [fiatCode, cryptoCode].join('')
|
||||
|
||||
logger.debug('[%s] Pushing trade: %d', market, cryptoAtoms)
|
||||
if (!tradesQueues[market]) tradesQueues[market] = []
|
||||
tradesQueues[market].push({
|
||||
fiatCode,
|
||||
cryptoAtoms,
|
||||
|
|
@ -173,7 +169,7 @@ function trade (deviceId, rawTrade) {
|
|||
})
|
||||
}
|
||||
|
||||
function stateChange (deviceId, deviceTime, rec, cb) {
|
||||
function stateChange (deviceId, deviceTime, rec) {
|
||||
const event = {
|
||||
id: rec.uuid,
|
||||
deviceId: deviceId,
|
||||
|
|
@ -225,7 +221,7 @@ function cashOut (deviceId, tx) {
|
|||
}
|
||||
|
||||
function dispenseAck (deviceId, tx) {
|
||||
const settings = settingsLoader.settings
|
||||
const settings = settingsLoader.settings()
|
||||
const config = configManager.machineScoped(deviceId, settings.config)
|
||||
const cartridges = [ config.currencies.topCashOutDenomination,
|
||||
config.currencies.bottomCashOutDenomination ]
|
||||
|
|
@ -234,12 +230,12 @@ function dispenseAck (deviceId, tx) {
|
|||
}
|
||||
|
||||
function fiatBalance (fiatCode, cryptoCode, deviceId) {
|
||||
const settings = settingsLoader.settings
|
||||
const settings = settingsLoader.settings()
|
||||
const config = configManager.scoped(cryptoCode, deviceId, settings.config)
|
||||
|
||||
return Promise.all([ticker.ticker(cryptoCode), wallet.balance(cryptoCode)])
|
||||
return Promise.all([ticker.getRates(fiatCode, cryptoCode), wallet.balance(cryptoCode)])
|
||||
.then(([rates, balanceRec]) => {
|
||||
const rawRate = rates[cryptoCode].rates.ask
|
||||
const rawRate = rates.rates.ask
|
||||
const commission = (new BigNumber(config.commissions.cashInCommission).div(100)).plus(1)
|
||||
const balance = balanceRec.balance
|
||||
|
||||
|
|
@ -324,37 +320,43 @@ function startPolling () {
|
|||
/*
|
||||
* Trader functions
|
||||
*/
|
||||
function buy (trade) {
|
||||
return exchange.buy(trade.cryptoAtoms, trade.fiatCode, trade.cryptoCode)
|
||||
}
|
||||
|
||||
function consolidateTrades (cryptoCode, fiatCode) {
|
||||
const market = [fiatCode, cryptoCode].join('')
|
||||
|
||||
if (tradesQueues[market].length === 0) return null
|
||||
const marketTradesQueues = tradesQueues[market]
|
||||
if (!marketTradesQueues || marketTradesQueues.length === 0) return null
|
||||
|
||||
logger.debug('[%s] tradesQueues size: %d', market, tradesQueues[market].length)
|
||||
logger.debug('[%s] tradesQueues head: %j', market, tradesQueues[market][0])
|
||||
logger.debug('[%s] tradesQueues size: %d', market, marketTradesQueues.length)
|
||||
logger.debug('[%s] tradesQueues head: %j', market, marketTradesQueues[0])
|
||||
|
||||
const t0 = Date.now()
|
||||
const t1 = Date.now()
|
||||
|
||||
const filtered = tradesQueues[market]
|
||||
.filter(trade => t0 - trade.timestamp < TRADE_TTL)
|
||||
const filtered = marketTradesQueues
|
||||
.filter(trade => {
|
||||
console.log('DEBUG33: %j, %s, %s, %s', trade, t1, trade.timestamp, TRADE_TTL)
|
||||
return t1 - trade.timestamp < TRADE_TTL
|
||||
})
|
||||
|
||||
const filteredCount = tradesQueues[market].length - filtered.length
|
||||
const filteredCount = marketTradesQueues.length - filtered.length
|
||||
|
||||
if (filteredCount > 0) {
|
||||
tradesQueues[market] = filtered
|
||||
logger.debug('[%s] expired %d trades', market, filteredCount)
|
||||
}
|
||||
|
||||
if (filtered.length === 0) return null
|
||||
|
||||
const cryptoAtoms = filtered
|
||||
.reduce((prev, current) => prev.plus(current.cryptoAtoms), new BigNumber(0))
|
||||
|
||||
const timestamp = filtered.map(r => r.timestamp).reduce((acc, r) => Math.max(acc, r), 0)
|
||||
|
||||
const consolidatedTrade = {
|
||||
fiatCode,
|
||||
cryptoAtoms,
|
||||
cryptoCode
|
||||
cryptoCode,
|
||||
timestamp
|
||||
}
|
||||
|
||||
tradesQueues[market] = []
|
||||
|
|
@ -364,8 +366,9 @@ function consolidateTrades (cryptoCode, fiatCode) {
|
|||
}
|
||||
|
||||
function executeTrades () {
|
||||
const settings = settingsLoader.settings
|
||||
const settings = settingsLoader.settings()
|
||||
const config = settings.config
|
||||
|
||||
return db.devices()
|
||||
.then(devices => {
|
||||
const deviceIds = devices.map(device => device.device_id)
|
||||
|
|
@ -397,18 +400,18 @@ function executeTradesForMarket (settings, fiatCode, cryptoCode) {
|
|||
}
|
||||
|
||||
logger.debug('[%s] making a trade: %d', market, trade.cryptoAtoms.toString())
|
||||
return buy(trade)
|
||||
|
||||
return exchange.buy(trade.cryptoAtoms, trade.fiatCode, trade.cryptoCode)
|
||||
.then(() => logger.debug('[%s] Successful trade.', market))
|
||||
.catch(err => {
|
||||
tradesQueues[market].push(trade)
|
||||
if (err.name === 'NoExchangeError') return logger.debug(err.message)
|
||||
logger.error(err)
|
||||
})
|
||||
.then(() => {
|
||||
logger.debug('[%s] Successful trade.', market)
|
||||
})
|
||||
}
|
||||
|
||||
function sendMessage (rec) {
|
||||
const settings = settingsLoader.settings
|
||||
const settings = settingsLoader.settings()
|
||||
const notifications = configManager.unscoped(settings.config).notifications
|
||||
|
||||
let promises = []
|
||||
|
|
@ -471,7 +474,7 @@ function checkNotification () {
|
|||
}
|
||||
|
||||
function checkDeviceBalances (deviceId) {
|
||||
const settings = settingsLoader.settings
|
||||
const settings = settingsLoader.settings()
|
||||
const config = configManager.machineScoped(deviceId, settings.config)
|
||||
const cryptoCodes = config.currencies.cryptoCurrencies
|
||||
const fiatCode = config.currencies.fiatCurrency
|
||||
|
|
@ -498,7 +501,7 @@ function checkBalances () {
|
|||
.then(arr => {
|
||||
const toMarket = r => r.fiatBalance + r.cryptoCode
|
||||
const min = R.minBy(r => r.fiatBalance)
|
||||
return R.reduceBy(min, Infinity, toMarket, R.flatten(arr))
|
||||
return R.values(R.reduceBy(min, Infinity, toMarket, R.flatten(arr)))
|
||||
})
|
||||
})
|
||||
}
|
||||
|
|
@ -509,23 +512,24 @@ function startCheckingNotification (config) {
|
|||
setInterval(checkNotification, CHECK_NOTIFICATION_INTERVAL)
|
||||
}
|
||||
|
||||
function randomCode () {
|
||||
return new BigNumber(crypto.randomBytes(3).toString('hex'), 16).shift(-6).toFixed(6).slice(-6)
|
||||
}
|
||||
|
||||
function getPhoneCode (phone) {
|
||||
return sms.code()
|
||||
.then(pluginCode => {
|
||||
const code = pluginCode === 'mock-sms'
|
||||
? '123'
|
||||
: BigNumber.random().toFixed(6).slice(2)
|
||||
const code = argv.mockSms
|
||||
? '123'
|
||||
: randomCode()
|
||||
|
||||
const rec = {
|
||||
sms: {
|
||||
toNumber: phone,
|
||||
body: 'Your cryptomat code: ' + code
|
||||
}
|
||||
const rec = {
|
||||
sms: {
|
||||
toNumber: phone,
|
||||
body: 'Your cryptomat code: ' + code
|
||||
}
|
||||
}
|
||||
|
||||
return sms.sendMessage(rec)
|
||||
.then(() => code)
|
||||
})
|
||||
return sms.sendMessage(rec)
|
||||
.then(() => code)
|
||||
}
|
||||
|
||||
function fetchPhoneTx (phone) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue