diff --git a/lib/blockchain/monero.js b/lib/blockchain/monero.js index ec53929f..86ca20b1 100644 --- a/lib/blockchain/monero.js +++ b/lib/blockchain/monero.js @@ -14,13 +14,13 @@ function setup (dataDir) { const config = buildConfig(auth) common.writeFile(path.resolve(dataDir, coinRec.configFile), config) const cmd = `/usr/local/bin/${coinRec.daemon} --data-dir ${dataDir} --config-file ${dataDir}/${coinRec.configFile}` - const walletCmd = `/usr/local/bin/${coinRec.wallet} --stagenet --rpc-login ${auth} --daemon-host 127.0.0.1 --daemon-port 38081 --trusted-daemon --daemon-login ${auth} --rpc-bind-port 38083 --wallet-dir ${dataDir}/wallets` + const walletCmd = `/usr/local/bin/${coinRec.wallet} --stagenet --rpc-login ${auth} --daemon-host 127.0.0.1 --daemon-port 18081 --trusted-daemon --daemon-login ${auth} --rpc-bind-port 18082 --wallet-dir ${dataDir}/wallets` common.writeSupervisorConfig(coinRec, cmd, walletCmd) } function buildConfig (auth) { return `rpc-login=${auth} -stagenet=1 +stagenet=0 restricted-rpc=1 db-sync-mode=safe out-peers=20 diff --git a/lib/plugins/wallet/monerod/monerod.js b/lib/plugins/wallet/monerod/monerod.js index ff69c384..f28eca0f 100644 --- a/lib/plugins/wallet/monerod/monerod.js +++ b/lib/plugins/wallet/monerod/monerod.js @@ -17,6 +17,8 @@ const configPath = utils.configPath(cryptoRec, blockchainDir) const walletDir = path.resolve(utils.cryptoDir(cryptoRec, blockchainDir), 'wallets') const unitScale = cryptoRec.unitScale +const SUPPORTS_BATCHING = false + function rpcConfig () { try { const config = jsonRpc.parseConf(configPath) @@ -186,9 +188,9 @@ function cryptoNetwork (account, cryptoCode) { return checkCryptoCode(cryptoCode) .then(() => { switch(parseInt(rpcConfig().port, 10)) { - case 18083: + case 18082: return 'main' - case 28083: + case 28082: return 'test' case 38083: return 'stage' @@ -198,11 +200,17 @@ function cryptoNetwork (account, cryptoCode) { }) } +function supportsBatching (cryptoCode) { + return checkCryptoCode(cryptoCode) + .then(() => SUPPORTS_BATCHING) +} + module.exports = { balance, sendCoins, newAddress, getStatus, newFunding, - cryptoNetwork + cryptoNetwork, + supportsBatching } diff --git a/new-lamassu-admin/src/pages/Wallet/WizardSplash.js b/new-lamassu-admin/src/pages/Wallet/WizardSplash.js index 64ca440b..21f4b966 100644 --- a/new-lamassu-admin/src/pages/Wallet/WizardSplash.js +++ b/new-lamassu-admin/src/pages/Wallet/WizardSplash.js @@ -8,6 +8,7 @@ import { ReactComponent as BitcoinCashLogo } from 'src/styling/logos/icon-bitcoi import { ReactComponent as DashLogo } from 'src/styling/logos/icon-dash-colour.svg' import { ReactComponent as EthereumLogo } from 'src/styling/logos/icon-ethereum-colour.svg' import { ReactComponent as LitecoinLogo } from 'src/styling/logos/icon-litecoin-colour.svg' +import { ReactComponent as MoneroLogo } from 'src/styling/logos/icon-monero-colour.svg' import { ReactComponent as TetherLogo } from 'src/styling/logos/icon-tether-colour.svg' import { ReactComponent as ZCashLogo } from 'src/styling/logos/icon-zcash-colour.svg' @@ -53,6 +54,8 @@ const getLogo = code => { return ZCashLogo case 'USDT': return TetherLogo + case 'XMR': + return MoneroLogo default: return null } diff --git a/new-lamassu-admin/src/styling/logos/icon-monero-colour.svg b/new-lamassu-admin/src/styling/logos/icon-monero-colour.svg new file mode 100644 index 00000000..af777a4d --- /dev/null +++ b/new-lamassu-admin/src/styling/logos/icon-monero-colour.svg @@ -0,0 +1 @@ + \ No newline at end of file