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

fixes

Browse source
This commit is contained in:
Josh Harvey 2016-11-28 03:34:18 +02:00
parent ee0eecbd30
commit 48a9f9d204
14 changed files with 186 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/app.js
View file

@ -7,7 +7,7 @@ const loop = require('reoccur')
const routes = require('./routes')
const plugins = require('./plugins')
const logger = require('./logger')
var argv = require('minimist')(process.argv.slice(2))
const argv = require('minimist')(process.argv.slice(2))
const settingsLoader = require('./settings-loader')
const options = require('./options')
@ -32,11 +32,8 @@ function runOnce () {
const app = express()
const localApp = express()
const seedPath = options.seedPath || './seeds/seed.txt'
plugins.init(seedPath)
return settingsLoader.load()
.then(settings => {
.then(() => {
plugins.startPolling()
plugins.startCheckingNotification()

8
lib/email.js
View file

@ -4,15 +4,15 @@ const settingsLoader = require('./settings-loader')
function sendMessage (rec) {
return Promise.resolve()
.then(() => {
const settings = settingsLoader.settings
const settings = settingsLoader.settings()
const pluginCode = configManager.unscoped(settings.config).extraServices.email
if (!pluginCode) throw new Error('No email plugin defined')
const account = settings.accounts.plugin
const plugin = require('lamassu-' + plugin)
const account = settings.accounts[pluginCode]
const plugin = require('lamassu-' + pluginCode)
return plugin.sendMessage(account, rec)
})
}
module.exports({sendMessage})
module.exports = {sendMessage}

24
lib/exchange.js
View file

@ -1,13 +1,20 @@
const configManager = require('./config-manager')
const settingsLoader = require('./settings-loader')
function noExchangeError (cryptoCode) {
const err = new Error('No exchange plugin defined for: ' + cryptoCode)
err.name = 'NoExchangeError'
return err
}
function fetchExchange (cryptoCode) {
return Promise.resolve()
.then(() => {
const settings = settingsLoader.settings
const plugin = configManager.cryptoScoped(cryptoCode, settings.config).cryptoServices.wallet
if (!plugin) throw new Error('No exchange plugin defined for: ' + cryptoCode)
const account = settings.accounts.plugin
const settings = settingsLoader.settings()
const plugin = configManager.cryptoScoped(cryptoCode, settings.config).cryptoServices.exchange
if (!plugin) throw noExchangeError(cryptoCode)
const account = settings.accounts[plugin]
const exchange = require('lamassu-' + plugin)
return {exchange, account}
@ -24,14 +31,7 @@ function sell (cryptoAtoms, fiatCode, cryptoCode) {
.then(r => r.exchange.sell(r.account, cryptoAtoms, fiatCode, cryptoCode))
}
function active (cryptoCode) {
return fetchExchange(cryptoCode)
.then(() => true)
.catch(() => false)
}
module.exports = {
buy,
sell,
active
sell
}

2
lib/logger.js
View file

@ -7,7 +7,7 @@ var logLevel = typeof process.env.LAMASSU_ENV === 'string'
const logger = new winston.Logger({
level: logLevel,
transports: [
new (winston.transports.Console)({colorize: true})
new (winston.transports.Console)({timestamp: true, colorize: true})
]
})

4
lib/notifier.js
View file

@ -4,7 +4,7 @@ const prettyMs = require('pretty-ms')
const numeral = require('numeral')
const configManager = require('./config-manager')
const settingsLoader = require('./settingsLoader')
const settingsLoader = require('./settings-loader')
const db = require('./postgresql_interface')
const STALE_STATE = 2 * 60 * 1000
@ -27,7 +27,7 @@ function sameState (a, b) {
}
function checkBalance (rec) {
const settings = settingsLoader.settings
const settings = settingsLoader.settings()
const config = configManager.unscoped(settings.config)
const lowBalanceThreshold = config.notifications.lowBalanceThreshold
return lowBalanceThreshold && rec.fiatBalance < lowBalanceThreshold

110
lib/plugins.js
View file

@ -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) {

2
lib/postgresql_interface.js
View file

@ -351,7 +351,7 @@ exports.updateTxStatus = function updateTxStatus (tx, status) {
})
}
exports.updateRedeem = function updateRedeem (txId) {
exports.registerRedeem = function registerRedeem (txId) {
const sql = 'UPDATE cash_out_txs SET redeem=$1 WHERE id=$2'
const values = [true, txId]

17
lib/routes.js
View file

@ -9,7 +9,7 @@ const configManager = require('./config-manager')
const db = require('./db')
const dbm = require('./postgresql_interface')
const pairing = require('./pairing')
const settingsLoader = require('./settings')
const settingsLoader = require('./settings-loader')
let plugins
@ -27,12 +27,12 @@ function poll (req, res, next) {
const deviceId = req.deviceId
const deviceTime = req.deviceTime
const pid = req.query.pid
const settings = settingsLoader.settings
const settings = settingsLoader.settings()
const config = configManager.machineScoped(deviceId, settings.config)
pids[deviceId] = {pid, ts: Date.now()}
plugins.pollQueries(settings, deviceTime, deviceId, req.query)
plugins.pollQueries(deviceTime, deviceId, req.query)
.then(results => {
const cartridges = results.cartridges
@ -40,7 +40,7 @@ function poll (req, res, next) {
const langs = config.languages.machineLanguages
const locale = {
fiatCode: config.currencies.fiatCode,
fiatCode: config.currencies.fiatCurrency,
localeInfo: {
primaryLocale: langs[0],
primaryLocales: langs
@ -248,7 +248,10 @@ function updateCachedAction (req, body, status) {
}
function errorHandler (err, req, res, next) {
const statusCode = err.code || 500
const statusCode = err.name === 'HttpError'
? err.code || 500
: 500
const json = {error: err.message}
logger.error(err)
@ -301,9 +304,9 @@ function authorize (req, res, next) {
return next()
}
throw new Error('Unauthorized')
throw httpError('Unauthorized', 403)
})
.catch(e => res.status(403).end())
.catch(next)
}
function init (opts) {

12
lib/settings-loader.js
View file

@ -2,7 +2,7 @@ const R = require('ramda')
const db = require('./db')
let settings
let settingsCache
function load () {
return Promise.all([
@ -10,15 +10,15 @@ function load () {
loadAccounts()
])
.then(function ([data, accounts]) {
settings = {
settingsCache = {
config: data.data,
accounts: accounts
}
return settings
return settingsCache
})
.catch(err => {
settings = undefined
settingsCache = undefined
throw err
})
}
@ -34,6 +34,10 @@ function loadAccounts () {
})
}
function settings () {
return settingsCache
}
module.exports = {
settings,
load

8
lib/sms.js
View file

@ -4,15 +4,15 @@ const settingsLoader = require('./settings-loader')
function sendMessage (rec) {
return Promise.resolve()
.then(() => {
const settings = settingsLoader.settings
const settings = settingsLoader.settings()
const pluginCode = configManager.unscoped(settings.config).extraServices.sms
if (!pluginCode) throw new Error('No sms plugin defined')
const account = settings.accounts.plugin
const plugin = require('lamassu-' + plugin)
const account = settings.accounts[pluginCode]
const plugin = require('lamassu-' + pluginCode)
return plugin.sendMessage(account, rec)
})
}
module.exports({sendMessage})
module.exports = {sendMessage}

4
lib/ticker.js
View file

@ -6,10 +6,10 @@ const FETCH_INTERVAL = 10000
function getRates (fiatCode, cryptoCode) {
return Promise.resolve()
.then(() => {
const settings = settingsLoader.settings
const settings = settingsLoader.settings()
const config = settings.config
const plugin = configManager.cryptoScoped(cryptoCode, config).cryptoServices.ticker
const account = settings.accounts.plugin
const account = settings.accounts[plugin]
const ticker = require('lamassu-' + plugin)
return ticker.ticker(account, fiatCode, cryptoCode)

8
lib/wallet.js
View file

@ -7,9 +7,9 @@ const FETCH_INTERVAL = 5000
function fetchWallet (cryptoCode) {
return Promise.resolve()
.then(() => {
const settings = settingsLoader.settings
const settings = settingsLoader.settings()
const plugin = configManager.cryptoScoped(cryptoCode, settings.config).cryptoServices.wallet
const account = settings.accounts.plugin
const account = settings.accounts[plugin]
const wallet = require('lamassu-' + plugin)
return {wallet, account}
@ -38,9 +38,9 @@ function newAddress (cryptoCode, info) {
.then(r => r.wallet.newAddress(r.account, cryptoCode, info))
}
function getStatus (toAdress, cryptoAtoms, cryptoCode) {
function getStatus (toAddress, cryptoAtoms, cryptoCode) {
return fetchWallet(cryptoCode)
.then(r => r.wallet.getStatus(r.account, toAdress, cryptoAtoms, cryptoCode))
.then(r => r.wallet.getStatus(r.account, toAddress, cryptoAtoms, cryptoCode))
}
module.exports = {