transaction dialog ui

mix/CodeModel.cpp

@@ -392,6 +392,7 @@ void CodeModel::gasEstimation(solidity::CompilerStack const& _cs)
 		}
 
 		eth::AssemblyItems const& runtimeAssembly = *_cs.getRuntimeAssemblyItems(n);
+		QString contractName = QString::fromStdString(contractDefinition.getName());
 		// Functional gas costs (per function, but also for accessors)
 		for (auto it: contractDefinition.getInterfaceFunctions())
 		{
@@ -399,13 +400,15 @@ void CodeModel::gasEstimation(solidity::CompilerStack const& _cs)
 				continue;
 			SourceLocation loc = it.second->getDeclaration().getLocation();
 			GasMeter::GasConsumption cost = GasEstimator::functionalEstimation(runtimeAssembly, it.second->externalSignature());
-			m_gasCostsMaps->push(sourceName, loc.start, loc.end, gasToString(cost), cost.isInfinite, GasMap::type::Function);
+			m_gasCostsMaps->push(sourceName, loc.start, loc.end, gasToString(cost), cost.isInfinite, GasMap::type::Function,
+								 contractName, QString::fromStdString(it.second->getDeclaration().getName()));
 		}
 		if (auto const* fallback = contractDefinition.getFallbackFunction())
 		{
 			SourceLocation loc = fallback->getLocation();
 			GasMeter::GasConsumption cost = GasEstimator::functionalEstimation(runtimeAssembly, "INVALID");
-			m_gasCostsMaps->push(sourceName, loc.start, loc.end, gasToString(cost), cost.isInfinite, GasMap::type::Function);
+			m_gasCostsMaps->push(sourceName, loc.start, loc.end, gasToString(cost), cost.isInfinite, GasMap::type::Function,
+								 contractName, "fallback");
 		}
 		for (auto const& it: contractDefinition.getDefinedFunctions())
 		{
@@ -416,13 +419,15 @@ void CodeModel::gasEstimation(solidity::CompilerStack const& _cs)
 			GasEstimator::GasConsumption cost = GasEstimator::GasConsumption::infinite();
 			if (entry > 0)
 				cost = GasEstimator::functionalEstimation(runtimeAssembly, entry, *it);
-			m_gasCostsMaps->push(sourceName, loc.start, loc.end, gasToString(cost), cost.isInfinite, GasMap::type::Function);
+			m_gasCostsMaps->push(sourceName, loc.start, loc.end, gasToString(cost), cost.isInfinite, GasMap::type::Function,
+								 contractName, QString::fromStdString(it->getName()));
 		}
 		if (auto const* constructor = contractDefinition.getConstructor())
 		{
 			SourceLocation loc = constructor->getLocation();
 			GasMeter::GasConsumption cost = GasEstimator::functionalEstimation(*_cs.getAssemblyItems(n));
-			m_gasCostsMaps->push(sourceName, loc.start, loc.end, gasToString(cost), cost.isInfinite, GasMap::type::Constructor);
+			m_gasCostsMaps->push(sourceName, loc.start, loc.end, gasToString(cost), cost.isInfinite, GasMap::type::Constructor,
+								 contractName, contractName);
 		}
 	}
 }
@@ -435,6 +440,14 @@ QVariantList CodeModel::gasCostByDocumentId(QString const& _documentId) const
 		return QVariantList();
 }
 
+QVariantList CodeModel::gasCostBy(QString const& _contractName, QString const& _functionName) const
+{
+	if (m_gasCostsMaps)
+		return m_gasCostsMaps->gasCostsBy(_contractName, _functionName);
+	else
+		return QVariantList();
+}
+
 void CodeModel::collectContracts(dev::solidity::CompilerStack const& _cs, std::vector<std::string> const& _sourceNames)
 {
 	Guard pl(x_pendingContracts);
@@ -643,9 +656,9 @@ void CodeModel::setOptimizeCode(bool _value)
 	emit scheduleCompilationJob(++m_backgroundJobId);
 }
 
