- Account Selection in DeploymentDialog.qml

- Mime type in swarm.json
 - Use of ownedregistrar

mix/FileIo.cpp

@@ -20,6 +20,9 @@
  * Ethereum IDE client.
  */
 
+#include <QDebug>
+#include <QDesktopServices>
+#include <QMimeDatabase>
 #include <QDirIterator>
 #include <QDir>
 #include <QFile>
@@ -37,6 +40,11 @@ using namespace dev;
 using namespace dev::crypto;
 using namespace dev::mix;
 
+void FileIo::openFileBrowser(QString _dir)
+{
+	QDesktopServices::openUrl(QUrl(_dir));
+}
+
 void FileIo::makeDir(QString const& _url)
 {
 	QUrl url(_url);
@@ -123,6 +131,7 @@ QStringList FileIo::makePackage(QString const& _deploymentFolder)
 	dev::RLPStream rlpStr;
 	int k = 1;
 	std::vector<bytes> files;
+	QMimeDatabase mimeDb;
 	for (auto item: deployDir.entryInfoList(QDir::Files))
 	{
 		QFile qFile(item.filePath());
@@ -134,7 +143,7 @@ QStringList FileIo::makePackage(QString const& _deploymentFolder)
 			std::string path = fileInfo.fileName() == "index.html" ? "/" : fileInfo.fileName().toStdString();
 			jsonValue["path"] = path; //TODO: Manage relative sub folder
 			jsonValue["file"] = "/" + fileInfo.fileName().toStdString();
-			jsonValue["contentType"] = "text/html"; //TODO: manage multiple content type
+			jsonValue["contentType"] = mimeDb.mimeTypeForFile(qFile.fileName()).name().toStdString();
 			QByteArray a = qFile.readAll();
 			bytes data = bytes(a.begin(), a.end());
 			files.push_back(data);

mix/FileIo.h

@@ -55,6 +55,8 @@ public:
 	Q_INVOKABLE bool fileExists(QString const& _url);
 	/// Compress a folder, @returns sha3 of the compressed file.
 	Q_INVOKABLE QStringList makePackage(QString const& _deploymentFolder);
+	/// Open a file browser
+	Q_INVOKABLE void openFileBrowser(QString _dir);
 
 private:
 	QString getHomePath() const;

mix/qml/DeploymentDialog.qml

@@ -12,9 +12,10 @@ import "."
 
 
 Window {
+
 	id: modalDeploymentDialog
 	modality: Qt.ApplicationModal
-	width: 600
+	width: 800
 	height: 350
 	visible: false
 	property alias applicationUrlEth: applicationUrlEth.text
@@ -22,8 +23,9 @@ Window {
 	property string urlHintContract: "c83d3e22645fb015d02043a744921cc2f828c64d"
 	property string packageHash
 	property alias packageBase64: base64Value.text
-	property string eth: "afb7cdbd076674fd2c67f8a66518e3145b184ae4";
+	property string eth: "4c3f7330690ed3657d3fa20fe5717b84010528ae";
-	property string wallet: "c83d3e22645fb015d02043a744921cc2f828c64d";
+	property string yanndappRegistrar: "29a2e6d3c56ef7713a4e7229c3d1a23406f0161a";
+	property string currentAccount
 
 	color: Style.generic.layout.backgroundColor
 
@@ -34,6 +36,23 @@ Window {
 
 	function open()
 	{
+		var requests = [];
+		requests.push({
+						  //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;
+		});
+
 		modalDeploymentDialog.setX((Screen.width - width) / 2);
 		modalDeploymentDialog.setY((Screen.height - height) / 2);
 		visible = true;
@@ -49,6 +68,46 @@ Window {
 		return h;
 	}
 
+	function waitForTrCountToIncrement(callBack)
+	{
+		poolLog.callBack = callBack;
+		poolLog.k = 0;
+		poolLog.start();
+	}
+
+	Timer
+	{
+		id: poolLog
+		property var callBack
+		property var k: -1
+		interval: 500
+		running: false
+		repeat: true
+		onTriggered: {
+			var requests = [];
+			var jsonRpcRequestId = 0;
+			requests.push({
+							  jsonrpc: "2.0",
+							  method: "eth_countAt",
+							  params: [ currentAccount ],
+							  id: jsonRpcRequestId++
+						  });
+			TransactionHelper.rpcCall(requests, function (httpRequest, response){
+				console.log(response);
+				response = response.replace(/,0+/, '');
+				console.log(response);
+				var count = JSON.parse(response)[0].result
+				if (k < parseInt(count) && k > 0)
+				{
+					stop();
+					callBack();
+				}
+				else
+					k = parseInt(JSON.parse(response)[0].result);
+			})
+		}
+	}
+
 	Rectangle
 	{
 		anchors.fill : parent
@@ -60,6 +119,22 @@ Window {
 			anchors.top: parent.top
 			anchors.left: parent.left
 			width: parent.width
+			DefaultLabel
+			{
+				text: qsTr("Account used to deploy:")
+			}
+
+			ComboBox {
+				id: comboAccounts
+				onCurrentIndexChanged : {
+					if (modelAccounts.count > 0)
+						currentAccount = modelAccounts.get(currentIndex).id;
+				}
+				model: ListModel {
+					id: modelAccounts
+				}
+			}
+
 			DefaultLabel
 			{
 				text: qsTr("Ethereum Application URL: ")
@@ -95,6 +170,20 @@ 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 {
@@ -109,13 +198,22 @@ Window {
 			anchors.right: parent.right;
 			anchors.bottomMargin: 10
 			Button {
-				text: qsTr("Deploy to Ethereum");
+				text: qsTr("Deploy contract / Package resources");
 				tooltip: qsTr("Deploy contract and package resources files.")
 				onClicked: {
 					deployWarningDialog.open();
 				}
 			}
 
+			Button {
+				text: qsTr("Package resources only");
+				tooltip: qsTr("Package resources files.")
+				enabled: Object.keys(projectModel.deploymentAddresses).length > 0
+				onClicked: {
+					ProjectModelCode.startDeployProject(false);
+				}
+			}
+
 			Button {
 				text: qsTr("Register Web Application");
 				tooltip: qsTr("Register hosted Web Application.")
@@ -137,27 +235,42 @@ Window {
 			}
 
 			Button {
-				text: qsTr("Check Ownership");
+				text: qsTr("Checking eth/yanndapp");
 				visible : false
 				onClicked: {
 					var requests = [];
-					var ethStr = QEtherHelper.createString("wallet");
+					var ethStr = QEtherHelper.createString("yanndapp");
-
-					var ethHash = QEtherHelper.createHash(eth);
 
 					requests.push({ //owner
-					jsonrpc: "2.0",
+									  jsonrpc: "2.0",
-					method: "eth_call",
+									  method: "eth_call",
-					params: [ { "to": '0x' + modalDeploymentDialog.eth, "data": "0xec7b9200" + ethStr.encodeValueAsString() } ],
+									  params: [ { "to": '0x' + modalDeploymentDialog.eth, "data": "0xec7b9200" + ethStr.encodeValueAsString() } ], //check for yanndappRegistrar in eth
-					id: 3
+									  id: 1
-				});
+								  });
-
+
-				requests.push({ //register
+					requests.push({ //register
-					jsonrpc: "2.0",
+									  jsonrpc: "2.0",
-					method: "eth_call",
+									  method: "eth_call",
-					params: [ { "to":  '0x' + modalDeploymentDialog.eth, "data": "0x6be16bed" + ethStr.encodeValueAsString() } ],
+									  params: [ { "to":  '0x' + modalDeploymentDialog.eth, "data": "0x6be16bed" + ethStr.encodeValueAsString() } ], //getregister yanndappRegistrar in eth
-					id: 4
+									  id: 2
-				});
+								  });
+
+
+					requests.push({ //getOwner
+									  jsonrpc: "2.0",
+									  method: "eth_call",
+									  params: [ { "to": '0x' + modalDeploymentDialog.yanndappRegistrar, "data": "0x893d20e8" } ], //check owner of this registrar
+									  id: 3
+								  });
+
+					/*requests.push({ //register
+									  jsonrpc: "2.0",
+									  method: "eth_call",
+									  params: [ { "to":  '0x' + modalDeploymentDialog.yanndappRegistrar, "data": "0x6be16bed" + ethStr.encodeValueAsString() } ],
+									  id: 2
+								  });*/
+
+
 
 					var jsonRpcUrl = "http://localhost:8080";
 					var rpcRequest = JSON.stringify(requests);
@@ -180,30 +293,76 @@ Window {
 				}
 			}
 
+			Button {
+				text: qsTr("add contracts");
+				visible : false
+				onClicked: {
+					 var jsonRpcRequestId = 0;
+					var requests = [];
+					requests.push({
+									  jsonrpc: "2.0",
+									  method: "eth_transact",
+									  params: [ { "gas": 20000, "code": "0x60056011565b600180601c6000396000f35b6008600081905550560000" } ],
+									  id: jsonRpcRequestId++
+								  });
+
+					var jsonRpcUrl = "http://localhost:8080";
+					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) {
+							console.log(httpRequest.responseText);
+							var requests = [];
+
+							requests.push({
+											  jsonrpc: "2.0",
+											  method: "eth_transact",
+											  params: [ { "gas": 20000, "code": "0x60056011565b600180601c6000396000f35b6009600081905550560000" } ],
+											  id: jsonRpcRequestId++
+										  });
+							rpcRequest = JSON.stringify(requests);
+							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) {
+									console.log(httpRequest.responseText);
+								}
+							}
+							httpRequest.send(rpcRequest);
+						}
+					}
+					httpRequest.send(rpcRequest);
+				}
+			}
+
 
 			Button {
-				text: qsTr("Generate registrar init");
+				text: qsTr("Registering eth/yanndapp");
 				visible: false
 				onClicked: {
-					console.log("registering eth/wallet")
+					console.log("registering eth/yanndapp")
 					var jsonRpcRequestId = 0;
-
 					var requests = [];
-
+					var ydapp = QEtherHelper.createString("yanndapp");
-					var walletStr = QEtherHelper.createString("wallet");
 
 					requests.push({ //reserve
 									  jsonrpc: "2.0",
 									  method: "eth_transact",
-									  params: [ { "to": '0x' + modalDeploymentDialog.eth, "data": "0x1c83171b" + walletStr.encodeValueAsString() } ],
+									  params: [ { "gas": 2000, "to": '0x' + modalDeploymentDialog.eth, "data": "0x1c83171b" + ydapp.encodeValueAsString() } ],
 									  id: jsonRpcRequestId++
 								  });
 
-
 					requests.push({ //setRegister
 									  jsonrpc: "2.0",
 									  method: "eth_transact",
-									  params: [ { "to": '0x' + modalDeploymentDialog.eth, "data": "0x96077307" + walletStr.encodeValueAsString() + pad(wallet) } ],
+									  params: [ { "gas": 2000, "to": '0x' + modalDeploymentDialog.eth, "data": "0x96077307" + ydapp.encodeValueAsString() + modalDeploymentDialog.pad(modalDeploymentDialog.yanndappRegistrar) } ],
 									  id: jsonRpcRequestId++
 								  });
 

mix/qml/ProjectModel.qml

@@ -7,6 +7,7 @@ import Qt.labs.settings 1.0
 import "js/ProjectModel.js" as ProjectModelCode
 
 Item {
+
 	id: projectModel
 
 	signal projectClosed
@@ -33,6 +34,7 @@ Item {
 	property string projectTitle: ""
 	property string currentDocumentId: ""
 	property var deploymentAddresses: []
+	property string deploymentDir
 	property var listModel: projectListModel
 	property var stateListModel: projectStateListModel.model
 	property CodeEditorView codeEditor: null
@@ -93,28 +95,17 @@ Item {
 
 	MessageDialog {
 		id: deployWarningDialog
-		property bool redeploy
 		title: qsTr("Project")
 		text:
 		{
 			if (Object.keys(projectModel.deploymentAddresses).length > 0)
-			{
+				return qsTr("This project has been already deployed to the network. Do you want to redeploy it? (Contract state will be reseted)")
-				redeploy = true
-				standardButtons = StandardButton.Ok | StandardButton.Reset | StandardButton.Abort;
-				return qsTr("This project has been already deployed to the network. Do you want to repackage the resources only, or also reset the deployed contract to its initial state?")
-			}
 			else
-			{
-				redeploy = false;
-				standardButtons = StandardButton.Ok | StandardButton.Abort;
 				return qsTr("This action will deploy to the network. Do you want to deploy it?")
-			}
 		}
 		icon: StandardIcon.Question
+		standardButtons: StandardButton.Ok | StandardButton.Abort
 		onAccepted: {
-			ProjectModelCode.startDeployProject(!redeploy);
-		}
-		onReset: {
 			ProjectModelCode.startDeployProject(true);
 		}
 	}
@@ -123,7 +114,6 @@ Item {
 		id: deployRessourcesDialog
 		title: qsTr("Project")
 		standardButtons: StandardButton.Ok
-		icon: StandardIcon.Info
 	}
 
 	DeploymentDialog

mix/qml/js/ProjectModel.js

@@ -20,6 +20,7 @@
  * Ethereum IDE client.
  */
 Qt.include("QEtherHelper.js")
+Qt.include("TransactionHelper.js")
 
 var htmlTemplate = "<html>\n<head>\n<script>\n</script>\n</head>\n<body>\n<script>\n</script>\n</body>\n</html>";
 var contractTemplate = "contract Contract {\n}\n";
@@ -50,7 +51,8 @@ function saveProject() {
 			applicationUrlEth: deploymentDialog.applicationUrlEth,
 			applicationUrlHttp: deploymentDialog.applicationUrlHttp,
 			packageHash: deploymentDialog.packageHash,
-			packageBase64: deploymentDialog.packageBase64
+			packageBase64: deploymentDialog.packageBase64,
+			deploymentDir: projectModel.deploymentDir
 		};
 		for (var i = 0; i < projectListModel.count; i++)
 			projectData.files.push(projectListModel.get(i).fileName)
@@ -68,6 +70,8 @@ function loadProject(path) {
 	var projectFile = path + projectFileName;
 	var json = fileIo.readFile(projectFile);
 	var projectData = JSON.parse(json);
+	if (projectData.deploymentDir)
+		projectModel.deploymentDir = projectData.deploymentDir
 	if (projectData.packageHash)
 		deploymentDialog.packageHash =  projectData.packageHash
 	if (projectData.packageBase64)
@@ -289,6 +293,7 @@ function deployProject(force) {
 	deploymentDialog.open();
 }
 
+var codeTest = "";
 function startDeployProject(erasePrevious)
 {
 	var date = new Date();
@@ -309,12 +314,13 @@ function startDeployProject(erasePrevious)
 	for (var c in codeModel.contracts) { //TODO: order based on dependencies
 		var code = codeModel.contracts[c].codeHex;
 		requests.push({
-			jsonrpc: "2.0",
+						  jsonrpc: "2.0",
-			method: "eth_transact",
+						  method: "eth_transact",
-			params: [ { "code": code } ],
+						  params: [ { "from": deploymentDialog.currentAccount, "gas": 20000, "code": code /* "0x60056013565b61059e8061001d6000396000f35b33600081905550560060003560e060020a90048063019848921461009a578063449c2090146100af5780635d574e32146100cd5780635fd4b08a146100e1578063618242da146100f65780636be16bed1461010b5780636c4489b414610129578063893d20e8146101585780639607730714610173578063c284bc2a14610187578063e50f599a14610198578063e5811b35146101af578063ec7b9200146101cd57005b6100a560043561031b565b8060005260206000f35b6100ba6004356103a0565b80600160a060020a031660005260206000f35b6100db600435602435610537565b60006000f35b6100ec600435610529565b8060005260206000f35b6101016004356103dd565b8060005260206000f35b6101166004356103bd565b80600160a060020a031660005260206000f35b61013460043561034b565b82600160a060020a031660005281600160a060020a03166020528060405260606000f35b610160610341565b80600160a060020a031660005260206000f35b6101816004356024356102b4565b60006000f35b6101926004356103fd565b60006000f35b6101a96004356024356044356101f2565b60006000f35b6101ba6004356101eb565b80600160a060020a031660005260206000f35b6101d8600435610530565b80600160a060020a031660005260206000f35b6000919050565b600054600160a060020a031633600160a060020a031614610212576102af565b8160026000858152602001908152602001600020819055508061023457610287565b81600160a060020a0316837f680ad70765443c2967675ab0fb91a46350c01c6df59bf9a41ff8a8dd097464ec60006000a3826001600084600160a060020a03168152602001908152602001600020819055505b827f18d67da0cd86808336a3aa8912f6ea70c5250f1a98b586d1017ef56fe199d4fc60006000a25b505050565b600054600160a060020a031633600160a060020a0316146102d457610317565b806002600084815260200190815260200160002060010181905550817f18d67da0cd86808336a3aa8912f6ea70c5250f1a98b586d1017ef56fe199d4fc60006000a25b5050565b60006001600083600160a060020a03168152602001908152602001600020549050919050565b6000600054905090565b6000600060006002600085815260200190815260200160002054925060026000858152602001908152602001600020600101549150600260008581526020019081526020016000206002015490509193909250565b600060026000838152602001908152602001600020549050919050565b600060026000838152602001908152602001600020600101549050919050565b600060026000838152602001908152602001600020600201549050919050565b600054600160a060020a031633600160a060020a03161461041d57610526565b80600160006002600085815260200190815260200160002054600160a060020a031681526020019081526020016000205414610458576104d2565b6002600082815260200190815260200160002054600160a060020a0316817f680ad70765443c2967675ab0fb91a46350c01c6df59bf9a41ff8a8dd097464ec60006000a36000600160006002600085815260200190815260200160002054600160a060020a03168152602001908152602001600020819055505b6002600082815260200190815260200160002060008101600090556001810160009055600281016000905550807f18d67da0cd86808336a3aa8912f6ea70c5250f1a98b586d1017ef56fe199d4fc60006000a25b50565b6000919050565b6000919050565b600054600160a060020a031633600160a060020a0316146105575761059a565b806002600084815260200190815260200160002060020181905550817f18d67da0cd86808336a3aa8912f6ea70c5250f1a98b586d1017ef56fe199d4fc60006000a25b505056" */ } ],
-			id: jsonRpcRequestId++
+						  id: jsonRpcRequestId++
-		});
+					  });
 		requestNames.push(c);
+		codeTest = code;
 	}
 
 	var rpcRequest = JSON.stringify(requests);
@@ -327,11 +333,18 @@ function startDeployProject(erasePrevious)
 		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;
-					finalizeDeployment(deploymentId, contractAddresses);
+
+					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;
@@ -346,6 +359,7 @@ function startDeployProject(erasePrevious)
 function finalizeDeployment(deploymentId, addresses) {
 	deploymentStepChanged(qsTr("Packaging application ..."));
 	var deploymentDir = projectPath + deploymentId + "/";
+	projectModel.deploymentDir = deploymentDir;
 	fileIo.makeDir(deploymentDir);
 	for (var i = 0; i < projectListModel.count; i++) {
 		var doc = projectListModel.get(i);
@@ -372,16 +386,16 @@ function finalizeDeployment(deploymentId, addresses) {
 	}
 	//write deployment js
 	var deploymentJs =
-		"// Autogenerated by Mix\n" +
+			"// Autogenerated by Mix\n" +
-		"web3 = require(\"web3\");\n" +
+			"web3 = require(\"web3\");\n" +
-		"contracts = {};\n";
+			"contracts = {};\n";
 	for (var c in codeModel.contracts)  {
 		var contractAccessor = "contracts[\"" + codeModel.contracts[c].contract.name + "\"]";
 		deploymentJs += contractAccessor + " = {\n" +
-		"\tinterface: " + codeModel.contracts[c].contractInterface + ",\n" +
+				"\tinterface: " + codeModel.contracts[c].contractInterface + ",\n" +
-		"\taddress: \"" + addresses[c] + "\"\n" +
+				"\taddress: \"" + addresses[c] + "\"\n" +
-		"};\n" +
+				"};\n" +
-		contractAccessor + ".contract = web3.eth.contract(" + contractAccessor + ".address, " + contractAccessor + ".interface);\n";
+				contractAccessor + ".contract = web3.eth.contract(" + contractAccessor + ".address, " + contractAccessor + ".interface);\n";
 	}
 	fileIo.writeFile(deploymentDir + "deployment.js", deploymentJs);
 	//copy scripts
@@ -398,135 +412,181 @@ function finalizeDeployment(deploymentId, addresses) {
 	applicationUrlEth = formatAppUrl(applicationUrlEth);
 
 	deploymentStepChanged(qsTr("Registering application on the Ethereum network ..."));
-	checkRegistration(applicationUrlEth, deploymentDialog.eth, function () {
+	applicationUrlEth.splice(0, 1); //Remove eth (already exists).
+	applicationUrlEth.push(projectModel.projectTitle);
+	checkEthPath(applicationUrlEth, function () {
 		deploymentComplete();
 		deployRessourcesDialog.text = qsTr("Register Web Application to finalize deployment.");
 		deployRessourcesDialog.open();
 	});
 }
 
-function rpcCall(requests, callBack)
+function checkEthPath(dappUrl, callBack)
 {
-	var jsonRpcUrl = "http://localhost:8080";
+	var str = createString(dappUrl[0]);
-	var rpcRequest = JSON.stringify(requests);
+	var requests = [];
-	var httpRequest = new XMLHttpRequest();
+	console.log(" ggg " + deploymentDialog.currentAccount);
-	httpRequest.open("POST", jsonRpcUrl, true);
+	console.log(" ggg " + deploymentDialog.eth);
-	httpRequest.setRequestHeader("Content-type", "application/json");
+	requests.push({
-	httpRequest.setRequestHeader("Content-length", rpcRequest.length);
+					  //register()
-	httpRequest.setRequestHeader("Connection", "close");
+					  jsonrpc: "2.0",
-	httpRequest.onreadystatechange = function() {
+					  method: "eth_call",
-		if (httpRequest.readyState === XMLHttpRequest.DONE) {
+					  params: [ { "from": deploymentDialog.currentAccount,  "to": '0x' + deploymentDialog.eth, "data": "0x6be16bed"  + str.encodeValueAsString() } ],
-			if (httpRequest.status !== 200)
+					  id: jsonRpcRequestId++
-			{
+				  });
-				var errorText = qsTr("Deployment error: Error while registering Dapp ") + httpRequest.status;
+	rpcCall(requests, function (httpRequest, response) {
-				console.log(errorText);
+		console.log("checking in path eth: found " + response);
-				deploymentError(errorText);
+		var res = JSON.parse(response);
-				return;
+		var addr = normalizeAddress(res[0].result);
-			}
+		if (addr === "")
-			callBack(httpRequest.status, httpRequest.responseText)
+		{
+			var errorTxt = qsTr("Path does not exists " + JSON.stringify(dappUrl) + ". Please register using Registration Dapp. Aborting.");
+			deploymentError(errorTxt);
+			console.log(errorTxt);
 		}
-	}
+		else
-	httpRequest.send(rpcRequest);
+		{
+			dappUrl.splice(0, 1);
+			checkRegistration(dappUrl, addr, callBack);
+		}
+	});
 }
 
 
 function checkRegistration(dappUrl, addr, callBack)
 {
+	var txt = qsTr("Checking " + JSON.stringify(dappUrl) + " ... in registrar " + addr);
+	deploymentStepChanged(txt);
+	console.log(txt);
 	var requests = [];
-	var data  = "";
+	var registrar = {}
-	if (dappUrl.length > 0)
+	var str = createString(dappUrl[0]);
-	{
+	requests.push({
-		//checking path (register).
+					  //getOwner()
-		var str = createString(dappUrl[0]);
+					  jsonrpc: "2.0",
-		data  = "0x6be16bed" + str.encodeValueAsString();
+					  method: "eth_call",
-		console.log("checking if path exists (register) => " + JSON.stringify(dappUrl));
+					  params: [ { "from": deploymentDialog.currentAccount, "to": '0x' + addr, "data": "0x893d20e8" } ],
-		requests.push({
+					  id: jsonRpcRequestId++
-			jsonrpc: "2.0",
+				  });
-			method: "eth_call",
-			params: [ { "to": '0x' + addr, "data": data } ],
-			id: jsonRpcRequestId++
-		});
-
-		rpcCall(requests, function (httpRequest, response) {
-			var address = JSON.parse(response)[0].result.replace('0x', '');
-			if (address === "")
-			{
-				var errorTxt = qsTr("Path does not exists " + JSON.stringify(dappUrl) + " cannot continue");
-				deploymentError(errorTxt);
-				console.log(errorTxt);
-				return;
-			}
-
-			dappUrl.splice(0, 1);
-			checkRegistration(dappUrl, address, callBack);
-		});
-	}
-	else
-	{
-		var paramTitle = createString(projectModel.projectTitle);
-		requests.push({
-						  //owner()
-						  jsonrpc: "2.0",
-						  method: "eth_call",
-						  params: [ { "to": '0x' + addr, "data": "0xec7b9200" + paramTitle.encodeValueAsString() } ],
-						  id: jsonRpcRequestId++
-					  });
 
-		requests.push({
+	requests.push({
-						  //accounts
+					  //register()
-						  jsonrpc: "2.0",
+					  jsonrpc: "2.0",
-						  method: "eth_accounts",
+					  method: "eth_call",
-						  params: null,
+					  params: [ { "from": deploymentDialog.currentAccount, "to": '0x' + addr, "data": "0x6be16bed"  + str.encodeValueAsString() } ],
-						  id: jsonRpcRequestId++
+					  id: jsonRpcRequestId++
-					  });
+				  });
 
-		rpcCall(requests, function (httpRequest, response) {
+	rpcCall(requests, function (httpRequest, response) {
+		console.log(" >> " +response);
+		var res = JSON.parse(response);
+		var nextAddr = normalizeAddress(res[1].result);
+		var errorTxt;
+		if (res[1].result === "0x")
+		{
+			errorTxt = qsTr("Error when creating new owned path. Please use the regsitration Dapp. Aborting");
+			deploymentError(errorTxt);
+			console.log(errorTxt);
+		}
+		else if (normalizeAddress(deploymentDialog.currentAccount) !== normalizeAddress(res[0].result))
+		{
+			errorTxt = qsTr("You are not the owner of " + dappUrl[0] + ". Aborting");
+			deploymentError(errorTxt);
+			console.log(errorTxt);
+		}
+		else if (nextAddr !== "")
+		{
+			dappUrl.splice(0, 1);
+			if (dappUrl.length > 0)
+				checkRegistration(dappUrl, nextAddr, callBack);
+			else
+				registerContentHash(addr, callBack);
+		}
+		else
+		{
+			var txt = qsTr("Creating sub domain " + dappUrl[0] +  " ...");
+			console.log(txt);
+			deploymentStepChanged(txt);
+			//current registrar is owned => ownedregistrar creation and continue.
 			requests = [];
-			var res = JSON.parse(response);
+
-			var currentOwner = res[0].result;
+			requests.push({
-			var noOwner = currentOwner.replace('0x', '').replace(/0/g, '') === '';
-
-			if (noOwner)
-			{
-				requests.push({
-							  //reserve()
 							  jsonrpc: "2.0",
 							  method: "eth_transact",
-							  params: [ { "to": '0x' + addr, "data": "0x1c83171b" + paramTitle.encodeValueAsString() } ],
+							  params: [ { "from": deploymentDialog.currentAccount, "gas": 20000, "code": "0x60056013565b61059e8061001d6000396000f35b33600081905550560060003560e060020a90048063019848921461009a578063449c2090146100af5780635d574e32146100cd5780635fd4b08a146100e1578063618242da146100f65780636be16bed1461010b5780636c4489b414610129578063893d20e8146101585780639607730714610173578063c284bc2a14610187578063e50f599a14610198578063e5811b35146101af578063ec7b9200146101cd57005b6100a560043561031b565b8060005260206000f35b6100ba6004356103a0565b80600160a060020a031660005260206000f35b6100db600435602435610537565b60006000f35b6100ec600435610529565b8060005260206000f35b6101016004356103dd565b8060005260206000f35b6101166004356103bd565b80600160a060020a031660005260206000f35b61013460043561034b565b82600160a060020a031660005281600160a060020a03166020528060405260606000f35b610160610341565b80600160a060020a031660005260206000f35b6101816004356024356102b4565b60006000f35b6101926004356103fd565b60006000f35b6101a96004356024356044356101f2565b60006000f35b6101ba6004356101eb565b80600160a060020a031660005260206000f35b6101d8600435610530565b80600160a060020a031660005260206000f35b6000919050565b600054600160a060020a031633600160a060020a031614610212576102af565b8160026000858152602001908152602001600020819055508061023457610287565b81600160a060020a0316837f680ad70765443c2967675ab0fb91a46350c01c6df59bf9a41ff8a8dd097464ec60006000a3826001600084600160a060020a03168152602001908152602001600020819055505b827f18d67da0cd86808336a3aa8912f6ea70c5250f1a98b586d1017ef56fe199d4fc60006000a25b505050565b600054600160a060020a031633600160a060020a0316146102d457610317565b806002600084815260200190815260200160002060010181905550817f18d67da0cd86808336a3aa8912f6ea70c5250f1a98b586d1017ef56fe199d4fc60006000a25b5050565b60006001600083600160a060020a03168152602001908152602001600020549050919050565b6000600054905090565b6000600060006002600085815260200190815260200160002054925060026000858152602001908152602001600020600101549150600260008581526020019081526020016000206002015490509193909250565b600060026000838152602001908152602001600020549050919050565b600060026000838152602001908152602001600020600101549050919050565b600060026000838152602001908152602001600020600201549050919050565b600054600160a060020a031633600160a060020a03161461041d57610526565b80600160006002600085815260200190815260200160002054600160a060020a031681526020019081526020016000205414610458576104d2565b6002600082815260200190815260200160002054600160a060020a0316817f680ad70765443c2967675ab0fb91a46350c01c6df59bf9a41ff8a8dd097464ec60006000a36000600160006002600085815260200190815260200160002054600160a060020a03168152602001908152602001600020819055505b6002600082815260200190815260200160002060008101600090556001810160009055600281016000905550807f18d67da0cd86808336a3aa8912f6ea70c5250f1a98b586d1017ef56fe199d4fc60006000a25b50565b6000919050565b6000919050565b600054600160a060020a031633600160a060020a0316146105575761059a565b806002600084815260200190815260200160002060020181905550817f18d67da0cd86808336a3aa8912f6ea70c5250f1a98b586d1017ef56fe199d4fc60006000a25b505056" } ],
 							  id: jsonRpcRequestId++
 						  });
-			}
-			else
-			{
-				var bOwner = false;
-				currentOwner = normalizeAddress(currentOwner);
-				for (var u in res[1].result)
-				{
-					if (normalizeAddress(res[1].result[u]) === currentOwner)
-						bOwner = true;
-				}
 
-				if (!bOwner)
+			rpcCall(requests, function(httpRequest, response) {
-				{
+				console.log("crea2" + response);
-					var errorTxt = qsTr("Current user is not the owner of this path. Cannot continue")
+				var newCtrAddress = normalizeAddress(JSON.parse(response)[0].result);
-					deploymentError(errorTxt);
+				requests = [];
-					console.log(errorTxt);
+				console.log('new created addr ' + newCtrAddress);
-					return;
+
-				}
+				var txt = qsTr("Please wait while " + dappUrl[0] + " is creating ...");
-			}
+				deploymentStepChanged(txt);
-			console.log("setContentHash");
+				console.log(txt);
-			requests.push({
+
-						  //setContent()
+				deploymentDialog.waitForTrCountToIncrement(function() {
-						  jsonrpc: "2.0",
+
-						  method: "eth_transact",
+					var crLevel = createString(dappUrl[0]).encodeValueAsString();
-						  params: [ { "to": '0x' + addr, "data": "0x5d574e32" + paramTitle.encodeValueAsString() + deploymentDialog.packageHash } ],
+					console.log("registering " + dappUrl[0]);
-						  id: jsonRpcRequestId++
+					requests.push({
-					  });
+									  //setRegister()
-			rpcCall(requests, function (httpRequest, response) {
+									  jsonrpc: "2.0",
-				callBack();
+									  method: "eth_transact",
+									  params: [ { "from": deploymentDialog.currentAccount, "gas": 2000, "to": '0x' + addr, "data": "0x96077307" + crLevel + deploymentDialog.pad(newCtrAddress) } ],
+									  id: jsonRpcRequestId++
+								  });
+
+					rpcCall(requests, function(){
+						dappUrl.splice(0, 1);
+						if (dappUrl.length > 0)
+							checkRegistration(dappUrl, newCtrAddress, callBack);
+						else
+							registerContentHash(addr, callBack);
+					});
+				});
 			});
-		});
+		}
-	}
+	});
+}
+
+var filterId;
+function createFilter(callBack)
+{
+	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);
+	})
+}
+
+function registerContentHash(registrar, callBack)
+{
+	var txt = qsTr("Finalizing Dapp registration ...");
+	deploymentStepChanged(txt);
+	console.log(txt);
+	var requests = [];
+	var paramTitle = createString(projectModel.projectTitle);
+	requests.push({
+					  //setContent()
+					  jsonrpc: "2.0",
+					  method: "eth_transact",
+					  params: [ { "from": deploymentDialog.currentAccount, "gas": "2000", "gasPrice": "10", "to": '0x' + registrar, "data": "0x5d574e32" + paramTitle.encodeValueAsString() + deploymentDialog.packageHash } ],
+					  id: jsonRpcRequestId++
+				  });
+	rpcCall(requests, function (httpRequest, response) {
+		callBack();
+	});
 }
 
 function registerToUrlHint()
@@ -535,12 +595,12 @@ function registerToUrlHint()
 	var requests = [];
 	var paramUrlHttp = createString(deploymentDialog.applicationUrlHttp);
 	requests.push({
-				  //urlHint => suggestUrl
+					  //urlHint => suggestUrl
-				  jsonrpc: "2.0",
+					  jsonrpc: "2.0",
-				  method: "eth_transact",
+					  method: "eth_transact",
-				  params: [ { "to": '0x' + deploymentDialog.urlHintContract, "data": "0x4983e19c" + deploymentDialog.packageHash + paramUrlHttp.encodeValueAsString() } ],
+					  params: [ { "to": '0x' + deploymentDialog.urlHintContract, "data": "0x4983e19c" + deploymentDialog.packageHash + paramUrlHttp.encodeValueAsString() } ],
-				  id: jsonRpcRequestId++
+					  id: jsonRpcRequestId++
-			  });
+				  });
 
 	rpcCall(requests, function (httpRequest, response) {
 		deploymentComplete();
@@ -556,7 +616,7 @@ function normalizeAddress(addr)
 		if (addr[k] !== "0")
 			break;
 		else
-			i++;
+		i++;
 	}
 	return addr.substring(i);
 }
@@ -586,4 +646,3 @@ function formatAppUrl(url)
 		return ret;
 	}
 }
-

mix/qml/js/TransactionHelper.js

@@ -10,3 +10,28 @@ function defaultTransaction()
 		parameters: {}
 	};
 }
+
+function rpcCall(requests, callBack)
+{
+	var jsonRpcUrl = "http://localhost:8080";
+	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 errorText = qsTr("Deployment error: Error while registering Dapp ") + httpRequest.status;
+				console.log(errorText);
+				deploymentError(errorText);
+				return;
+			}
+			callBack(httpRequest.status, httpRequest.responseText)
+		}
+	}
+	httpRequest.send(rpcRequest);
+}
+