From 1f857037bdeb73af14dc8388c5ec161c885278c1 Mon Sep 17 00:00:00 2001
From: Vadim <varasev@gmail.com>
Date: Wed, 10 Oct 2018 18:55:10 +0300
Subject: [PATCH 1/3] (Update) Add support of a new version of MetaMask

Solves https://github.com/poanetwork/poa-dapps-validators/issues/85
---
 src/App.js                                    |   4 +-
 src/Footer.js                                 |   4 +-
 src/Header.js                                 |  13 +-
 src/Loading.js                                |  13 +-
 src/constants.js                              |  30 ++-
 src/contracts/KeysManager.contract.js         |   4 +-
 src/contracts/Metadata.contract.js            |   4 +-
 src/contracts/PoaConsensus.contract.js        |   7 +-
 .../ProofOfPhysicalAddress.contract.js        |   7 +-
 src/contracts/addresses.js                    |  20 +-
 src/contracts/helpers.js                      |  18 +-
 src/getWeb3.js                                | 171 ++++++++----------
 src/helpers.js                                |  12 +-
 src/index.js                                  |  85 ++++-----
 14 files changed, 182 insertions(+), 210 deletions(-)

diff --git a/src/App.js b/src/App.js
index 1c75333..d950cea 100644
--- a/src/App.js
+++ b/src/App.js
@@ -152,7 +152,7 @@ class App extends Component {
       const isValid = await this.getKeysManager().isVotingActive(votingKey)
       console.log(isValid)
       if (isValid) {
-        //   // add loading screen
+        // add loading screen
         await this.sendTxToContract()
       } else {
         this.setState({ loading: false })
@@ -203,7 +203,7 @@ class App extends Component {
   }
   render() {
     const { netId } = this.props.web3Config
-    const classNameHiddenIfNotCoreNetwork = netId !== constants.NETID_CORE ? 'display-none' : ''
+    const classNameHiddenIfNotCoreNetwork = netId !== helpers.netIdByName('core') ? 'display-none' : ''
 
     if (!this.isValidVotingKey) {
       return null
diff --git a/src/Footer.js b/src/Footer.js
index 6dc923e..29746f4 100644
--- a/src/Footer.js
+++ b/src/Footer.js
@@ -1,10 +1,10 @@
 import React from 'react'
 import moment from 'moment'
 import Socials from './Socials'
-import { isTestnet } from './helpers'
+import { constants } from './constants'
 
 const Footer = ({ netId }) => {
-  const footerClassName = isTestnet(netId) ? 'sokol' : ''
+  const footerClassName = netId in constants.NETWORKS && constants.NETWORKS[netId].TESTNET ? 'sokol' : ''
 
   return (
     <footer className={`footer ${footerClassName}`}>
diff --git a/src/Header.js b/src/Header.js
index ff162ac..edbd399 100644
--- a/src/Header.js
+++ b/src/Header.js
@@ -9,16 +9,20 @@ import menuOpenIconSokol from './images/icons/icon-close-sokol.svg'
 import NavigationLinks from './NavigationLinks'
 import MobileMenuLinks from './MobileMenuLinks'
 import { constants } from './constants'
-import { isTestnet } from './helpers'
 
 const Header = ({ netId, onChange, injectedWeb3, showMobileMenu, onMenuToggle, baseRootPath, navigationData }) => {
-  const thisIsTestnet = isTestnet(netId)
+  const thisIsTestnet = netId in constants.NETWORKS && constants.NETWORKS[netId].TESTNET
   const headerClassName = thisIsTestnet ? 'sokol' : ''
   const logoImageName = thisIsTestnet ? logoSokol : logoBase
   const menuIcon = thisIsTestnet ? menuIconSokol : menuIconBase
   const menuOpenIcon = thisIsTestnet ? menuOpenIconSokol : menuOpenIconBase
 
   let select
+  let options = []
+
+  for (const _netId in constants.NETWORKS) {
+    options.push({ value: _netId, label: `Network: ${constants.NETWORKS[_netId].NAME}` })
+  }
 
   if (!injectedWeb3) {
     select = (
@@ -33,10 +37,7 @@ const Header = ({ netId, onChange, injectedWeb3, showMobileMenu, onMenuToggle, b
           width: '150px'
         }}
         clearable={false}
-        options={[
-          { value: constants.NETID_SOKOL, label: 'Network: Sokol' },
-          { value: constants.NETID_CORE, label: 'Network: Core' }
-        ]}
+        options={options}
       />
     )
   }
diff --git a/src/Loading.js b/src/Loading.js
index 11ea1c1..b2a46d0 100644
--- a/src/Loading.js
+++ b/src/Loading.js
@@ -9,16 +9,11 @@ const styles = netId => {
     backgroundColor: 'rgba(47, 109, 99, 0.8)'
   }
 
-  switch (netId) {
-    case constants.NETID_SOKOL:
-    case constants.NETID_DAI_TEST:
-      return sokol
-    case constants.NETID_CORE:
-    case constants.NETID_DAI:
-      return core
-    default:
-      return {}
+  if (netId in constants.NETWORKS) {
+    return constants.NETWORKS[netId].TESTNET ? sokol : core
   }
+
+  return core
 }
 const Loading = ({ netId }) => (
   <div className="loading-container" style={styles(netId)}>
diff --git a/src/constants.js b/src/constants.js
index e8042e7..3089482 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -10,10 +10,32 @@ constants.ABIsSources = {
 }
 constants.userDeniedTransactionPattern = 'User denied transaction'
 
-constants.NETID_SOKOL = '77'
-constants.NETID_CORE = '99'
-constants.NETID_DAI_TEST = '79'
-constants.NETID_DAI = '100'
+constants.NETWORKS = {
+  '77': {
+    NAME: 'Sokol',
+    RPC: 'https://sokol.poa.network',
+    BRANCH: 'sokol',
+    TESTNET: true
+  },
+  '99': {
+    NAME: 'Core',
+    RPC: 'https://core.poa.network',
+    BRANCH: 'core',
+    TESTNET: false
+  },
+  '79': {
+    NAME: 'Dai-Test',
+    RPC: 'https://dai-test.poa.network',
+    BRANCH: 'dai-test',
+    TESTNET: true
+  },
+  '100': {
+    NAME: 'Dai',
+    RPC: 'https://dai.poa.network',
+    BRANCH: 'dai',
+    TESTNET: false
+  }
+}
 
 module.exports = {
   constants
diff --git a/src/contracts/KeysManager.contract.js b/src/contracts/KeysManager.contract.js
index 58e30f7..7344c7e 100644
--- a/src/contracts/KeysManager.contract.js
+++ b/src/contracts/KeysManager.contract.js
@@ -1,4 +1,5 @@
 import Web3 from 'web3'
+import { constants } from '../constants'
 import helpers from './helpers'
 
 export default class KeysManager {
@@ -6,9 +7,8 @@ export default class KeysManager {
     let web3_10 = new Web3(web3.currentProvider)
     const { KEYS_MANAGER_ADDRESS } = addresses
     console.log('Keys Manager address ', KEYS_MANAGER_ADDRESS)
-    const branch = helpers.getBranch(netId)
 
-    let KeysManagerAbi = await helpers.getABI(branch, 'KeysManager')
+    let KeysManagerAbi = await helpers.getABI(constants.NETWORKS[netId].BRANCH, 'KeysManager')
 
     this.keysInstance = new web3_10.eth.Contract(KeysManagerAbi, KEYS_MANAGER_ADDRESS)
   }
diff --git a/src/contracts/Metadata.contract.js b/src/contracts/Metadata.contract.js
index 1429f60..9589abe 100644
--- a/src/contracts/Metadata.contract.js
+++ b/src/contracts/Metadata.contract.js
@@ -4,6 +4,7 @@ import moment from 'moment'
 import helpers from './helpers'
 import helpersGlobal from '../helpers'
 import { messages } from '../messages'
+import { constants } from '../constants'
 
 var toAscii = function(hex) {
   var str = '',
@@ -25,9 +26,8 @@ export default class Metadata {
     this.web3_10 = new Web3(web3.currentProvider)
     const { METADATA_ADDRESS, MOC } = addresses
     console.log('Metadata contract Address: ', METADATA_ADDRESS)
-    const branch = helpers.getBranch(netId)
 
-    let MetadataAbi = await helpers.getABI(branch, 'ValidatorMetadata')
+    const MetadataAbi = await helpers.getABI(constants.NETWORKS[netId].BRANCH, 'ValidatorMetadata')
 
     this.metadataInstance = new this.web3_10.eth.Contract(MetadataAbi, METADATA_ADDRESS)
     this.MOC_ADDRESS = MOC
diff --git a/src/contracts/PoaConsensus.contract.js b/src/contracts/PoaConsensus.contract.js
index b0908e6..ca1afea 100644
--- a/src/contracts/PoaConsensus.contract.js
+++ b/src/contracts/PoaConsensus.contract.js
@@ -1,15 +1,14 @@
 import Web3 from 'web3'
 import helpers from './helpers'
+import { constants } from '../constants'
 
 export default class POAConsensus {
   async init({ web3, netId, addresses }) {
-    let web3_10 = new Web3(web3.currentProvider)
+    const web3_10 = new Web3(web3.currentProvider)
     const { POA_ADDRESS } = addresses
     console.log('POA Address ', POA_ADDRESS)
 
-    const branch = helpers.getBranch(netId)
-
-    let poaConsensusAbi = await helpers.getABI(branch, 'PoaNetworkConsensus')
+    const poaConsensusAbi = await helpers.getABI(constants.NETWORKS[netId].BRANCH, 'PoaNetworkConsensus')
 
     this.poaInstance = new web3_10.eth.Contract(poaConsensusAbi, POA_ADDRESS)
   }
diff --git a/src/contracts/ProofOfPhysicalAddress.contract.js b/src/contracts/ProofOfPhysicalAddress.contract.js
index 9586a3e..2c88a2f 100644
--- a/src/contracts/ProofOfPhysicalAddress.contract.js
+++ b/src/contracts/ProofOfPhysicalAddress.contract.js
@@ -1,18 +1,19 @@
 import Web3 from 'web3'
 import helpers from './helpers'
+import { constants } from '../constants'
 
 const REGISTER_ADDRESS_EVENT_NAME = 'LogAddressRegistered'
 
 export default class ProofOfPhysicalAddress {
   async init({ web3, netId, addresses }) {
-    let web3_10 = new Web3(web3.currentProvider)
+    const web3_10 = new Web3(web3.currentProvider)
     const { PROOF_OF_PHYSICAL_ADDRESS } = addresses
 
-    const branch = helpers.getBranch(netId)
+    const branch = constants.NETWORKS[netId].BRANCH
     if (branch !== 'core') {
       throw new Error(`ProofOfPhysicalAddress contract not deployed on network "${branch}"`)
     }
-    let proofOfPhysicalAddressAbi = await helpers.getABI(branch, 'ProofOfPhysicalAddress')
+    const proofOfPhysicalAddressAbi = await helpers.getABI(branch, 'ProofOfPhysicalAddress')
     this.instance = new web3_10.eth.Contract(proofOfPhysicalAddressAbi, PROOF_OF_PHYSICAL_ADDRESS)
 
     this.getPhysicalAddressesOfWalletAddress = this.getPhysicalAddressesOfWalletAddress.bind(this)
diff --git a/src/contracts/addresses.js b/src/contracts/addresses.js
index 771cb48..d02bf19 100644
--- a/src/contracts/addresses.js
+++ b/src/contracts/addresses.js
@@ -10,25 +10,7 @@ import messages from '../messages'
 }*/
 
 export default web3Config => {
-  let branch
-
-  switch (web3Config.netId) {
-    case constants.NETID_SOKOL:
-      branch = 'sokol'
-      break
-    case constants.NETID_DAI_TEST:
-      branch = 'dai-test'
-      break
-    case constants.NETID_CORE:
-      branch = 'core'
-      break
-    case constants.NETID_DAI:
-      branch = 'dai'
-      break
-    default:
-      branch = 'core'
-      break
-  }
+  const branch = constants.NETWORKS[web3Config.netId].BRANCH
   return new Promise((resolve, reject) => {
     fetch(helpers.addressesURL(branch))
       .then(response => {
diff --git a/src/contracts/helpers.js b/src/contracts/helpers.js
index 42b1d14..640fa4a 100644
--- a/src/contracts/helpers.js
+++ b/src/contracts/helpers.js
@@ -23,26 +23,10 @@ function getABI(branch, contract) {
   })
 }
 
-function getBranch(netId) {
-  switch (netId) {
-    case constants.NETID_SOKOL:
-      return 'sokol'
-    case constants.NETID_DAI_TEST:
-      return 'dai-test'
-    case constants.NETID_CORE:
-      return 'core'
-    case constants.NETID_DAI:
-      return 'dai'
-    default:
-      return 'core'
-  }
-}
-
 const helpers = {
   addressesURL,
   ABIURL,
-  getABI,
-  getBranch
+  getABI
 }
 
 export default helpers
diff --git a/src/getWeb3.js b/src/getWeb3.js
index 4a4bf7d..c0dc156 100644
--- a/src/getWeb3.js
+++ b/src/getWeb3.js
@@ -1,119 +1,100 @@
 import Web3 from 'web3'
+import { netIdByName } from './helpers'
 import { constants } from './constants'
 
-const POA_CORE = { RPC_URL: 'https://core.poa.network', netIdName: 'CORE', netId: constants.NETID_CORE }
-const POA_SOKOL = { RPC_URL: 'https://sokol.poa.network', netIdName: 'SOKOL', netId: constants.NETID_SOKOL }
-const POA_DAI = { RPC_URL: 'https://dai.poa.network', netIdName: 'DAI', netId: constants.NETID_DAI }
-const POA_DAI_TEST = { RPC_URL: 'https://dai-test.poa.network', netIdName: 'DAI-TEST', netId: constants.NETID_DAI_TEST }
+let getNetId = web3 => {
+  return new Promise(function(resolve, reject) {
+    web3.version.getNetwork((err, netId) => {
+      resolve(netId)
+    })
+  })
+}
 
 let getWeb3 = () => {
   return new Promise(function(resolve, reject) {
     // Wait for loading completion to avoid race conditions with web3 injection timing.
-    window.addEventListener('load', function() {
-      var results
-      var web3 = window.web3
+    window.addEventListener('load', async function() {
+      let web3 = null
 
       // Checking if Web3 has been injected by the browser (Mist/MetaMask)
-      if (typeof web3 !== 'undefined') {
-        // Use Mist/MetaMask's provider.
-        var errorMsg = null
-        web3 = new window.Web3(web3.currentProvider)
-        web3.version.getNetwork((err, netId) => {
-          let netIdName
-          console.log('netId', netId)
-          switch (netId) {
-            case constants.NETID_DAI:
-              netIdName = 'Dai'
-              console.log('This is Dai', netId)
-              break
-            case constants.NETID_CORE:
-              netIdName = 'Core'
-              console.log('This is Core', netId)
-              break
-            case constants.NETID_DAI_TEST:
-              netIdName = 'Dai-Test'
-              console.log('This is Dai-Test', netId)
-              break
-            case constants.NETID_SOKOL:
-              netIdName = 'Sokol'
-              console.log('This is Sokol', netId)
-              break
-            default:
-              netIdName = 'ERROR'
-              errorMsg = `You aren't connected to POA Network.
-                  Please, switch to POA network and refresh the page.
-                  Check POA Network <a href='https://github.com/poanetwork/wiki' target='blank'>wiki</a> for more info.`
-              console.log('This is an unknown network.', netId)
-          }
-          document.title = `${netIdName} - POA Validators dApp`
-          var defaultAccount = web3.eth.defaultAccount || null
-          if (errorMsg !== null) {
-            reject({ message: errorMsg })
-          }
-          results = {
-            web3Instance: web3,
-            netIdName,
-            netId,
-            injectedWeb3: true,
-            defaultAccount
-          }
-          resolve(results)
-        })
-
+      if (window.ethereum) {
+        web3 = new window.Web3(window.ethereum)
         console.log('Injected web3 detected.')
+        try {
+          await window.ethereum.enable()
+        } catch (e) {
+          reject({ message: 'You have denied access to your accounts' })
+          return
+        }
+      } else if (window.web3) {
+        web3 = new window.Web3(window.web3.currentProvider)
+        console.log('Injected web3 detected.')
+      }
+
+      let errorMsg = null
+      let netIdName
+      let netId
+      let injectedWeb3 = web3 !== null
+      let defaultAccount = null
+
+      if (web3) {
+        netId = await getNetId(web3)
+        console.log('netId', netId)
+
+        if (!(netId in constants.NETWORKS)) {
+          netIdName = 'ERROR'
+          errorMsg = `You aren't connected to POA Network.
+              Please, switch to POA Network and refresh the page.
+              Check POA Network <a href='https://github.com/poanetwork/wiki' target='blank'>Wiki</a> for more info.`
+          console.log('This is an unknown network.')
+        } else {
+          netIdName = constants.NETWORKS[netId].NAME
+          console.log(`This is ${netIdName}`)
+        }
+
+        defaultAccount = web3.eth.defaultAccount || null
       } else {
         // Fallback to localhost if no web3 injection.
 
-        let network
-        if (window.location.host.indexOf('sokol') !== -1) {
-          network = POA_SOKOL
-        } else if (window.location.host.indexOf('dai-test') !== -1) {
-          network = POA_DAI_TEST
-        } else if (window.location.host.indexOf('dai') !== -1) {
-          network = POA_DAI
-        } else {
-          network = POA_CORE
-        }
-
-        document.title = `${network.netIdName} - POA validators dApp`
-        const provider = new Web3.providers.HttpProvider(network.RPC_URL)
-        let web3 = new Web3(provider)
-
-        results = {
-          web3Instance: web3,
-          netIdName: network.netIdName,
-          netId: network.netId,
-          injectedWeb3: false,
-          defaultAccount: null
-        }
-        resolve(results)
         console.log('No web3 instance injected, using Local web3.')
         console.error('Metamask not found')
+
+        if (window.location.host.indexOf('sokol') !== -1) {
+          netId = netIdByName('sokol')
+        } else if (window.location.host.indexOf('dai-test') !== -1) {
+          netId = netIdByName('dai-test')
+        } else if (window.location.host.indexOf('dai') !== -1) {
+          netId = netIdByName('dai')
+        } else {
+          netId = netIdByName('core')
+        }
+
+        const network = constants.NETWORKS[netId]
+
+        web3 = new Web3(new Web3.providers.HttpProvider(network.RPC))
+        netIdName = network.NAME
       }
+
+      document.title = `${netIdName} - POA Validators DApp`
+
+      if (errorMsg !== null) {
+        reject({ message: errorMsg })
+        return
+      }
+
+      resolve({
+        web3Instance: web3,
+        netId,
+        netIdName,
+        injectedWeb3,
+        defaultAccount
+      })
     })
   })
 }
 
 const setWeb3 = netId => {
-  let network
-  switch (netId) {
-    case constants.NETID_SOKOL:
-      network = POA_SOKOL
-      break
-    case constants.NETID_DAI_TEST:
-      network = POA_DAI_TEST
-      break
-    case constants.NETID_CORE:
-      network = POA_CORE
-      break
-    case constants.NETID_DAI:
-      network = POA_DAI
-      break
-    default:
-      network = POA_CORE
-      break
-  }
-  const provider = new Web3.providers.HttpProvider(network.RPC_URL)
+  const provider = new Web3.providers.HttpProvider(constants.NETWORKS[netId].RPC)
   return new Web3(provider)
 }
 
diff --git a/src/helpers.js b/src/helpers.js
index b294dcb..29d4945 100644
--- a/src/helpers.js
+++ b/src/helpers.js
@@ -11,11 +11,17 @@ function generateAlert(icon, title, msg) {
   })
 }
 
-function isTestnet(netId) {
-  return netId === constants.NETID_SOKOL || netId === constants.NETID_DAI_TEST
+function netIdByName(netName) {
+  const netNameLowerCase = netName.toLowerCase()
+  for (let netId in constants.NETWORKS) {
+    if (constants.NETWORKS[netId].NAME.toLowerCase() === netNameLowerCase) {
+      return netId
+    }
+  }
+  return null
 }
 
 module.exports = {
   generateAlert,
-  isTestnet
+  netIdByName
 }
diff --git a/src/index.js b/src/index.js
index 527cd44..f261cd4 100644
--- a/src/index.js
+++ b/src/index.js
@@ -75,38 +75,15 @@ class AppMainRouter extends Component {
       })
       .then(async config => {
         const { web3Config, addresses } = config
-        const keysManager = new KeysManager()
-        await keysManager.init({
+        await this.loadContracts({
           web3: web3Config.web3Instance,
           netId: web3Config.netId,
           addresses
         })
-        const metadataContract = new Metadata()
-        await metadataContract.init({
-          web3: web3Config.web3Instance,
-          netId: web3Config.netId,
-          addresses
-        })
-        let proofOfPhysicalAddressContract = new ProofOfPhysicalAddress()
-        try {
-          await proofOfPhysicalAddressContract.init({
-            web3: web3Config.web3Instance,
-            netId: web3Config.netId,
-            addresses
-          })
-        } catch (e) {
-          console.error('Error initializing ProofOfPhysicalAddress', e)
-          proofOfPhysicalAddressContract = null
-        }
         this.setState({
           votingKey: web3Config.defaultAccount,
-          miningKey: await keysManager.miningKeyByVoting(web3Config.defaultAccount),
-          keysManager,
-          metadataContract,
-          proofOfPhysicalAddressContract,
-          loading: false,
-          injectedWeb3: web3Config.injectedWeb3,
-          netId: web3Config.netId
+          miningKey: await this.state.keysManager.miningKeyByVoting(web3Config.defaultAccount),
+          injectedWeb3: web3Config.injectedWeb3
         })
       })
       .catch(error => {
@@ -115,6 +92,38 @@ class AppMainRouter extends Component {
         helpers.generateAlert('error', 'Error!', error.message)
       })
   }
+  async loadContracts({ web3, netId, addresses }) {
+    const keysManager = new KeysManager()
+    await keysManager.init({
+      web3,
+      netId,
+      addresses
+    })
+    const metadataContract = new Metadata()
+    await metadataContract.init({
+      web3,
+      netId,
+      addresses
+    })
+    let proofOfPhysicalAddressContract = new ProofOfPhysicalAddress()
+    try {
+      await proofOfPhysicalAddressContract.init({
+        web3,
+        netId,
+        addresses
+      })
+    } catch (e) {
+      console.error('Error initializing ProofOfPhysicalAddress', e)
+      proofOfPhysicalAddressContract = null
+    }
+    this.setState({
+      keysManager,
+      metadataContract,
+      proofOfPhysicalAddressContract,
+      loading: false,
+      netId
+    })
+  }
   onRouteChange() {
     const setMetadata = baseRootPath + '/set'
 
@@ -215,32 +224,24 @@ class AppMainRouter extends Component {
     )
   }
   getNetIdClass() {
-    const netId = this.state.netId
-    return netId === constants.NETID_SOKOL || netId === constants.NETID_DAI_TEST ? 'sokol' : ''
+    const { netId } = this.state
+    if (netId in constants.NETWORKS) {
+      return constants.NETWORKS[netId].TESTNET ? 'sokol' : ''
+    }
+    return ''
   }
   onSearch(term) {
     this.setState({ searchTerm: term.target.value.toLowerCase() })
   }
   async onNetworkChange(e) {
+    this.setState({ loading: true })
+
     const netId = e.value
     const web3 = setWeb3(netId)
 
     networkAddresses({ netId }).then(async config => {
       const { addresses } = config
-      const keysManager = new KeysManager()
-
-      await keysManager.init({
-        web3,
-        netId,
-        addresses
-      })
-      const metadataContract = new Metadata()
-      await metadataContract.init({
-        web3,
-        netId,
-        addresses
-      })
-      this.setState({ netId: e.value, keysManager, metadataContract })
+      await this.loadContracts({ web3, netId, addresses })
     })
   }
   render() {

From 9689c6282f62c83d6d324fb17be1795a4e1c4688 Mon Sep 17 00:00:00 2001
From: Vadim Arasev <varasev@gmail.com>
Date: Thu, 11 Oct 2018 10:08:49 +0300
Subject: [PATCH 2/3] (Fix) Use web3 1.0 by default

---
 src/constants.js                              |  2 +-
 src/contracts/KeysManager.contract.js         | 12 ++++----
 src/contracts/Metadata.contract.js            | 30 +++++++++----------
 src/contracts/PoaConsensus.contract.js        | 14 ++++-----
 .../ProofOfPhysicalAddress.contract.js        |  4 +--
 src/getWeb3.js                                | 14 ++-------
 src/index.js                                  |  8 ++---
 7 files changed, 34 insertions(+), 50 deletions(-)

diff --git a/src/constants.js b/src/constants.js
index 3089482..1b08eb8 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -25,7 +25,7 @@ constants.NETWORKS = {
   },
   '79': {
     NAME: 'Dai-Test',
-    RPC: 'https://dai-test.poa.network',
+    RPC: 'http://40.112.48.125',
     BRANCH: 'dai-test',
     TESTNET: true
   },
diff --git a/src/contracts/KeysManager.contract.js b/src/contracts/KeysManager.contract.js
index 7344c7e..76968cd 100644
--- a/src/contracts/KeysManager.contract.js
+++ b/src/contracts/KeysManager.contract.js
@@ -1,24 +1,22 @@
-import Web3 from 'web3'
 import { constants } from '../constants'
 import helpers from './helpers'
 
 export default class KeysManager {
   async init({ web3, netId, addresses }) {
-    let web3_10 = new Web3(web3.currentProvider)
     const { KEYS_MANAGER_ADDRESS } = addresses
     console.log('Keys Manager address ', KEYS_MANAGER_ADDRESS)
 
-    let KeysManagerAbi = await helpers.getABI(constants.NETWORKS[netId].BRANCH, 'KeysManager')
+    const KeysManagerAbi = await helpers.getABI(constants.NETWORKS[netId].BRANCH, 'KeysManager')
 
-    this.keysInstance = new web3_10.eth.Contract(KeysManagerAbi, KEYS_MANAGER_ADDRESS)
+    this.instance = new web3.eth.Contract(KeysManagerAbi, KEYS_MANAGER_ADDRESS)
   }
   async isVotingActive(votingKey) {
-    return await this.keysInstance.methods.isVotingActive(votingKey).call()
+    return await this.instance.methods.isVotingActive(votingKey).call()
   }
   async miningKeyByVoting(votingKey) {
-    return await this.keysInstance.methods.miningKeyByVoting(votingKey).call()
+    return await this.instance.methods.miningKeyByVoting(votingKey).call()
   }
   async getVotingByMining(miningKey) {
-    return await this.keysInstance.methods.getVotingByMining(miningKey).call()
+    return await this.instance.methods.getVotingByMining(miningKey).call()
   }
 }
diff --git a/src/contracts/Metadata.contract.js b/src/contracts/Metadata.contract.js
index 9589abe..62aa86a 100644
--- a/src/contracts/Metadata.contract.js
+++ b/src/contracts/Metadata.contract.js
@@ -1,5 +1,4 @@
 import PoaConsensus from './PoaConsensus.contract'
-import Web3 from 'web3'
 import moment from 'moment'
 import helpers from './helpers'
 import helpersGlobal from '../helpers'
@@ -23,18 +22,20 @@ var toAscii = function(hex) {
 
 export default class Metadata {
   async init({ web3, netId, addresses }) {
-    this.web3_10 = new Web3(web3.currentProvider)
+    this.web3 = web3
+    this.gasPrice = web3.utils.toWei('2', 'gwei')
+
     const { METADATA_ADDRESS, MOC } = addresses
     console.log('Metadata contract Address: ', METADATA_ADDRESS)
 
     const MetadataAbi = await helpers.getABI(constants.NETWORKS[netId].BRANCH, 'ValidatorMetadata')
 
-    this.metadataInstance = new this.web3_10.eth.Contract(MetadataAbi, METADATA_ADDRESS)
+    this.metadataInstance = new web3.eth.Contract(MetadataAbi, METADATA_ADDRESS)
     this.MOC_ADDRESS = MOC
     this.addresses = addresses
 
     const poaInstance = new PoaConsensus()
-    await poaInstance.init({ web3: this.web3_10, netId, addresses })
+    await poaInstance.init({ web3, netId, addresses })
     this.mocRemoved = await poaInstance.isMasterOfCeremonyRemoved()
     this.miningKeys = await poaInstance.getValidators()
   }
@@ -50,16 +51,15 @@ export default class Metadata {
     hasData
   }) {
     let methodToCall = hasData ? 'changeRequest' : 'createMetadata'
-    const gasPrice = this.web3_10.utils.toWei('2', 'gwei')
     return await this.metadataInstance.methods[methodToCall](
-      this.web3_10.utils.fromAscii(firstName),
-      this.web3_10.utils.fromAscii(lastName),
-      this.web3_10.utils.fromAscii(licenseId),
+      this.web3.utils.fromAscii(firstName),
+      this.web3.utils.fromAscii(lastName),
+      this.web3.utils.fromAscii(licenseId),
       fullAddress,
-      this.web3_10.utils.fromAscii(state),
-      this.web3_10.utils.fromAscii(zipcode),
+      this.web3.utils.fromAscii(state),
+      this.web3.utils.fromAscii(zipcode),
       expirationDate
-    ).send({ from: votingKey, gasPrice })
+    ).send({ from: votingKey, gasPrice: this.gasPrice })
   }
 
   getMocData() {
@@ -180,10 +180,9 @@ export default class Metadata {
           Please ask other validators to verify your new information.`
       }
     }
-    const gasPrice = this.web3_10.utils.toWei('2', 'gwei')
     return await this.metadataInstance.methods
       .confirmPendingChange(miningKeyToConfirm)
-      .send({ from: senderVotingKey, gasPrice })
+      .send({ from: senderVotingKey, gasPrice: this.gasPrice })
   }
 
   async getConfirmations({ miningKey }) {
@@ -208,7 +207,8 @@ export default class Metadata {
           The minimum threshold to finalize is ${getMinThreshold}.`
       }
     }
-    const gasPrice = this.web3_10.utils.toWei('2', 'gwei')
-    return await this.metadataInstance.methods.finalize(miningKeyToConfirm).send({ from: senderVotingKey, gasPrice })
+    return await this.metadataInstance.methods
+      .finalize(miningKeyToConfirm)
+      .send({ from: senderVotingKey, gasPrice: this.gasPrice })
   }
 }
diff --git a/src/contracts/PoaConsensus.contract.js b/src/contracts/PoaConsensus.contract.js
index ca1afea..0038686 100644
--- a/src/contracts/PoaConsensus.contract.js
+++ b/src/contracts/PoaConsensus.contract.js
@@ -1,24 +1,22 @@
-import Web3 from 'web3'
 import helpers from './helpers'
 import { constants } from '../constants'
 
-export default class POAConsensus {
+export default class PoaConsensus {
   async init({ web3, netId, addresses }) {
-    const web3_10 = new Web3(web3.currentProvider)
     const { POA_ADDRESS } = addresses
     console.log('POA Address ', POA_ADDRESS)
 
     const poaConsensusAbi = await helpers.getABI(constants.NETWORKS[netId].BRANCH, 'PoaNetworkConsensus')
 
-    this.poaInstance = new web3_10.eth.Contract(poaConsensusAbi, POA_ADDRESS)
+    this.instance = new web3.eth.Contract(poaConsensusAbi, POA_ADDRESS)
   }
   async getValidators() {
-    console.log(this.poaInstance)
-    return await this.poaInstance.methods.getValidators().call()
+    console.log(this.instance)
+    return await this.instance.methods.getValidators().call()
   }
   async isMasterOfCeremonyRemoved() {
-    if (this.poaInstance.methods.isMasterOfCeremonyRemoved) {
-      return await this.poaInstance.methods.isMasterOfCeremonyRemoved().call()
+    if (this.instance.methods.isMasterOfCeremonyRemoved) {
+      return await this.instance.methods.isMasterOfCeremonyRemoved().call()
     }
     return false
   }
diff --git a/src/contracts/ProofOfPhysicalAddress.contract.js b/src/contracts/ProofOfPhysicalAddress.contract.js
index 2c88a2f..f8d4f72 100644
--- a/src/contracts/ProofOfPhysicalAddress.contract.js
+++ b/src/contracts/ProofOfPhysicalAddress.contract.js
@@ -1,4 +1,3 @@
-import Web3 from 'web3'
 import helpers from './helpers'
 import { constants } from '../constants'
 
@@ -6,7 +5,6 @@ const REGISTER_ADDRESS_EVENT_NAME = 'LogAddressRegistered'
 
 export default class ProofOfPhysicalAddress {
   async init({ web3, netId, addresses }) {
-    const web3_10 = new Web3(web3.currentProvider)
     const { PROOF_OF_PHYSICAL_ADDRESS } = addresses
 
     const branch = constants.NETWORKS[netId].BRANCH
@@ -14,7 +12,7 @@ export default class ProofOfPhysicalAddress {
       throw new Error(`ProofOfPhysicalAddress contract not deployed on network "${branch}"`)
     }
     const proofOfPhysicalAddressAbi = await helpers.getABI(branch, 'ProofOfPhysicalAddress')
-    this.instance = new web3_10.eth.Contract(proofOfPhysicalAddressAbi, PROOF_OF_PHYSICAL_ADDRESS)
+    this.instance = new web3.eth.Contract(proofOfPhysicalAddressAbi, PROOF_OF_PHYSICAL_ADDRESS)
 
     this.getPhysicalAddressesOfWalletAddress = this.getPhysicalAddressesOfWalletAddress.bind(this)
     this.getAllEvents = this.getAllEvents.bind(this)
diff --git a/src/getWeb3.js b/src/getWeb3.js
index c0dc156..2955202 100644
--- a/src/getWeb3.js
+++ b/src/getWeb3.js
@@ -2,14 +2,6 @@ import Web3 from 'web3'
 import { netIdByName } from './helpers'
 import { constants } from './constants'
 
-let getNetId = web3 => {
-  return new Promise(function(resolve, reject) {
-    web3.version.getNetwork((err, netId) => {
-      resolve(netId)
-    })
-  })
-}
-
 let getWeb3 = () => {
   return new Promise(function(resolve, reject) {
     // Wait for loading completion to avoid race conditions with web3 injection timing.
@@ -18,7 +10,7 @@ let getWeb3 = () => {
 
       // Checking if Web3 has been injected by the browser (Mist/MetaMask)
       if (window.ethereum) {
-        web3 = new window.Web3(window.ethereum)
+        web3 = new Web3(window.ethereum)
         console.log('Injected web3 detected.')
         try {
           await window.ethereum.enable()
@@ -27,7 +19,7 @@ let getWeb3 = () => {
           return
         }
       } else if (window.web3) {
-        web3 = new window.Web3(window.web3.currentProvider)
+        web3 = new Web3(window.web3.currentProvider)
         console.log('Injected web3 detected.')
       }
 
@@ -38,7 +30,7 @@ let getWeb3 = () => {
       let defaultAccount = null
 
       if (web3) {
-        netId = await getNetId(web3)
+        netId = await web3.eth.net.getId()
         console.log('netId', netId)
 
         if (!(netId in constants.NETWORKS)) {
diff --git a/src/index.js b/src/index.js
index f261cd4..eea9252 100644
--- a/src/index.js
+++ b/src/index.js
@@ -75,7 +75,7 @@ class AppMainRouter extends Component {
       })
       .then(async config => {
         const { web3Config, addresses } = config
-        await this.loadContracts({
+        await this.initContracts({
           web3: web3Config.web3Instance,
           netId: web3Config.netId,
           addresses
@@ -92,7 +92,7 @@ class AppMainRouter extends Component {
         helpers.generateAlert('error', 'Error!', error.message)
       })
   }
-  async loadContracts({ web3, netId, addresses }) {
+  async initContracts({ web3, netId, addresses }) {
     const keysManager = new KeysManager()
     await keysManager.init({
       web3,
@@ -241,12 +241,10 @@ class AppMainRouter extends Component {
 
     networkAddresses({ netId }).then(async config => {
       const { addresses } = config
-      await this.loadContracts({ web3, netId, addresses })
+      await this.initContracts({ web3, netId, addresses })
     })
   }
   render() {
-    console.log('v2.09')
-
     const search = this.state.showSearch ? (
       <div className={`search-container ${this.getNetIdClass()}`}>
         <div className="container">

From 2f9c30953c3cb1cca0d4c01d0e738407b856c6f7 Mon Sep 17 00:00:00 2001
From: Vadim Arasev <varasev@gmail.com>
Date: Thu, 11 Oct 2018 11:45:28 +0300
Subject: [PATCH 3/3] (Fix) Use web3.eth.getAccounts() instead of
 web3.eth.defaultAccount

---
 src/getWeb3.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/getWeb3.js b/src/getWeb3.js
index 2955202..7be5eaf 100644
--- a/src/getWeb3.js
+++ b/src/getWeb3.js
@@ -44,7 +44,9 @@ let getWeb3 = () => {
           console.log(`This is ${netIdName}`)
         }
 
-        defaultAccount = web3.eth.defaultAccount || null
+        const accounts = await web3.eth.getAccounts()
+
+        defaultAccount = accounts[0] || null
       } else {
         // Fallback to localhost if no web3 injection.