Merge remote-tracking branch 'up/develop' into ui_macos

Conflicts:
	mix/qml/DeploymentDialog.qml
	mix/qml/StateDialog.qml
	mix/qml/TransactionDialog.qml

CMakeLists.txt

@@ -29,47 +29,48 @@ else()
 	qt5_add_resources(UI_RESOURCES noweb.qrc)
 endif()
 
-add_definitions(-DQT_QML_DEBUG)
+if (CMAKE_BUILD_TYPE MATCHES Debug)
+	add_definitions(-DQT_QML_DEBUG)
+endif()
 
 # eth_add_executable is defined in cmake/EthExecutableHelper.cmake
 eth_add_executable(${EXECUTABLE} 
 	ICON mix
 	UI_RESOURCES ${UI_RESOURCES}
 )
 
-target_link_libraries(${EXECUTABLE} Qt5::Core)
-target_link_libraries(${EXECUTABLE} Qt5::Gui)
-target_link_libraries(${EXECUTABLE} Qt5::Widgets)
-target_link_libraries(${EXECUTABLE} Qt5::Network)
-target_link_libraries(${EXECUTABLE} Qt5::Quick)
-target_link_libraries(${EXECUTABLE} Qt5::Qml)
-target_link_libraries(${EXECUTABLE} webthree)
-target_link_libraries(${EXECUTABLE} ethereum)
-target_link_libraries(${EXECUTABLE} evm)
-target_link_libraries(${EXECUTABLE} ethcore)
-target_link_libraries(${EXECUTABLE} devcrypto)
-target_link_libraries(${EXECUTABLE} secp256k1)
-if (NOT ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC"))
-target_link_libraries(${EXECUTABLE} serpent)
-endif()
-target_link_libraries(${EXECUTABLE} lll)
-target_link_libraries(${EXECUTABLE} solidity)
-target_link_libraries(${EXECUTABLE} evmcore)
-target_link_libraries(${EXECUTABLE} devcore)
-target_link_libraries(${EXECUTABLE} jsqrc)
-target_link_libraries(${EXECUTABLE} web3jsonrpc)
 
+set(LIBRARIES "Qt5::Core;Qt5::Gui;Qt5::Widgets;Qt5::Network;Qt5::Quick;Qt5::Qml;webthree;ethereum;evm;ethcore;devcrypto;solidity;evmcore;devcore;jsqrc;web3jsonrpc")
 if (${ETH_HAVE_WEBENGINE})
 	add_definitions(-DETH_HAVE_WEBENGINE)
-	target_link_libraries(${EXECUTABLE} Qt5::WebEngine)
+	list(APPEND LIBRARIES "Qt5::WebEngine")
 endif()
 
+target_link_libraries(${EXECUTABLE} ${LIBRARIES})
+
 # eth_install_executable is defined in cmake/EthExecutableHelper.cmake
 eth_install_executable(${EXECUTABLE}
 	QMLDIR ${CMAKE_CURRENT_SOURCE_DIR}/qml
 )
 
 #add qml asnd stdc files to project tree in Qt creator
 file(GLOB_RECURSE QMLFILES "qml/*.*")
+file(GLOB_RECURSE TESTFILES "test/qml/*.*")
 file(GLOB_RECURSE SOLFILES "stdc/*.*")
-add_custom_target(mix_qml SOURCES ${QMLFILES} ${SOLFILES})
+add_custom_target(mix_qml SOURCES ${QMLFILES} ${SOLFILES} ${TESTFILES})
+
+#test target
+find_package(Qt5QuickTest REQUIRED)
+find_package(Qt5Test REQUIRED)
+set(TEST_EXECUTABLE mix_test)
+list(APPEND LIBRARIES "Qt5::QuickTest")
+list(APPEND LIBRARIES "Qt5::Test")
+list(REMOVE_ITEM SRC_LIST "./main.cpp")
+aux_source_directory(test SRC_LIST)
+file(GLOB HEADERS "test/*.h")
+add_executable(${TEST_EXECUTABLE} ${UI_RESOURCES} ${SRC_LIST} ${HEADERS})
+target_link_libraries(${TEST_EXECUTABLE} ${LIBRARIES})
+set_target_properties(${TEST_EXECUTABLE} PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1)
+
+
+

ClientModel.cpp

@@ -90,6 +90,7 @@ ClientModel::ClientModel():
 
 ClientModel::~ClientModel()
 {
+	m_runFuture.waitForFinished();
 }
 
 QString ClientModel::apiCall(QString const& _message)
@@ -113,7 +114,7 @@ void ClientModel::mine()
 	m_mining = true;
 	emit miningStarted();
 	emit miningStateChanged();
-	QtConcurrent::run([=]()
+	m_runFuture = QtConcurrent::run([=]()
 	{
 		try
 		{
@@ -138,6 +139,12 @@ QString ClientModel::newAddress()
 	return QString::fromStdString(toHex(a.secret().ref()));
 }
 
+QString ClientModel::encodeAbiString(QString _string)
+{
+	ContractCallDataEncoder encoder;
+	return QString::fromStdString(toHex(encoder.encodeBytes(_string)));
+}
+
 QVariantMap ClientModel::contractAddresses() const
 {
 	QVariantMap res;
@@ -206,7 +213,7 @@ void ClientModel::executeSequence(std::vector<TransactionSettings> const& _seque
 	emit runStateChanged();
 
 	//run sequence
-	QtConcurrent::run([=]()
+	m_runFuture = QtConcurrent::run([=]()
 	{
 		try
 		{
@@ -468,7 +475,7 @@ RecordLogEntry* ClientModel::lastBlock() const
 	strGas << blockInfo.gasUsed;
 	std::stringstream strNumber;
 	strNumber << blockInfo.number;
-	RecordLogEntry* record =  new RecordLogEntry(0, QString::fromStdString(strNumber.str()), tr(" - Block - "), tr("Hash: ") + QString(QString::fromStdString(toHex(blockInfo.hash.ref()))), tr("Gas Used: ") + QString::fromStdString(strGas.str()), QString(), QString(), false, RecordLogEntry::RecordType::Block);
+	RecordLogEntry* record =  new RecordLogEntry(0, QString::fromStdString(strNumber.str()), tr(" - Block - "), tr("Hash: ") + QString(QString::fromStdString(toHex(blockInfo.hash().ref()))), tr("Gas Used: ") + QString::fromStdString(strGas.str()), QString(), QString(), false, RecordLogEntry::RecordType::Block);
 	QQmlEngine::setObjectOwnership(record, QQmlEngine::JavaScriptOwnership);
 	return record;
 }

ClientModel.h

@@ -27,6 +27,7 @@
 #include <map>
 #include <QString>
 #include <QVariantMap>
+#include <QFuture>
 #include "MachineStates.h"
 
 namespace dev
@@ -154,7 +155,10 @@ public slots:
 	Q_INVOKABLE void debugRecord(unsigned _index);
 	/// Show the debugger for an empty record
 	Q_INVOKABLE void emptyRecord();
+	/// Generate new adress
 	Q_INVOKABLE QString newAddress();
+	/// Encode a string to ABI parameter. Returns a hex string
+	Q_INVOKABLE QString encodeAbiString(QString _string);
 
 private slots:
 	/// Update UI with machine states result. Display a modal dialog.
@@ -203,6 +207,7 @@ private slots:
 
 	std::atomic<bool> m_running;
 	std::atomic<bool> m_mining;
+	QFuture<void> m_runFuture;
 	std::unique_ptr<MixClient> m_client;
 	std::unique_ptr<RpcConnector> m_rpcConnector;
 	std::unique_ptr<Web3Server> m_web3Server;

ContractCallDataEncoder.cpp

@@ -110,11 +110,6 @@ unsigned ContractCallDataEncoder::encodeSingleItem(QVariant const& _data, Solidi
 	return dataSize;
 }
 
-void ContractCallDataEncoder::push(bytes const& _b)
-{
-	m_encodedData.insert(m_encodedData.end(), _b.begin(), _b.end());
-}
-
 bigint ContractCallDataEncoder::decodeInt(dev::bytes const& _rawValue)
 {
 	dev::u256 un = dev::fromBigEndian<dev::u256>(_rawValue);

ContractCallDataEncoder.h

@@ -52,8 +52,10 @@ class ContractCallDataEncoder
 	QVariant decode(SolidityType const& _type, bytes const& _value);
 	/// Get all encoded data encoded by encode function.
 	bytes encodedData();
-	/// Push the given @a _b to the current param context.
-	void push(bytes const& _b);
+	/// Encode a string to ABI bytes
+	dev::bytes encodeBytes(QString const& _str);
+	/// Decode bytes from ABI
+	dev::bytes decodeBytes(dev::bytes const& _rawValue);
 
 private:
 	unsigned encodeSingleItem(QVariant const& _data, SolidityType const& _type, bytes& _dest);
@@ -63,8 +65,6 @@ class ContractCallDataEncoder
 	dev::bytes encodeBool(QString const& _str);
 	bool decodeBool(dev::bytes const& _rawValue);
 	QString toString(bool _b);
-	dev::bytes encodeBytes(QString const& _str);
-	dev::bytes decodeBytes(dev::bytes const& _rawValue);
 	QString toString(dev::bytes const& _b);
 	bool asString(dev::bytes const& _b, QString& _str);
 

FileIo.cpp

@@ -196,6 +196,7 @@ QStringList FileIo::makePackage(QString const& _deploymentFolder)
 	QStringList ret;
 	ret.append(QString::fromStdString(toHex(dappHash.ref())));
 	ret.append(qFileBytes.toBase64());
+	ret.append(url.toString());
 	return ret;
 }
 

MixApplication.cpp

@@ -23,6 +23,7 @@
 #include <QQmlApplicationEngine>
 #include <QUrl>
 #include <QIcon>
+#include <QFont>
 #ifdef ETH_HAVE_WEBENGINE
 #include <QtWebEngine/QtWebEngine>
 #endif
@@ -35,23 +36,54 @@
 #include "Clipboard.h"
 #include "HttpServer.h"
 
+extern int qInitResources_js();
 using namespace dev::mix;
 
+ApplicationService::ApplicationService()
+{
+#ifdef ETH_HAVE_WEBENGINE
+	QtWebEngine::initialize();
+#endif
+	QFont f;
+	m_systemPointSize = f.pointSize();
+}
+
 MixApplication::MixApplication(int& _argc, char* _argv[]):
 	QApplication(_argc, _argv), m_engine(new QQmlApplicationEngine())
 {
+	m_engine->load(QUrl("qrc:/qml/Application.qml"));
+	if (!m_engine->rootObjects().empty())
+	{
+		QWindow *window = qobject_cast<QWindow*>(m_engine->rootObjects().at(0));
+		if (window)
+			window->setIcon(QIcon(":/res/mix_256x256x32.png"));
+	}
+}
+
+void MixApplication::initialize()
+{
+#if __linux
+	//work around ubuntu appmenu-qt5 bug
+	//https://bugs.launchpad.net/ubuntu/+source/appmenu-qt5/+bug/1323853
+	putenv((char*)"QT_QPA_PLATFORMTHEME=");
+	putenv((char*)"QSG_RENDER_LOOP=threaded");
+#endif
+#if (defined(_WIN32) || defined(_WIN64))
+	if (!getenv("OPENSSL_CONF"))
+		putenv((char*)"OPENSSL_CONF=c:\\");
+#endif
+#ifdef ETH_HAVE_WEBENGINE
+	qInitResources_js();
+#endif
+
 	setOrganizationName(tr("Ethereum"));
 	setOrganizationDomain(tr("ethereum.org"));
 	setApplicationName(tr("Mix"));
 	setApplicationVersion("0.1");
-#ifdef ETH_HAVE_WEBENGINE
-	QtWebEngine::initialize();
-#endif
 
-	QFont f;
-	m_engine->rootContext()->setContextProperty("systemPointSize", f.pointSize());
 	qmlRegisterType<CodeModel>("org.ethereum.qml.CodeModel", 1, 0, "CodeModel");
 	qmlRegisterType<ClientModel>("org.ethereum.qml.ClientModel", 1, 0, "ClientModel");
+	qmlRegisterType<ApplicationService>("org.ethereum.qml.ApplicationService", 1, 0, "ApplicationService");
 	qmlRegisterType<FileIo>("org.ethereum.qml.FileIo", 1, 0, "FileIo");
 	qmlRegisterType<QEther>("org.ethereum.qml.QEther", 1, 0, "QEther");
 	qmlRegisterType<QBigInt>("org.ethereum.qml.QBigInt", 1, 0, "QBigInt");
@@ -63,10 +95,7 @@ MixApplication::MixApplication(int& _argc, char* _argv[]):
 	qmlRegisterType<HttpServer>("HttpServer", 1, 0, "HttpServer");
 	qRegisterMetaType<CodeModel*>("CodeModel*");
 	qRegisterMetaType<ClientModel*>("ClientModel*");
-
-	m_engine->load(QUrl("qrc:/qml/main.qml"));
-	QWindow *window = qobject_cast<QWindow*>(m_engine->rootObjects().at(0));
-	window->setIcon(QIcon(":/res/mix_256x256x32.png"));
+	qRegisterMetaType<ClientModel*>("ClientModel*");
 }
 
 MixApplication::~MixApplication()

MixApplication.h

@@ -33,12 +33,33 @@ namespace dev
 namespace mix
 {
 
+class ApplicationService: public QObject
+{
+	Q_OBJECT
+	Q_PROPERTY(int systemPointSize READ systemPointSize CONSTANT)
+	Q_PROPERTY(bool haveWebEngine READ haveWebEngine CONSTANT)
+
+public:
+	ApplicationService();
+	int systemPointSize() const { return m_systemPointSize; }
+#ifdef ETH_HAVE_WEBENGINE
+	bool haveWebEngine() const { return true; }
+#else
+	bool haveWebEngine() const { return false; }
+#endif
+
+private:
+	int m_systemPointSize = 0;
+};
+
+
 class MixApplication: public QApplication
 {
 	Q_OBJECT
 
 public:
 	MixApplication(int& _argc, char* _argv[]);
+	static void initialize();
 	virtual ~MixApplication();
 	QQmlApplicationEngine* engine() { return m_engine.get(); }
 

MixClient.cpp

@@ -93,7 +93,7 @@ void MixClient::resetState(std::map<Secret, u256> _accounts)
 	h256 stateRoot = accountState.root();
 	m_bc.reset();
 	m_bc.reset(new MixBlockChain(m_dbPath, stateRoot));
-	m_state = eth::State(genesisState.begin()->first , m_stateDB, BaseState::Empty);
+	m_state = eth::State(m_stateDB, BaseState::PreExisting, genesisState.begin()->first);
 	m_state.sync(bc());
 	m_startState = m_state;
 	WriteGuard lx(x_executions);

MixClient.h

@@ -37,7 +37,7 @@ namespace mix
 class MixBlockChain: public dev::eth::BlockChain
 {
 public:
-	MixBlockChain(std::string const& _path, h256 _stateRoot): BlockChain(createGenesisBlock(_stateRoot), _path, true) {}
+	MixBlockChain(std::string const& _path, h256 _stateRoot): BlockChain(createGenesisBlock(_stateRoot), _path, WithExisting::Kill) {}
 
 	static bytes createGenesisBlock(h256 _stateRoot);
 };

QBasicNodeDefinition.cpp

@@ -0,0 +1,41 @@
+/*
+	This file is part of cpp-ethereum.
+
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file QBasicNodeDefinition.cpp
+ * @author Yann [email protected]
+ * @date 2014
+ */
+
+#include "QBasicNodeDefinition.h"
+#include <libsolidity/AST.h>
+
+namespace dev
+{
+namespace mix
+{
+
+QBasicNodeDefinition::QBasicNodeDefinition(QObject* _parent, solidity::Declaration const* _d):
+	QObject(_parent), m_name(QString::fromStdString(_d->getName()))
+{
+}
+
+QBasicNodeDefinition::QBasicNodeDefinition(QObject* _parent, std::string const& _name):
+	QObject(_parent), m_name(QString::fromStdString(_name))
+{
+}
+
+}
+}

QBasicNodeDefinition.h

@@ -21,11 +21,17 @@
 
 #pragma once
 
+#include <string>
 #include <QObject>
-#include <libsolidity/AST.h>
 
 namespace dev
 {
+
+namespace solidity
+{
+class Declaration;
+}
+
 namespace mix
 {
 
@@ -37,8 +43,8 @@ class QBasicNodeDefinition: public QObject
 public:
 	QBasicNodeDefinition(QObject* _parent = nullptr): QObject(_parent) {}
 	~QBasicNodeDefinition() {}
-	QBasicNodeDefinition(QObject* _parent, solidity::Declaration const* _d): QObject(_parent), m_name(QString::fromStdString(_d->getName())) {}
-	QBasicNodeDefinition(QObject* _parent, std::string const& _name): QObject(_parent), m_name(QString::fromStdString(_name)) {}
+	QBasicNodeDefinition(QObject* _parent, solidity::Declaration const* _d);
+	QBasicNodeDefinition(QObject* _parent, std::string const& _name);
 	/// Get the name of the node.
 	QString name() const { return m_name; }