git.iko.soy/bridge
on master help sign in
Merge branch 'master' into build-int
1ba7ccdChris Johnson
src/Bridge.js+1−1
compare with master
unifiedsplit
@@ -82,7 +82,7 @@ class Bridge extends React.Component {
82
82
83 // if (process.env.NODE_ENV === 'development') {
83 // if (process.env.NODE_ENV === 'development') {
84 //
84 //
85− // const socket = 'ws://localhost:8545'
85+ // const socket = 'wss://localhost:8545'
86 // const provider = new Web3.providers.WebsocketProvider(socket)
86 // const provider = new Web3.providers.WebsocketProvider(socket)
87 // const web3 = new Web3(provider)
87 // const web3 = new Web3(provider)
88 // const contracts = azimuth.initContracts(web3, CONTRACT_ADDRESSES.DEV)
88 // const contracts = azimuth.initContracts(web3, CONTRACT_ADDRESSES.DEV)
src/views/Network.js+1−1
@@ -45,7 +45,7 @@ class Network extends React.Component {
45 if (network === NETWORK_NAMES.LOCAL) {
45 if (network === NETWORK_NAMES.LOCAL) {
46 setNetworkType(network)
46 setNetworkType(network)
47
47
48− const endpoint = 'ws://localhost:8545'
48+ const endpoint = 'wss://localhost:8545'
49 const provider = new Web3.providers.WebsocketProvider(endpoint)
49 const provider = new Web3.providers.WebsocketProvider(endpoint)
50 const web3 = new Web3(provider)
50 const web3 = new Web3(provider)
51 const contracts = azimuth.initContracts(web3, CONTRACT_ADDRESSES.DEV)
51 const contracts = azimuth.initContracts(web3, CONTRACT_ADDRESSES.DEV)