Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop

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/Block.qml

@@ -243,7 +243,6 @@ ColumnLayout
 							}
 						}
 
-
 						Rectangle
 						{
 							Layout.preferredWidth: toWidth
@@ -266,8 +265,6 @@ ColumnLayout
 							}
 						}
 
-
-
 						function userFrienldyToken(value)
 						{
 							if (value && value.indexOf("<") === 0)
@@ -293,7 +290,7 @@ ColumnLayout
 								color: labelColor
 								font.bold: true
 								font.pointSize: dbgStyle.absoluteSize(1)
-								width: parent.width -30
+								width: parent.width - 30
 								text: {
 									if (index >= 0 && transactions.get(index).returned)
 										return transactions.get(index).returned
@@ -402,18 +399,5 @@ ColumnLayout
 			}
 		}
 	}
-
-	Rectangle
-	{
-		id: right
-		Layout.preferredWidth: blockWidth
-		height: 10
-		anchors.top: parent.bottom
-		anchors.topMargin: 5
-		color: "#DEDCDC"
-		radius: 15
-		anchors.left: parent.left
-		anchors.leftMargin: statusWidth
-	}
 }
 

mix/qml/Ether.qml

@@ -54,6 +54,7 @@ RowLayout {
 	{
 		id: units
 		visible: displayUnitSelection;
+		implicitWidth: 145
 		onCurrentTextChanged:
 		{
 			if (value)

mix/qml/QAddressView.qml

@@ -2,14 +2,14 @@ import QtQuick 2.0
 import QtQuick.Controls 1.3
 import QtQuick.Controls.Styles 1.3
 
-Item
+Row
 {
 	property alias value: textinput.text
 	property alias accountRef: ctrModel
 	property string subType
 	property bool readOnly
 	property alias currentIndex: trCombobox.currentIndex
-	property alias currentText: textinput.text
+	property alias displayInput: textInputRect.visible
 	property variant accounts
 	signal indexChanged()
 	id: editRoot
@@ -22,7 +22,7 @@ Item
 	}
 
 	function currentValue() {
-		return currentText;
+		return value;
 	}
 
 	function currentType()
@@ -38,7 +38,6 @@ Item
 	function load()
 	{
 		accountRef.clear();
-		accountRef.append({"itemid": " - "});
         if (subType === "contract" || subType === "address")
 		{
 			var trCr = 0;
@@ -52,7 +51,7 @@ Item
                         if (i > transactionIndex)
                             break;
                         var tr = blockChainPanel.model.blocks[k].transactions[i]
-                        if (tr.functionId === tr.contractId /*&& (dec[1] === tr.contractId || item.subType === "address")*/)
+						if (tr.functionId === tr.contractId)
                         {
                             accountRef.append({ "itemid": tr.contractId + " - " + trCr, "value": "<" + tr.contractId + " - " + trCr + ">", "type": "contract" });
                             trCr++;
@@ -87,6 +86,7 @@ Item
 			}
 			trCombobox.currentIndex = 0;
 		}
+		trCombobox.update()
 	}
 
 	function select(address)
@@ -102,10 +102,10 @@ Item
 	}
 
 	Rectangle {
-		anchors.fill: parent
 		radius: 4
 		anchors.verticalCenter: parent.verticalCenter
 		height: 20
+		id: textInputRect
 		TextInput {
 			id: textinput
 			text: value
@@ -141,12 +141,12 @@ Item
 		property bool selected: false
 		id: trCombobox
 		model: ctrModel
+		width: 350
 		textRole: "itemid"
-		height: 20
 		anchors.verticalCenter: parent.verticalCenter
-		anchors.left: textinput.parent.right
-		anchors.leftMargin: 3
-		onCurrentIndexChanged: {
+
+		function update()
+		{
 			trCombobox.selected = false;
 			if (currentText === "")
 				return;
@@ -164,5 +164,9 @@ Item
 			}
 			indexChanged();
 		}
+
+		onCurrentIndexChanged: {
+			update()
+		}
 	}
 }

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/QHashTypeView.qml

@@ -13,22 +13,15 @@ Item
 		id: boldFont
 	}
 
-	Rectangle {
-		anchors.fill: parent
-		radius: 4
-		TextInput {
-			id: textinput
-			text: value
+	TextInput {
+		id: textinput
+		text: value
+		wrapMode: Text.WrapAnywhere
+		MouseArea {
+			id: mouseArea
 			anchors.fill: parent
-			wrapMode: Text.WrapAnywhere
-			clip: true
-			font.family: boldFont.name
-			MouseArea {
-				id: mouseArea
-				anchors.fill: parent
-				hoverEnabled: true
-				onClicked: textinput.forceActiveFocus()
-			}
+			hoverEnabled: true
+			onClicked: textinput.forceActiveFocus()
 		}
 	}
 }

mix/qml/QIntTypeView.qml

@@ -1,35 +1,26 @@
 import QtQuick 2.0
-
+import QtQuick.Controls 1.1
 Item
 {
 	property alias value: textinput.text
 	property alias readOnly: textinput.readOnly
 	id: editRoot
-	width: readOnly ? textinput.implicitWidth : 150
-
+	width: 200
 	DebuggerPaneStyle {
 		id: dbgStyle
 	}
 
-	Rectangle {
-		anchors.fill: parent
-		radius: 4
-		TextInput {
-			anchors.verticalCenter: parent.verticalCenter
-			id: textinput
-			font.family: dbgStyle.general.basicFont
-			clip: true
-			selectByMouse: true
-			text: value
+	TextField {
+		anchors.verticalCenter: parent.verticalCenter
+		id: textinput
+		selectByMouse: true
+		text: value
+		implicitWidth: 200
+		MouseArea {
+			id: mouseArea
 			anchors.fill: parent
-			font.pointSize: dbgStyle.general.basicFontSize
-			color: dbgStyle.general.basicColor
-			MouseArea {
-				id: mouseArea
-				anchors.fill: parent
-				hoverEnabled: true
-				onClicked: textinput.forceActiveFocus()
-			}
+			hoverEnabled: true
+			onClicked: textinput.forceActiveFocus()
 		}
 	}
 }

mix/qml/QStringTypeView.qml

@@ -1,4 +1,5 @@
 import QtQuick 2.0
+import QtQuick.Controls 1.1
 
 Item
 {
@@ -11,25 +12,16 @@ Item
 		id: dbgStyle
 	}
 
-	Rectangle {
-		anchors.fill: parent
-		radius: 4
-		TextInput {
-			anchors.verticalCenter: parent.verticalCenter
-			id: textinput
-			font.family: dbgStyle.general.basicFont
-			clip: true
-			selectByMouse: true
-			text: value
+	TextField {
+		anchors.verticalCenter: parent.verticalCenter
+		id: textinput
+		selectByMouse: true
+		text: value
+		MouseArea {
+			id: mouseArea
 			anchors.fill: parent
-			font.pointSize: dbgStyle.general.basicFontSize
-			color: dbgStyle.general.basicColor
-			MouseArea {
-				id: mouseArea
-				anchors.fill: parent
-				hoverEnabled: true
-				onClicked: textinput.forceActiveFocus()
-			}
+			hoverEnabled: true
+			onClicked: textinput.forceActiveFocus()
 		}
 	}
 }

mix/qml/StructView.qml

@@ -13,58 +13,40 @@ Column
 	property int transactionIndex
 	property string context
 	Layout.fillWidth: true
-	spacing: 0
-
-	DebuggerPaneStyle {
-		id: dbgStyle
-	}
-
+	spacing: 5
 	Repeater
 	{
 		id: repeater
 		visible: model.length > 0
-		Layout.fillWidth: true
-
 		RowLayout
 		{
 			id: row
-			height: 20 + (members[index].type.category === QSolidityType.Struct ? (20 * members[index].type.members.length) : 0)
+			height: 30 + (members[index].type.category === QSolidityType.Struct ? (30 * members[index].type.members.length) : 0)
 			Layout.fillWidth: true
-			DefaultLabel {
-				height: 20
-				id: typeLabel
-				text: modelData.type.name
-				anchors.verticalCenter: parent.verticalCenter
-				font.family: dbgStyle.general.basicFont
-				color: dbgStyle.general.basicColor
-				font.pointSize: dbgStyle.general.basicFontSize
-			}
-
-			DefaultLabel {
-				height: 20
-				id: nameLabel
-				text: modelData.name
-				anchors.verticalCenter: parent.verticalCenter
-				font.family: dbgStyle.general.basicFont
-				color: dbgStyle.general.basicColor
-				font.pointSize: dbgStyle.general.basicFontSize
-			}
+			Rectangle
+			{
+				Layout.preferredWidth: 150
+				Row
+				{
+					anchors.right: parent.right
+					anchors.verticalCenter: parent.verticalCenter
+					Label {
+						id: nameLabel
+						text: modelData.name
+					}
 
-			DefaultLabel {
-				height: 20
-				id: equalLabel
-				text: "="
-				anchors.verticalCenter: parent.verticalCenter
-				font.family: dbgStyle.general.basicFont
-				color: dbgStyle.general.basicColor
-				font.pointSize: dbgStyle.general.basicFontSize
+					Label {
+						id: typeLabel
+						text: " (" + modelData.type.name + ")"
+						font.italic: true
+						font.weight: Font.Light
+					}
+				}
 			}
 
 			Loader
 			{
 				id: typeLoader
-				height: 20
-				anchors.verticalCenter: parent.verticalCenter
 				sourceComponent:
 				{
 					var t = modelData.type.category;

mix/qml/TransactionDialog.qml

@@ -7,12 +7,13 @@ 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: 570
+	width: 580
 	height: 500
 	visible: false
 	title: qsTr("Edit Transaction")
@@ -22,7 +23,7 @@ Dialog {
 	property alias gasAuto: gasAutoCheck.checked;
 	property alias gasPrice: gasPriceField.value;
 	property alias transactionValue: valueField.value;
-	property string contractId: contractComboBox.currentValue();
+	property string contractId: contractCreationComboBox.currentValue();
 	property alias functionId: functionComboBox.currentText;
 	property var paramValues;
 	property var paramsModel: [];
@@ -30,21 +31,16 @@ Dialog {
 	property alias stateAccounts: senderComboBox.model
 	property bool saveStatus
 	signal accepted;
-
+	property int rowWidth: 500
 	StateDialogStyle {
 		id: transactionDialogStyle
 	}
 
 	function open(index, blockIdx, item) {
-		rowFunction.visible = !useTransactionDefaultValue;
-		rowValue.visible = !useTransactionDefaultValue;
-		rowGas.visible = !useTransactionDefaultValue;
-		rowGasPrice.visible = !useTransactionDefaultValue;
-
 		transactionIndex = index
 		blockIndex = blockIdx
-		typeLoader.transactionIndex = index
-		typeLoader.blockIndex = blockIdx
+		paramScroll.transactionIndex = index
+		paramScroll.blockIndex = blockIdx
 		saveStatus = item.saveStatus
 		gasValueEdit.gasValue = item.gas;
 		gasAutoCheck.checked = item.gasAuto ? true : false;
@@ -52,48 +48,20 @@ Dialog {
 		valueField.value = item.value;
 		var contractId = item.contractId;
 		var functionId = item.functionId;
-		rowFunction.visible = true;
 
 		paramValues = item.parameters !== undefined ? item.parameters : {};
 		if (item.sender)
 			senderComboBox.select(item.sender);
 
-		contractsModel.clear();
-		var contractIndex = -1;
-		var contracts = codeModel.contracts;
-		for (var c in contracts) {
-			contractsModel.append({ cid: c, text: contracts[c].contract.name });
-			if (contracts[c].contract.name === contractId)
-				contractIndex = contractsModel.count - 1;
-		}
 
-		if (contractIndex == -1 && contractsModel.count > 0)
-			contractIndex = 0; //@todo suggest unused contract
-		contractComboBox.currentIndex = contractIndex;
+		trTypeCreate.checked = item.isContractCreation
+		trTypeSend.checked = !item.isFunctionCall
+		trTypeExecute.checked = item.isFunctionCall && !item.isContractCreation
 
-		recipients.accounts = senderComboBox.model;
-		recipients.subType = "address";
-		recipients.load();
-		recipients.init();
-		recipients.select(contractId);
-
-		if (item.isContractCreation)
-			loadFunctions(contractComboBox.currentValue());
-		else
-			loadFunctions(contractFromToken(recipients.currentValue()))
-		selectFunction(functionId);
-
-		trType.checked = item.isContractCreation
-		trType.init();
-
-		paramsModel = [];
-		if (item.isContractCreation)
-			loadCtorParameters();
-		else
-			loadParameters();
+		load(item.isContractCreation, item.isFunctionCall, functionId, contractId)
 
+		estimatedGas.updateView()
 		visible = true;
-		valueField.focus = true;
 	}
 
 	function loadCtorParameters(contractId)
@@ -111,12 +79,12 @@ Dialog {
 	function loadFunctions(contractId)
 	{
 		functionsModel.clear();
-		functionsModel.append({ text: " - " });
 		var contract = codeModel.contracts[contractId];
 		if (contract) {
 			var functions = codeModel.contracts[contractId].contract.functions;
 			for (var f = 0; f < functions.length; f++) {
-				functionsModel.append({ text: functions[f].name });
+				if (functions[f].name !== contractId)
+					functionsModel.append({ text: functions[f].name });
 			}
 		}
 	}
@@ -156,9 +124,9 @@ Dialog {
 	function loadParameters() {
 		paramsModel = []
 		if (functionComboBox.currentIndex >= 0 && functionComboBox.currentIndex < functionsModel.count) {
-			var contract = codeModel.contracts[contractFromToken(recipients.currentValue())];
+			var contract = codeModel.contracts[contractFromToken(contractCreationComboBox.currentValue())];
 			if (contract) {
-				var func = contract.contract.functions[functionComboBox.currentIndex - 1];
+				var func = contract.contract.functions[functionComboBox.currentIndex + 1];
 				if (func) {
 					var parameters = func.parameters;
 					for (var p = 0; p < parameters.length; p++)
@@ -171,13 +139,11 @@ Dialog {
 
 	function initTypeLoader()
 	{
-		typeLoader.value = {}
-		typeLoader.members = []
-		typeLoader.value = paramValues;
-		typeLoader.members = paramsModel;
-		paramLabel.visible = paramsModel.length > 0;
-		paramScroll.visible = paramsModel.length > 0;
-		modalTransactionDialog.height = (paramsModel.length > 0 ? 500 : 300);
+		paramScroll.value = {}
+		paramScroll.members = []
+		paramScroll.value = paramValues;
+		paramScroll.members = paramsModel;
+		paramScroll.updateView()
 	}
 
 	function acceptAndClose()
@@ -213,16 +179,16 @@ Dialog {
 			item.functionId = transactionDialog.functionId;
 		}
 
-		item.isContractCreation = trType.checked;
+		item.isContractCreation = trTypeCreate.checked;
 		if (item.isContractCreation)
 			item.functionId = item.contractId;
-		item.isFunctionCall = item.functionId !== " - ";
+		item.isFunctionCall = trTypeExecute.checked
 
 		if (!item.isContractCreation)
 		{
-			item.contractId = recipients.currentText;
-			item.label = item.contractId + " " + item.functionId;
-			if (recipients.current().type === "address")
+			item.contractId = recipientsAccount.currentValue();
+			item.label = contractFromToken(item.contractId) + "." + item.functionId + "()";
+			if (recipientsAccount.current().type === "address")
 			{
 				item.functionId = "";
 				item.isFunctionCall = false;
@@ -230,8 +196,9 @@ Dialog {
 		}
 		else
 		{
+			item.isFunctionCall = true
 			item.functionId = item.contractId;
-			item.label = qsTr("Deploy") + " " + item.contractId;
+			item.label = item.contractId + "." + item.contractId + "()";
 		}
 		item.saveStatus = saveStatus
 		item.sender = senderComboBox.model[senderComboBox.currentIndex].secret;
@@ -246,187 +213,360 @@ Dialog {
 		return token;
 	}
 
+	function load(isContractCreation, isFunctionCall, functionId, contractId)
+	{
+		if (!isContractCreation)
+		{
+			contractCreationComboBox.visible = false
+			recipientsAccount.visible = true
+			recipientsAccount.accounts = senderComboBox.model;
+			amountLabel.text = qsTr("Amount")
+			if (!isFunctionCall)
+				recipientsAccount.subType = "address"
+			else
+				recipientsAccount.subType = "contract";
+			recipientsAccount.load();
+			recipientsAccount.init();
+			if (contractId)
+				recipientsAccount.select(contractId);
+			if (functionId)
+				selectFunction(functionId);
+			if (isFunctionCall)
+			{
+				labelRecipient.text = qsTr("Recipient Contract")
+				functionRect.show()
+				loadFunctions(contractFromToken(recipientsAccount.currentValue()))
+				loadParameters();
+				paramScroll.updateView()
+			}
+			else
+			{
+				paramsModel = []
+				paramScroll.updateView()
+				labelRecipient.text = qsTr("Recipient Account")
+				functionRect.hide()
+			}
+		}
+		else
+		{
+			//contract creation
+			contractsModel.clear();
+			var contractIndex = -1;
+			var contracts = codeModel.contracts;
+			for (var c in contracts) {
+				contractsModel.append({ cid: c, text: contracts[c].contract.name });
+				if (contracts[c].contract.name === contractId)
+					contractIndex = contractsModel.count - 1;
+			}
+
+			if (contractIndex == -1 && contractsModel.count > 0)
+				contractIndex = 0; //@todo suggest unused contract
+			contractCreationComboBox.currentIndex = contractIndex;
+			contractCreationComboBox.visible = true
+			labelRecipient.text = qsTr("Contract")
+			amountLabel.text = qsTr("Endownment")
+			functionRect.hide()
+			recipientsAccount.visible = false
+			loadCtorParameters(contractCreationComboBox.currentValue());
+			paramScroll.updateView()
+		}
+	}
+
 	contentItem: Rectangle {
+		id: containerRect
 		color: transactionDialogStyle.generic.backgroundColor
-		ColumnLayout {
+		anchors.fill: parent
+		ScrollView
+		{
+			anchors.top: parent.top
 			anchors.fill: parent
 			ColumnLayout {
-				anchors.fill: parent
-				anchors.margins: 10
-
-				ColumnLayout {
-					id: dialogContent
-					anchors.top: parent.top
-					spacing: 10
-					RowLayout
+				Layout.preferredWidth: rowWidth
+				anchors.top: parent.top
+				anchors.topMargin: 10
+				anchors.left: parent.left
+				width: 500
+				anchors.leftMargin:
+				{
+					return (containerRect.width - 530) /2
+				}
+
+				RowLayout
+				{
+					Rectangle
 					{
-						id: rowSender
-						Layout.fillWidth: true
-						height: 150
-						DefaultLabel {
-							Layout.preferredWidth: 75
-							text: qsTr("Sender")
+						Layout.preferredWidth: 150
+						Label {
+							anchors.right: parent.right
+							anchors.verticalCenter: parent.verticalCenter
+							text: qsTr("Sender Account")
 						}
-						ComboBox {
+					}
 
-							function select(secret)
-							{
-								for (var i in model)
-									if (model[i].secret === secret)
-									{
-										currentIndex = i;
-										break;
-									}
-							}
+					ComboBox {
+						function select(secret)
+						{
+							for (var i in model)
+								if (model[i].secret === secret)
+								{
+									currentIndex = i;
+									break;
+								}
+						}
+						Layout.preferredWidth: 350
+						id: senderComboBox
+						currentIndex: 0
+						textRole: "name"
+						editable: false
+					}
+				}
 
-							id: senderComboBox
-							Layout.preferredWidth: 350
-							currentIndex: 0
-							textRole: "name"
-							editable: false
+				RowLayout
+				{
+					Rectangle
+					{
+						Layout.preferredWidth: 150
+						Layout.preferredHeight: 80
+						color: "transparent"
+						Label
+						{
+							anchors.verticalCenter: parent.verticalCenter
+							anchors.top: parent.top
+							anchors.right: parent.right
+							text: qsTr("Type of Transaction")
 						}
 					}
 
-					RowLayout
+					Column
 					{
-						id: rowIsContract
-						Layout.fillWidth: true
-						height: 150
-						CheckBox {
-							id: trType
-							onCheckedChanged:
-							{
-								init();
+						Layout.preferredWidth: 350
+						Layout.preferredHeight: 90
+						ExclusiveGroup {
+							id: rbbuttonList
+							onCurrentChanged: {
+								if (current)
+								{
+									if (current.objectName === "trTypeSend")
+									{
+										recipientsAccount.visible = true
+										contractCreationComboBox.visible = false
+										modalTransactionDialog.load(false, false)
+									}
+									else if (current.objectName === "trTypeCreate")
+									{
+										contractCreationComboBox.visible = true
+										recipientsAccount.visible = false
+										modalTransactionDialog.load(true, true)
+									}
+									else if (current.objectName === "trTypeExecute")
+									{
+										recipientsAccount.visible = true
+										contractCreationComboBox.visible = false
+										modalTransactionDialog.load(false, true)
+									}
+								}
 							}
+						}
 
-							function init()
-							{
-								rowFunction.visible = !checked;
-								rowContract.visible = checked;
-								rowRecipient.visible = !checked;
-								paramLabel.visible = checked;
-								paramScroll.visible = checked;
-								functionComboBox.enabled = !checked;
-								if (checked)
-									loadCtorParameters(contractComboBox.currentValue());
-							}
+						RadioButton {
+							id: trTypeSend
+							objectName: "trTypeSend"
+							exclusiveGroup: rbbuttonList
+							height: 30
+							text: qsTr("Send ether to account")
 
-							text: qsTr("is contract creation")
-							checked: true
+						}
+
+						RadioButton {
+							id: trTypeCreate
+							objectName: "trTypeCreate"
+							exclusiveGroup: rbbuttonList
+							height: 30
+							text: qsTr("Create Contract")
+						}
+
+						RadioButton {
+							id: trTypeExecute
+							objectName: "trTypeExecute"
+							exclusiveGroup: rbbuttonList
+							height: 30
+							text: qsTr("Execute Contract")
 						}
 					}
+				}
 
-					RowLayout
+				RowLayout
+				{
+					Rectangle
 					{
-						id: rowRecipient
-						Layout.fillWidth: true
-						height: 150
-						DefaultLabel {
-							Layout.preferredWidth: 75
-							text: qsTr("Recipient")
+						Layout.preferredWidth: 150
+						Label {
+							id: labelRecipient
+							anchors.verticalCenter: parent.verticalCenter
+							anchors.right: parent.right
+							text: qsTr("Recipient Account")
 						}
+					}
 
-						QAddressView
+					QAddressView
+					{
+						id: recipientsAccount
+						displayInput: false
+						onIndexChanged:
 						{
-							id: recipients
-							onIndexChanged:
-							{
-								rowFunction.visible = current().type === "contract";
-								paramLabel.visible = current().type === "contract";
-								paramScroll.visible = current().type === "contract";
-								if (!rowIsContract.checked)
-									loadFunctions(contractFromToken(recipients.currentValue()))
-							}
+							if (rbbuttonList.current.objectName === "trTypeExecute")
+								loadFunctions(contractFromToken(currentValue()))
 						}
 					}
 
-					RowLayout
-					{
-						id: rowContract
-						Layout.fillWidth: true
-						height: 150
-						DefaultLabel {
-							Layout.preferredWidth: 75
-							text: qsTr("Contract")
+					ComboBox {
+						id: contractCreationComboBox
+						function currentValue() {
+							return (currentIndex >=0 && currentIndex < contractsModel.count) ? contractsModel.get(currentIndex).cid : "";
 						}
-						ComboBox {
-							id: contractComboBox
-							function currentValue() {
-								return (currentIndex >=0 && currentIndex < contractsModel.count) ? contractsModel.get(currentIndex).cid : "";
-							}
-							Layout.preferredWidth: 350
-							currentIndex: -1
-							textRole: "text"
-							editable: false
-							model: ListModel {
-								id: contractsModel
-							}
-							onCurrentIndexChanged: {
-								loadCtorParameters(currentValue());
-							}
+						Layout.preferredWidth: 350
+						currentIndex: -1
+						textRole: "text"
+						editable: false
+						model: ListModel {
+							id: contractsModel
+						}
+						onCurrentIndexChanged: {
+							loadCtorParameters(currentValue());
 						}
 					}
+				}
 
-					RowLayout
+				RowLayout
+				{
+					Rectangle
 					{
-						id: rowFunction
-						Layout.fillWidth: true
-						height: 150
-						DefaultLabel {
-							Layout.preferredWidth: 75
+						Layout.preferredWidth: 150
+						id: functionRect
+
+						function hide()
+						{
+							parent.visible = false
+							functionRect.visible = false
+							functionComboBox.visible = false
+						}
+
+						function show()
+						{
+							parent.visible = true
+							functionRect.visible = true
+							functionComboBox.visible = true
+						}
+
+						Label {
+							anchors.verticalCenter: parent.verticalCenter
+							anchors.right: parent.right
 							text: qsTr("Function")
 						}
-						ComboBox {
-							id: functionComboBox
-							Layout.preferredWidth: 350
-							currentIndex: -1
-							textRole: "text"
-							editable: false
-							model: ListModel {
-								id: functionsModel
-							}
-							onCurrentIndexChanged: {
-								loadParameters();
-							}
+					}
+
+					ComboBox {
+						id: functionComboBox
+						Layout.preferredWidth: 350
+						currentIndex: -1
+						textRole: "text"
+						editable: false
+						model: ListModel {
+							id: functionsModel
+						}
+						onCurrentIndexChanged: {
+							loadParameters();
 						}
 					}
+				}
 
-					CommonSeparator
+				StructView
+				{
+					id: paramScroll
+					members: paramsModel;
+					accounts: senderComboBox.model
+					context: "parameter"
+					Layout.fillWidth: true
+					function updateView()
 					{
-						Layout.fillWidth: true
+						paramScroll.visible = paramsModel.length > 0
+						paramScroll.Layout.preferredHeight = paramsModel.length < 6 ? paramsModel.length * 30 : 205
+						if (paramsModel.length === 0)
+						{
+							paramScroll.height = 0
+						}
 					}
+				}
 
-					RowLayout
+				RowLayout
+				{
+					Rectangle
 					{
-						id: rowValue
-						Layout.fillWidth: true
-						height: 150
-						DefaultLabel {
-							Layout.preferredWidth: 75
-							text: qsTr("Value")
-						}
-						Ether {
-							id: valueField
-							edit: true
-							displayFormattedValue: true
+						Layout.preferredWidth: 150
+						Label {
+							id: amountLabel
+							anchors.verticalCenter: parent.verticalCenter
+							anchors.right: parent.right
+							text: qsTr("Amount")
 						}
 					}
 
-					CommonSeparator
+					Ether {
+						Layout.preferredWidth: 350
+						id: valueField
+						edit: true
+						displayFormattedValue: false
+						displayUnitSelection: true
+					}
+				}
+
+				Rectangle
+				{
+					Layout.preferredHeight: 30
+					Layout.fillWidth: true
+					color: "transparent"
+					Rectangle
+					{
+						color: "#cccccc"
+						height: 1
+						width: parent.width
+						anchors.verticalCenter: parent.verticalCenter
+					}
+				}
+
+				Rectangle
+				{
+					height: 20
+					color: "transparent"
+					Layout.preferredWidth: 500
+					Rectangle
 					{
-						Layout.fillWidth: true
+
+						anchors.horizontalCenter: parent.horizontalCenter
+						Label {
+							text: qsTr("Transaction fees")
+							anchors.horizontalCenter: parent.horizontalCenter
+						}
 					}
 
-					RowLayout
+				}
+
+				RowLayout
+				{
+					Layout.preferredHeight: 45
+					Rectangle
 					{
-						id: rowGas
-						Layout.fillWidth: true
-						height: 150
-						DefaultLabel {
-							Layout.preferredWidth: 75
+						Layout.preferredWidth: 150
+						Label {
+							anchors.verticalCenter: parent.verticalCenter
+							anchors.right: parent.right
 							text: qsTr("Gas")
 						}
+					}
 
+					Row
+					{
+						Layout.preferredWidth: 350
 						DefaultTextField
 						{
 							property variant gasValue
@@ -435,6 +575,55 @@ 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)
+									{
+										var gas = codeModel.txGas + codeModel.callStipend + parseInt(gasCost[0].gas)
+										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
@@ -444,101 +633,92 @@ Dialog {
 							text: qsTr("Auto");
 						}
 					}
+				}
 
-					CommonSeparator
-					{
-						Layout.fillWidth: true
-					}
-
-					RowLayout
+				RowLayout
+				{
+					Layout.preferredWidth: 500
+					Layout.preferredHeight: 45
+					Rectangle
 					{
-						id: rowGasPrice
-						Layout.fillWidth: true
-						height: 150
-						DefaultLabel {
-							Layout.preferredWidth: 75
+						Layout.preferredWidth: 150
+						Label {
+							id: gasPriceLabel
+							anchors.verticalCenter: parent.verticalCenter
+							anchors.right: parent.right
 							text: qsTr("Gas Price")
-						}
-						Ether {
-							id: gasPriceField
-							edit: true
-							displayFormattedValue: true
-						}
-					}
-
-					CommonSeparator
-					{
-						Layout.fillWidth: true
-					}
 
-					DefaultLabel {
-						id: paramLabel
-						text: qsTr("Parameters:")
-						Layout.preferredWidth: 75
-					}
-
-					ScrollView
-					{
-						id: paramScroll
-						anchors.top: paramLabel.bottom
-						anchors.topMargin: 10
-						Layout.fillWidth: true
-						Layout.fillHeight: true
-						StructView
-						{
-							id: typeLoader
-							Layout.preferredWidth: 150
-							members: paramsModel;
-							accounts: senderComboBox.model
-							context: "parameter"
+							Label {
+								id: gasPriceMarket
+								anchors.top: gasPriceLabel.bottom
+								Component.onCompleted:
+								{
+									NetworkDeployment.gasPrice(function(result)
+									{
+										gasPriceMarket.text = qsTr("Current market: ") + " " + result + " Wei";
+									}, function (){});
+								}
+							}
 						}
 					}
 
-					CommonSeparator
-					{
-						Layout.fillWidth: true
-						visible: paramsModel.length > 0
+					Ether {
+						Layout.preferredWidth: 350
+						id: gasPriceField
+						edit: true
+						displayFormattedValue: false
+						displayUnitSelection: true
 					}
 				}
-			}
 
-			RowLayout
-			{
-				anchors.bottom: parent.bottom
-				anchors.right: parent.right;
 
-				Button {
+				RowLayout
+				{
 
-					text: qsTr("OK");
-					onClicked: {
-						var invalid = InputValidator.validate(paramsModel, paramValues);
-						if (invalid.length === 0)
-						{
-							close();
-							accepted();
+					Layout.preferredWidth: 500
+					Row
+					{
+						width: parent.width
+						anchors.right: parent.right
+						Button {
+							id: updateBtn
+							text: qsTr("Cancel");
+							onClicked: close();
 						}
-						else
-						{
-							errorDialog.text = qsTr("Some parameters are invalid:\n");
-							for (var k in invalid)
-								errorDialog.text += invalid[k].message + "\n";
-							errorDialog.open();
+
+						Button {
+							text: qsTr("Update");
+							onClicked: {
+								var invalid = InputValidator.validate(paramsModel, paramValues);
+								if (invalid.length === 0)
+								{
+									close();
+									accepted();
+								}
+								else
+								{
+									errorDialog.text = qsTr("Some parameters are invalid:\n");
+									for (var k in invalid)
+										errorDialog.text += invalid[k].message + "\n";
+									errorDialog.open();
+								}
+							}
 						}
 					}
-				}
 
-				Button {
-					text: qsTr("Cancel");
-					onClicked: close();
+					MessageDialog {
+						id: errorDialog
+						standardButtons: StandardButton.Ok
+						icon: StandardIcon.Critical
+					}
 				}
 
-				MessageDialog {
-					id: errorDialog
-					standardButtons: StandardButton.Ok
-					icon: StandardIcon.Critical
+				RowLayout
+				{
+					Layout.preferredHeight: 30
+					anchors.bottom: parent.bottom
 				}
 			}
 		}
 	}
 }
-

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
 			{