-void GasMapWrapper::push(QString _source, int _start, int _end, QString _value, bool _isInfinite, GasMap::type _type)
+void GasMapWrapper::push(QString _source, int _start, int _end, QString _value, bool _isInfinite, GasMap::type _type, QString _contractName, QString _functionName)
 {
-	GasMap* gas = new GasMap(_start, _end, _value, _isInfinite, _type, this);
+	GasMap* gas = new GasMap(_start, _end, _value, _isInfinite, _type, _contractName, _functionName, this);
 	m_gasMaps.find(_source).value().push_back(QVariant::fromValue(gas));
 }
 
@@ -668,3 +681,17 @@ QVariantList GasMapWrapper::gasCostsByDocId(QString _source)
 		return QVariantList();
 }
 
+QVariantList GasMapWrapper::gasCostsBy(QString _contractName, QString _functionName)
+{
+	QVariantList gasMap;
+	for (auto const& map: m_gasMaps)
+	{
+		for (auto const& gas: map)
+		{
+			if (gas.value<GasMap*>()->contractName() == _contractName && (_functionName.isEmpty() || gas.value<GasMap*>()->functionName() == _functionName))
+				gasMap.push_back(gas);
+		}
+	}
+	return gasMap;
+}
+

mix/CodeModel.h

@@ -31,6 +31,7 @@
 #include <QMetaEnum>
 #include <libdevcore/Common.h>
 #include <libdevcore/Guards.h>
+#include <libevmcore/Params.h>
 #include <libevmasm/Assembly.h>
 #include "SolidityType.h"
 #include "QBigInt.h"
@@ -140,6 +141,8 @@ class GasMap: public QObject
 	Q_PROPERTY(QString gas MEMBER m_gas CONSTANT)
 	Q_PROPERTY(bool isInfinite MEMBER m_isInfinite CONSTANT)
 	Q_PROPERTY(QString codeBlockType READ codeBlockType CONSTANT)
+	Q_PROPERTY(QString contractName MEMBER m_contractName CONSTANT)
+	Q_PROPERTY(QString functionName MEMBER m_functionName CONSTANT)
 
 public:
 
@@ -150,13 +153,19 @@ public:
 		Constructor
 	};
 
-	GasMap(int _start, int _end, QString _gas, bool _isInfinite, type _type, QObject* _parent): QObject(_parent), m_start(_start), m_end(_end), m_gas(_gas), m_isInfinite(_isInfinite), m_type(_type) {}
+	GasMap(int _start, int _end, QString _gas, bool _isInfinite, type _type, QString _contractName, QString _functionName, QObject* _parent): QObject(_parent),
+		m_start(_start), m_end(_end), m_gas(_gas), m_isInfinite(_isInfinite), m_type(_type), m_contractName(_contractName), m_functionName(_functionName) {}
+	QString contractName() { return m_contractName; }
+	QString functionName() { return m_functionName; }
 
+private:
 	int m_start;
 	int m_end;
 	QString m_gas;
 	bool m_isInfinite;
 	type m_type;
