(Fix) Don't show addresses if tx from metamask was failed

This commit is contained in:
Roman Storm 2018-01-04 16:46:11 -08:00
parent 536f97c240
commit 6aecd189ee
3 changed files with 29 additions and 11 deletions

View File

@ -32,7 +32,8 @@ class App extends Component {
getWeb3().then((web3Config) => {
this.setState({web3Config})
this.keysManager = new KeysManager({
web3: web3Config.web3Instance
web3: web3Config.web3Instance,
netId: web3Config.netId
});
}).catch((error) => {
if(error.msg){
@ -77,7 +78,7 @@ class App extends Component {
swal("Congratulations!", "Your keys are generated!", "success");
}).catch((error) => {
console.error(error.message);
this.setState({loading: false})
this.setState({loading: false, keysGenerated: false})
var content = document.createElement("div");
content.innerHTML = `<div>
Something went wrong!<br/><br/>

View File

@ -1,3 +1,21 @@
module.exports = {
KEYS_MANAGER_ADDRESS: '0xfc90125492e58dbfe80c0bfb6a2a759c4f703ca8'
const local = {
KEYS_MANAGER_ADDRESS: '0xAfB147E450f0375Bc3e61709B053238f5804C9a6',
}
const CORE_ADDRESSES = {
KEYS_MANAGER_ADDRESS: '0xfc90125492e58dbfe80c0bfb6a2a759c4f703ca8',
}
const SOKOL_ADDRESSES = {
KEYS_MANAGER_ADDRESS: '0x88a34124bfffa27ef3e052c8dd2908e212643771',
}
module.exports = (netId) => {
switch (netId){
case '77':
return SOKOL_ADDRESSES
case '99':
return CORE_ADDRESSES
default:
return CORE_ADDRESSES
}
}

View File

@ -1,15 +1,14 @@
import KeysManagerAbi from './keysManagerAbi.json'
import Web3 from 'web3';
import addressGenerator from './addressGenerator';
import {KEYS_MANAGER_ADDRESS} from './addresses'
import networkAddresses from './addresses'
console.log('Keys Manager ', KEYS_MANAGER_ADDRESS)
export default class KeysManager {
constructor(){
if(window.web3.currentProvider){
let web3_10 = new Web3(window.web3.currentProvider);
this.keysInstance = new web3_10.eth.Contract(KeysManagerAbi, KEYS_MANAGER_ADDRESS);
}
constructor({web3, netId}){
let web3_10 = new Web3(web3.currentProvider);
const {KEYS_MANAGER_ADDRESS} = networkAddresses(netId);
console.log('Keys Manager ', KEYS_MANAGER_ADDRESS);
this.keysInstance = new web3_10.eth.Contract(KeysManagerAbi, KEYS_MANAGER_ADDRESS);
}
async isInitialKeyValid(initialKey) {
return await this.keysInstance.methods.initialKeys(initialKey).call();