Merge branch 'master' into build-int
commit1ba7ccd6b5c1529f9232ee6cd5adf24e0d95fbd1
authorChris Johnson <chris@cjohnson.io>
dateWed 13 Mar 2019, 17:06 (8 years ago)
parentb283733632f406
src/Bridge.js+1−1
@@ -82,7 +82,7 @@ class Bridge extends React.Component {
8282
8383 // if (process.env.NODE_ENV === 'development') {
8484 //
85− // const socket = 'ws://localhost:8545'
85+ // const socket = 'wss://localhost:8545'
8686 // const provider = new Web3.providers.WebsocketProvider(socket)
8787 // const web3 = new Web3(provider)
8888 // const contracts = azimuth.initContracts(web3, CONTRACT_ADDRESSES.DEV)
src/views/Network.js+1−1
@@ -45,7 +45,7 @@ class Network extends React.Component {
4545 if (network === NETWORK_NAMES.LOCAL) {
4646 setNetworkType(network)
4747
48− const endpoint = 'ws://localhost:8545'
48+ const endpoint = 'wss://localhost:8545'
4949 const provider = new Web3.providers.WebsocketProvider(endpoint)
5050 const web3 = new Web3(provider)
5151 const contracts = azimuth.initContracts(web3, CONTRACT_ADDRESSES.DEV)