+	QString m_contractName;
+	QString m_functionName;
 
 	QString codeBlockType() const
 	{
@@ -178,10 +187,11 @@ class GasMapWrapper: public QObject
 
 public:
 	GasMapWrapper(QObject* _parent = nullptr): QObject(_parent){}
-	void push(QString _source, int _start, int _end, QString _value, bool _isInfinite, GasMap::type _type);
+	void push(QString _source, int _start, int _end, QString _value, bool _isInfinite, GasMap::type _type, QString _contractName = "", QString _functionName = "");
 	bool contains(QString _key);
 	void insert(QString _source, QVariantList _variantList);
 	QVariantList gasCostsByDocId(QString _source);
+	QVariantList gasCostsBy(QString _contractName, QString _functionName = "");
 
 private:
 	GasCostsMaps m_gasMaps;
@@ -200,6 +210,8 @@ public:
 	Q_PROPERTY(bool compiling READ isCompiling NOTIFY stateChanged)
 	Q_PROPERTY(bool hasContract READ hasContract NOTIFY codeChanged)
 	Q_PROPERTY(bool optimizeCode MEMBER m_optimizeCode WRITE setOptimizeCode)
+	Q_PROPERTY(int callStipend READ callStipend)
+	Q_PROPERTY(int txGas READ txGas)
 
 	/// @returns latest compilation results for contracts
 	QVariantMap contracts() const;
@@ -234,7 +246,10 @@ public:
 	void gasEstimation(solidity::CompilerStack const& _cs);
 	/// Gas cost by doc id
 	Q_INVOKABLE QVariantList gasCostByDocumentId(QString const& _documentId) const;
+	Q_INVOKABLE QVariantList gasCostBy(QString const& _contractName, QString const& _functionName) const;
 	Q_INVOKABLE void setOptimizeCode(bool _value);
+	int txGas() { return static_cast<int>(dev::eth::c_txGas); }
+	int callStipend() { return static_cast<int>(dev::eth::c_callStipend); }
 
 signals:
 	/// Emited on compilation state change

mix/qml/QAddressView.qml

@@ -102,7 +102,6 @@ Row
 	}
 
 	Rectangle {
-		//anchors.fill: parent
 		radius: 4
 		anchors.verticalCenter: parent.verticalCenter
 		height: 20

mix/qml/QBoolTypeView.qml

@@ -21,16 +21,19 @@ Item
 		value = value === "true" ? "1" : value
 		value = value === "false" ? "0" : value;
 
+		var setValue = "1"
 		if (value === "")
-			boolCombo.currentIndex = parseInt(defaultValue);
+			setValue = parseInt(defaultValue);
 		else
-			boolCombo.currentIndex = parseInt(value);
+			setValue = parseInt(value);
+		boolCombo.checked = setValue === "1" ? true: false
 		boolCombo.enabled = !readOnly;
 	}
 
 	Rectangle {
+		color: "transparent"
 		anchors.fill: parent
-		ComboBox
+		CheckBox
 		{
 			property bool inited;
 			Component.onCompleted:
@@ -41,17 +44,13 @@ Item
 
 			id: boolCombo
 			anchors.fill: parent
-			onCurrentIndexChanged:
+			onCheckedChanged:
 			{
 				if (inited)
-					value = comboModel.get(currentIndex).value;
-			}
-			model: ListModel
-			{
-				id: comboModel
-				ListElement { text: qsTr("False"); value: "0" }
-				ListElement { text: qsTr("True"); value: "1" }
+					value = checked ? "1" : "0"
+
 			}
+			text: qsTr("True")
 		}
 	}
 }

mix/qml/StructView.qml

@@ -13,14 +13,11 @@ Column
 	property int transactionIndex
 	property string context
 	Layout.fillWidth: true
-	spacing: 5
-
+	spacing: 15
 	Repeater
 	{
 		id: repeater
 		visible: model.length > 0
-		//height: parent.height
-
 		RowLayout
 		{
 			id: row
@@ -43,6 +40,8 @@ Column
 						height: 20
 						id: typeLabel
 						text: " (" + modelData.type.name + ")"
+						font.italic: true
+						font.weight: Font.Light
 					}
 				}
 			}

mix/qml/TransactionDialog.qml

@@ -7,13 +7,14 @@ import QtQuick.Controls.Styles 1.3
 import org.ethereum.qml.QEther 1.0
 import "js/TransactionHelper.js" as TransactionHelper
 import "js/InputValidator.js" as InputValidator
