poanetwork
/
poa-dapps-keys-generation
mirror of https://github.com/poanetwork/poa-dapps-keys-generation.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactoring

This commit is contained in:
viktor 2017-11-23 20:54:07 +03:00
parent e317d924ba
commit 1f4e3dc8d5
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
assets/javascripts/application.js
View File

@ -91,13 +91,13 @@ function attachToContract(web3, abi, addr) {
return contractInstance;
}
function checkInitialKey(web3, initialKey, contractAddr, abi, cb) {
let oraclesContract = attachToContract(web3, abi, contractAddr)
let KeysStorage = attachToContract(web3, abi, contractAddr)
console.log("attach to oracles contract");
if (!oraclesContract) {
if (!KeysStorage) {
return cb();
}
oraclesContract.methods.checkInitialKey(initialKey).call(function(isNew) {
KeysStorage.methods.checkInitialKey(initialKey).call(function(isNew) {
cb(isNew);
})
}
@ -218,9 +218,9 @@ function bytesCount(s) {
}
function createKeys(web3, keys, contractAddr, abi, cb) {
console.log("***Create keys function***");
let oraclesContract = attachToContract(web3, abi, contractAddr)
let KeysStorage = attachToContract(web3, abi, contractAddr)
console.log("attach to oracles contract");
if (!oraclesContract) {
if (!KeysStorage) {
return cb();
}
@ -229,7 +229,7 @@ function createKeys(web3, keys, contractAddr, abi, cb) {
var gasPrice = web3.utils.toWei(new web3.utils.BN(1), 'gwei')
var opts = {from: web3.eth.defaultAccount, gasPrice: gasPrice}
oraclesContract.methods.createKeys("0x" + keys.miningKey.miningKeyObject.address,
KeysStorage.methods.createKeys("0x" + keys.miningKey.miningKeyObject.address,
"0x" + keys.payoutKey.payoutKeyObject.address,
"0x" + keys.votingKey.votingKeyObject.address
).send(opts).on('error', error => {

6
assets/javascripts/application/checkInitialKey.js
View File

@ -1,11 +1,11 @@
function checkInitialKey(web3, initialKey, contractAddr, abi, cb) {
let oraclesContract = attachToContract(web3, abi, contractAddr)
let KeysStorage = attachToContract(web3, abi, contractAddr)
console.log("attach to oracles contract");
if (!oraclesContract) {
if (!KeysStorage) {
return cb();
}
oraclesContract.methods.checkInitialKey(initialKey).call(function(isNew) {
KeysStorage.methods.checkInitialKey(initialKey).call(function(isNew) {
cb(isNew);
})
}

6
assets/javascripts/application/createKeys.js
View File

@ -1,8 +1,8 @@
function createKeys(web3, keys, contractAddr, abi, cb) {
console.log("***Create keys function***");
let oraclesContract = attachToContract(web3, abi, contractAddr)
let KeysStorage = attachToContract(web3, abi, contractAddr)
console.log("attach to oracles contract");
if (!oraclesContract) {
if (!KeysStorage) {
return cb();
}
@ -11,7 +11,7 @@ function createKeys(web3, keys, contractAddr, abi, cb) {
var gasPrice = web3.utils.toWei(new web3.utils.BN(1), 'gwei')
var opts = {from: web3.eth.defaultAccount, gasPrice: gasPrice}
oraclesContract.methods.createKeys("0x" + keys.miningKey.miningKeyObject.address,
KeysStorage.methods.createKeys("0x" + keys.miningKey.miningKeyObject.address,
"0x" + keys.payoutKey.payoutKeyObject.address,
"0x" + keys.votingKey.votingKeyObject.address
).send(opts).on('error', error => {