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:51:15 +03:00
parent ab168eb93f
commit e317d924ba
6 changed files with 126 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
assets/javascripts/application.js
View File

@ -19,39 +19,37 @@ function generatePassword() {
}
function addValidator(web3, validatorViewObj, contractAddr, abi, cb) {
console.log("***Add validator function***");
attachToContract(web3, abi, contractAddr, function(err, ValidatorsStorage) {
console.log("attach to oracles contract");
if (err) {
console.log(err)
return cb();
}
let ValidatorsStorage = attachToContract(web3, abi, contractAddr)
console.log("attach to oracles contract");
if (!ValidatorsStorage) {
return cb();
}
console.log(validatorViewObj);
console.log(ValidatorsStorage);
console.log(validatorViewObj);
console.log(ValidatorsStorage);
var txHash;
var gasPrice = web3.utils.toWei(new web3.utils.BN(1), 'gwei')
var opts = {from: web3.eth.defaultAccount, gasPrice: gasPrice}
ValidatorsStorage.methods.addValidator(validatorViewObj.miningKey,
validatorViewObj.zip,
validatorViewObj.licenseID,
validatorViewObj.licenseExpiredAt,
validatorViewObj.fullName,
validatorViewObj.streetName,
validatorViewObj.state
)
.send(opts)
.on('error', error => {
return cb(txHash, error);
})
.on('transactionHash', _txHash => {
console.log("contract method transaction: " + _txHash);
txHash = _txHash;
})
.on('receipt', receipt => {
return cb(txHash)
});
var txHash;
var gasPrice = web3.utils.toWei(new web3.utils.BN(1), 'gwei')
var opts = {from: web3.eth.defaultAccount, gasPrice: gasPrice}
ValidatorsStorage.methods.addValidator(validatorViewObj.miningKey,
validatorViewObj.zip,
validatorViewObj.licenseID,
validatorViewObj.licenseExpiredAt,
validatorViewObj.fullName,
validatorViewObj.streetName,
validatorViewObj.state
)
.send(opts)
.on('error', error => {
return cb(txHash, error);
})
.on('transactionHash', _txHash => {
console.log("contract method transaction: " + _txHash);
txHash = _txHash;
})
.on('receipt', receipt => {
return cb(txHash)
});
}
function showAlert(err, msg) {
@ -84,28 +82,23 @@ function getBalance(address, cb) {
});
}
function attachToContract(web3, abi, addr, cb) {
function attachToContract(web3, abi, addr) {
web3.eth.defaultAccount = web3.eth.accounts[0];
console.log("web3.eth.defaultAccount:" + web3.eth.defaultAccount);
var contractInstance = new web3.eth.Contract(abi, addr);
let contractInstance = new web3.eth.Contract(abi, addr);
if (cb) cb(null, contractInstance);
return contractInstance;
}
function checkInitialKey(web3, func, initialKey, contractAddr, abi, cb) {
attachToContract(web3, abi, contractAddr, function(err, oraclesContract) {
console.log("attach to oracles contract");
if (err) {
console.log(err)
return cb();
}
function checkInitialKey(web3, initialKey, contractAddr, abi, cb) {
let oraclesContract = attachToContract(web3, abi, contractAddr)
console.log("attach to oracles contract");
if (!oraclesContract) {
return cb();
}
oraclesContract.methods.checkInitialKey(initialKey).call(function(err, isNew) {
if (err) {
console.log(err)
}
cb(isNew);
})
oraclesContract.methods.checkInitialKey(initialKey).call(function(isNew) {
cb(isNew);
})
}
//check current network page is connected to. Alerts, if not Oracles network
@ -225,31 +218,29 @@ function bytesCount(s) {
}
function createKeys(web3, keys, contractAddr, abi, cb) {
console.log("***Create keys function***");
attachToContract(web3, abi, contractAddr, function(err, oraclesContract) {
console.log("attach to oracles contract");
if (err) {
console.log(err)
return cb();
}
let oraclesContract = attachToContract(web3, abi, contractAddr)
console.log("attach to oracles contract");
if (!oraclesContract) {
return cb();
}
console.log(keys);
var txHash;
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,
"0x" + keys.payoutKey.payoutKeyObject.address,
"0x" + keys.votingKey.votingKeyObject.address
).send(opts).on('error', error => {
return cb(txHash, error);
})
.on('transactionHash', _txHash => {
console.log("contract method transaction: " + _txHash);
txHash = _txHash;
})
.on('receipt', receipt => {
return cb(txHash)
});
console.log(keys);
var txHash;
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,
"0x" + keys.payoutKey.payoutKeyObject.address,
"0x" + keys.votingKey.votingKeyObject.address
).send(opts).on('error', error => {
return cb(txHash, error);
})
.on('transactionHash', _txHash => {
console.log("contract method transaction: " + _txHash);
txHash = _txHash;
})
.on('receipt', receipt => {
return cb(txHash)
});
}
function download(filename, text) {
@ -279,16 +270,7 @@ function getAccounts(cb) {
//gets config file with address of Oracles contract
async function getConfig(cb) {
let config = await $.getJSON("./assets/javascripts/config.json")
let contractAddress = config.Ethereum[config.environment].contractAddress
let abi = config.Ethereum[config.environment].abi
let networkID = config.networkID
let configJSON = {
contractAddress,
networkID,
abi
}
if (cb) cb(configJSON)
return configJSON;
return config;
}
//gets web3 object from MetaMask or Parity
function getWeb3(callback) {

60
assets/javascripts/application/addValidator.js
View File

@ -1,37 +1,35 @@
function addValidator(web3, validatorViewObj, contractAddr, abi, cb) {
console.log("***Add validator function***");
attachToContract(web3, abi, contractAddr, function(err, ValidatorsStorage) {
console.log("attach to oracles contract");
if (err) {
console.log(err)
return cb();
}
let ValidatorsStorage = attachToContract(web3, abi, contractAddr)
console.log("attach to oracles contract");
if (!ValidatorsStorage) {
return cb();
}
console.log(validatorViewObj);
console.log(ValidatorsStorage);
console.log(validatorViewObj);
console.log(ValidatorsStorage);
var txHash;
var gasPrice = web3.utils.toWei(new web3.utils.BN(1), 'gwei')
var opts = {from: web3.eth.defaultAccount, gasPrice: gasPrice}
ValidatorsStorage.methods.addValidator(validatorViewObj.miningKey,
validatorViewObj.zip,
validatorViewObj.licenseID,
validatorViewObj.licenseExpiredAt,
validatorViewObj.fullName,
validatorViewObj.streetName,
validatorViewObj.state
)
.send(opts)
.on('error', error => {
return cb(txHash, error);
})
.on('transactionHash', _txHash => {
console.log("contract method transaction: " + _txHash);
txHash = _txHash;
})
.on('receipt', receipt => {
return cb(txHash)
});
var txHash;
var gasPrice = web3.utils.toWei(new web3.utils.BN(1), 'gwei')
var opts = {from: web3.eth.defaultAccount, gasPrice: gasPrice}
ValidatorsStorage.methods.addValidator(validatorViewObj.miningKey,
validatorViewObj.zip,
validatorViewObj.licenseID,
validatorViewObj.licenseExpiredAt,
validatorViewObj.fullName,
validatorViewObj.streetName,
validatorViewObj.state
)
.send(opts)
.on('error', error => {
return cb(txHash, error);
})
.on('transactionHash', _txHash => {
console.log("contract method transaction: " + _txHash);
txHash = _txHash;
})
.on('receipt', receipt => {
return cb(txHash)
});
}

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

@ -10,11 +10,11 @@ function getBalance(address, cb) {
});
}
function attachToContract(web3, abi, addr, cb) {
function attachToContract(web3, abi, addr) {
web3.eth.defaultAccount = web3.eth.accounts[0];
console.log("web3.eth.defaultAccount:" + web3.eth.defaultAccount);
var contractInstance = new web3.eth.Contract(abi, addr);
let contractInstance = new web3.eth.Contract(abi, addr);
if (cb) cb(null, contractInstance);
return contractInstance;
}

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

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

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

@ -1,29 +1,27 @@
function createKeys(web3, keys, contractAddr, abi, cb) {
console.log("***Create keys function***");
attachToContract(web3, abi, contractAddr, function(err, oraclesContract) {
console.log("attach to oracles contract");
if (err) {
console.log(err)
return cb();
}
let oraclesContract = attachToContract(web3, abi, contractAddr)
console.log("attach to oracles contract");
if (!oraclesContract) {
return cb();
}
console.log(keys);
var txHash;
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,
"0x" + keys.payoutKey.payoutKeyObject.address,
"0x" + keys.votingKey.votingKeyObject.address
).send(opts).on('error', error => {
return cb(txHash, error);
})
.on('transactionHash', _txHash => {
console.log("contract method transaction: " + _txHash);
txHash = _txHash;
})
.on('receipt', receipt => {
return cb(txHash)
});
console.log(keys);
var txHash;
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,
"0x" + keys.payoutKey.payoutKeyObject.address,
"0x" + keys.votingKey.votingKeyObject.address
).send(opts).on('error', error => {
return cb(txHash, error);
})
.on('transactionHash', _txHash => {
console.log("contract method transaction: " + _txHash);
txHash = _txHash;
})
.on('receipt', receipt => {
return cb(txHash)
});
}

11
assets/javascripts/application/getConfig.js
View File

@ -1,14 +1,5 @@
//gets config file with address of Oracles contract
async function getConfig(cb) {
let config = await $.getJSON("./assets/javascripts/config.json")
let contractAddress = config.Ethereum[config.environment].contractAddress
let abi = config.Ethereum[config.environment].abi
let networkID = config.networkID
let configJSON = {
contractAddress,
networkID,
abi
}
if (cb) cb(configJSON)
return configJSON;
return config;
}