lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

- Display balance. 

- Deploy contracts in a sync way.
 - Timeout for contract creation.
cl-refactor
yann300 10 years ago
parent
d43c16f366
commit
22d322f40e
4 changed files with 166 additions and 112 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 142
      mix/qml/DeploymentDialog.qml
  2. 11
      mix/qml/StatusPane.qml
  3. 124
      mix/qml/js/ProjectModel.js
  4. 1
      mix/qml/js/TransactionHelper.js

142
mix/qml/DeploymentDialog.qml
View File

@ -15,7 +15,7 @@ Window {
id: modalDeploymentDialog
modality: Qt.ApplicationModal
width: 800
width: 930
height: 350
visible: false
property alias applicationUrlEth: applicationUrlEth.text
@ -26,6 +26,7 @@ Window {
property string eth: "4c3f7330690ed3657d3fa20fe5717b84010528ae";
property string yanndappRegistrar: "29a2e6d3c56ef7713a4e7229c3d1a23406f0161a";
property string currentAccount
property alias gasToUse: gasToUseInput.text
color: Style.generic.layout.backgroundColor
@ -36,26 +37,48 @@ Window {
function open()
{
var requests = [];
requests.push({
//accounts
jsonrpc: "2.0",
method: "eth_accounts",
params: null,
id: 0
});
modalDeploymentDialog.setX((Screen.width - width) / 2);
modalDeploymentDialog.setY((Screen.height - height) / 2);
visible = true;
var requests = [{
//accounts
jsonrpc: "2.0",
method: "eth_accounts",
params: null,
id: 0
}];
TransactionHelper.rpcCall(requests, function(arg1, arg2)
{
modelAccounts.clear();
modelAccounts.append({ "id": JSON.parse(arg2)[0].result[0] })
modelAccounts.append({ "id": JSON.parse(arg2)[0].result[1] })
currentAccount = modelAccounts.get(0).id;
});
var ids = JSON.parse(arg2)[0].result;
requests = [];
for (var k in ids)
{
modelAccounts.append({ "id": ids[k] })
requests.push({
//accounts
jsonrpc: "2.0",
method: "eth_balanceAt",
params: [ids[k]],
id: k
});
}
modalDeploymentDialog.setX((Screen.width - width) / 2);
modalDeploymentDialog.setY((Screen.height - height) / 2);
visible = true;
if (ids.length > 0)
currentAccount = modelAccounts.get(0).id;
TransactionHelper.rpcCall(requests, function (request, response){
var balanceRet = JSON.parse(response);
for (var k in balanceRet)
{
var ether = QEtherHelper.createEther(balanceRet[k].result, QEther.Wei);
comboAccounts.balances.push(ether.format());
}
balance.text = comboAccounts.balances[0];
});
});
}
function pad(h)
@ -71,7 +94,8 @@ Window {
function waitForTrCountToIncrement(callBack)
{
poolLog.callBack = callBack;
poolLog.k = 0;
poolLog.k = -1;
poolLog.elapsed = 0;
poolLog.start();
}
@ -79,11 +103,13 @@ Window {
{
id: poolLog
property var callBack
property var k: -1
property int k: -1
property int elapsed
interval: 500
running: false
repeat: true
onTriggered: {
elapsed += interval;
var requests = [];
var jsonRpcRequestId = 0;
requests.push({
@ -93,14 +119,17 @@ Window {
id: jsonRpcRequestId++
});
TransactionHelper.rpcCall(requests, function (httpRequest, response){
console.log(response);
response = response.replace(/,0+/, '');
console.log(response);
response = response.replace(/,0+/, ''); // ==> result:27,00000000
var count = JSON.parse(response)[0].result
if (k < parseInt(count) && k > 0)
{
stop();
callBack();
callBack(1);
}
else if (elapsed > 25000)
{
stop();
callBack(-1);
}
else
k = parseInt(JSON.parse(response)[0].result);
@ -124,17 +153,36 @@ Window {
text: qsTr("Account used to deploy:")
}
ComboBox {
id: comboAccounts
onCurrentIndexChanged : {
if (modelAccounts.count > 0)
currentAccount = modelAccounts.get(currentIndex).id;
Rectangle
{
width: 300
height: 25
color: "transparent"
ComboBox {
id: comboAccounts
property var balances: []
onCurrentIndexChanged : {
if (modelAccounts.count > 0)
{
currentAccount = modelAccounts.get(currentIndex).id;
balance.text = balances[currentIndex];
}
}
model: ListModel {
id: modelAccounts
}
}
model: ListModel {
id: modelAccounts
DefaultLabel
{
anchors.verticalCenter: parent.verticalCenter
anchors.left: comboAccounts.right
anchors.leftMargin: 20
id: balance;
}
}
DefaultLabel
{
text: qsTr("Ethereum Application URL: ")
@ -157,6 +205,18 @@ Window {
id: applicationUrlHttp
}
DefaultLabel
{
text: qsTr("Amount of gas to use for each contract deployment: ")
}
DefaultTextField
{
text: "20000"
Layout.fillWidth: true
id: gasToUseInput
}
DefaultLabel
{
text: qsTr("Package (Base64): ")
@ -170,20 +230,6 @@ Window {
height: 60
enabled: base64Value.text != ""
}
DefaultLabel
{
text: qsTr("open package directory");
visible: projectModel.deploymentDir !== ""
MouseArea
{
anchors.fill: parent;
onClicked:
{
fileIo.openFileBrowser(projectModel.deploymentDir);
}
}
}
}
MessageDialog {
@ -214,6 +260,14 @@ Window {
}
}
Button {
text: qsTr("Open Package Directory");
enabled: projectModel.deploymentDir !== ""
onClicked: {
fileIo.openFileBrowser(projectModel.deploymentDir);
}
}
Button {
text: qsTr("Register Web Application");
tooltip: qsTr("Register hosted Web Application.")
@ -297,7 +351,7 @@ Window {
text: qsTr("add contracts");
visible : false
onClicked: {
var jsonRpcRequestId = 0;
var jsonRpcRequestId = 0;
var requests = [];
requests.push({
jsonrpc: "2.0",

11
mix/qml/StatusPane.qml
View File

@ -35,17 +35,24 @@ Rectangle {
logslink.visible = false;
}
function errorMessage(text)
{
status.state = "error";
status.text = text
logslink.visible = false;
}
Connections {
target:clientModel
onRunStarted: infoMessage(qsTr("Running transactions..."));
onRunFailed: infoMessage(qsTr("Error running transactions"));
onRunFailed: errorMessage(qsTr("Error running transactions"));
onRunComplete: infoMessage(qsTr("Run complete"));
onNewBlock: infoMessage(qsTr("New block created"));
}
Connections {
target:projectModel
onDeploymentStarted: infoMessage(qsTr("Running deployment..."));
onDeploymentError: infoMessage(error);
onDeploymentError: errorMessage(error);
onDeploymentComplete: infoMessage(qsTr("Deployment complete"));
onDeploymentStepChanged: infoMessage(message);
}

124
mix/qml/js/ProjectModel.js
View File

@ -293,7 +293,6 @@ function deployProject(force) {
deploymentDialog.open();
}
var codeTest = "";
function startDeployProject(erasePrevious)
{
var date = new Date();
@ -308,52 +307,54 @@ function startDeployProject(erasePrevious)
console.log("Deploying " + deploymentId + " to " + jsonRpcUrl);
deploymentStarted();
var requests = [];
var requestNames = [];
for (var c in codeModel.contracts) { //TODO: order based on dependencies
var code = codeModel.contracts[c].codeHex;
requests.push({
jsonrpc: "2.0",
method: "eth_transact",
params: [ { "from": deploymentDialog.currentAccount, "gas": 20000, "code": code /* "0x60056013565b61059e8061001d6000396000f35b33600081905550560060003560e060020a90048063019848921461009a578063449c2090146100af5780635d574e32146100cd5780635fd4b08a146100e1578063618242da146100f65780636be16bed1461010b5780636c4489b414610129578063893d20e8146101585780639607730714610173578063c284bc2a14610187578063e50f599a14610198578063e5811b35146101af578063ec7b9200146101cd57005b6100a560043561031b565b8060005260206000f35b6100ba6004356103a0565b80600160a060020a031660005260206000f35b6100db600435602435610537565b60006000f35b6100ec600435610529565b8060005260206000f35b6101016004356103dd565b8060005260206000f35b6101166004356103bd565b80600160a060020a031660005260206000f35b61013460043561034b565b82600160a060020a031660005281600160a060020a03166020528060405260606000f35b610160610341565b80600160a060020a031660005260206000f35b6101816004356024356102b4565b60006000f35b6101926004356103fd565b60006000f35b6101a96004356024356044356101f2565b60006000f35b6101ba6004356101eb565b80600160a060020a031660005260206000f35b6101d8600435610530565b80600160a060020a031660005260206000f35b6000919050565b600054600160a060020a031633600160a060020a031614610212576102af565b8160026000858152602001908152602001600020819055508061023457610287565b81600160a060020a0316837f680ad70765443c2967675ab0fb91a46350c01c6df59bf9a41ff8a8dd097464ec60006000a3826001600084600160a060020a03168152602001908152602001600020819055505b827f18d67da0cd86808336a3aa8912f6ea70c5250f1a98b586d1017ef56fe199d4fc60006000a25b505050565b600054600160a060020a031633600160a060020a0316146102d457610317565b806002600084815260200190815260200160002060010181905550817f18d67da0cd86808336a3aa8912f6ea70c5250f1a98b586d1017ef56fe199d4fc60006000a25b5050565b60006001600083600160a060020a03168152602001908152602001600020549050919050565b6000600054905090565b6000600060006002600085815260200190815260200160002054925060026000858152602001908152602001600020600101549150600260008581526020019081526020016000206002015490509193909250565b600060026000838152602001908152602001600020549050919050565b600060026000838152602001908152602001600020600101549050919050565b600060026000838152602001908152602001600020600201549050919050565b600054600160a060020a031633600160a060020a03161461041d57610526565b80600160006002600085815260200190815260200160002054600160a060020a031681526020019081526020016000205414610458576104d2565b6002600082815260200190815260200160002054600160a060020a0316817f680ad70765443c2967675ab0fb91a46350c01c6df59bf9a41ff8a8dd097464ec60006000a36000600160006002600085815260200190815260200160002054600160a060020a03168152602001908152602001600020819055505b6002600082815260200190815260200160002060008101600090556001810160009055600281016000905550807f18d67da0cd86808336a3aa8912f6ea70c5250f1a98b586d1017ef56fe199d4fc60006000a25b50565b6000919050565b6000919050565b600054600160a060020a031633600160a060020a0316146105575761059a565b806002600084815260200190815260200160002060020181905550817f18d67da0cd86808336a3aa8912f6ea70c5250f1a98b586d1017ef56fe199d4fc60006000a25b505056" */ } ],
id: jsonRpcRequestId++
});
requestNames.push(c);
codeTest = code;
}
var ctrNames = Object.keys(codeModel.contracts);
var ctrAddresses = {};
deployContracts(0, ctrAddresses, ctrNames, function (){
finalizeDeployment(deploymentId, ctrAddresses);
});
}
var rpcRequest = JSON.stringify(requests);
var httpRequest = new XMLHttpRequest();
httpRequest.open("POST", jsonRpcUrl, true);
httpRequest.setRequestHeader("Content-type", "application/json");
httpRequest.setRequestHeader("Content-length", rpcRequest.length);
httpRequest.setRequestHeader("Connection", "close");
httpRequest.onreadystatechange = function() {
if (httpRequest.readyState === XMLHttpRequest.DONE) {
if (httpRequest.status === 200) {
var rpcResponse = JSON.parse(httpRequest.responseText);
console.log("crea" + httpRequest.responseText);
if (rpcResponse.length === requestNames.length) {
var contractAddresses = {};
for (var r = 0; r < rpcResponse.length; r++)
contractAddresses[requestNames[r]] = rpcResponse[r].result;
var txt = qsTr("Please wait while the contract is published ...")
deploymentStepChanged(txt);
console.log(txt);
deploymentDialog.waitForTrCountToIncrement(function() {
finalizeDeployment(deploymentId, contractAddresses);
});
}
} else {
var errorText = qsTr("Deployment error: RPC server HTTP status ") + httpRequest.status;
console.log(errorText);
deploymentError(errorText);
function deployContracts(ctrIndex, ctrAddresses, ctrNames, callBack)
{
var code = codeModel.contracts[ctrNames[ctrIndex]].codeHex;
var requests = [{
jsonrpc: "2.0",
method: "eth_transact",
params: [ { "from": deploymentDialog.currentAccount, "gas": deploymentDialog.gasToUse, "code": code } ],
id: 0
}];
rpcCall(requests, function (httpCall, response){
var txt = qsTr("Please wait while " + ctrNames[ctrIndex] + " is published ...")
deploymentStepChanged(txt);
console.log(txt);
ctrAddresses[ctrNames[ctrIndex]] = JSON.parse(response)[0].result
deploymentDialog.waitForTrCountToIncrement(function(status) {
if (status === -1)
{
trCountIncrementTimeOut();
return;
}
}
}
httpRequest.send(rpcRequest);
ctrIndex++;
if (ctrIndex < ctrNames.length)
deployContracts(ctrIndex, ctrAddresses, ctrNames, callBack);
else
callBack();
});
});
}
function checkNewLog()
{
var requests = [];
requests.push({
jsonrpc: "2.0",
method: "eth_changed",
params: [0],
id: 0
});
rpcCall(requests, function (httpRequest, response) {
console.log("eth log: " + response);
});
}
function finalizeDeployment(deploymentId, addresses) {
@ -480,7 +481,7 @@ function checkRegistration(dappUrl, addr, callBack)
var errorTxt;
if (res[1].result === "0x")
{
errorTxt = qsTr("Error when creating new owned path. Please use the regsitration Dapp. Aborting");
errorTxt = qsTr("Error when creating new owned regsitrar. Please use the regsitration Dapp. Aborting");
deploymentError(errorTxt);
console.log(errorTxt);
}
@ -500,7 +501,7 @@ function checkRegistration(dappUrl, addr, callBack)
}
else
{
var txt = qsTr("Creating sub domain " + dappUrl[0] + " ...");
var txt = qsTr("Registering sub domain " + dappUrl[0] + " ...");
console.log(txt);
deploymentStepChanged(txt);
//current registrar is owned => ownedregistrar creation and continue.
@ -519,12 +520,16 @@ function checkRegistration(dappUrl, addr, callBack)
requests = [];
console.log('new created addr ' + newCtrAddress);
var txt = qsTr("Please wait while " + dappUrl[0] + " is creating ...");
var txt = qsTr("Please wait " + dappUrl[0] + " is registering ...");
deploymentStepChanged(txt);
console.log(txt);
deploymentDialog.waitForTrCountToIncrement(function() {
deploymentDialog.waitForTrCountToIncrement(function(status) {
if (status === -1)
{
trCountIncrementTimeOut();
return;
}
var crLevel = createString(dappUrl[0]).encodeValueAsString();
requests.push({
//setRegister()
@ -547,22 +552,11 @@ function checkRegistration(dappUrl, addr, callBack)
});
}
var filterId;
function createFilter(callBack)
function trCountIncrementTimeOut()
{
var requests = [];
var jsonRpcRequestId = 0;
requests.push({
jsonrpc: "2.0",
method: "eth_newFilterString",
params: [ "pending" ],
id: jsonRpcRequestId++
});
rpcCall(requests, function (httpRequest, response){
console.log(response);
filterId = JSON.parse(response)[0].result;
callBack(filterId);
})
var error = qsTr("Something went wrong during the deployment. Please verify the amount of gas for this transaction and check your balance.")
console.log(error);
deploymentError(error);
}
function registerContentHash(registrar, callBack)

1
mix/qml/js/TransactionHelper.js
View File

@ -27,7 +27,6 @@ function rpcCall(requests, callBack)
var errorText = qsTr("Deployment error: Error while registering Dapp ") + httpRequest.status;
console.log(errorText);
deploymentError(errorText);
return;
}
callBack(httpRequest.status, httpRequest.responseText)
}

Write Preview
Loading…
Cancel
Save