Merge branch 'master' into develop

Author: gabmontes

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "metronome-desktop-wallet",
-  "version": "0.11.0",
+  "version": "1.1.0",
   "private": true,
   "author": {
     "name": "Autonomous Software",

package.json

@@ -1,19 +1,19 @@
 {
   "app": {
-    "chain": "ropsten",
+    "chain": "mainnet",
     "node": {
-      "jsonRpcApiUrl": "https://eth.met.bloqrock.net:8545",
-      "websocketApiUrl": "wss://eth.met.bloqrock.net:8546"
+      "jsonRpcApiUrl": "https://eth.wallet.metronome.io:8545",
+      "websocketApiUrl": "wss://eth.wallet.metronome.io:8546"
     },
     "defaultDerivationPath": "m/44'/60'/0'/0",
-    "indexerApiUrl": "https://indexer.met.bloqrock.net",
-    "tracerApiUrl": "https://tracer.met.bloqrock.net"
+    "indexerApiUrl": "https://indexer.metronome.io",
+    "tracerApiUrl": "https://tracer.metronome.io"
   },
   "coincap": {
     "ethPriceEmitRate": 5
   },
   "tokens": {
-    "0xf3e9a687fdf24112745d4d7dee150ba87a07ecc3": {
+    "0xa3d58c4E56fedCae3a7c43A725aeE9A71F0ece4e": {
       "decimals": 18,
       "name": "Metronome",
       "symbol": "MET"

public/main/settings/defaultSettings.json

@@ -1,13 +1,13 @@
 import MetronomeContracts from 'metronome-contracts'
 
-const addresses = MetronomeContracts.addresses[process.env.REACT_APP_ETH_CHAIN || 'ropsten']
-const defaultExplorerUrl = 'https://explorer.met.bloqrock.net'
+const addresses = MetronomeContracts.addresses[process.env.REACT_APP_ETH_CHAIN || 'main']
+const defaultExplorerUrl = 'https://explorer.metronome.io'
 
 export default {
   MET_TOKEN_ADDR: addresses.metToken.toLowerCase(),
   CONVERTER_ADDR: addresses.autonomousConverter.toLowerCase(),
   MET_EXPLORER_URL: process.env.REACT_APP_MET_EXPLORER_URL || defaultExplorerUrl,
-  SENTRY_DSN: process.env.REACT_APP_SENTRY_DSN,
+  SENTRY_DSN: process.env.REACT_APP_SENTRY_DSN  || 'https://d9905c2eec994071935593d4085d3547@sentry.io/290706',
   ETH_DEFAULT_GAS_LIMIT: '21000',
   MET_DEFAULT_GAS_LIMIT: '250000',
   DEFAULT_GAS_PRICE: '1000000000',