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

Fixing some bugs and minor changes

Browse source
This commit is contained in:
José Oliveira 2021-01-27 12:22:53 +00:00 • committed by Josh Harvey
parent 7accdaa84f
commit ea1c29ebba
5 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/new-admin/config/accounts.js
View file

@ -1,4 +1,6 @@
const _ = require('lodash/fp') const _ = require('lodash/fp')
const { ALL } = require('../../plugins/common/ccxt')
const { COINS, ALL_CRYPTOS } = require('./coins') const { COINS, ALL_CRYPTOS } = require('./coins')
const { BTC, BCH, DASH, ETH, LTC, ZEC } = COINS const { BTC, BCH, DASH, ETH, LTC, ZEC } = COINS
@ -13,11 +15,11 @@ const EMAIL = 'email'
const ZERO_CONF = 'zeroConf' const ZERO_CONF = 'zeroConf'
const ALL_ACCOUNTS = [ const ALL_ACCOUNTS = [
{ code: 'bitpay', display: 'Bitpay', class: TICKER, cryptos: [BTC, BCH] }, { code: 'bitpay', display: 'Bitpay', class: TICKER, cryptos: ALL['bitpay'].CRYPTO },
{ code: 'kraken', display: 'Kraken', class: TICKER, cryptos: [BTC, ETH, LTC, DASH, ZEC, BCH] }, { code: 'kraken', display: 'Kraken', class: TICKER, cryptos: ALL['kraken'].CRYPTO },
{ code: 'bitstamp', display: 'Bitstamp', class: TICKER, cryptos: [BTC, ETH, LTC, BCH] }, { code: 'bitstamp', display: 'Bitstamp', class: TICKER, cryptos: ALL['bitstamp'].CRYPTO },
{ code: 'coinbase', display: 'Coinbase', class: TICKER, cryptos: [BTC, ETH, LTC, DASH, ZEC, BCH] }, { code: 'coinbase', display: 'Coinbase', class: TICKER, cryptos: ALL['coinbase'].CRYPTO },
{ code: 'itbit', display: 'itBit', class: TICKER, cryptos: [BTC, ETH] }, { code: 'itbit', display: 'itBit', class: TICKER, cryptos: ALL['itbit'].CRYPTO },
{ code: 'mock-ticker', display: 'Mock (Caution!)', class: TICKER, cryptos: ALL_CRYPTOS, dev: true }, { code: 'mock-ticker', display: 'Mock (Caution!)', class: TICKER, cryptos: ALL_CRYPTOS, dev: true },
{ code: 'bitcoind', display: 'bitcoind', class: WALLET, cryptos: [BTC] }, { code: 'bitcoind', display: 'bitcoind', class: WALLET, cryptos: [BTC] },
{ code: 'no-layer2', display: 'No Layer 2', class: LAYER_2, cryptos: ALL_CRYPTOS }, { code: 'no-layer2', display: 'No Layer 2', class: LAYER_2, cryptos: ALL_CRYPTOS },
@ -28,9 +30,9 @@ const ALL_ACCOUNTS = [
{ code: 'dashd', display: 'dashd', class: WALLET, cryptos: [DASH] }, { code: 'dashd', display: 'dashd', class: WALLET, cryptos: [DASH] },
{ code: 'bitcoincashd', display: 'bitcoincashd', class: WALLET, cryptos: [BCH] }, { code: 'bitcoincashd', display: 'bitcoincashd', class: WALLET, cryptos: [BCH] },
{ code: 'bitgo', display: 'BitGo', class: WALLET, cryptos: [BTC, ZEC, LTC, BCH, DASH] }, { code: 'bitgo', display: 'BitGo', class: WALLET, cryptos: [BTC, ZEC, LTC, BCH, DASH] },
{ code: 'bitstamp', display: 'Bitstamp', class: EXCHANGE, cryptos: [BTC, ETH, LTC, BCH] }, { code: 'bitstamp', display: 'Bitstamp', class: EXCHANGE, cryptos: ALL['bitstamp'].CRYPTO },
{ code: 'itbit', display: 'itBit', class: EXCHANGE, cryptos: [BTC, ETH] }, { code: 'itbit', display: 'itBit', class: EXCHANGE, cryptos: ALL['itbit'].CRYPTO },
{ code: 'kraken', display: 'Kraken', class: EXCHANGE, cryptos: [BTC, ETH, LTC, DASH, ZEC, BCH] }, { code: 'kraken', display: 'Kraken', class: EXCHANGE, cryptos: ALL['kraken'].CRYPTO },
{ code: 'mock-wallet', display: 'Mock (Caution!)', class: WALLET, cryptos: ALL_CRYPTOS, dev: true }, { code: 'mock-wallet', display: 'Mock (Caution!)', class: WALLET, cryptos: ALL_CRYPTOS, dev: true },
{ code: 'no-exchange', display: 'No exchange', class: EXCHANGE, cryptos: ALL_CRYPTOS }, { code: 'no-exchange', display: 'No exchange', class: EXCHANGE, cryptos: ALL_CRYPTOS },
{ code: 'mock-exchange', display: 'Mock exchange', class: EXCHANGE, cryptos: ALL_CRYPTOS, dev: true }, { code: 'mock-exchange', display: 'Mock exchange', class: EXCHANGE, cryptos: ALL_CRYPTOS, dev: true },

7
lib/plugins/common/ccxt.js
View file

@ -29,4 +29,9 @@ function buildMarket (fiatCode, cryptoCode, serviceName) {
return cryptoCode + '/' + fiatCode return cryptoCode + '/' + fiatCode
} }
module.exports = { buildMarket, ALL } function verifyFiatSupport (fiatCode, serviceName) {
const fiat = ALL[serviceName].FIAT
return fiat === 'ALL_CURRENCIES' ? true : _.includes(fiatCode, fiat)
}
module.exports = { buildMarket, ALL, verifyFiatSupport }

6
lib/plugins/exchange/itbit.js
View file

@ -1,11 +1,11 @@
const _ = require('lodash/fp') const _ = require('lodash/fp')
const { ORDER_TYPES } = require('./consts') const { ORDER_TYPES } = require('./consts')
const { COINS } = require('../../new-admin/config/coins') // para cada exchange const { COINS } = require('../../new-admin/config/coins')
const ORDER_TYPE = ORDER_TYPES.LIMIT const ORDER_TYPE = ORDER_TYPES.LIMIT
const { BTC, ETH, LTC, BCH } = COINS const { BTC, ETH } = COINS
const CRYPTO = [BTC, ETH, LTC, BCH] const CRYPTO = [BTC, ETH]
const FIAT = ['USD'] const FIAT = ['USD']
const AMOUNT_PRECISION = 4 const AMOUNT_PRECISION = 4

3
lib/plugins/ticker/bitpay.js
View file

@ -1,7 +1,8 @@
const axios = require('axios') const axios = require('axios')
const BN = require('../../bn') const BN = require('../../bn')
const { BTC, BCH } = require('../../new-admin/config/coins') const { COINS } = require('../../new-admin/config/coins')
const { BTC, BCH } = COINS
const CRYPTO = [BTC, BCH] const CRYPTO = [BTC, BCH]
const FIAT = 'ALL_CURRENCIES' const FIAT = 'ALL_CURRENCIES'

4
lib/plugins/ticker/ccxt.js
View file

@ -3,11 +3,11 @@ const axios = require('axios')
const ccxt = require('ccxt') const ccxt = require('ccxt')
const BN = require('../../bn') const BN = require('../../bn')
const { buildMarket } = require('../common/ccxt') const { buildMarket, verifyFiatSupport } = require('../common/ccxt')
function ticker (fiatCode, cryptoCode, tickerName) { function ticker (fiatCode, cryptoCode, tickerName) {
const ticker = new ccxt[tickerName]({ timeout: 3000 }) const ticker = new ccxt[tickerName]({ timeout: 3000 })
if (fiatCode === 'EUR' || fiatCode === 'USD' || ticker.id === 'coinbase') { if (verifyFiatSupport) {
return getCurrencyRates(ticker, fiatCode, cryptoCode) return getCurrencyRates(ticker, fiatCode, cryptoCode)
} }