Merge pull request ethereum#299 from LianaHus/add_tr_params

fixes bug when adding transaction parameters
microfins · Apr 12, 2016 · 8d37d26 · 8d37d26
2 parents 26dbfb2 + 6e6745e
commit 8d37d26
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/qml/BlockChain.qml b/qml/BlockChain.qml
@@ -499,6 +499,7 @@ ColumnLayout {
 			width: btnWidth
 			tooltip: qsTr("Add Transaction/Block")
 			height: btnHeight
+			imageSource: "qrc:/qml/img/plus.png"
 			Component.onCompleted:
 			{
 				actions.push({ label: qsTr("Add Transaction...") , action: addTransaction })

diff --git a/qml/DropdownButton.qml b/qml/DropdownButton.qml
@@ -9,6 +9,7 @@ Item
 {
 	property string tooltip
 	property var actions: []
+	property string imageSource: "qrc:/qml/img/showmoreactions.png"
 	id: root
 	function init()
 	{
@@ -41,7 +42,7 @@ Item
 		roundRight: false
 		width: parent.width
 		height: parent.height
-		sourceImg: "qrc:/qml/img/showmoreactions.png"
+		sourceImg: imageSource
 		text: tooltip
 		onClicked:
 		{

diff --git a/src/ContractCallDataEncoder.cpp b/src/ContractCallDataEncoder.cpp
@@ -322,7 +322,7 @@ QJsonArray ContractCallDataEncoder::decodeArray(SolidityType const& _type, bytes
 		bytes rawParam((static_cast<size_t>(count)));
 		value.populate(&rawParam);
 		if (_type.type == QSolidityType::Type::Bytes)
-			array.append(toString(decodeBytes(rawParam)));
+			array.append(toChar(decodeBytes(rawParam)));
 		else
 			array.append(toChar(decodeBytes(rawParam)));
 	}
@@ -361,7 +361,7 @@ QVariant ContractCallDataEncoder::decode(SolidityType const& _type, bytes const&
 	else if (type == QSolidityType::Type::Bool)
 		return QVariant::fromValue(toString(decodeBool(rawParam)));
 	else if (type == QSolidityType::Type::Bytes || type == QSolidityType::Type::Hash)
-		return QVariant::fromValue(toString(decodeBytes(rawParam)));
+		return QVariant::fromValue(toChar(decodeBytes(rawParam)));
 	else if (type == QSolidityType::Type::String)
 		return QVariant::fromValue(toChar(decodeBytes(rawParam)));
 	else if (type == QSolidityType::Type::Struct)
@@ -632,7 +632,7 @@ QVariant ContractCallDataEncoder::decodeType(SolidityType _type, bytes _value, u
 	if (_type.array)
 	{
 		QJsonArray array = decodeArray(_type, _value, _readPosition);
-		if (_type.type == SolidityType::String && array.count() <= 1)
+		if ((_type.type == SolidityType::String || _type.type == SolidityType::Bytes) && array.count() <= 1)
 		{
 			if (array.count() == 1)
 				return array[0].toString();