diff --git a/src/App.js b/src/App.js index 2174825..eb87834 100644 --- a/src/App.js +++ b/src/App.js @@ -5,6 +5,15 @@ import Keys from './Keys'; import swal from 'sweetalert'; import './index/index.css'; import ReactDOM from 'react-dom'; +import { error } from 'util'; + +function generateElement(msg){ + let errorNode = document.createElement("div"); + errorNode.innerHTML = `
+ ${msg} +
`; + return errorNode; +} const Loading = () => (
@@ -53,7 +62,15 @@ class App extends Component { console.log(isValid); if(Number(isValid) !== 1){ this.setState({loading:false}); - swal("Warning!", "The key is not valid initial Key! Please make sure you have loaded correct initial key in metamask", "warning"); + const invalidKeyMsg = `The key is not valid initial Key!
+ Please make sure you have loaded correct initial key in metamask.
+ Your current selected key is ${initialKey}` + swal({ + icon: 'error', + title: 'Error', + content: generateElement(invalidKeyMsg) + + }) return; } if(Number(isValid) === 1){ @@ -82,7 +99,7 @@ class App extends Component { var content = document.createElement("div"); content.innerHTML = `
Something went wrong!

- Please contract Master Of Ceremony

+ Please contact Master Of Ceremony

${error.message}
`; swal({ diff --git a/src/addresses.js b/src/addresses.js index 4fbbc53..7b99b33 100644 --- a/src/addresses.js +++ b/src/addresses.js @@ -1,6 +1,3 @@ -const local = { - KEYS_MANAGER_ADDRESS: '0xAfB147E450f0375Bc3e61709B053238f5804C9a6', -} const CORE_ADDRESSES = { KEYS_MANAGER_ADDRESS: '0xfc90125492e58dbfe80c0bfb6a2a759c4f703ca8', } diff --git a/src/getWeb3.js b/src/getWeb3.js index 85981b1..83c7883 100644 --- a/src/getWeb3.js +++ b/src/getWeb3.js @@ -2,6 +2,13 @@ let errorMsgNoMetamaskAccount = `You haven't chosen any account in MetaMask. Please, choose your initial key in MetaMask and reload the page. Check POA Network wiki for more info.`; +let netIdUrlMismatch = (netId) => { + return ` + Your current URL is ${window.location.host}, + however your metamask netId is ${netId} + Please select correct network in metamask + ` +} function generateElement(msg){ let errorNode = document.createElement("div"); @@ -37,9 +44,13 @@ let getWeb3 = () => { netIdName = 'ERROR' errorMsg = `You aren't connected to POA Network. Please, switch on POA plugin and refresh the page. - Check POA Network wiki for more info.` + Check POA Network wiki for more info. + Current Network Id: ${netId}` + console.log('This is an unknown network.', netId) } + const networkUrl = window.location.host.indexOf('sokol') !== -1 ? "77" : "99"; + console.log('network', networkUrl) results = { web3Instance: web3, netIdName, @@ -54,6 +65,9 @@ let getWeb3 = () => { if(errorMsg !== null){ reject({msg: errorMsg, node: generateElement(errorMsg)}) } + if(networkUrl !== netId) { + reject({msg: netIdUrlMismatch(netId), node: generateElement(netIdUrlMismatch(netId))}) + } resolve(results) }) diff --git a/src/keysManager.js b/src/keysManager.js index 2dfc25d..c8622f5 100644 --- a/src/keysManager.js +++ b/src/keysManager.js @@ -8,6 +8,7 @@ export default class KeysManager { let web3_10 = new Web3(web3.currentProvider); const {KEYS_MANAGER_ADDRESS} = networkAddresses(netId); console.log('Keys Manager ', KEYS_MANAGER_ADDRESS); + this.web3_10 = web3_10; this.keysInstance = new web3_10.eth.Contract(KeysManagerAbi, KEYS_MANAGER_ADDRESS); } async isInitialKeyValid(initialKey) { @@ -18,7 +19,8 @@ export default class KeysManager { return await addressGenerator(); } createKeys({mining, voting, payout, sender}){ - return this.keysInstance.methods.createKeys(mining, voting, payout).send({from: sender}) + const gasPrice = this.web3_10.utils.toWei('2', 'gwei') + return this.keysInstance.methods.createKeys(mining, voting, payout).send({from: sender, gasPrice}) } } \ No newline at end of file