From 01aced01890f0e5ba29c0ebe6d9f3069cd2a173f Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Fri, 15 May 2015 17:36:20 +0200
Subject: [PATCH 1/2] fixed gas calculation

---
 mix/MixClient.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mix/MixClient.cpp b/mix/MixClient.cpp
index cac208ba4..e3ed2eead 100644
--- a/mix/MixClient.cpp
+++ b/mix/MixClient.cpp
@@ -220,7 +220,7 @@ void MixClient::executeTransaction(Transaction const& _t, State& _state, bool _c
 	d.address = _t.receiveAddress();
 	d.sender = _t.sender();
 	d.value = _t.value();
-	d.gasUsed = er.gasUsed + er.gasRefunded;
+	d.gasUsed = er.gasUsed + er.gasRefunded + c_callStipend;
 	if (_t.isCreation())
 		d.contractAddress = right160(sha3(rlpList(_t.sender(), _t.nonce())));
 	if (!_call)
@@ -234,7 +234,7 @@ void MixClient::executeTransaction(Transaction const& _t, State& _state, bool _c
 		er =_state.execute(lastHashes, t);
 		if (t.isCreation() && _state.code(d.contractAddress).empty())
 			BOOST_THROW_EXCEPTION(OutOfGas() << errinfo_comment("Not enough gas for contract deployment"));
-		d.gasUsed = er.gasUsed + er.gasRefunded + er.gasForDeposit;
+		d.gasUsed = er.gasUsed + er.gasRefunded + er.gasForDeposit + c_callStipend;
 		// collect watches
 		h256Set changed;
 		Guard l(x_filtersWatches);

From 135513f18a1851bc18a2d4f01ecf76d376abc2e9 Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Fri, 15 May 2015 17:56:44 +0200
Subject: [PATCH 2/2] globalreg address

---
 mix/qml/DeploymentDialog.qml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mix/qml/DeploymentDialog.qml b/mix/qml/DeploymentDialog.qml
index 1fbde3ac9..81092ec76 100644
--- a/mix/qml/DeploymentDialog.qml
+++ b/mix/qml/DeploymentDialog.qml
@@ -15,7 +15,7 @@ Dialog {
 	id: modalDeploymentDialog
 	modality: Qt.ApplicationModal
 	width: 735
-	height: 400
+	height: 450
 	visible: false
 	property int ownedRegistrarDeployGas: 1179075 // TODO: Use sol library to calculate gas requirement for each tr.
 	property int ownedRegistrarSetSubRegistrarGas: 50000
@@ -293,15 +293,15 @@ Dialog {
 					DefaultLabel
 					{
 						text: qsTr("Root Registrar address:")
-						visible: false //still use it for now in dev env.
+						visible: true //still use it for now in dev env.
 					}
 
 					DefaultTextField
 					{
 						Layout.preferredWidth: 350
 						id: registrarAddr
-						text: "ab69f864e49fc4294d18355c4bafb0b91b5e629b"
-						visible: false
+						text: "c6d9d2cd449a754c494264e1809c50e34d64562b"
+						visible: true
 					}
 
 					DefaultLabel