Merge pull request #1065 from chaotixkilla/fix-monero-setup-issues

Fix XMR setup

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

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
 }

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
   }

new-lamassu-admin/src/styling/logos/icon-monero-colour.svg

@@ -0,0 +1 @@
+<svg width="2500" height="2500" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M127.998 0C57.318 0 0 57.317 0 127.999c0 14.127 2.29 27.716 6.518 40.43H44.8V60.733l83.2 83.2 83.198-83.2v107.695h38.282c4.231-12.714 6.521-26.303 6.521-40.43C256 57.314 198.681 0 127.998 0" fill="#F60"/><path d="M108.867 163.062l-36.31-36.311v67.765H18.623c22.47 36.863 63.051 61.48 109.373 61.48s86.907-24.617 109.374-61.48h-53.933V126.75l-36.31 36.31-19.13 19.129-19.128-19.128h-.002z" fill="#4C4C4C"/></svg>