diff --git a/lib/admin/funding.js b/lib/admin/funding.js index 456c814f..12a9f9bd 100644 --- a/lib/admin/funding.js +++ b/lib/admin/funding.js @@ -5,7 +5,6 @@ const configManager = require('./config-manager') const wallet = require('../wallet') const ticker = require('../ticker') const { utils } = require('lamassu-coins') -// const coinUtils = require('../coin-utils') const machineLoader = require('../machine-loader') module.exports = {getFunding} diff --git a/lib/blockchain/bitcoin.js b/lib/blockchain/bitcoin.js index 1c725fd7..f4a966b5 100644 --- a/lib/blockchain/bitcoin.js +++ b/lib/blockchain/bitcoin.js @@ -1,7 +1,6 @@ const path = require('path') const { utils } = require('lamassu-coins') -// const coinUtils = require('../coin-utils') const common = require('./common') diff --git a/lib/blockchain/bitcoincash.js b/lib/blockchain/bitcoincash.js index 1a4ef11d..98cba208 100644 --- a/lib/blockchain/bitcoincash.js +++ b/lib/blockchain/bitcoincash.js @@ -1,7 +1,6 @@ const path = require('path') const { utils } = require('lamassu-coins') -// const coinUtils = require('../coin-utils') const common = require('./common') diff --git a/lib/blockchain/dash.js b/lib/blockchain/dash.js index 79ea6dee..5b8bd696 100644 --- a/lib/blockchain/dash.js +++ b/lib/blockchain/dash.js @@ -1,7 +1,6 @@ const path = require('path') const { utils } = require('lamassu-coins') -// const coinUtils = require('../coin-utils') const common = require('./common') diff --git a/lib/blockchain/ethereum.js b/lib/blockchain/ethereum.js index 19e837a5..b4190620 100644 --- a/lib/blockchain/ethereum.js +++ b/lib/blockchain/ethereum.js @@ -1,5 +1,4 @@ const { utils } = require('lamassu-coins') -// const coinUtils = require('../coin-utils') const common = require('./common') diff --git a/lib/blockchain/litecoin.js b/lib/blockchain/litecoin.js index 8b003b74..d0fc9705 100644 --- a/lib/blockchain/litecoin.js +++ b/lib/blockchain/litecoin.js @@ -1,7 +1,6 @@ const path = require('path') const { utils } = require('lamassu-coins') -// const coinUtils = require('../coin-utils') const common = require('./common') diff --git a/lib/blockchain/zcash.js b/lib/blockchain/zcash.js index 9e3dfffb..f148e4ef 100644 --- a/lib/blockchain/zcash.js +++ b/lib/blockchain/zcash.js @@ -1,7 +1,6 @@ const path = require('path') const { utils } = require('lamassu-coins') -// const coinUtils = require('../coin-utils') const common = require('./common') diff --git a/lib/config-migration.js b/lib/config-migration.js index 740b9af2..60a950a6 100644 --- a/lib/config-migration.js +++ b/lib/config-migration.js @@ -1,7 +1,6 @@ const _ = require('lodash/fp') const uuid = require('uuid') const { COINS } = require('lamassu-coins') -// const { COINS } = require('../lib/new-admin/config/coins') const { scopedValue } = require('./admin/config-manager') const GLOBAL = 'global' diff --git a/lib/new-admin/config/coins.js b/lib/new-admin/config/coins.js deleted file mode 100644 index fe347abf..00000000 --- a/lib/new-admin/config/coins.js +++ /dev/null @@ -1,23 +0,0 @@ -const _ = require('lodash/fp') - -const COINS = { - BTC: 'BTC', - ETH: 'ETH', - LTC: 'LTC', - DASH: 'DASH', - ZEC: 'ZEC', - BCH: 'BCH' -} - -const COIN_LIST = [ - { code: COINS.BTC, display: 'Bitcoin' }, - { code: COINS.ETH, display: 'Ethereum' }, - { code: COINS.LTC, display: 'Litecoin' }, - { code: COINS.DASH, display: 'Dash' }, - { code: COINS.ZEC, display: 'Zcash' }, - { code: COINS.BCH, display: 'Bitcoin Cash' } -] - -const ALL_CRYPTOS = _.keys(COINS) - -module.exports = { COINS, ALL_CRYPTOS, COIN_LIST } diff --git a/lib/new-admin/config/index.js b/lib/new-admin/config/index.js index 12b53ae8..735fcb43 100644 --- a/lib/new-admin/config/index.js +++ b/lib/new-admin/config/index.js @@ -1,7 +1,6 @@ const _ = require('lodash/fp') const { COIN_LIST: coins } = require('lamassu-coins') -// const { COIN_LIST: coins } = require('./coins') const { ACCOUNT_LIST: accounts } = require('./accounts') const countries = require('../../../data/countries.json') diff --git a/lib/notifier/utils.js b/lib/notifier/utils.js index 15465d7a..fcbd8ad0 100644 --- a/lib/notifier/utils.js +++ b/lib/notifier/utils.js @@ -3,7 +3,7 @@ const crypto = require('crypto') const numeral = require('numeral') const prettyMs = require('pretty-ms') -const coinUtils = require('../coin-utils') +const { utils } = require('lamassu-coins') const { CODES_DISPLAY, NETWORK_DOWN_TIME, @@ -94,7 +94,7 @@ function sendNoAlerts (plugins, smsEnabled, emailEnabled) { const buildTransactionMessage = (tx, rec, highValueTx, machineName, customer) => { const isCashOut = tx.direction === 'cashOut' const direction = isCashOut ? 'Cash Out' : 'Cash In' - const crypto = `${coinUtils.toUnit(tx.cryptoAtoms, tx.cryptoCode)} ${ + const crypto = `${utils.toUnit(tx.cryptoAtoms, tx.cryptoCode)} ${ tx.cryptoCode }` const fiat = `${tx.fiat} ${tx.fiatCode}` diff --git a/lib/plugins/common/ccxt.js b/lib/plugins/common/ccxt.js index 0a0ed232..3ead7673 100644 --- a/lib/plugins/common/ccxt.js +++ b/lib/plugins/common/ccxt.js @@ -1,10 +1,10 @@ +const { COINS } = require('lamassu-coins') const _ = require('lodash/fp') const kraken = require('../exchange/kraken') const bitstamp = require('../exchange/bitstamp') const itbit = require('../exchange/itbit') const bitpay = require('../ticker/bitpay') -const { COINS } = require('../../new-admin/config/coins') const { BTC, BCH, DASH, ETH, LTC, ZEC } = COINS const ALL = { diff --git a/lib/plugins/exchange/bitstamp.js b/lib/plugins/exchange/bitstamp.js index e8945cd5..d4cedc62 100644 --- a/lib/plugins/exchange/bitstamp.js +++ b/lib/plugins/exchange/bitstamp.js @@ -1,7 +1,7 @@ +const { COINS } = require('lamassu-coins') const _ = require('lodash/fp') const { ORDER_TYPES } = require('./consts') -const { COINS } = require('../../new-admin/config/coins') const ORDER_TYPE = ORDER_TYPES.MARKET const { BTC, ETH, LTC, BCH } = COINS diff --git a/lib/plugins/exchange/bitstamp/bitstamp.js b/lib/plugins/exchange/bitstamp/bitstamp.js index 1891ed28..ebb626ee 100644 --- a/lib/plugins/exchange/bitstamp/bitstamp.js +++ b/lib/plugins/exchange/bitstamp/bitstamp.js @@ -1,6 +1,5 @@ const common = require('../../common/bitstamp') const { utils } = require('lamassu-coins') -// const coinUtils = require('../../../coin-utils') function buy (account, cryptoAtoms, fiatCode, cryptoCode) { return trade('buy', account, cryptoAtoms, fiatCode, cryptoCode) diff --git a/lib/plugins/exchange/ccxt.js b/lib/plugins/exchange/ccxt.js index 7ab27794..7d8601cd 100644 --- a/lib/plugins/exchange/ccxt.js +++ b/lib/plugins/exchange/ccxt.js @@ -1,7 +1,7 @@ +const { toUnit } = require('lamassu-coins') const _ = require('lodash/fp') const ccxt = require('ccxt') -const { toUnit } = require('../../coin-utils') const { buildMarket, ALL, isConfigValid } = require('../common/ccxt') const { ORDER_TYPES } = require('./consts') diff --git a/lib/plugins/exchange/itbit.js b/lib/plugins/exchange/itbit.js index 57e6522c..2e4062f0 100644 --- a/lib/plugins/exchange/itbit.js +++ b/lib/plugins/exchange/itbit.js @@ -1,7 +1,7 @@ const _ = require('lodash/fp') const { ORDER_TYPES } = require('./consts') -const { COINS } = require('../../new-admin/config/coins') +const { COINS } = require('lamassu-coins') const ORDER_TYPE = ORDER_TYPES.LIMIT const { BTC, ETH } = COINS diff --git a/lib/plugins/exchange/itbit/itbit.js b/lib/plugins/exchange/itbit/itbit.js index c16d5eae..80592d13 100644 --- a/lib/plugins/exchange/itbit/itbit.js +++ b/lib/plugins/exchange/itbit/itbit.js @@ -1,6 +1,5 @@ const common = require('../../common/itbit') const { utils } = require('lamassu-coins') -// const coinUtils = require('../../../coin-utils') exports.buy = function (account, cryptoAtoms, fiatCode, cryptoCode) { return trade('buy', account, cryptoAtoms, fiatCode, cryptoCode) diff --git a/lib/plugins/exchange/kraken.js b/lib/plugins/exchange/kraken.js index 6a5ff6ca..239c96aa 100644 --- a/lib/plugins/exchange/kraken.js +++ b/lib/plugins/exchange/kraken.js @@ -1,7 +1,7 @@ const _ = require('lodash/fp') const { ORDER_TYPES } = require('./consts') -const { COINS } = require('../../new-admin/config/coins') +const { COINS } = require('lamassu-coins') const ORDER_TYPE = ORDER_TYPES.MARKET const { BTC, BCH, DASH, ETH, LTC, ZEC } = COINS diff --git a/lib/plugins/exchange/kraken/kraken.js b/lib/plugins/exchange/kraken/kraken.js index 5a06f15f..ca3c4872 100644 --- a/lib/plugins/exchange/kraken/kraken.js +++ b/lib/plugins/exchange/kraken/kraken.js @@ -4,7 +4,6 @@ const _ = require('lodash/fp') const common = require('../../common/kraken') const { utils } = require('lamassu-coins') -// const coinUtils = require('../../../coin-utils') var PAIRS = common.PAIRS diff --git a/lib/plugins/ticker/bitpay.js b/lib/plugins/ticker/bitpay.js index d43b3442..937f8ef8 100644 --- a/lib/plugins/ticker/bitpay.js +++ b/lib/plugins/ticker/bitpay.js @@ -1,7 +1,7 @@ const axios = require('axios') +const { COINS } = require('lamassu-coins') const BN = require('../../bn') -const { COINS } = require('../../new-admin/config/coins') const { BTC, BCH } = COINS const CRYPTO = [BTC, BCH] diff --git a/lib/plugins/wallet/bitcoincashd/bitcoincashd.js b/lib/plugins/wallet/bitcoincashd/bitcoincashd.js index 06d07327..7fda2f06 100644 --- a/lib/plugins/wallet/bitcoincashd/bitcoincashd.js +++ b/lib/plugins/wallet/bitcoincashd/bitcoincashd.js @@ -4,7 +4,6 @@ const jsonRpc = require('../../common/json-rpc') const BN = require('../../../bn') const E = require('../../../error') const { utils } = require('lamassu-coins') -// const coinUtils = require('../../../coin-utils') const cryptoRec = utils.getCryptoCurrency('BCH') const configPath = utils.configPath(cryptoRec) diff --git a/lib/plugins/wallet/bitcoind/bitcoind.js b/lib/plugins/wallet/bitcoind/bitcoind.js index f0c88393..84f96912 100644 --- a/lib/plugins/wallet/bitcoind/bitcoind.js +++ b/lib/plugins/wallet/bitcoind/bitcoind.js @@ -4,7 +4,6 @@ const jsonRpc = require('../../common/json-rpc') const BN = require('../../../bn') const E = require('../../../error') const { utils } = require('lamassu-coins') -// const coinUtils = require('../../../coin-utils') const cryptoRec = utils.getCryptoCurrency('BTC') const configPath = utils.configPath(cryptoRec) diff --git a/lib/plugins/wallet/dashd/dashd.js b/lib/plugins/wallet/dashd/dashd.js index c92ae6f5..d30945f6 100644 --- a/lib/plugins/wallet/dashd/dashd.js +++ b/lib/plugins/wallet/dashd/dashd.js @@ -2,7 +2,6 @@ const _ = require('lodash/fp') const jsonRpc = require('../../common/json-rpc') const { utils } = require('lamassu-coins') -// const coinUtils = require('../../../coin-utils') const BN = require('../../../bn') const E = require('../../../error') diff --git a/lib/plugins/wallet/geth/geth.js b/lib/plugins/wallet/geth/geth.js index 14bcb352..63e0fd95 100644 --- a/lib/plugins/wallet/geth/geth.js +++ b/lib/plugins/wallet/geth/geth.js @@ -1,7 +1,6 @@ const base = require('./base') const { utils } = require('lamassu-coins') -// const coinUtils = require('../../../coin-utils') const cryptoRec = utils.getCryptoCurrency('ETH') const defaultPort = cryptoRec.defaultPort diff --git a/lib/plugins/wallet/litecoind/litecoind.js b/lib/plugins/wallet/litecoind/litecoind.js index cf9661ad..f6c7350e 100644 --- a/lib/plugins/wallet/litecoind/litecoind.js +++ b/lib/plugins/wallet/litecoind/litecoind.js @@ -2,7 +2,6 @@ const _ = require('lodash/fp') const jsonRpc = require('../../common/json-rpc') const { utils } = require('lamassu-coins') -// const coinUtils = require('../../../coin-utils') const BN = require('../../../bn') const E = require('../../../error') diff --git a/lib/plugins/wallet/lnd/lnd.js b/lib/plugins/wallet/lnd/lnd.js index 1cbeadcb..5a5daa35 100644 --- a/lib/plugins/wallet/lnd/lnd.js +++ b/lib/plugins/wallet/lnd/lnd.js @@ -3,7 +3,6 @@ const lnd = require('lnd-async') const BN = require('../../../bn') const E = require('../../../error') const { utils } = require('lamassu-coins') -// const coinUtils = require('../../../coin-utils') const options = require('../../../options') const _ = require('lodash/fp') diff --git a/lib/plugins/wallet/mock-wallet/mock-wallet.js b/lib/plugins/wallet/mock-wallet/mock-wallet.js index 91700e99..6ff6c569 100644 --- a/lib/plugins/wallet/mock-wallet/mock-wallet.js +++ b/lib/plugins/wallet/mock-wallet/mock-wallet.js @@ -1,7 +1,6 @@ const BN = require('../../../bn') const E = require('../../../error') const { utils } = require('lamassu-coins') -// const coinUtils = require('../../../coin-utils') const NAME = 'FakeWallet' diff --git a/lib/plugins/wallet/zcashd/zcashd.js b/lib/plugins/wallet/zcashd/zcashd.js index 68e0b0d1..a44fe7bc 100644 --- a/lib/plugins/wallet/zcashd/zcashd.js +++ b/lib/plugins/wallet/zcashd/zcashd.js @@ -3,7 +3,6 @@ const pRetry = require('p-retry') const jsonRpc = require('../../common/json-rpc') const { utils } = require('lamassu-coins') -// const coinUtils = require('../../../coin-utils') const BN = require('../../../bn') const E = require('../../../error') diff --git a/new-lamassu-admin/src/pages/Customers/components/TransactionsList.js b/new-lamassu-admin/src/pages/Customers/components/TransactionsList.js index f4b6f93e..0306d981 100644 --- a/new-lamassu-admin/src/pages/Customers/components/TransactionsList.js +++ b/new-lamassu-admin/src/pages/Customers/components/TransactionsList.js @@ -8,7 +8,6 @@ import DataTable from 'src/components/tables/DataTable' import { H3, H4, Label1, Label2, P } from 'src/components/typography' import { ReactComponent as TxInIcon } from 'src/styling/icons/direction/cash-in.svg' import { ReactComponent as TxOutIcon } from 'src/styling/icons/direction/cash-out.svg' -// import { toUnit } from 'src/utils/coin' import { ifNotNull } from 'src/utils/nullCheck' import { formatDate } from 'src/utils/timezones' diff --git a/new-lamassu-admin/src/pages/Funding.js b/new-lamassu-admin/src/pages/Funding.js index 1a6931de..420db7aa 100644 --- a/new-lamassu-admin/src/pages/Funding.js +++ b/new-lamassu-admin/src/pages/Funding.js @@ -23,7 +23,6 @@ import { } from 'src/components/typography' import CopyToClipboard from 'src/pages/Transactions/CopyToClipboard' import { primaryColor } from 'src/styling/variables' -// import { formatCryptoAddress } from 'src/utils/coin' import styles from './Funding.styles' diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js index 9dcb849e..7ef372c2 100644 --- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js +++ b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js @@ -23,7 +23,6 @@ import { ReactComponent as Download } from 'src/styling/icons/button/download/zo import { ReactComponent as TxInIcon } from 'src/styling/icons/direction/cash-in.svg' import { ReactComponent as TxOutIcon } from 'src/styling/icons/direction/cash-out.svg' import { URI } from 'src/utils/apollo' -// import { toUnit, formatCryptoAddress } from 'src/utils/coin' import { onlyFirstToUpper } from 'src/utils/string' import CopyToClipboard from './CopyToClipboard'