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

fix up eth 0-conf

Browse source
This commit is contained in:
Josh Harvey 2017-10-23 16:11:25 +03:00
parent 18a702dbf8
commit e847425244
4 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
bin/lamassu-display-config.js Normal file
View file

@ -0,0 +1,12 @@
const settingsLoader = require('../lib/settings-loader')
const pp = require('../lib/pp')
settingsLoader.loadLatest()
.then(r => {
pp('config')(r)
process.exit(0)
})
.catch(e => {
console.log(e.stack)
process.exit(1)
})

4
lib/admin/config.js
View file

@ -186,8 +186,8 @@ function fetchData () {
{code: 'mock-id-verify', display: 'Mock ID verifier', class: 'idVerifier'},
{code: 'twilio', display: 'Twilio', class: 'sms'},
{code: 'mailjet', display: 'Mailjet', class: 'email'},
{code: 'all-zero-conf', display: 'All pass', class: 'zeroConf', cryptos: ALL_CRYPTOS},
{code: 'no-zero-conf', display: 'None pass', class: 'zeroConf', cryptos: ALL_CRYPTOS},
{code: 'all-zero-conf', display: 'Always 0-conf', class: 'zeroConf', cryptos: ['BTC', 'ZEC', 'LTC', 'DASH']},
{code: 'no-zero-conf', display: 'Always 1-conf', class: 'zeroConf', cryptos: ALL_CRYPTOS},
{code: 'blockcypher', display: 'Blockcypher', class: 'zeroConf', cryptos: ['BTC']},
{code: 'mock-zero-conf', display: 'Mock 0-conf', class: 'zeroConf', cryptos: ['BTC', 'ZEC', 'LTC', 'DASH']}
],

1
lib/routes.js
View file

@ -67,7 +67,6 @@ function poll (req, res, next) {
cassettes,
twoWayMode: config.cashOutEnabled,
zeroConfLimit: config.zeroConfLimit,
fiatTxLimit: config.cashOutTransactionLimit,
reboot
}

14
lib/settings-loader.js
View file

@ -182,6 +182,14 @@ function populateScopes (schema) {
return _.map(r => _.assign(scopeLookup[r.code], r), schema.fields)
}
function cryptoDefaultOverride (cryptoCode, code, defaultValue) {
if (cryptoCode === 'ETH' && code === 'zeroConf') {
return 'no-zero-conf'
}
return defaultValue
}
function cryptoCodeDefaults (schema, cryptoCode) {
const scope = {crypto: cryptoCode, machine: 'global'}
@ -190,13 +198,15 @@ function cryptoCodeDefaults (schema, cryptoCode) {
const cryptoSpecificFields = _.filter(hasCryptoSpecificDefault, schemaEntries)
return _.map(r => {
return configAddField(scope, r.code, r.fieldType, r.fieldClass, r.default)
const defaultValue = cryptoDefaultOverride(cryptoCode, r.code, r.default)
return configAddField(scope, r.code, r.fieldType, r.fieldClass, defaultValue)
}, cryptoSpecificFields)
}
function addCryptoDefaults (oldConfig, newFields) {
const cryptoCodeEntries = _.filter(v => v.fieldLocator.code === 'cryptoCurrencies', newFields)
const cryptoCodes = _.map(v => v.fieldValue.value, cryptoCodeEntries)
const cryptoCodes = _.map(_.get('fieldValue.value'), cryptoCodeEntries)
const uniqueCryptoCodes = _.uniq(_.flatten(cryptoCodes))
const mapDefaults = cryptoCode => cryptoCodeDefaults(schema, cryptoCode)