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

MetaMask support

This commit is contained in:
viktor 2017-06-22 15:12:46 +03:00
parent 40cdf74072
commit bb4c816d49
9 changed files with 164 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
assets/javascripts/application.js
View File

File diff suppressed because one or more lines are too long

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

@ -1,9 +1,8 @@
function addValidator(api, func, validatorViewObj, address, contractAddr, cb) {
var funcHex = func.hexEncode();
function addValidator(web3, func, validatorViewObj, address, contractAddr, cb) {
var funcParamsNumber = 7;
var standardLength = 32;
SHA3Encrypt(api, funcHex, function(funcEncode) {
SHA3Encrypt(web3, func, function(funcEncode) {
var funcEncodePart = funcEncode.substring(0,10);
if (validatorViewObj.miningKey.indexOf("0x") > -1) {
validatorViewObj.miningKey = validatorViewObj.miningKey.substr(2);
@ -30,13 +29,13 @@ function addValidator(api, func, validatorViewObj, address, contractAddr, cb) {
+ toUnifiedLengthLeft(bytesCount(validatorViewObj.streetName).toString(16)) + streetNameHex.substring(2)
+ toUnifiedLengthLeft(bytesCount(validatorViewObj.state).toString(16)) + stateHex.substring(2);
estimateGas(api, address, contractAddr, data, null, function(estimatedGas, err) {
estimateGas(web3, address, contractAddr, data, null, function(estimatedGas, err) {
if (err) {
cb(null, err);
return;
}
estimatedGas += 100000;
sendTx(api, address, contractAddr, data, null, estimatedGas, function(txHash, err) {
sendTx(web3, address, contractAddr, data, null, estimatedGas, function(txHash, err) {
if (err) {
cb(txHash, err);
return;

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

@ -1,64 +1,42 @@
function SHA3Encrypt(api, str, cb) {
api._web3.sha3(str).then(function(strEncode) {
cb(strEncode, null);
}).catch(function(err) {
console.log(err);
cb("", err);
});
function SHA3Encrypt(web3, str, cb) {
var strEncode = web3.sha3(str);
cb(strEncode);
}
function estimateGas(api, from, to, data, val, cb) {
function estimateGas(web3, from, to, data, val, cb) {
var props;
if (val)
props = { from: from, value: val, data: null, to: to };
else
props = { from: from, data: data, to: to };
api.eth.estimateGas(props).then(function(res) {
if (!res) {
cb(null, {"code": 500, "title": "Error", "message": "Unexpected error"});
return;
}
var gasWillUsed = res.c[0];
cb(gasWillUsed);
}, function(err) {
web3.eth.estimateGas(props, function(err, estimatedGas) {
console.log(err);
cb(null, err);
}).catch(function(err) {
console.log(err);
cb(null, err);
console.log(estimatedGas);
cb(estimatedGas);
});
}
function sendTx(api, from, to, data, val, estimatedGas, cb) {
function sendTx(web3, from, to, data, val, estimatedGas, cb) {
var props;
if (val)
props = { from: from, value: val, to: to, gas: estimatedGas };
else
props = { from: from, data: data, to: to, gas: estimatedGas };
api.eth.sendTransaction(props)
.then(function(txHash) {
cb(txHash);
}).catch(function(err) {
console.log(err);
cb(null, err);
web3.eth.sendTransaction(props, function(err, txHash) {
cb(txHash, err);
});
}
function call(api, from, to, data, cb) {
function call(web3, from, to, data, cb) {
var props;
if (from)
props = { from: from, data: data, to: to };
else
props = { data: data, to: to };
api.eth.call(props)
.then(function(data) {
web3.eth.call(props, function(err, data) {
cb(data);
}).catch(function(err) {
console.log(err);
cb(null, err);
});
}

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

@ -1,15 +1,14 @@
function checkInitialKey(api, func, initialKey, contractAddr, cb) {
var funcHex = func.hexEncode();
function checkInitialKey(web3, func, initialKey, contractAddr, cb) {
var funcParamsNumber = 1;
var standardLength = 32;
SHA3Encrypt(api, funcHex, function(funcEncode) {
SHA3Encrypt(web3, func, function(funcEncode) {
var funcEncodePart = funcEncode.substring(0,10);
var data = funcEncodePart
+ toUnifiedLengthLeft(initialKey);
call(api, "0x" + initialKey, contractAddr, data, function(respHex) {
call(web3, "0x" + initialKey, contractAddr, data, function(respHex) {
console.log(respHex);
cb(parseInt(respHex, 16));
});

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

@ -1,11 +1,10 @@
function createKeys(api, func, keys, address, contractAddr, cb) {
var funcHex = func.hexEncode();
function createKeys(web3, func, keys, address, contractAddr, cb) {
var funcParamsNumber = 3;
var standardLength = 32;
var parameterLocation = standardLength*funcParamsNumber;
SHA3Encrypt(api, funcHex, function(funcEncode) {
SHA3Encrypt(web3, func, function(funcEncode) {
var funcEncodePart = funcEncode.substring(0,10);
var data = funcEncodePart
@ -13,9 +12,9 @@ function createKeys(api, func, keys, address, contractAddr, cb) {
+ toUnifiedLengthLeft(keys.payoutKey.payoutKeyObject.address)
+ toUnifiedLengthLeft(keys.votingKey.votingKeyObject.address);
estimateGas(api, address, contractAddr, data, null, function(estimatedGas) {
estimateGas(web3, address, contractAddr, data, null, function(estimatedGas) {
estimatedGas += 100000;
sendTx(api, address, contractAddr, data, null, estimatedGas, function(txHash, err) {
sendTx(web3, address, contractAddr, data, null, estimatedGas, function(txHash, err) {
if (err) {
cb(txHash, err);
return;

183
assets/javascripts/application/index.js
View File

@ -1,3 +1,53 @@
function getWeb3(callback) {
if (typeof window.web3 === 'undefined') {
// no web3, use fallback
console.error("Please use a web3 browser");
var msgNotEthereum = "You are not connected to Ethereum. Please, switch on Parity or MetaMask client and refresh the page.";
swal("Warning", msgNotEthereum, "warning");
} else {
// window.web3 == web3 most of the time. Don't override the provided,
// web3, just wrap it in your Web3.
var myWeb3 = new Web3(window.web3.currentProvider);
// the default account doesn't seem to be persisted, copy it to our
// new instance
myWeb3.eth.defaultAccount = window.web3.eth.defaultAccount;
checkNetworkVersion(myWeb3);
callback(myWeb3);
}
}
function checkNetworkVersion(web3) {
var msgNotOracles = "You are not connected to Oracles network. Please, switch on Parity or MetaMask client and refresh the page.";
web3.version.getNetwork(function(err, netId) {
console.log(netId);
switch (netId) {
case "1": {
console.log('This is mainnet');
swal("Warning", msgNotOracles, "warning");
} break;
case "2": {
console.log('This is the deprecated Morden test network.');
swal("Warning", msgNotOracles, "warning");
} break;
case "3": {
console.log('This is the ropsten test network.');
swal("Warning", msgNotOracles, "warning");
} break;
case "8995": {
console.log('This is Oracles from Metamask');
} break;
default: {
console.log('This is an unknown network.');
swal("Warning", msgNotOracles, "warning");
} break;
}
})
}
function startDapp(web3) {
$(function() {
$(".loading-container").hide();
var keys = {
@ -5,7 +55,6 @@ $(function() {
"payoutKey": {},
"votingKey": {}
};
var api = window.parity.api;
var config;
$.getJSON("./assets/javascripts/config.json", function(_config) {
config = _config;
@ -27,29 +76,22 @@ $(function() {
try {
a = JSON.parse(evt.target.result);
} catch(e) {
swal("Error", "Invalid key file", "error");
return;
return swal("Error", "Invalid key file", "error");
}
var keyJSON = JSON.parse(evt.target.result);
var address = keyJSON.address;
if (!address) {
swal("Error", "No address in key file", "error");
return;
}
if (!address) return swal("Error", "No address in key file", "error");
checkInitialKey(api,
checkInitialKey(web3,
"checkInitialKey(address)",
address,
config.Ethereum[config.environment].contractAddress,
function(_isNew) {
_isNew = !!+_isNew;
if (!_isNew) {
swal("Error", "Initial key is already activated or isn't valid", "error");
return;
}
if (!_isNew) return swal("Error", "Initial key is already activated or isn't valid", "error");
$(".loading-container").show();
@ -57,11 +99,9 @@ $(function() {
if (!config) {
$.getJSON("./assets/javascripts/config.json", function(_config) {
config = _config;
configLoadedCallBack(api, config, address);
configLoadedCallBack(web3, config, address);
});
} else {
configLoadedCallBack(api, config, address);
}
} else configLoadedCallBack(web3, config, address);
}, 500)
}
);
@ -71,7 +111,7 @@ $(function() {
}
}
function configLoadedCallBack(api, config, address) {
function configLoadedCallBack(web3, config, address) {
var keysCount = 0;
for (var i in keys) {
@ -86,9 +126,7 @@ $(function() {
keys.miningKey.miningKeyObject = _miningKeyObject;
keys.miningKey.password = password;
if (keysIterator == keysCount) {
addressesGeneratedCallBack(keys, address);
}
if (keysIterator == keysCount) addressesGeneratedCallBack(keys, address);
});
generateAddress(function(_payoutKeyObject, password) {
keysIterator++;
@ -97,9 +135,7 @@ $(function() {
keys.payoutKey.payoutKeyObject = _payoutKeyObject;
keys.payoutKey.password = password;
if (keysIterator == keysCount) {
addressesGeneratedCallBack(keys, address);
}
if (keysIterator == keysCount) addressesGeneratedCallBack(keys, address);
});
generateAddress(function(_votingKeyObject, password) {
keysIterator++;
@ -108,9 +144,7 @@ $(function() {
keys.votingKey.votingKeyObject = _votingKeyObject;
keys.votingKey.password = password;
if (keysIterator == keysCount) {
addressesGeneratedCallBack(keys, address);
}
if (keysIterator == keysCount) addressesGeneratedCallBack(keys, address);
});
}
@ -124,7 +158,7 @@ $(function() {
licenseID: $("#license-id").val(),
licenseExpiredAt: new Date($("#license-expiration").val()).getTime() / 1000,
};
addValidator(api,
addValidator(web3,
"addValidator(address,uint256,uint256,uint256,string,string,string)",
validatorViewObj,
address,
@ -133,12 +167,11 @@ $(function() {
if (err) {
$(".loading-container").hide();
console.log(err.message);
if (err.type != "REQUEST_REJECTED")
swal("Error", "Error in addresses addition to contract", "error");
if (err.type != "REQUEST_REJECTED") swal("Error", "Error in addresses addition to contract", "error");
return;
}
createKeys(api,
createKeys(web3,
"createKeys(address,address,address)",
keys,
address,
@ -147,8 +180,7 @@ $(function() {
if (err) {
$(".loading-container").hide();
console.log(err.message);
if (err.type != "REQUEST_REJECTED")
swal("Error", "Error in addresses addition to contract", "error");
if (err.type != "REQUEST_REJECTED") swal("Error", "Error in addresses addition to contract", "error");
return;
}
@ -167,45 +199,70 @@ $(function() {
}
//send ether to payoutKey
api._eth.getBalance(address).then(function(balanceObj){
var balance = balanceObj.toNumber();
web3.eth.getBalance(address, function(err, balance){
if (err) {
console.log(err);
$(".loading-container").hide();
return;
}
var to = "0x" + keys.payoutKey.payoutKeyObject.address;
api._eth.gasPrice().then(function(gasPrice) {
var estimatedGas = web3.eth.estimateGas({from: address, value: parseInt(balance/2), data: null, to: to});
var ammountToSend = balance - 10 * estimatedGas * gasPrice;
console.log("ammountToSend: " + ammountToSend);
web3.eth.sendTransaction({gas: estimatedGas, from: address, to: to, value: ammountToSend}, function(err, txHash) {
if (err) {
web3.eth.getGasPrice(function(err, gasPriceObj) {
if (err) {
console.log(err);
$(".loading-container").hide();
return;
}
var gasPrice = gasPriceObj.c[0];
estimateGas(web3, address, to, null, parseInt(balance/2), function(estimatedGas, err) {
if (err) {
console.log(err);
$(".loading-container").hide();
return;
}
$(".loading-container").hide();
swal("Sucess", "Keys are created", "success");
$('.content').empty();
$('.content').load("./keys.html", function() {
$("#miningKey").text("0x" + keys.miningKey.miningKeyObject.address);
$("#payoutKey").text("0x" + keys.payoutKey.payoutKeyObject.address);
$("#votingKey").text("0x" + keys.votingKey.votingKeyObject.address);
$("#miningKeyPass").text(keys.miningKey.password);
$("#payoutKeyPass").text(keys.payoutKey.password);
$("#votingKeyPass").text(keys.votingKey.password);
var ammountToSend = balance - 10 * estimatedGas * gasPrice;
console.log("ammountToSend: " + ammountToSend);
web3.eth.sendTransaction({gas: estimatedGas, from: address, to: to, value: ammountToSend}, function(err, txHash) {
if (err) {
console.log(err);
$(".loading-container").hide();
return;
}
$(".loading-container").hide();
swal("Sucess", "Keys are created", "success");
$('.content').empty();
$('.content').load("./keys.html", function() {
$("#miningKey").text("0x" + keys.miningKey.miningKeyObject.address);
$("#payoutKey").text("0x" + keys.payoutKey.payoutKeyObject.address);
$("#votingKey").text("0x" + keys.votingKey.votingKeyObject.address);
$("#miningKeyDownload").click(function() {
download("key_" + keys.miningKey.miningKeyObject.address, JSON.stringify(keys.miningKey.miningKeyObject));
$("#miningKeyPass").text(keys.miningKey.password);
$("#payoutKeyPass").text(keys.payoutKey.password);
$("#votingKeyPass").text(keys.votingKey.password);
$("#miningKeyDownload").click(function() {
download("key_" + keys.miningKey.miningKeyObject.address, JSON.stringify(keys.miningKey.miningKeyObject));
});
$("#payoutKeyDownload").click(function() {
download("key_" + keys.payoutKey.payoutKeyObject.address, JSON.stringify(keys.payoutKey.payoutKeyObject));
});
$("#votingKeyDownload").click(function() {
download("key_" + keys.votingKey.votingKeyObject.address, JSON.stringify(keys.votingKey.votingKeyObject));
});
});
$("#payoutKeyDownload").click(function() {
download("key_" + keys.payoutKey.payoutKeyObject.address, JSON.stringify(keys.payoutKey.payoutKeyObject));
});
$("#votingKeyDownload").click(function() {
download("key_" + keys.votingKey.votingKeyObject.address, JSON.stringify(keys.votingKey.votingKeyObject));
});
});
});
});
});
});
});
});
}
});
}
window.addEventListener('load', function() {
getWeb3(startDapp);
});

2
gulpfile.js
View File

@ -10,6 +10,7 @@ const addsrc = require('gulp-add-src');
const order = require('gulp-order');
const concat = require('gulp-concat');
const uglify = require('gulp-uglify');
const gutil = require('gulp-util')
gulp.task('sass', function() {
return gulp.src(['assets/stylesheets/*.scss'])
@ -30,6 +31,7 @@ gulp.task('javascript', function() {
.pipe(include())
.pipe(concat('application.js'))
.pipe(uglify())
.on('error', function (err) { gutil.log(gutil.colors.red('[Error]'), err.toString()); })
.pipe(gulp.dest('assets/javascripts'));
});

4
index.html
View File

@ -69,14 +69,14 @@
<a href="#" class="footer-logo"></a>
<div class="socials">
<a href="#" class="socials-i socials-i_reddit"></a>
<a href="https://twitter.com/notarycoin" class="socials-i socials-i_twitter"></a>
<a href="https://twitter.com/oraclesorg" class="socials-i socials-i_twitter"></a>
<a href="#" class="socials-i socials-i_bitcoin"></a>
</div>
<p class="footer-rights">2017 Oracles. All rights reserved.</p>
</div>
</footer>
<script src="./assets/javascripts/sweetalert.min.js" type="text/javascript"></script>
<script src="./assets/javascripts/application.js?v=1.1" type="text/javascript"></script>
<script src="./assets/javascripts/application.js?v=1.12" type="text/javascript"></script>
<script src="./assets/javascripts/keythereum.min.js" type="text/javascript"></script>
</body>
</html>

1
package.json
View File

@ -16,6 +16,7 @@
"gulp-sass-glob": "^1.0.6",
"gulp-uglify": "^2.0.0",
"gulp-uglifycss": "^1.0.6",
"gulp-util": "^3.0.8",
"http-server": "^0.9.0"
},
"scripts": {