From 9bf408b4e3982bc1c7103aaa302d5016a1a1de8e Mon Sep 17 00:00:00 2001 From: viktor Date: Wed, 6 Dec 2017 20:14:05 -0800 Subject: [PATCH] Support of mainnet contracts --- assets/javascripts/application.js | 21 +- .../application/checkInitialKey.js | 2 +- assets/javascripts/application/createKeys.js | 5 + assets/javascripts/application/index.js | 14 +- assets/javascripts/config.json | 700 +----------------- assets/javascripts/modules.js | 10 +- index.html | 4 +- 7 files changed, 36 insertions(+), 720 deletions(-) mode change 100755 => 100644 assets/javascripts/application.js diff --git a/assets/javascripts/application.js b/assets/javascripts/application.js old mode 100755 new mode 100644 index fc4399c..594ab2d --- a/assets/javascripts/application.js +++ b/assets/javascripts/application.js @@ -101,7 +101,7 @@ function checkInitialKey(web3, initialKey, contractAddr, abi, cb) { } console.log(initialKey.toLowerCase()) - return KeysStorage.methods.checkInitialKey(initialKey.toLowerCase()).call({from: web3.eth.defaultAccount}); + return KeysStorage.methods.initialKeys(initialKey.toLowerCase()).call({from: web3.eth.defaultAccount}); } //check current network page is connected to. Alerts, if not Oracles network async function checkNetworkVersion(web3, cb) { @@ -228,6 +228,11 @@ function createKeys(web3, keys, contractAddr, abi) { var gasPrice = web3.utils.toWei(new web3.utils.BN(1), 'gwei') var opts = {from: web3.eth.defaultAccount, gasPrice: gasPrice} + + console.log(opts); + console.log("0x" + keys.miningKey.miningKeyObject.address, + "0x" + keys.payoutKey.payoutKeyObject.address, + "0x" + keys.votingKey.votingKeyObject.address) return KeysStorage.methods.createKeys("0x" + keys.miningKey.miningKeyObject.address, "0x" + keys.payoutKey.payoutKeyObject.address, @@ -327,7 +332,7 @@ function startDapp(web3, isOraclesNetwork) { ) .then(function(_isNew) { console.log(_isNew) - if (!_isNew) swal("Warning", "Current key isn't valid initial key. Please, choose your initial key in MetaMask and reload the page. Check Oracles network wiki for more info.", "warning"); + if (_isNew != 1) swal("Warning", "Current key isn't valid initial key. Please, choose your initial key in MetaMask and reload the page. Check Oracles network wiki for more info.", "warning"); }) .catch(function(err) { swal(err.title, err.message, "error") @@ -374,7 +379,7 @@ function startDapp(web3, isOraclesNetwork) { config.Ethereum[config.environment].KeysStorage.abi ) .then(function(_isNew) { - if (!_isNew) return swal("Error", "Initial key is already activated or isn't valid", "error"); + if (_isNew != 1) return swal("Error", "Initial key is already activated or isn't valid", "error"); $(".loading-container").show(); @@ -394,8 +399,8 @@ function startDapp(web3, isOraclesNetwork) { function generateProductionsKeys(config, initialKey) { console.log(config) generateAddresses(keys, function(_keys) { - fillContractData(config, _keys) - .then(function(reciept) { + //fillContractData(config, _keys) + //.then(function(reciept) { $(".content").hide(); $('.waiting-container').show(); $('.waiting-container').empty(); @@ -415,13 +420,13 @@ function startDapp(web3, isOraclesNetwork) { if (err.type != "REQUEST_REJECTED") swal("Error", "Error in addresses addition to contract", "error"); return; }) - }) - .catch(function(err) { + //}) + /*.catch(function(err) { loadingFinished(); console.log(err.message); if (err.type != "REQUEST_REJECTED") swal("Error", "Error in addresses addition to contract", "error"); return; - }) + })*/ }); } diff --git a/assets/javascripts/application/checkInitialKey.js b/assets/javascripts/application/checkInitialKey.js index 050e91b..0bfa90b 100755 --- a/assets/javascripts/application/checkInitialKey.js +++ b/assets/javascripts/application/checkInitialKey.js @@ -7,5 +7,5 @@ function checkInitialKey(web3, initialKey, contractAddr, abi, cb) { } console.log(initialKey.toLowerCase()) - return KeysStorage.methods.checkInitialKey(initialKey.toLowerCase()).call({from: web3.eth.defaultAccount}); + return KeysStorage.methods.initialKeys(initialKey.toLowerCase()).call({from: web3.eth.defaultAccount}); } \ No newline at end of file diff --git a/assets/javascripts/application/createKeys.js b/assets/javascripts/application/createKeys.js index dd6449a..ae4d521 100755 --- a/assets/javascripts/application/createKeys.js +++ b/assets/javascripts/application/createKeys.js @@ -8,6 +8,11 @@ function createKeys(web3, keys, contractAddr, abi) { var gasPrice = web3.utils.toWei(new web3.utils.BN(1), 'gwei') var opts = {from: web3.eth.defaultAccount, gasPrice: gasPrice} + + console.log(opts); + console.log("0x" + keys.miningKey.miningKeyObject.address, + "0x" + keys.payoutKey.payoutKeyObject.address, + "0x" + keys.votingKey.votingKeyObject.address) return KeysStorage.methods.createKeys("0x" + keys.miningKey.miningKeyObject.address, "0x" + keys.payoutKey.payoutKeyObject.address, diff --git a/assets/javascripts/application/index.js b/assets/javascripts/application/index.js index 001e9fe..d0f9902 100644 --- a/assets/javascripts/application/index.js +++ b/assets/javascripts/application/index.js @@ -30,7 +30,7 @@ function startDapp(web3, isOraclesNetwork) { ) .then(function(_isNew) { console.log(_isNew) - if (!_isNew) swal("Warning", "Current key isn't valid initial key. Please, choose your initial key in MetaMask and reload the page. Check Oracles network wiki for more info.", "warning"); + if (_isNew != 1) swal("Warning", "Current key isn't valid initial key. Please, choose your initial key in MetaMask and reload the page. Check Oracles network wiki for more info.", "warning"); }) .catch(function(err) { swal(err.title, err.message, "error") @@ -77,7 +77,7 @@ function startDapp(web3, isOraclesNetwork) { config.Ethereum[config.environment].KeysStorage.abi ) .then(function(_isNew) { - if (!_isNew) return swal("Error", "Initial key is already activated or isn't valid", "error"); + if (_isNew != 1) return swal("Error", "Initial key is already activated or isn't valid", "error"); $(".loading-container").show(); @@ -97,8 +97,8 @@ function startDapp(web3, isOraclesNetwork) { function generateProductionsKeys(config, initialKey) { console.log(config) generateAddresses(keys, function(_keys) { - fillContractData(config, _keys) - .then(function(reciept) { + //fillContractData(config, _keys) + //.then(function(reciept) { $(".content").hide(); $('.waiting-container').show(); $('.waiting-container').empty(); @@ -118,13 +118,13 @@ function startDapp(web3, isOraclesNetwork) { if (err.type != "REQUEST_REJECTED") swal("Error", "Error in addresses addition to contract", "error"); return; }) - }) - .catch(function(err) { + //}) + /*.catch(function(err) { loadingFinished(); console.log(err.message); if (err.type != "REQUEST_REJECTED") swal("Error", "Error in addresses addition to contract", "error"); return; - }) + })*/ }); } diff --git a/assets/javascripts/config.json b/assets/javascripts/config.json index 65aeb21..be9a609 100755 --- a/assets/javascripts/config.json +++ b/assets/javascripts/config.json @@ -5,705 +5,11 @@ "live": { "ValidatorsManager": { "addr": "0xbbeeea48d60b8c24eaefa334a503509e23d5e515", - "abi": [ - { - "constant": true, - "inputs": [], - "name": "validatorsStorage", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "keysManager", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "keysStorage", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "miningKey", - "type": "address" - }, - { - "name": "zip", - "type": "uint256" - }, - { - "name": "licenseExpiredAt", - "type": "uint256" - }, - { - "name": "licenseID", - "type": "string" - }, - { - "name": "fullName", - "type": "string" - }, - { - "name": "streetName", - "type": "string" - }, - { - "name": "state", - "type": "string" - } - ], - "name": "insertValidatorFromCeremony", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "owner", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "miningKey", - "type": "address" - }, - { - "name": "zip", - "type": "uint256" - }, - { - "name": "licenseExpiredAt", - "type": "uint256" - }, - { - "name": "licenseID", - "type": "string" - }, - { - "name": "fullName", - "type": "string" - }, - { - "name": "streetName", - "type": "string" - }, - { - "name": "state", - "type": "string" - } - ], - "name": "upsertValidatorFromGovernance", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "validatorsStorageAddr", - "type": "address" - }, - { - "name": "keysStorageAddr", - "type": "address" - }, - { - "name": "keysManagerAddr", - "type": "address" - } - ], - "name": "initialize", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - } - ] + "abi": [{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"pendingChanges","outputs":[{"name":"firstName","type":"bytes32"},{"name":"lastName","type":"bytes32"},{"name":"licenseId","type":"bytes32"},{"name":"fullAddress","type":"string"},{"name":"state","type":"bytes32"},{"name":"zipcode","type":"uint256"},{"name":"expirationDate","type":"uint256"},{"name":"createdDate","type":"uint256"},{"name":"updatedDate","type":"uint256"},{"name":"minThreshold","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getBallotsStorage","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"confirmations","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_miningKey","type":"address"}],"name":"finalize","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"getTime","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"_votingKey","type":"address"}],"name":"getMiningByVotingKey","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_firstName","type":"bytes32"},{"name":"_lastName","type":"bytes32"},{"name":"_licenseId","type":"bytes32"},{"name":"_fullAddress","type":"string"},{"name":"_state","type":"bytes32"},{"name":"_zipcode","type":"uint256"},{"name":"_expirationDate","type":"uint256"}],"name":"changeRequest","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"getKeysManager","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_miningKey","type":"address"}],"name":"confirmPendingChange","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"proxyStorage","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getMinThreshold","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_firstName","type":"bytes32"},{"name":"_lastName","type":"bytes32"},{"name":"_licenseId","type":"bytes32"},{"name":"_fullAddress","type":"string"},{"name":"_state","type":"bytes32"},{"name":"_zipcode","type":"uint256"},{"name":"_expirationDate","type":"uint256"}],"name":"createMetadata","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"cancelPendingChange","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"validators","outputs":[{"name":"firstName","type":"bytes32"},{"name":"lastName","type":"bytes32"},{"name":"licenseId","type":"bytes32"},{"name":"fullAddress","type":"string"},{"name":"state","type":"bytes32"},{"name":"zipcode","type":"uint256"},{"name":"expirationDate","type":"uint256"},{"name":"createdDate","type":"uint256"},{"name":"updatedDate","type":"uint256"},{"name":"minThreshold","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[{"name":"_proxyStorage","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"miningKey","type":"address"}],"name":"MetadataCreated","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"miningKey","type":"address"}],"name":"ChangeRequestInitiated","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"miningKey","type":"address"}],"name":"CancelledRequest","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"miningKey","type":"address"},{"indexed":false,"name":"votingSender","type":"address"}],"name":"Confirmed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"miningKey","type":"address"}],"name":"FinalizedChange","type":"event"}] }, "KeysStorage": { - "addr": "0xeb1352fa30033da7f2a7b50a033ed47ef4b178a6", - "abi": [ - { - "constant": true, - "inputs": [ - { - "name": "votingKey", - "type": "address" - } - ], - "name": "getMiningByVoting", - "outputs": [ - { - "name": "miningKey", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "miningKeys", - "outputs": [ - { - "name": "isActive", - "type": "bool" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "validatorsStorage", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "miningKey", - "type": "address" - } - ], - "name": "getVotingByMining", - "outputs": [ - { - "name": "votingKey", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "key", - "type": "address" - } - ], - "name": "checkInitialKey", - "outputs": [ - { - "name": "value", - "type": "bool" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "miningKey", - "type": "address" - }, - { - "name": "payoutKey", - "type": "address" - } - ], - "name": "setMiningPayoutKeysPair", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "payoutKeys", - "outputs": [ - { - "name": "isActive", - "type": "bool" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "miningKey", - "type": "address" - }, - { - "name": "votingKey", - "type": "address" - } - ], - "name": "setMiningVotingKeysPair", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "licensesIssued", - "outputs": [ - { - "name": "", - "type": "int8" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "increaseLicenses", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "keysManager", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_payoutKey", - "type": "address" - }, - { - "name": "_isActive", - "type": "bool" - } - ], - "name": "setPayoutKey", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "ballotsManager", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "initialKeys", - "outputs": [ - { - "name": "isNew", - "type": "bool" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "miningKey", - "type": "address" - } - ], - "name": "getPayoutByMining", - "outputs": [ - { - "name": "payoutKey", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "owner", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "key", - "type": "address" - } - ], - "name": "addInitialKey", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "validatorsManager", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "addr", - "type": "address" - } - ], - "name": "checkMiningKeyValidity", - "outputs": [ - { - "name": "value", - "type": "bool" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "initialKeysIssued", - "outputs": [ - { - "name": "", - "type": "int8" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "miningAddr", - "type": "address" - }, - { - "name": "payoutAddr", - "type": "address" - }, - { - "name": "votingAddr", - "type": "address" - } - ], - "name": "createKeys", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "votingKeys", - "outputs": [ - { - "name": "isActive", - "type": "bool" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getLicensesIssuedFromGovernance", - "outputs": [ - { - "name": "licensesIssuedFromGovernance", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "votingKey", - "type": "address" - }, - { - "name": "miningKey", - "type": "address" - } - ], - "name": "setVotingMiningKeysPair", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "addr", - "type": "address" - } - ], - "name": "checkPayoutKeyValidity", - "outputs": [ - { - "name": "value", - "type": "bool" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "miningToSecondaryKeys", - "outputs": [ - { - "name": "votingKey", - "type": "address" - }, - { - "name": "payoutKey", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_votingKey", - "type": "address" - }, - { - "name": "_isActive", - "type": "bool" - } - ], - "name": "setVotingKey", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "votingMiningKeysPair", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "addr", - "type": "address" - } - ], - "name": "checkVotingKeyValidity", - "outputs": [ - { - "name": "value", - "type": "bool" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "initialKeysInvalidated", - "outputs": [ - { - "name": "", - "type": "int8" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "keysManagerAddr", - "type": "address" - }, - { - "name": "ballotsManagerAddr", - "type": "address" - }, - { - "name": "validatorsStorageAddr", - "type": "address" - }, - { - "name": "validatorsManagerAddr", - "type": "address" - } - ], - "name": "initialize", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - } - ] + "addr": "0xb95A26dFf3ba4C777c1880814255272bBdFbBfdb", + "abi": [{"constant":false,"inputs":[{"name":"_miningKey","type":"address"}],"name":"removePayoutKey","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_miningKey","type":"address"}],"name":"removeVotingKey","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_miningKey","type":"address"}],"name":"getVotingByMining","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"getMiningKeyByVoting","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_key","type":"address"}],"name":"addMiningKey","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"poaNetworkConsensus","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"miningKeyHistory","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getVotingToChangeKeys","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getTime","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"validatorKeys","outputs":[{"name":"votingKey","type":"address"},{"name":"payoutKey","type":"address"},{"name":"isMiningActive","type":"bool"},{"name":"isVotingActive","type":"bool"},{"name":"isPayoutActive","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"_votingKey","type":"address"}],"name":"isVotingActive","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_key","type":"address"},{"name":"_miningKey","type":"address"}],"name":"addPayoutKey","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"initialKeys","outputs":[{"name":"","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_key","type":"address"},{"name":"_miningKey","type":"address"}],"name":"swapPayoutKey","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_miningKey","type":"address"}],"name":"getPayoutByMining","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_key","type":"address"}],"name":"removeMiningKey","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"maxLimitValidators","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_initialKey","type":"address"}],"name":"initiateKeys","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_key","type":"address"},{"name":"_miningKey","type":"address"}],"name":"addVotingKey","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_key","type":"address"}],"name":"isMiningActive","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"proxyStorage","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"votingContract","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_miningKey","type":"address"},{"name":"_votingKey","type":"address"},{"name":"_payoutKey","type":"address"}],"name":"createKeys","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"initialKeysCount","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_key","type":"address"},{"name":"_miningKey","type":"address"}],"name":"swapVotingKey","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_key","type":"address"},{"name":"_oldMiningKey","type":"address"}],"name":"swapMiningKey","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"maxNumberOfInitialKeys","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"masterOfCeremony","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"_miningKey","type":"address"}],"name":"isPayoutActive","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[{"name":"_proxyStorage","type":"address"},{"name":"_poaConsensus","type":"address"},{"name":"_masterOfCeremony","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"key","type":"address"},{"indexed":true,"name":"miningKey","type":"address"},{"indexed":false,"name":"action","type":"string"}],"name":"PayoutKeyChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"key","type":"address"},{"indexed":true,"name":"miningKey","type":"address"},{"indexed":false,"name":"action","type":"string"}],"name":"VotingKeyChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"key","type":"address"},{"indexed":false,"name":"action","type":"string"}],"name":"MiningKeyChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"miningKey","type":"address"},{"indexed":true,"name":"votingKey","type":"address"},{"indexed":true,"name":"payoutKey","type":"address"}],"name":"ValidatorInitialized","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"initialKey","type":"address"},{"indexed":false,"name":"time","type":"uint256"},{"indexed":false,"name":"initialKeysCount","type":"uint256"}],"name":"InitialKeyCreated","type":"event"}] } } } diff --git a/assets/javascripts/modules.js b/assets/javascripts/modules.js index a0eb742..369545a 100644 --- a/assets/javascripts/modules.js +++ b/assets/javascripts/modules.js @@ -23091,7 +23091,7 @@ module.exports={ "_args": [ [ "elliptic@6.4.0", - "/Users/viktor/Documents/HintsProjects/BlockNotary/Oracles/oracles-dapps-keys-generation" + "/Users/viktor/Documents/HintsProjects/BlockNotary/Oracles/oracles-dapps-keys-generation-mainnet" ] ], "_from": "elliptic@6.4.0", @@ -23117,7 +23117,7 @@ module.exports={ ], "_resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz", "_spec": "6.4.0", - "_where": "/Users/viktor/Documents/HintsProjects/BlockNotary/Oracles/oracles-dapps-keys-generation", + "_where": "/Users/viktor/Documents/HintsProjects/BlockNotary/Oracles/oracles-dapps-keys-generation-mainnet", "author": { "name": "Fedor Indutny", "email": "fedor@indutny.com" @@ -74006,7 +74006,7 @@ module.exports={ "_args": [ [ "web3@1.0.0-beta.26", - "/Users/viktor/Documents/HintsProjects/BlockNotary/Oracles/oracles-dapps-keys-generation" + "/Users/viktor/Documents/HintsProjects/BlockNotary/Oracles/oracles-dapps-keys-generation-mainnet" ] ], "_from": "web3@1.0.0-beta.26", @@ -74030,7 +74030,7 @@ module.exports={ ], "_resolved": "https://registry.npmjs.org/web3/-/web3-1.0.0-beta.26.tgz", "_spec": "1.0.0-beta.26", - "_where": "/Users/viktor/Documents/HintsProjects/BlockNotary/Oracles/oracles-dapps-keys-generation", + "_where": "/Users/viktor/Documents/HintsProjects/BlockNotary/Oracles/oracles-dapps-keys-generation-mainnet", "author": { "name": "ethereum.org" }, @@ -74235,7 +74235,7 @@ module.exports={ ], "_resolved": "git://github.com/frozeman/WebSocket-Node.git#7004c39c42ac98875ab61126e5b4a925430f592c", "_spec": "websocket@git://github.com/frozeman/WebSocket-Node.git#7004c39c42ac98875ab61126e5b4a925430f592c", - "_where": "/Users/viktor/Documents/HintsProjects/BlockNotary/Oracles/oracles-dapps-keys-generation", + "_where": "/Users/viktor/Documents/HintsProjects/BlockNotary/Oracles/oracles-dapps-keys-generation-mainnet", "author": { "name": "Brian McKelvey", "email": "brian@worlize.com", diff --git a/index.html b/index.html index 5e59650..3747980 100755 --- a/index.html +++ b/index.html @@ -33,7 +33,7 @@ The app will make your initial key unusable after the process. Please proceed with care, don't lose your keys and follow instructions. -
+ Upload your initial key