+import "js/NetworkDeployment.js" as NetworkDeployment
 import "."
 
 Dialog {
 	id: modalTransactionDialog
 	modality: Qt.ApplicationModal
 	width: 630
-	height: 550
+	height: 500
 	visible: false
 	title: qsTr("Edit Transaction")
 	property int transactionIndex
@@ -59,6 +60,7 @@ Dialog {
 
 		load(item.isContractCreation, item.isFunctionCall, functionId, contractId)
 
+		estimatedGas.updateView()
 		visible = true;
 	}
 
@@ -273,12 +275,16 @@ Dialog {
 	contentItem: Rectangle {
 		color: transactionDialogStyle.generic.backgroundColor
 		anchors.fill: parent
+		ScrollView
+		{
+			anchors.top: parent.top
+			anchors.fill: parent
 			ColumnLayout {
 				width: modalTransactionDialog.width - 30
 				anchors.horizontalCenter: parent.horizontalCenter
 				anchors.top: parent.top
-			anchors.topMargin: 20
-
+				anchors.topMargin: 10
+				spacing: 10
 				RowLayout
 				{
 					Layout.fillWidth: true
@@ -471,19 +477,21 @@ Dialog {
 				}
 
 				RowLayout
-			{
-				Layout.fillWidth: true
-				ScrollView
 				{
 					id: paramScroll
-					anchors.topMargin: 10
 					Layout.fillWidth: true
 
 					function updateView()
 					{
-						paramScroll.height = paramsModel.length < 4 ? paramsModel.length * 20 : 145
-						paramScroll.parent.Layout.preferredHeight = paramsModel.length < 4 ? paramsModel.length * 20 : 145
-						paramScroll.visible = paramsModel.length !== 0
+						paramScroll.visible = paramsModel.length > 0
+						typeLoader.visible = paramsModel.length > 0
+						paramScroll.height = paramsModel.length < 6 ? paramsModel.length * 30 : 190
+						typeLoader.height = paramsModel.length < 6 ? paramsModel.length * 30 : 190
+						if (paramsModel.length === 0)
+						{
+							paramScroll.height = 0
+							typeLoader.height = 0
+						}
 					}
 
 					StructView
@@ -495,7 +503,6 @@ Dialog {
 						context: "parameter"
 					}
 				}
-			}
 
 				RowLayout
 				{
@@ -514,15 +521,23 @@ Dialog {
 					Ether {
 						id: valueField
 						edit: true
-					displayFormattedValue: true
+						displayFormattedValue: false
+						displayUnitSelection: true
 					}
 				}
 
+				Rectangle
+				{
+					Layout.preferredHeight: 30
+					Layout.fillWidth: true
+					color: "transparent"
 					Rectangle
 					{
 						color: "#cccccc"
 						height: 1
-				Layout.fillWidth: true
+						width: parent.width
+						anchors.verticalCenter: parent.verticalCenter
+					}
 				}
 
 				Rectangle
@@ -539,6 +554,8 @@ Dialog {
 				RowLayout
 				{
 					Layout.fillWidth: true
+					Layout.preferredHeight: 40
+
 					Rectangle
 					{
 						Layout.preferredWidth: 150
@@ -559,6 +576,52 @@ Dialog {
 							implicitWidth: 200
 							enabled: !gasAutoCheck.checked
 							id: gasValueEdit;
+
+							Label
+							{
+								id: estimatedGas
+								anchors.top: parent.bottom
+								text: ""
+								Connections
+								{
+									target: functionComboBox
+									onCurrentIndexChanged:
+									{
+										estimatedGas.displayGas(contractFromToken(recipientsAccount.currentValue()), functionComboBox.currentText)
+									}
+								}
+
+								function displayGas(contractName, functionName)
+								{
+									var gasCost = codeModel.gasCostBy(contractName, functionName);
+									if (gasCost && gasCost.length > 0)
+										estimatedGas.text = qsTr("Estimated cost: ") + gasCost[0].gas + " gas"
+								}
+
+								function updateView()
+								{
+									if (rbbuttonList.current.objectName === "trTypeExecute")
+										estimatedGas.displayGas(contractFromToken(recipientsAccount.currentValue()), functionComboBox.currentText)
+									else if (rbbuttonList.current.objectName === "trTypeCreate")
+									{
+										var contractName = contractCreationComboBox.currentValue()
+										estimatedGas.displayGas(contractName, contractName)
+									}
+									else if (rbbuttonList.current.objectName === "trTypeSend")
+									{
+										var gas = codeModel.txGas + codeModel.callStipend
+										estimatedGas.text = qsTr("Estimated cost: ") + gas + " gas"
+									}
+								}
+
+								Connections
+								{
+									target: rbbuttonList
+									onCurrentChanged: {
+										estimatedGas.updateView()
+									}
+								}
+							}
 						}
 
 						CheckBox
@@ -573,31 +636,50 @@ Dialog {
 				RowLayout
 				{
 					Layout.fillWidth: true
+					Layout.preferredHeight: 40
 					Rectangle
 					{
 						Layout.preferredWidth: 150
 						Label {
+							id: gasPriceLabel
 							anchors.verticalCenter: parent.verticalCenter
 							anchors.right: parent.right
 							text: qsTr("Gas Price")
 						}
+
+						Label {
+							id: gasPriceMarket
+							anchors.top: gasPriceLabel.bottom
+							Component.onCompleted:
+							{
+								NetworkDeployment.gasPrice(function(result)
+								{
+									gasPriceMarket.text = qsTr("Current market: ") + " " + result + " Wei";
+								}, function (){});
+							}
+						}
 					}
 
 					Ether {
 						id: gasPriceField
 						edit: true
-					displayFormattedValue: true
+						displayFormattedValue: false
+						displayUnitSelection: true
 					}
 				}
 
 
 				RowLayout
 				{
-				anchors.bottom: parent.bottom
-				anchors.right: parent.right;
+					anchors.right: parent.right
 
 					Button {
-					text: qsTr("OK");
+						text: qsTr("Cancel");
+						onClicked: close();
+					}
+
+					Button {
+						text: qsTr("Update");
 						onClicked: {
 							var invalid = InputValidator.validate(paramsModel, paramValues);
 							if (invalid.length === 0)
@@ -615,10 +697,6 @@ Dialog {
 						}
 					}
 
-				Button {
-					text: qsTr("Cancel");
-					onClicked: close();
-				}
 
 					MessageDialog {
 						id: errorDialog
@@ -626,6 +704,13 @@ Dialog {
 						icon: StandardIcon.Critical
 					}
 				}
+
+				RowLayout
+				{
+					anchors.bottom: parent.bottom
+					Layout.preferredHeight: 20
+				}
+			}
 		}
 	}
 }

mix/qml/js/NetworkDeployment.js

@@ -201,7 +201,7 @@ function executeTrNextStep(trIndex, state, ctrAddresses, callBack)
 		callBack();
 }
 
-function gasPrice(callBack)
+function gasPrice(callBack, error)
 {
 	var requests = [{
 						jsonrpc: "2.0",
@@ -210,7 +210,9 @@ function gasPrice(callBack)
 						id: jsonRpcRequestId
 					}];
 	rpcCall(requests, function (httpCall, response){
-		callBack(JSON.parse(response)[0].result);
+		callBack(JSON.parse(response)[0].result)
+	}, function(message){
+		error(message)
 	});
 }
 

mix/qml/js/TransactionHelper.js

@@ -17,7 +17,7 @@ function defaultTransaction()
 	};
 }
 
-function rpcCall(requests, callBack)
+function rpcCall(requests, callBack, error)
 {
 	var jsonRpcUrl = "http://localhost:8545";
 	var rpcRequest = JSON.stringify(requests);
@@ -33,7 +33,7 @@ function rpcCall(requests, callBack)
 			{
 				var errorText = qsTr("Unable to initiate request to the live network. Please verify your ethereum node is up.") + qsTr(" Error status: ")  + httpRequest.status;
 				console.log(errorText);
-				deploymentError(errorText);
+				error(errorText);
 			}
 			else
 			{