loading DApps by package url

alethzero/DappLoader.cpp

@@ -193,11 +193,26 @@ Manifest DappLoader::loadManifest(std::string const& _manifest)
 
 void DappLoader::loadDapp(QString const& _uri)
 {
+	QUrl uri(_uri);
 	QUrl contentUri;
+	h256 hash;
+	if (uri.path().endsWith(".dapp") && uri.query().startsWith("hash="))
+	{
+		contentUri = uri;
+		QString query = uri.query();
+		query.remove("hash=");
+		if (!query.startsWith("0x"))
+			query.insert(0, "0x");
+		hash = jsToFixed<32>(query.toStdString());
+	}
+	else
+	{
 		DappLocation location = resolveAppUri(_uri);
-	QUrl uri(location.contentUri);
+		contentUri = location.contentUri;
-	QNetworkRequest request(uri);
+		hash = location.contentHash;
-	m_uriHashes[uri] = location.contentHash;
+	}
+	QNetworkRequest request(contentUri);
+	m_uriHashes[uri] = hash;
 	m_net.get(request);
 }
 

alethzero/MainWin.cpp

@@ -900,7 +900,7 @@ void Main::on_urlEdit_returnPressed()
 {
 	QString s = ui->urlEdit->text();
 	QUrl url(s);
-	if (url.scheme().isEmpty() || url.scheme() == "eth")
+	if (url.scheme().isEmpty() || url.scheme() == "eth" || url.path().endsWith(".dapp"))
 	{
 		try
 		{

mix/ClientModel.cpp

@@ -138,6 +138,12 @@ QString ClientModel::newAddress()
 	return QString::fromStdString(toHex(a.secret().ref()));
 }
 
+QString ClientModel::encodeAbiString(QString _string)
+{
+	ContractCallDataEncoder encoder;
+	return QString::fromStdString(toHex(encoder.encodeBytes(_string)));
+}
+
 QVariantMap ClientModel::contractAddresses() const
 {
 	QVariantMap res;

mix/ClientModel.h

@@ -154,7 +154,10 @@ public slots:
 	Q_INVOKABLE void debugRecord(unsigned _index);
 	/// Show the debugger for an empty record
 	Q_INVOKABLE void emptyRecord();
+	/// Generate new adress
 	Q_INVOKABLE QString newAddress();
+	/// Encode a string to ABI parameter. Returns a hex string
+	Q_INVOKABLE QString encodeAbiString(QString _string);
 
 private slots:
 	/// Update UI with machine states result. Display a modal dialog.

mix/ContractCallDataEncoder.cpp

@@ -110,11 +110,6 @@ unsigned ContractCallDataEncoder::encodeSingleItem(QVariant const& _data, Solidi
 	return dataSize;
 }
 
-void ContractCallDataEncoder::push(bytes const& _b)
-{
-	m_encodedData.insert(m_encodedData.end(), _b.begin(), _b.end());
-}
-
 bigint ContractCallDataEncoder::decodeInt(dev::bytes const& _rawValue)
 {
 	dev::u256 un = dev::fromBigEndian<dev::u256>(_rawValue);

mix/ContractCallDataEncoder.h

@@ -52,8 +52,10 @@ public:
 	QVariant decode(SolidityType const& _type, bytes const& _value);
 	/// Get all encoded data encoded by encode function.
 	bytes encodedData();
-	/// Push the given @a _b to the current param context.
+	/// Encode a string to ABI bytes
-	void push(bytes const& _b);
+	dev::bytes encodeBytes(QString const& _str);
+	/// Decode bytes from ABI
+	dev::bytes decodeBytes(dev::bytes const& _rawValue);
 
 private:
 	unsigned encodeSingleItem(QVariant const& _data, SolidityType const& _type, bytes& _dest);
@@ -63,8 +65,6 @@ private:
 	dev::bytes encodeBool(QString const& _str);
 	bool decodeBool(dev::bytes const& _rawValue);
 	QString toString(bool _b);
-	dev::bytes encodeBytes(QString const& _str);
-	dev::bytes decodeBytes(dev::bytes const& _rawValue);
 	QString toString(dev::bytes const& _b);
 	bool asString(dev::bytes const& _b, QString& _str);
 

mix/FileIo.cpp

@@ -196,6 +196,7 @@ QStringList FileIo::makePackage(QString const& _deploymentFolder)
 	QStringList ret;
 	ret.append(QString::fromStdString(toHex(dappHash.ref())));
 	ret.append(qFileBytes.toBase64());
+	ret.append(url.toString());
 	return ret;
 }
 

mix/qml/DeploymentDialog.qml

@@ -24,7 +24,8 @@ Window {
 	visible: false
 	property alias applicationUrlEth: applicationUrlEth.text
 	property alias applicationUrlHttp: applicationUrlHttp.text
-	property string urlHintContract: urlHintAddr.text
+	property alias urlHintContract: urlHintAddr.text
+	property alias localPackageUrl: localPackageUrl.text
 	property string packageHash
 	property string packageBase64
 	property string eth: registrarAddr.text
@@ -299,7 +300,7 @@ Window {
 
 				DefaultTextField
 				{
-					text: "20000"
+					text: "1000000"
 					Layout.preferredWidth: 350
 					id: gasToUseInput
 				}
@@ -416,6 +417,20 @@ Window {
 				columns: 2
 				Layout.fillWidth: true
 
+				DefaultLabel
+				{
+					Layout.preferredWidth: 355
+					text: qsTr("Local package URL")
+				}
+
+				DefaultTextField
+				{
+					Layout.preferredWidth: 350
+					id: localPackageUrl
+					//readOnly: true
+					//enabled: rowRegister.isOkToRegister()
+				}
+
 				DefaultLabel
 				{
 					Layout.preferredWidth: 355

mix/qml/ProjectModel.qml

@@ -158,7 +158,7 @@ Item {
 	}
 
 	MessageDialog {
-		id: deployRessourcesDialog
+		id: deployResourcesDialog
 		title: qsTr("Project")
 		standardButtons: StandardButton.Ok
 	}

mix/qml/js/ProjectModel.js

@@ -367,24 +367,9 @@ function startDeployProject(erasePrevious)
 
 	var ctrNames = Object.keys(codeModel.contracts);
 	var ctrAddresses = {};
-	setDefaultBlock(0, function() {
 	deployContracts(0, ctrAddresses, ctrNames, function (){
 		finalizeDeployment(deploymentId, ctrAddresses);
 	});
-	});
-}
-
-function setDefaultBlock(val, callBack)
-{
-	var requests = [{
-						jsonrpc: "2.0",
-						method: "eth_setDefaultBlock",
-						params: [val],
-						id: 0
-					}];
-	rpcCall(requests, function (httpCall, response){
-		callBack();
-	});
 }
 
 function deployContracts(ctrIndex, ctrAddresses, ctrNames, callBack)
@@ -461,6 +446,7 @@ function finalizeDeployment(deploymentId, addresses) {
 	var packageRet = fileIo.makePackage(deploymentDir);
 	deploymentDialog.packageHash = packageRet[0];
 	deploymentDialog.packageBase64 = packageRet[1];
+	deploymentDialog.localPackageUrl = packageRet[2] + "?hash=" + packageRet[0];
 
 	var applicationUrlEth = deploymentDialog.applicationUrlEth;
 
@@ -468,9 +454,8 @@ function finalizeDeployment(deploymentId, addresses) {
 	deploymentStepChanged(qsTr("Registering application on the Ethereum network ..."));
 	checkEthPath(applicationUrlEth, function () {
 		deploymentComplete();
-		deployRessourcesDialog.text = qsTr("Register Web Application to finalize deployment.");
+		deployResourcesDialog.text = qsTr("Register Web Application to finalize deployment.");
-		deployRessourcesDialog.open();
+		deployResourcesDialog.open();
-		setDefaultBlock(-1, function() {});
 	});
 }
 
@@ -617,12 +602,12 @@ function registerContentHash(registrar, callBack)
 	deploymentStepChanged(txt);
 	console.log(txt);
 	var requests = [];
-	var paramTitle = createString(projectModel.projectTitle);
+	var paramTitle = clientModel.encodeAbiString(projectModel.projectTitle);
 	requests.push({
 					  //setContent()
 					  jsonrpc: "2.0",
 					  method: "eth_sendTransaction",
-					  params: [ { "from": deploymentDialog.currentAccount, "gas": 30000, "gasPrice": "10", "to": '0x' + registrar, "data": "0x5d574e32" + paramTitle.encodeValueAsString() + deploymentDialog.packageHash } ],
+					  params: [ { "from": deploymentDialog.currentAccount, "gas": 30000, "gasPrice": "10", "to": '0x' + registrar, "data": "0x5d574e32" + paramTitle + deploymentDialog.packageHash } ],
 					  id: jsonRpcRequestId++
 				  });
 	rpcCall(requests, function (httpRequest, response) {

mix/qml/js/QEtherHelper.js

@@ -15,19 +15,3 @@ function createBigInt(_value)
 	return bigint;
 }
 
-function createString(_value)
-{
-	var stringComponent = Qt.createComponent("qrc:/qml/QStringType.qml");
-	var stringC = stringComponent.createObject();
-	stringC.setValue(_value);
-	return stringC;
-}
-
-function createHash(_value)
-{
-	var hComponent = Qt.createComponent("qrc:/qml/QHashType.qml");
-	var hC = hComponent.createObject();
-	hC.setValue(_value);
-	return hC;
-}
-