Merge pull request #2804 from arkpar/mix-fix

mix: Fixed transaction creating for a new state

libethereum/EthereumPeer.cpp

@@ -63,7 +63,7 @@ EthereumPeer::~EthereumPeer()
 {
 	if (m_asking != Asking::Nothing)
 	{
-		cnote << "Peer aborting while being asked for " << ::toString(m_asking);
+		clog(NetAllDetail) << "Peer aborting while being asked for " << ::toString(m_asking);
 		setRude();
 	}
 	abortSync();

mix/ClientModel.cpp

@@ -444,7 +444,10 @@ void ClientModel::executeSequence(vector<TransactionSettings> const& _sequence)
 				{
 					auto contractAddressIter = m_contractAddresses.find(ctrInstance);
 					if (contractAddressIter == m_contractAddresses.end())
+					{
 						emit runFailed("Contract '" + transaction.contractId + tr(" not deployed.") + "' " + tr(" Cannot call ") + transaction.functionId);
+						break;
+					}
 					callAddress(contractAddressIter->second, encoder.encodedData(), transaction);
 				}
 				m_gasCosts.append(m_client->lastExecution().gasUsed);

mix/qml/BlockChain.qml

@@ -492,7 +492,7 @@ ColumnLayout {
 
 				ScenarioButton {
 					id: addBlockBtn
-					text: qsTr("Add Block..")
+					text: qsTr("Add Block...")
 					anchors.left: addTransaction.right
 					roundLeft: false
 					roundRight: true
@@ -609,7 +609,7 @@ ColumnLayout {
 
 			ScenarioButton {
 				id: newAccount
-				text: qsTr("New Account..")
+				text: qsTr("New Account...")
 				onClicked: {
 					var ac = projectModel.stateListModel.newAccount("O", QEther.Wei)
 					model.accounts.push(ac)

mix/qml/ScenarioLoader.qml

@@ -294,8 +294,9 @@ ColumnLayout
 						projectModel.stateListModel.appendState(item)
 						projectModel.stateListModel.save()
 						scenarioList.currentIndex = projectModel.stateListModel.count - 1
+						clientModel.setupScenario(item);
 					}
-					text: qsTr("New..")
+					text: qsTr("New...")
 					roundRight: true
 					roundLeft: false
 				}

mix/qml/StructView.qml

@@ -12,6 +12,7 @@ Column
 	property int blockIndex
 	property int transactionIndex
 	property string context
+	property bool readOnly
 	Layout.fillWidth: true
 	spacing: 0
 	property int colHeight
@@ -26,7 +27,7 @@ Column
 	Repeater
 	{
 		id: repeater
-		visible: model.length > 0
+		visible: members.length > 0
 		RowLayout
 		{
 			id: row