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

cmake/EthCompilerSettings.cmake

@@ -19,6 +19,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
 
 	set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wno-unknown-pragmas -Wextra -DSHAREDLIB -fPIC")
 	set(CMAKE_CXX_FLAGS_DEBUG          "-O0 -g -DETH_DEBUG")
+	set(CMAKE_CXX_FLAGS_DEBUGSAN       "-O1 -g -fsanitize=address,integer,undefined -fsanitize-blacklist=${CMAKE_SOURCE_DIR}/sanitizer-blacklist.txt -fno-omit-frame-pointer -DETH_DEBUG")
 	set(CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG -DETH_RELEASE")
 	set(CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG -DETH_RELEASE")
 	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DETH_RELEASE")

evmjit/CMakeLists.txt

@@ -10,28 +10,17 @@ else()
 	set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wextra -Wconversion -Wno-sign-conversion -Wno-unknown-pragmas ${CMAKE_CXX_FLAGS}")
 endif()
 
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT ${CMAKE_BUILD_TYPE} STREQUAL "DebugSan")
 	# Do not allow unresovled symbols in shared library (default on linux)
 	set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")
 endif()
 
 # LLVM
-if(LLVM_DIR OR APPLE)	# local LLVM build
-	find_package(LLVM REQUIRED CONFIG)
-	message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
-	message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
-	add_definitions(${LLVM_DEFINITIONS})
-	# TODO: bitwriter is needed only for evmcc
-	llvm_map_components_to_libnames(LLVM_LIBS core support mcjit x86asmparser x86codegen bitwriter ipo)
-else()
-	# Workaround for Ubuntu broken LLVM package
-	message(STATUS "Using llvm-3.5-dev package from Ubuntu. If does not work, build LLVM and set -DLLVM_DIR=llvm-build/share/llvm/cmake")
-	execute_process(COMMAND llvm-config-3.5 --includedir OUTPUT_VARIABLE LLVM_INCLUDE_DIRS)
-	message(STATUS "LLVM include dirs: ${LLVM_INCLUDE_DIRS}")
-	set(LLVM_LIBS "-lLLVMBitWriter -lLLVMX86CodeGen -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMCodeGen -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMX86AsmParser -lLLVMX86Desc -lLLVMX86Info -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMMCJIT -lLLVMTarget -lLLVMRuntimeDyld -lLLVMObject -lLLVMMCParser -lLLVMBitReader -lLLVMExecutionEngine -lLLVMMC -lLLVMCore -lLLVMSupport -lz -lpthread -lffi -ltinfo -ldl -lm")
-	add_definitions(-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS)
-	link_directories(/usr/lib/llvm-3.5/lib)
-endif()
+find_package(LLVM 3.7 REQUIRED CONFIG)
+message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
+message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
+add_definitions(${LLVM_DEFINITIONS})
+llvm_map_components_to_libnames(LLVM_LIBS core support mcjit x86asmparser x86codegen ipo)
 
 get_filename_component(EVMJIT_INCLUDE_DIR include ABSOLUTE)
 

evmjit/libevmjit/Arith256.cpp

@@ -167,21 +167,10 @@ llvm::Function* Arith256::getDivFunc(llvm::Type* _type)
 		m_builder.SetInsertPoint(mainBB);
 		auto ctlzIntr = llvm::Intrinsic::getDeclaration(getModule(), llvm::Intrinsic::ctlz, _type);
 		// both y and r are non-zero
-		auto yLz = m_builder.CreateCall2(ctlzIntr, yArg, m_builder.getInt1(true), "y.lz");
-		auto rLz = m_builder.CreateCall2(ctlzIntr, r0, m_builder.getInt1(true), "r.lz");
+		auto yLz = m_builder.CreateCall(ctlzIntr, {yArg, m_builder.getInt1(true)}, "y.lz");
+		auto rLz = m_builder.CreateCall(ctlzIntr, {r0, m_builder.getInt1(true)}, "r.lz");
 		auto i0 = m_builder.CreateNUWSub(yLz, rLz, "i0");
-		auto shlBy0 = m_builder.CreateICmpEQ(i0, zero);
 		auto y0 = m_builder.CreateShl(yArg, i0);
-		if (_type == m_builder.getIntNTy(512)) // Workaround for shl bug for long shifts
-		{
-			const auto treshold = m_builder.getIntN(512, 128);
-			auto highShift = m_builder.CreateICmpUGT(i0, treshold);
-			auto s = m_builder.CreateNUWSub(i0, treshold);
-			auto yhs = m_builder.CreateShl(yArg, treshold);
-			yhs = m_builder.CreateShl(yhs, s);
-			y0 = m_builder.CreateSelect(highShift, yhs, y0);
-		}
-		y0 = m_builder.CreateSelect(shlBy0, yArg, y0, "y0"); // Workaround for LLVM bug: shl by 0 produces wrong result
 		m_builder.CreateBr(loopBB);
 
 		m_builder.SetInsertPoint(loopBB);

evmjit/libevmjit/Array.cpp

@@ -45,9 +45,9 @@ llvm::Function* Array::createArrayPushFunc()
 	auto pushBB = llvm::BasicBlock::Create(m_builder.getContext(), "Push", func);
 
 	m_builder.SetInsertPoint(entryBB);
-	auto dataPtr = m_builder.CreateStructGEP(arrayPtr, 0, "dataPtr");
-	auto sizePtr = m_builder.CreateStructGEP(arrayPtr, 1, "sizePtr");
-	auto capPtr = m_builder.CreateStructGEP(arrayPtr, 2, "capPtr");
+	auto dataPtr = m_builder.CreateStructGEP(getType(), arrayPtr, 0, "dataPtr");
+	auto sizePtr = m_builder.CreateStructGEP(getType(), arrayPtr, 1, "sizePtr");
+	auto capPtr = m_builder.CreateStructGEP(getType(), arrayPtr, 2, "capPtr");
 	auto data = m_builder.CreateLoad(dataPtr, "data");
 	auto size = m_builder.CreateLoad(sizePtr, "size");
 	auto cap = m_builder.CreateLoad(capPtr, "cap");
@@ -94,7 +94,7 @@ llvm::Function* Array::createArraySetFunc()
 
 	InsertPointGuard guard{m_builder};
 	m_builder.SetInsertPoint(llvm::BasicBlock::Create(m_builder.getContext(), {}, func));
-	auto dataPtr = m_builder.CreateStructGEP(arrayPtr, 0, "dataPtr");
+	auto dataPtr = m_builder.CreateStructGEP(getType(), arrayPtr, 0, "dataPtr");
 	auto data = m_builder.CreateLoad(dataPtr, "data");
 	auto valuePtr = m_builder.CreateGEP(data, index, "valuePtr");
 	m_builder.CreateStore(value, valuePtr);
@@ -116,7 +116,7 @@ llvm::Function* Array::createArrayGetFunc()
 
 	InsertPointGuard guard{m_builder};
 	m_builder.SetInsertPoint(llvm::BasicBlock::Create(m_builder.getContext(), {}, func));
-	auto dataPtr = m_builder.CreateStructGEP(arrayPtr, 0, "dataPtr");
+	auto dataPtr = m_builder.CreateStructGEP(getType(), arrayPtr, 0, "dataPtr");
 	auto data = m_builder.CreateLoad(dataPtr, "data");
 	auto valuePtr = m_builder.CreateGEP(data, index, "valuePtr");
 	auto value = m_builder.CreateLoad(valuePtr, "value");
@@ -161,7 +161,7 @@ llvm::Function* Array::createFreeFunc()
 
 	InsertPointGuard guard{m_builder};
 	m_builder.SetInsertPoint(llvm::BasicBlock::Create(m_builder.getContext(), {}, func));
-	auto dataPtr = m_builder.CreateStructGEP(arrayPtr, 0, "dataPtr");
+	auto dataPtr = m_builder.CreateStructGEP(getType(), arrayPtr, 0, "dataPtr");
 	auto data = m_builder.CreateLoad(dataPtr, "data");
 	auto mem = m_builder.CreateBitCast(data, Type::BytePtr, "mem");
 	m_builder.CreateCall(freeFunc, mem);
@@ -197,8 +197,8 @@ llvm::Function* Array::createExtendFunc()
 	InsertPointGuard guard{m_builder};
 	m_builder.SetInsertPoint(llvm::BasicBlock::Create(m_builder.getContext(), {}, func));
 	auto dataPtr = m_builder.CreateBitCast(arrayPtr, Type::BytePtr->getPointerTo(), "dataPtr");// TODO: Use byte* in Array
-	auto sizePtr = m_builder.CreateStructGEP(arrayPtr, 1, "sizePtr");
-	auto capPtr = m_builder.CreateStructGEP(arrayPtr, 2, "capPtr");
+	auto sizePtr = m_builder.CreateStructGEP(getType(), arrayPtr, 1, "sizePtr");
+	auto capPtr = m_builder.CreateStructGEP(getType(), arrayPtr, 2, "capPtr");
 	auto data = m_builder.CreateLoad(dataPtr, "data");
 	auto size = m_builder.CreateLoad(sizePtr, "size");
 	auto extSize = m_builder.CreateNUWSub(newSize, size, "extSize");
@@ -244,7 +244,7 @@ Array::Array(llvm::IRBuilder<>& _builder, llvm::Value* _array) :
 
 void Array::pop(llvm::Value* _count)
 {
-	auto sizePtr = m_builder.CreateStructGEP(m_array, 1, "sizePtr");
+	auto sizePtr = m_builder.CreateStructGEP(getType(), m_array, 1, "sizePtr");
 	auto size = m_builder.CreateLoad(sizePtr, "size");
 	auto newSize = m_builder.CreateNUWSub(size, _count, "newSize");
 	m_builder.CreateStore(newSize, sizePtr);
@@ -252,7 +252,7 @@ void Array::pop(llvm::Value* _count)
 
 llvm::Value* Array::size(llvm::Value* _array)
 {
-	auto sizePtr = m_builder.CreateStructGEP(_array ? _array : m_array, 1, "sizePtr");
+	auto sizePtr = m_builder.CreateStructGEP(getType(), _array ? _array : m_array, 1, "sizePtr");
 	return m_builder.CreateLoad(sizePtr, "array.size");
 }
 

evmjit/libevmjit/Cache.cpp

@@ -28,7 +28,7 @@ namespace
 	using Guard = std::lock_guard<std::mutex>;
 	std::mutex x_cacheMutex;
 	CacheMode g_mode;
-	llvm::MemoryBuffer* g_lastObject;
+	std::unique_ptr<llvm::MemoryBuffer> g_lastObject;
 	ExecutionEngineListener* g_listener;
 	static const size_t c_versionStampLength = 32;
 
@@ -90,8 +90,7 @@ void Cache::preload(llvm::ExecutionEngine& _ee, std::unordered_map<std::string,
 		if (auto module = getObject(name))
 		{
 			DLOG(cache) << "Preload: " << name << "\n";
-			_ee.addModule(module.get());
-			module.release();
+			_ee.addModule(std::move(module));
 			auto addr = _ee.getFunctionAddress(name);
 			assert(addr);
 			_funcCache[std::move(name)] = addr;
@@ -148,7 +147,7 @@ std::unique_ptr<llvm::Module> Cache::getObject(std::string const& id)
 }
 
 
-void ObjectCache::notifyObjectCompiled(llvm::Module const* _module, llvm::MemoryBuffer const* _object)
+void ObjectCache::notifyObjectCompiled(llvm::Module const* _module, llvm::MemoryBufferRef _object)
 {
 	Guard g{x_cacheMutex};
 
@@ -171,19 +170,17 @@ void ObjectCache::notifyObjectCompiled(llvm::Module const* _module, llvm::Memory
 	llvm::sys::path::append(cachePath, id);
 
 	DLOG(cache) << id << ": write\n";
-	std::string error;
+	std::error_code error;
 	llvm::raw_fd_ostream cacheFile(cachePath.c_str(), error, llvm::sys::fs::F_None);
-	cacheFile << _object->getBuffer() << getLibVersionStamp();
+	cacheFile << _object.getBuffer() << getLibVersionStamp();
 }
 
-llvm::MemoryBuffer* ObjectCache::getObject(llvm::Module const* _module)
+std::unique_ptr<llvm::MemoryBuffer> ObjectCache::getObject(llvm::Module const* _module)
 {
 	Guard g{x_cacheMutex};
 
 	DLOG(cache) << _module->getModuleIdentifier() << ": use\n";
-	auto o = g_lastObject;
-	g_lastObject = nullptr;
-	return o;
+	return std::move(g_lastObject);
 }
 
 }

evmjit/libevmjit/Cache.h

@@ -3,7 +3,9 @@
 #include <memory>
 #include <unordered_map>
 
+#include "preprocessor/llvm_includes_start.h"
 #include <llvm/ExecutionEngine/ObjectCache.h>
+#include "preprocessor/llvm_includes_end.h"
 
 namespace llvm
 {
@@ -32,13 +34,13 @@ class ObjectCache : public llvm::ObjectCache
 {
 public:
 	/// notifyObjectCompiled - Provides a pointer to compiled code for Module M.
-	virtual void notifyObjectCompiled(llvm::Module const* _module, llvm::MemoryBuffer const* _object) final override;
+	virtual void notifyObjectCompiled(llvm::Module const* _module, llvm::MemoryBufferRef _object) final override;
 
 	/// getObjectCopy - Returns a pointer to a newly allocated MemoryBuffer that
 	/// contains the object which corresponds with Module M, or 0 if an object is
 	/// not available. The caller owns both the MemoryBuffer returned by this
 	/// and the memory it references.
-	virtual llvm::MemoryBuffer* getObject(llvm::Module const* _module) final override;
+	virtual std::unique_ptr<llvm::MemoryBuffer> getObject(llvm::Module const* _module) final override;
 };
 
 

evmjit/libevmjit/Compiler.cpp

@@ -148,7 +148,7 @@ std::unique_ptr<llvm::Module> Compiler::compile(code_iterator _begin, code_itera
 	auto fp = m_builder.CreateCall(frameaddress, m_builder.getInt32(0), "fp");
 	m_builder.CreateStore(fp, jmpBufWords);
 	auto stacksave = llvm::Intrinsic::getDeclaration(module.get(), llvm::Intrinsic::stacksave);
-	auto sp = m_builder.CreateCall(stacksave, "sp");
+	auto sp = m_builder.CreateCall(stacksave, {}, "sp");
 	auto jmpBufSp = m_builder.CreateConstInBoundsGEP1_64(jmpBufWords, 2, "jmpBuf.sp");
 	m_builder.CreateStore(sp, jmpBufSp);
 	auto setjmp = llvm::Intrinsic::getDeclaration(module.get(), llvm::Intrinsic::eh_sjlj_setjmp);
@@ -464,12 +464,8 @@ void Compiler::compileBasicBlock(BasicBlock& _basicBlock, RuntimeManager& _runti
 			// test for word >> (k * 8 + 7)
 			auto bitpos = m_builder.CreateAdd(k32x8, m_builder.getInt64(7), "bitpos");
 			auto bitposEx = m_builder.CreateZExt(bitpos, Type::Word);
-			auto bittester = m_builder.CreateShl(Constant::get(1), bitposEx);
-			auto bitresult = m_builder.CreateAnd(word, bittester);
-			auto bittest = m_builder.CreateICmpUGT(bitresult, Constant::get(0));
-			// FIXME: The following does not work - LLVM bug, report!
-			//auto bitval = m_builder.CreateLShr(word, bitpos, "bitval");
-			//auto bittest = m_builder.CreateTrunc(bitval, Type::Bool, "bittest");
+			auto bitval = m_builder.CreateLShr(word, bitposEx, "bitval");
+			auto bittest = m_builder.CreateTrunc(bitval, Type::Bool, "bittest");
 
 			auto mask_ = m_builder.CreateShl(Constant::get(1), bitposEx);
 			auto mask = m_builder.CreateSub(mask_, Constant::get(1), "mask");

evmjit/libevmjit/Endianness.cpp

@@ -18,9 +18,8 @@ llvm::Value* Endianness::bswapIfLE(llvm::IRBuilder<>& _builder, llvm::Value* _wo
 {
 	if (llvm::sys::IsLittleEndianHost)
 	{
-		// FIXME: Disabled because of problems with BYTE
-		//if (auto constant = llvm::dyn_cast<llvm::ConstantInt>(_word))
-		//	return _builder.getInt(constant->getValue().byteSwap());
+		if (auto constant = llvm::dyn_cast<llvm::ConstantInt>(_word))
+			return _builder.getInt(constant->getValue().byteSwap());
 
 		// OPT: Cache func declaration?
 		auto bswapFunc = llvm::Intrinsic::getDeclaration(_builder.GetInsertBlock()->getParent()->getParent(), llvm::Intrinsic::bswap, Type::Word);

evmjit/libevmjit/ExecutionEngine.cpp

@@ -87,20 +87,7 @@ void parseOptions()
 {
 	static llvm::llvm_shutdown_obj shutdownObj{};
 	cl::AddExtraVersionPrinter(printVersion);
-	//cl::ParseEnvironmentOptions("evmjit", "EVMJIT", "Ethereum EVM JIT Compiler");
-
-	// FIXME: LLVM workaround:
-	// Manually select instruction scheduler. Confirmed bad schedulers: source, list-burr, list-hybrid.
-	// "source" scheduler has a bug: http://llvm.org/bugs/show_bug.cgi?id=22304
-	auto envLine = std::getenv("EVMJIT");
-	auto commandLine = std::string{"evmjit "} + (envLine ? envLine : "") + " -pre-RA-sched=list-ilp\0";
-	static const auto c_maxArgs = 20;
-	char const* argv[c_maxArgs] = {nullptr, };
-	auto arg = std::strtok(&*commandLine.begin(), " ");
-	auto i = 0;
-	for (; i < c_maxArgs && arg; ++i, arg = std::strtok(nullptr, " "))
-		argv[i] = arg;
-	cl::ParseCommandLineOptions(i, argv, "Ethereum EVM JIT Compiler");
+	cl::ParseEnvironmentOptions("evmjit", "EVMJIT", "Ethereum EVM JIT Compiler");
 }
 
 }
@@ -131,20 +118,20 @@ ReturnCode ExecutionEngine::run(RuntimeData* _data, Env* _env)
 		llvm::InitializeNativeTargetAsmPrinter();
 
 		auto module = std::unique_ptr<llvm::Module>(new llvm::Module({}, llvm::getGlobalContext()));
-		llvm::EngineBuilder builder(module.get());
-		builder.setEngineKind(llvm::EngineKind::JIT);
-		builder.setUseMCJIT(true);
-		builder.setOptLevel(g_optimize ? llvm::CodeGenOpt::Default : llvm::CodeGenOpt::None);
 
+		// FIXME: LLVM 3.7: test on Windows
 		auto triple = llvm::Triple(llvm::sys::getProcessTriple());
 		if (triple.getOS() == llvm::Triple::OSType::Win32)
 			triple.setObjectFormat(llvm::Triple::ObjectFormatType::ELF);  // MCJIT does not support COFF format
 		module->setTargetTriple(triple.str());
 
+		llvm::EngineBuilder builder(std::move(module));
+		builder.setEngineKind(llvm::EngineKind::JIT);
+		builder.setOptLevel(g_optimize ? llvm::CodeGenOpt::Default : llvm::CodeGenOpt::None);
+
 		ee.reset(builder.create());
 		if (!CHECK(ee))
 			return ReturnCode::LLVMConfigError;
-		module.release();  // Successfully created llvm::ExecutionEngine takes ownership of the module
 		ee->setObjectCache(objectCache);
 
 		// FIXME: Disabled during API changes
@@ -177,8 +164,7 @@ ReturnCode ExecutionEngine::run(RuntimeData* _data, Env* _env)
 		if (g_dump)
 			module->dump();
 
-		ee->addModule(module.get());
-		module.release();
+		ee->addModule(std::move(module));
 		listener->stateChanged(ExecState::CodeGen);
 		entryFuncPtr = (EntryFuncPtr)ee->getFunctionAddress(mainFuncName);
 		if (!CHECK(entryFuncPtr))

evmjit/libevmjit/GasMeter.cpp

@@ -216,22 +216,12 @@ void GasMeter::countExp(llvm::Value* _exponent)
 	// cost = ((256 - lz) + 7) / 8
 
 	// OPT: Can gas update be done in exp algorithm?
-
-	auto t = llvm::APInt{256, 1};
-	auto c = m_builder.CreateSelect(m_builder.CreateICmpUGE(_exponent, Constant::get(t)), m_builder.getInt64(1), m_builder.getInt64(0));
-	for (auto i = 2; i <= 32; ++i)
-	{
-		t <<= 8;
-		c = m_builder.CreateSelect(m_builder.CreateICmpUGE(_exponent, Constant::get(t)), m_builder.getInt64(i), c);
-	}
-
-	// FIXME: Does not work because of LLVM bug: https://llvm.org/bugs/show_bug.cgi?id=22304
-//	auto ctlz = llvm::Intrinsic::getDeclaration(getModule(), llvm::Intrinsic::ctlz, Type::Word);
-//	auto lz256 = m_builder.CreateCall2(ctlz, _exponent, m_builder.getInt1(false));
-//	auto lz = m_builder.CreateTrunc(lz256, Type::Gas, "lz");
-//	auto sigBits = m_builder.CreateSub(m_builder.getInt64(256), lz, "sigBits");
-//	auto sigBytes = m_builder.CreateUDiv(m_builder.CreateAdd(sigBits, m_builder.getInt64(7)), m_builder.getInt64(8));
-	count(m_builder.CreateNUWMul(c, m_builder.getInt64(c_expByteGas)));
+	auto ctlz = llvm::Intrinsic::getDeclaration(getModule(), llvm::Intrinsic::ctlz, Type::Word);
+	auto lz256 = m_builder.CreateCall(ctlz, {_exponent, m_builder.getInt1(false)});
+	auto lz = m_builder.CreateTrunc(lz256, Type::Gas, "lz");
+	auto sigBits = m_builder.CreateSub(m_builder.getInt64(256), lz, "sigBits");
+	auto sigBytes = m_builder.CreateUDiv(m_builder.CreateAdd(sigBits, m_builder.getInt64(7)), m_builder.getInt64(8));
+	count(m_builder.CreateNUWMul(sigBytes, m_builder.getInt64(c_expByteGas)));
 }
 
 void GasMeter::countSStore(Ext& _ext, llvm::Value* _index, llvm::Value* _newValue)

evmjit/libevmjit/Optimizer.cpp

@@ -1,7 +1,7 @@
 #include "Optimizer.h"
 
 #include "preprocessor/llvm_includes_start.h"
-#include <llvm/PassManager.h>
+#include <llvm/IR/LegacyPassManager.h>
 #include <llvm/Transforms/Scalar.h>
 #include <llvm/Transforms/IPO.h>
 #include "preprocessor/llvm_includes_end.h"
@@ -15,10 +15,10 @@ namespace jit
 
 bool optimize(llvm::Module& _module)
 {
-	auto pm = llvm::PassManager{};
-	//pm.add(llvm::createFunctionInliningPass(2, 2)); // Produces invalid IR
+	auto pm = llvm::legacy::PassManager{};
+	//pm.add(llvm::createFunctionInliningPass(2, 2)); // Problem with APInt value bigger than 64bit
 	pm.add(llvm::createCFGSimplificationPass());
-	//pm.add(llvm::createInstructionCombiningPass()); // Produces invalid runtime results
+	pm.add(llvm::createInstructionCombiningPass());
 	pm.add(llvm::createAggressiveDCEPass());
 	pm.add(llvm::createLowerSwitchPass());
 	return pm.run(_module);

evmjit/libevmjit/RuntimeManager.cpp

@@ -93,13 +93,13 @@ RuntimeManager::RuntimeManager(llvm::IRBuilder<>& _builder, code_iterator _codeB
 
 	// Unpack data
 	auto rtPtr = getRuntimePtr();
-	m_dataPtr = m_builder.CreateLoad(m_builder.CreateStructGEP(rtPtr, 0), "data");
+	m_dataPtr = m_builder.CreateLoad(m_builder.CreateStructGEP(getRuntimeType(), rtPtr, 0), "data");
 	assert(m_dataPtr->getType() == Type::RuntimeDataPtr);
-	m_gasPtr = m_builder.CreateStructGEP(m_dataPtr, 0, "gas");
+	m_gasPtr = m_builder.CreateStructGEP(getRuntimeDataType(), m_dataPtr, 0, "gas");
 	assert(m_gasPtr->getType() == Type::Gas->getPointerTo());
-	m_memPtr = m_builder.CreateStructGEP(rtPtr, 2, "mem");
+	m_memPtr = m_builder.CreateStructGEP(getRuntimeType(), rtPtr, 2, "mem");
 	assert(m_memPtr->getType() == Array::getType()->getPointerTo());
-	m_envPtr = m_builder.CreateLoad(m_builder.CreateStructGEP(rtPtr, 1), "env");
+	m_envPtr = m_builder.CreateLoad(m_builder.CreateStructGEP(getRuntimeType(), rtPtr, 1), "env");
 	assert(m_envPtr->getType() == Type::EnvPtr);
 
 	m_stackSize = m_builder.CreateAlloca(Type::Size, nullptr, "stackSize");
@@ -160,7 +160,7 @@ llvm::Value* RuntimeManager::getDataPtr()
 		return m_dataPtr;
 
 	auto rtPtr = getRuntimePtr();
-	auto dataPtr = m_builder.CreateLoad(m_builder.CreateStructGEP(rtPtr, 0), "data");
+	auto dataPtr = m_builder.CreateLoad(m_builder.CreateStructGEP(getRuntimeType(), rtPtr, 0), "data");
 	assert(dataPtr->getType() == getRuntimeDataType()->getPointerTo());
 	return dataPtr;
 }
@@ -173,7 +173,7 @@ llvm::Value* RuntimeManager::getEnvPtr()
 
 llvm::Value* RuntimeManager::getPtr(RuntimeData::Index _index)
 {
-	auto ptr = getBuilder().CreateStructGEP(getDataPtr(), _index);
+	auto ptr = getBuilder().CreateStructGEP(getRuntimeDataType(), getDataPtr(), _index);
 	assert(getRuntimeDataType()->getElementType(_index)->getPointerTo() == ptr->getType());
 	return ptr;
 }

evmjit/libevmjit/Type.h

@@ -2,8 +2,9 @@
 
 #include "preprocessor/llvm_includes_start.h"
 #include <llvm/IR/Type.h>
-#include <llvm/IR/Constants.h>
-#include "preprocessor/llvm_includes_end.h"
+#include <llvm/IR/Constants.h>
+#include <llvm/IR/Metadata.h>
+#include "preprocessor/llvm_includes_end.h" // FIXME: LLVM 3.7: check if needed
 
 #include "Common.h"
 

libdevcore/RLP.cpp

@@ -202,9 +202,7 @@ unsigned RLP::items() const
 
 RLPStream& RLPStream::appendRaw(bytesConstRef _s, unsigned _itemCount)
 {
-	unsigned os = m_out.size();
-	m_out.resize(os + _s.size());
-	memcpy(m_out.data() + os, _s.data(), _s.size());
+	m_out.insert(m_out.end(), _s.begin(), _s.end());
 	noteAppended(_itemCount);
 	return *this;
 }

libethereum/BlockChain.cpp

@@ -391,7 +391,7 @@ ImportRoute BlockChain::import(bytes const& _block, OverlayDB const& _db, Import
 	try
 #endif
 	{
-		block = verifyBlock(_block, m_onBad);
+		block = verifyBlock(_block, m_onBad, _ir);
 	}
 #if ETH_CATCH
 	catch (Exception& ex)

mix/CodeModel.cpp

@@ -374,29 +374,55 @@ void CodeModel::gasEstimation(solidity::CompilerStack const& _cs)
 		dev::solidity::SourceUnit const& sourceUnit = _cs.getAST(*contractDefinition.getLocation().sourceName);
 		AssemblyItems const* items = _cs.getRuntimeAssemblyItems(n);
 		std::map<ASTNode const*, GasMeter::GasConsumption> gasCosts = GasEstimator::breakToStatementLevel(GasEstimator::structuralEstimation(*items, std::vector<ASTNode const*>({&sourceUnit})), {&sourceUnit});
+
+		auto gasToString = [](GasMeter::GasConsumption const& _gas)
+		{
+			if (_gas.isInfinite)
+				return QString("0");
+			else
+				return QString::fromStdString(toString(_gas.value));
+		};
+
+		// Structural gas costs (per opcode)
 		for (auto gasItem = gasCosts.begin(); gasItem != gasCosts.end(); ++gasItem)
 		{
 			SourceLocation const& location = gasItem->first->getLocation();
 			GasMeter::GasConsumption cost = gasItem->second;
-			std::stringstream v;
-			v << cost.value;
-			m_gasCostsMaps->push(sourceName, location.start, location.end, QString::fromStdString(v.str()), cost.isInfinite, GasMap::type::Statement);
+			m_gasCostsMaps->push(sourceName, location.start, location.end, gasToString(cost), cost.isInfinite, GasMap::type::Statement);
 		}
 
-		if (contractDefinition.getConstructor() != nullptr)
+		eth::AssemblyItems const& runtimeAssembly = *_cs.getRuntimeAssemblyItems(n);
+		// Functional gas costs (per function, but also for accessors)
+		for (auto it: contractDefinition.getInterfaceFunctions())
 		{
-			GasMeter::GasConsumption cost = GasEstimator::functionalEstimation(*_cs.getRuntimeAssemblyItems(n), contractDefinition.getConstructor()->externalSignature());
-			std::stringstream v;
-			v << cost.value;
-			m_gasCostsMaps->push(sourceName, contractDefinition.getConstructor()->getLocation().start, contractDefinition.getConstructor()->getLocation().end, QString::fromStdString(v.str()), cost.isInfinite, GasMap::type::Constructor);
+			if (!it.second->hasDeclaration())
+				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);
 		}
-
-		for (auto func: contractDefinition.getDefinedFunctions())
+		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);
+		}
+		for (auto const& it: contractDefinition.getDefinedFunctions())
+		{
+			if (it->isPartOfExternalInterface() || it->isConstructor())
+				continue;
+			SourceLocation loc = it->getLocation();
+			size_t entry = _cs.getFunctionEntryPoint(n, *it);
+			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);
+		}
+		if (auto const* constructor = contractDefinition.getConstructor())
 		{
-			GasMeter::GasConsumption cost = GasEstimator::functionalEstimation(*_cs.getRuntimeAssemblyItems(n), func->externalSignature());
-			std::stringstream v;
-			v << cost.value;
-			m_gasCostsMaps->push(sourceName, func->getLocation().start, func->getLocation().end, QString::fromStdString(v.str()), cost.isInfinite, GasMap::type::Function);
+			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);
 		}
 	}
 }

mix/qml/Block.qml

@@ -16,23 +16,24 @@ ColumnLayout
 	property int number
 	property int blockWidth: Layout.preferredWidth - statusWidth - horizontalMargin
 	property int horizontalMargin: 10
-	property int trHeight: 30
+	property int trHeight: 35
 	spacing: 0
 	property int openedTr: 0
 	property int blockIndex
 	property variant scenario
+	property string labelColor: "#414141"
 
 	function calculateHeight()
 	{
 		if (transactions)
 		{
 			if (index >= 0)
-				return 30 + 30 * transactions.count + openedTr
+				return trHeight + trHeight * transactions.count + openedTr
 			else
-				return 30
+				return trHeight
 		}
 		else
-			return 30
+			return trHeight
 	}
 
 	onOpenedTrChanged:
@@ -41,31 +42,67 @@ ColumnLayout
 		height = calculateHeight()
 	}
 
+	DebuggerPaneStyle {
+		id: dbgStyle
+	}
 
+	Rectangle
+	{
+		id: top
+		Layout.preferredWidth: blockWidth
+		height: 10
+		anchors.bottom: rowHeader.top
+		color: "#DEDCDC"
+		radius: 15
+		anchors.left: parent.left
+		anchors.leftMargin: statusWidth
+		anchors.bottomMargin: -5
+	}
 
 	RowLayout
 	{
 		Layout.preferredHeight: trHeight
 		Layout.preferredWidth: blockWidth
 		id: rowHeader
+		spacing: 0
 		Rectangle
 		{
-			color: "#DEDCDC"
 			Layout.preferredWidth: blockWidth
 			Layout.preferredHeight: trHeight
-			radius: 4
+			color: "#DEDCDC"
 			anchors.left: parent.left
-			anchors.leftMargin: statusWidth + 5
+			anchors.leftMargin: statusWidth
 			Label {
 				anchors.verticalCenter: parent.verticalCenter
 				anchors.left: parent.left
 				anchors.leftMargin: horizontalMargin
+				font.pointSize: dbgStyle.absoluteSize(1)
+				color: "#adadad"
 				text:
 				{
-					if (status === "mined")
+					if (number === -2)
+						return qsTr("STARTING PARAMETERS")
+					else if (status === "mined")
 						return qsTr("BLOCK") + " " + number
 					else
-						return qsTr("BLOCK") + " pending"
+						return qsTr("PENDING TRANSACTIONS")
+				}
+			}
+
+			Label
+			{
+				text: qsTr("EDIT")
+				color:  "#1397da"
+				anchors.verticalCenter: parent.verticalCenter
+				anchors.right: parent.right
+				anchors.rightMargin: 14
+				MouseArea
+				{
+					anchors.fill: parent
+					onClicked:
+					{
+						// load edit block panel
+					}
 				}
 			}
 		}
@@ -75,11 +112,11 @@ ColumnLayout
 	{
 		id: transactionRepeater
 		model: transactions
-
 		RowLayout
 		{
 			id: rowTransaction
 			Layout.preferredHeight: trHeight
+			spacing: 0
 			function displayContent()
 			{
 				logsText.text = ""
@@ -99,7 +136,7 @@ ColumnLayout
 								var p = log.param.get(i)
 								logsText.text += p.name + " = " + p.value + " - indexed:" + p.indexed + "\n"
 							}
-						else{
+						else {
 							logsText.text += "From : " + log.address + "\n"
 						}
 					}
@@ -112,18 +149,19 @@ ColumnLayout
 			{
 				id: trSaveStatus
 				Layout.preferredWidth: statusWidth
-				Layout.preferredHeight: trHeight
+				Layout.preferredHeight: parent.height
 				color: "transparent"
 				anchors.top: parent.top
 				property bool saveStatus
-
 				Image {
+					anchors.top: parent.top
+					anchors.left: parent.left
+					anchors.leftMargin: -9
+					anchors.topMargin: -9
 					id: saveStatusImage
 					source: "qrc:/qml/img/recyclediscard@2x.png"
-					width: statusWidth
+					width: statusWidth + 20
 					fillMode: Image.PreserveAspectFit
-					anchors.verticalCenter: parent.verticalCenter
-					anchors.horizontalCenter: parent.horizontalCenter
 				}
 
 				Component.onCompleted:
@@ -160,45 +198,76 @@ ColumnLayout
 				color: "#DEDCDC"
 				id: rowContentTr
 				anchors.top: parent.top
+
+				MouseArea
+				{
+					anchors.fill: parent
+					onDoubleClicked:
+					{
+						transactionDialog.stateAccounts = scenario.accounts
+						transactionDialog.execute = false
+						transactionDialog.open(index, blockIndex,  transactions.get(index))
+					}
+				}
+
 				ColumnLayout
 				{
 					anchors.top: parent.top
-					spacing: 10
+					width: parent.width
+					spacing: 20
 					RowLayout
 					{
 						anchors.top: parent.top
-						anchors.verticalCenter: parent.verticalCenter
-						spacing: cellSpacing
-						Text
+						Layout.fillWidth: true
+						Rectangle
 						{
-							id: hash
+							Layout.preferredWidth: fromWidth
 							anchors.left: parent.left
 							anchors.leftMargin: horizontalMargin
-							Layout.preferredWidth: fromWidth
-							elide: Text.ElideRight
-							maximumLineCount: 1
-							text: {
-								if (index >= 0)
-									return transactions.get(index).sender
-								else
-									return ""
+							Text
+							{
+								id: hash
+								width: parent.width - 30
+								elide: Text.ElideRight
+								anchors.verticalCenter: parent.verticalCenter
+								maximumLineCount: 1
+								color: labelColor
+								font.pointSize: dbgStyle.absoluteSize(1)
+								font.bold: true
+								text: {
+									if (index >= 0)
+										return transactions.get(index).sender
+									else
+										return ""
+								}
 							}
 						}
 
-						Text
+
+						Rectangle
 						{
-							id: func
-							text: {
-								if (index >= 0)
-									parent.userFrienldyToken(transactions.get(index).label)
-								else
-									return ""
-							}
-							elide: Text.ElideRight
-							maximumLineCount: 1
 							Layout.preferredWidth: toWidth
+							Text
+							{
+								id: func
+								text: {
+									if (index >= 0)
+										parent.parent.userFrienldyToken(transactions.get(index).label)
+									else
+										return ""
+								}
+								elide: Text.ElideRight
+								anchors.verticalCenter: parent.verticalCenter
+								color: labelColor
+								font.pointSize: dbgStyle.absoluteSize(1)
+								font.bold: true
+								maximumLineCount: 1
+								width: parent.width
+							}
 						}
 
+
+
 						function userFrienldyToken(value)
 						{
 							if (value && value.indexOf("<") === 0)
@@ -212,17 +281,25 @@ ColumnLayout
 								return value
 						}
 
-						Text
+						Rectangle
 						{
-							id: returnValue
-							elide: Text.ElideRight
-							maximumLineCount: 1
 							Layout.preferredWidth: valueWidth
-							text: {
-								if (index >= 0 && transactions.get(index).returned)
-									return transactions.get(index).returned
-								else
-									return ""
+							Text
+							{
+								id: returnValue
+								elide: Text.ElideRight
+								anchors.verticalCenter: parent.verticalCenter
+								maximumLineCount: 1
+								color: labelColor
+								font.bold: true
+								font.pointSize: dbgStyle.absoluteSize(1)
+								width: parent.width -30
+								text: {
+									if (index >= 0 && transactions.get(index).returned)
+										return transactions.get(index).returned
+									else
+										return ""
+								}
 							}
 						}
 
@@ -236,7 +313,11 @@ ColumnLayout
 							{
 								id: logs
 								anchors.left: parent.left
+								anchors.verticalCenter: parent.verticalCenter
 								anchors.leftMargin: 10
+								color: labelColor
+								font.bold: true
+								font.pointSize: dbgStyle.absoluteSize(1)
 								text: {
 									if (index >= 0 && transactions.get(index).logs && transactions.get(index).logs.count)
 										return transactions.get(index).logs.count
@@ -251,60 +332,6 @@ ColumnLayout
 								}
 							}
 						}
-
-						Rectangle
-						{
-							Layout.preferredWidth: debugActionWidth
-							Layout.preferredHeight: trHeight - 10
-							color: "transparent"
-
-							Image {
-								source: "qrc:/qml/img/edit.png"
-								width: 18
-								fillMode: Image.PreserveAspectFit
-								anchors.verticalCenter: parent.verticalCenter
-								anchors.horizontalCenter: parent.horizontalCenter
-							}
-							MouseArea
-							{
-								anchors.fill: parent
-								onClicked:
-								{
-									transactionDialog.stateAccounts = scenario.accounts
-									transactionDialog.execute = false
-									transactionDialog.open(index, blockIndex,  transactions.get(index))
-								}
-							}
-						}
-
-						Rectangle
-						{
-							Layout.preferredWidth: debugActionWidth
-							Layout.preferredHeight: trHeight - 10
-							color: "transparent"
-
-							Image {
-								id: debugImg
-								source: "qrc:/qml/img/rightarrow@2x.png"
-								width: statusWidth
-								fillMode: Image.PreserveAspectFit
-								anchors.verticalCenter: parent.verticalCenter
-								anchors.horizontalCenter: parent.horizontalCenter
-								visible: transactions.get(index).recordIndex !== undefined
-							}
-							MouseArea
-							{
-								anchors.fill: parent
-								onClicked:
-								{
-									if (transactions.get(index).recordIndex !== undefined)
-									{
-										debugTrRequested = [ blockIndex, index ]
-										clientModel.debugRecord(transactions.get(index).recordIndex);
-									}
-								}
-							}
-						}
 					}
 
 					RowLayout
@@ -340,7 +367,53 @@ ColumnLayout
 					}
 				}
 			}
+
+			Rectangle
+			{
+				width: debugActionWidth
+				height: trHeight
+				anchors.left: rowContentTr.right
+				anchors.topMargin: -6
+				anchors.top: rowContentTr.top
+				anchors.leftMargin: -50
+				color: "transparent"
+
+				Image {
+					id: debugImg
+					source: "qrc:/qml/img/rightarrow@2x.png"
+					width: debugActionWidth
+					fillMode: Image.PreserveAspectFit
+					anchors.verticalCenter: parent.verticalCenter
+					anchors.horizontalCenter: parent.horizontalCenter
+					visible: transactions.get(index).recordIndex !== undefined
+				}
+				MouseArea
+				{
+					anchors.fill: parent
+					onClicked:
+					{
+						if (transactions.get(index).recordIndex !== undefined)
+						{
+							debugTrRequested = [ blockIndex, index ]
+							clientModel.debugRecord(transactions.get(index).recordIndex);
+						}
+					}
+				}
+			}
 		}
 	}
+
+	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/BlockChain.qml

@@ -18,15 +18,27 @@ ColumnLayout {
 	property int previousWidth
 	property variant debugTrRequested: []
 	signal chainChanged
+	signal chainReloaded
+
+	Connections
+	{
+		target: codeModel
+		onContractRenamed: {
+			rebuild.startBlinking()
+		}
+		onNewContractCompiled: {
+			rebuild.startBlinking()
+		}
+	}
 
 	onChainChanged: {
-		reBuildNeeded.start()
+		rebuild.startBlinking()
 	}
 
 	onWidthChanged:
 	{
-
-		if (width <= 630 || previousWidth <= 630)
+		var minWidth = scenarioMinWidth - 20 // margin
+		if (width <= minWidth || previousWidth <= minWidth)
 		{
 			fromWidth = 100
 			toWidth = 100
@@ -47,7 +59,7 @@ ColumnLayout {
 		if (!scenario)
 			return;
 		if (model)
-			chainChanged()
+			rebuild.startBlinking()
 		model = scenario
 		blockModel.clear()
 		for (var b in model.blocks)
@@ -56,11 +68,11 @@ ColumnLayout {
 	}
 
 	property int statusWidth: 30
-	property int fromWidth: 100
+	property int fromWidth: 150
 	property int toWidth: 100
 	property int valueWidth: 200
-	property int logsWidth: 50
-	property int debugActionWidth: 50
+	property int logsWidth: 40
+	property int debugActionWidth: 40
 	property int horizontalMargin: 10
 	property int cellSpacing: 10
 
@@ -68,23 +80,30 @@ ColumnLayout {
 	{
 		id: header
 		spacing: 0
-		Layout.preferredHeight: 25
-		Image {
-			id: debugImage
-			source: "qrc:/qml/img/recycleicon@2x.png"
+		Layout.preferredHeight: 30
+		Rectangle
+		{
 			Layout.preferredWidth: statusWidth
-			Layout.preferredHeight: 25
-			fillMode: Image.PreserveAspectFit
+			Layout.preferredHeight: parent.height
+			color: "transparent"
+			Image {
+				id: debugImage
+				anchors.verticalCenter: parent.verticalCenter
+				anchors.horizontalCenter: parent.horizontalCenter
+				source: "qrc:/qml/img/recycleicon@2x.png"
+				width: statusWidth + 20
+				fillMode: Image.PreserveAspectFit
+			}
 		}
 		Rectangle
 		{
-			Layout.preferredWidth: fromWidth + cellSpacing
+			Layout.preferredWidth: fromWidth
 			Label
 			{
 				anchors.verticalCenter: parent.verticalCenter
 				text: "From"
 				anchors.left: parent.left
-				anchors.leftMargin: horizontalMargin + 5
+				anchors.leftMargin: horizontalMargin
 			}
 		}
 		Label
@@ -120,12 +139,25 @@ ColumnLayout {
 		{
 			id: blockChainScrollView
 			anchors.fill: parent
-			anchors.topMargin: 10
+			anchors.topMargin: 8
 			ColumnLayout
 			{
 				id: blockChainLayout
 				width: parent.width
-				spacing: 10
+				spacing: 20
+
+				Block
+				{
+					scenario: blockChainPanel.model
+					Layout.preferredWidth: blockChainScrollView.width
+					Layout.preferredHeight: 60
+					blockIndex: -1
+					transactions: []
+					status: ""
+					number: -2
+					trHeight: 60
+				}
+
 				Repeater // List of blocks
 				{
 					id: blockChainRepeater
@@ -218,158 +250,171 @@ ColumnLayout {
 		Layout.preferredWidth: parent.width
 		RowLayout
 		{
-			width: 4 * 100
+			anchors.horizontalCenter: parent.horizontalCenter
 			anchors.top: parent.top
 			anchors.topMargin: 10
-			spacing: 0
-			ScenarioButton {
-				id: rebuild
-				text: qsTr("Rebuild")
-				onClicked:
-				{
-					if (ensureNotFuturetime.running)
-						return;
-					reBuildNeeded.stop()
-					var retBlocks = [];
-					var bAdded = 0;
-					for (var j = 0; j < model.blocks.length; j++)
+			spacing: 20
+
+			Rectangle {
+				Layout.preferredWidth: 100
+				Layout.preferredHeight: 30
+
+				ScenarioButton {
+					id: rebuild
+					text: qsTr("Rebuild")
+					width: 100
+					height: 30
+					roundLeft: true
+					roundRight: true
+					onClicked:
 					{
-						var b = model.blocks[j];
-						var block = {
-							hash: b.hash,
-							number: b.number,
-							transactions: [],
-							status: b.status
-						}
-						for (var k = 0; k < model.blocks[j].transactions.length; k++)
+						if (ensureNotFuturetime.running)
+							return;
+						stopBlinking()
+						var retBlocks = [];
+						var bAdded = 0;
+						for (var j = 0; j < model.blocks.length; j++)
 						{
-							if (blockModel.get(j).transactions.get(k).saveStatus)
+							var b = model.blocks[j];
+							var block = {
+								hash: b.hash,
+								number: b.number,
+								transactions: [],
+								status: b.status
+							}
+							for (var k = 0; k < model.blocks[j].transactions.length; k++)
 							{
-								var tr = model.blocks[j].transactions[k]
-								tr.saveStatus = true
-								block.transactions.push(tr);
+								if (blockModel.get(j).transactions.get(k).saveStatus)
+								{
+									var tr = model.blocks[j].transactions[k]
+									tr.saveStatus = true
+									block.transactions.push(tr);
+								}
+
+							}
+							if (block.transactions.length > 0)
+							{
+								bAdded++
+								block.number = bAdded
+								block.status = "mined"
+								retBlocks.push(block)
 							}
 
 						}
-						if (block.transactions.length > 0)
+						if (retBlocks.length === 0)
+							retBlocks.push(projectModel.stateListModel.createEmptyBlock())
+						else
 						{
-							bAdded++
-							block.number = bAdded
-							block.status = "mined"
-							retBlocks.push(block)
+							var last = retBlocks[retBlocks.length - 1]
+							last.number = -1
+							last.status = "pending"
 						}
 
+						model.blocks = retBlocks
+						blockModel.clear()
+						for (var j = 0; j < model.blocks.length; j++)
+							blockModel.append(model.blocks[j])
+
+						ensureNotFuturetime.start()
+						clientModel.setupScenario(model);
 					}
-					if (retBlocks.length === 0)
-						retBlocks.push(projectModel.stateListModel.createEmptyBlock())
-					else
-					{
-						var last = retBlocks[retBlocks.length - 1]
-						last.number = -1
-						last.status = "pending"
-					}
+					buttonShortcut: ""
+					sourceImg: "qrc:/qml/img/recycleicon@2x.png"
+				}
+			}
 
-					model.blocks = retBlocks
-					blockModel.clear()
-					for (var j = 0; j < model.blocks.length; j++)
-						blockModel.append(model.blocks[j])
 
-					ensureNotFuturetime.start()
-					clientModel.setupScenario(model);
+			Rectangle
+			{
+				Layout.preferredWidth: 200
+				Layout.preferredHeight: 30
+				color: "transparent"
+
+				ScenarioButton {
+					id: addTransaction
+					text: qsTr("Add Tx")
+					onClicked:
+					{
+						var lastBlock = model.blocks[model.blocks.length - 1];
+						if (lastBlock.status === "mined")
+						{
+							var newblock = projectModel.stateListModel.createEmptyBlock()
+							blockModel.appendBlock(newblock)
+							model.blocks.push(newblock);
+						}
+
+						var item = TransactionHelper.defaultTransaction()
+						transactionDialog.stateAccounts = model.accounts
+						transactionDialog.execute = true
+						transactionDialog.open(model.blocks[model.blocks.length - 1].transactions.length, model.blocks.length - 1, item)
+					}
+					width: 100
+					height: 30
+					buttonShortcut: ""
+					sourceImg: "qrc:/qml/img/sendtransactionicon@2x.png"
+					roundLeft: true
+					roundRight: false
 				}
 
-				Layout.preferredWidth: 100
-				Layout.preferredHeight: 30
-				buttonShortcut: ""
-				sourceImg: "qrc:/qml/img/recycleicon@2x.png"
 				Timer
 				{
-					id: reBuildNeeded
-					repeat: true
+					id: ensureNotFuturetime
 					interval: 1000
+					repeat: false
 					running: false
-					onTriggered: {
-						if (!parent.fillColor || parent.fillColor === "white")
-							parent.fillColor = "orange"
-						else
-							parent.fillColor = "white"
-					}
-					onRunningChanged: {
-						if (!running)
-							parent.fillColor = "white"
-					}
 				}
-			}
 
-			ScenarioButton {
-				id: addTransaction
-				text: qsTr("Add Transaction")
-				onClicked:
+				Rectangle
 				{
-					var lastBlock = model.blocks[model.blocks.length - 1];
-					if (lastBlock.status === "mined")
-					{
-						var newblock = projectModel.stateListModel.createEmptyBlock()
-						blockModel.appendBlock(newblock)
-						model.blocks.push(newblock);
-					}
-
-					var item = TransactionHelper.defaultTransaction()
-					transactionDialog.stateAccounts = model.accounts
-					transactionDialog.execute = true
-					transactionDialog.open(model.blocks[model.blocks.length - 1].transactions.length, model.blocks.length - 1, item)
+					width: 1
+					height: parent.height
+					anchors.right: addBlockBtn.left
+					color: "#ededed"
 				}
-				Layout.preferredWidth: 100
-				Layout.preferredHeight: 30
-				buttonShortcut: ""
-				sourceImg: "qrc:/qml/img/sendtransactionicon@2x.png"
-			}
 
-			Timer
-			{
-				id: ensureNotFuturetime
-				interval: 1000
-				repeat: false
-				running: false
-			}
-
-			ScenarioButton {
-				id: addBlockBtn
-				text: qsTr("Add Block")
-				onClicked:
-				{
-					if (ensureNotFuturetime.running)
-						return
-					if (clientModel.mining || clientModel.running)
-						return
-					if (model.blocks.length > 0)
+				ScenarioButton {
+					id: addBlockBtn
+					text: qsTr("Add Block..")
+					anchors.left: addTransaction.right
+					roundLeft: false
+					roundRight: true
+					onClicked:
 					{
-						var lastBlock = model.blocks[model.blocks.length - 1]
-						if (lastBlock.status === "pending")
+						if (ensureNotFuturetime.running)
+							return
+						if (clientModel.mining || clientModel.running)
+							return
+						if (model.blocks.length > 0)
 						{
-							ensureNotFuturetime.start()
-							clientModel.mine()
+							var lastBlock = model.blocks[model.blocks.length - 1]
+							if (lastBlock.status === "pending")
+							{
+								ensureNotFuturetime.start()
+								clientModel.mine()
+							}
+							else
+								addNewBlock()
 						}
 						else
 							addNewBlock()
+
 					}
-					else
-						addNewBlock()
 
-				}
+					function addNewBlock()
+					{
+						var block = projectModel.stateListModel.createEmptyBlock()
+						model.blocks.push(block)
+						blockModel.appendBlock(block)
+					}
+					width: 100
+					height: 30
 
-				function addNewBlock()
-				{
-					var block = projectModel.stateListModel.createEmptyBlock()
-					model.blocks.push(block)
-					blockModel.appendBlock(block)
+					buttonShortcut: ""
+					sourceImg: "qrc:/qml/img/addblock@2x.png"
 				}
-				Layout.preferredWidth: 100
-				Layout.preferredHeight: 30
-				buttonShortcut: ""
-				sourceImg: "qrc:/qml/img/addblock@2x.png"
 			}
 
+
 			Connections
 			{
 				target: clientModel
@@ -412,7 +457,6 @@ ColumnLayout {
 							return;
 						}
 					}
-
 					// tr is not in the list.
 					var itemTr = TransactionHelper.defaultTransaction()
 					itemTr.saveStatus = false
@@ -438,7 +482,7 @@ ColumnLayout {
 
 			ScenarioButton {
 				id: newAccount
-				text: qsTr("New Account")
+				text: qsTr("New Account..")
 				onClicked: {
 					model.accounts.push(projectModel.stateListModel.newAccount("1000000", QEther.Ether))
 				}
@@ -446,6 +490,8 @@ ColumnLayout {
 				Layout.preferredHeight: 30
 				buttonShortcut: ""
 				sourceImg: "qrc:/qml/img/newaccounticon@2x.png"
+				roundLeft: true
+				roundRight: true
 			}
 		}
 	}

mix/qml/MainContent.qml

@@ -31,6 +31,7 @@ Rectangle {
 	property alias codeEditor: codeEditor
 	property bool webViewHorizontal: codeWebSplitter.orientation === Qt.Vertical //vertical splitter positions elements vertically, splits screen horizontally
 	property bool firstCompile: true
+	property int scenarioMinWidth: 590
 
 	Connections {
 		target: codeModel
@@ -110,6 +111,7 @@ Rectangle {
 		property alias webHeight: webPreview.height
 		property alias showProjectView: projectList.visible
 		property bool runOnProjectLoad: true
+		property int scenarioMinWidth: scenarioMinWidth
 	}
 
 	ColumnLayout
@@ -205,7 +207,7 @@ Rectangle {
 					visible: false;
 					Layout.fillHeight: true
 					Keys.onEscapePressed: visible = false
-					Layout.minimumWidth: 650
+					Layout.minimumWidth: scenarioMinWidth
 					anchors.right: parent.right
 				}
 
@@ -215,7 +217,7 @@ Rectangle {
 					visible: false
 					Layout.fillHeight: true
 					Keys.onEscapePressed: visible = false
-					Layout.minimumWidth: 650
+					Layout.minimumWidth: scenarioMinWidth
 					anchors.right: parent.right
 				}
 
@@ -224,10 +226,9 @@ Rectangle {
 					onDebugDataReady:  {
 						scenarioExe.visible = false
 						debugPanel.visible = true
+						debugPanel.width = scenarioExe.width
 						if (scenarioExe.bc.debugTrRequested)
-						{
 							debugPanel.setTr(scenarioExe.bc.model.blocks[scenarioExe.bc.debugTrRequested[0]].transactions[scenarioExe.bc.debugTrRequested[1]])
-						}
 					}
 				}
 
@@ -236,6 +237,7 @@ Rectangle {
 					onPanelClosed:  {
 						debugPanel.visible = false
 						scenarioExe.visible = true
+						scenarioExe.width = debugPanel.width
 					}
 				}
 			}

mix/qml/ScenarioButton.qml

@@ -2,6 +2,7 @@ import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.0
 import QtQuick.Controls.Styles 1.1
+import QtGraphicalEffects 1.0
 
 Rectangle {
 	id: buttonActionContainer
@@ -9,15 +10,68 @@ Rectangle {
 	property string buttonShortcut
 	property string sourceImg
 	property string fillColor
+	property alias roundLeft: left.visible
+	property alias roundRight: right.visible
 	signal clicked
 
+	function startBlinking()
+	{
+		if (!blinkTimer.running)
+			blinkTimer.start()
+	}
+
+	function stopBlinking()
+	{
+		blinkTimer.stop()
+	}
+
+	Rectangle
+	{
+		id: left
+		width: 10
+		height: parent.height
+		anchors.left: parent.left
+		anchors.leftMargin: -8
+		radius: 15
+	}
+
 	Rectangle {
 		id: contentRectangle
 		anchors.fill: parent
-		border.color: "#cccccc"
-		border.width: 1
-		radius: 4
-		color: parent.fillColor ? parent.fillColor : "white"
+		color: "white"
+		property variant colorGradient: ["#FFFFFF", "#FFFEFC", "#FFFDF9", "#FFFCF7", "#FFFBF4", "#FFFAF2", "#FFF9EF", "#FFF8EC", "#FFF7EA", "#FFF6E7", "#FFF5E5", "#FFF5E2", "#FFF4E0", "#FFF3DD", "#FFF2DA", "#FFF1D8", "#FFF0D5", "#FFEFD3", "#FFEED0", "#FFEDCE", "#FFECCB", "#FFEBC8", "#FFEBC6", "#FFEAC3", "#FFE9C1", "#FFE8BE", "#FFE7BC", "#FFE6B9", "#FFE5B6", "#FFE4B4", "#FFE3B1", "#FFE2AF", "#FFE1AC", "#FFE1AA", "#FFE0A7", "#FFDFA4", "#FFDEA2", "#FFDD9F", "#FFDC9D", "#FFDB9A", "#FFDA97", "#FFD995", "#FFD892", "#FFD790", "#FFD78D", "#FFD68B", "#FFD588", "#FFD485", "#FFD383", "#FFD280", "#FFD17E", "#FFD07B", "#FFCF79", "#FFCE76", "#FFCD73", "#FFCD71", "#FFCC6E", "#FFCB6C", "#FFCA69", "#FFC967", "#FFC864", "#FFC761", "#FFC65F", "#FFC55C", "#FFC45A", "#FFC357", "#FFC355", "#FFC252", "#FFC14F", "#FFC04D", "#FFBF4A", "#FFBE48", "#FFBD45", "#FFBC42", "#FFBB40", "#FFBA3D", "#FFB93B", "#FFB938", "#FFB836", "#FFB733", "#FFB630", "#FFB52E", "#FFB42B", "#FFB329", "#FFB226", "#FFB124", "#FFB021", "#FFAF1E", "#FFAF1C", "#FFAE19", "#FFAD17", "#FFAC14", "#FFAB12", "#FFAA0F", "#FFA90C", "#FFA80A", "#FFA707", "#FFA605", "#FFA502", "#FFA500"]
+
+		Timer
+		{
+			id: blinkTimer
+			repeat: true
+			interval: 40
+			running: false
+			property int index: 0
+			property int direction: 1
+			onTriggered: {
+				index = index + direction
+				var color = parent.colorGradient[index]
+				left.color = color
+				right.color = color
+				parent.color = parent.colorGradient[index]
+				if (index >= parent.colorGradient.length - 1)
+					direction = -1
+				else if (index <= 0)
+					direction = 1
+			}
+			onRunningChanged: {
+				if (!running)
+				{
+					left.color = "white"
+					right.color = "white"
+					parent.color = "white"
+					index = 0
+					direction = 1
+				}
+			}
+		}
+
 		Image {
 			id: debugImage
 			anchors {
@@ -25,12 +79,11 @@ Rectangle {
 				right: parent.right
 				top: parent.top
 				bottom: parent.bottom
-				bottomMargin: debugImg.pressed ? 0 : 2;
+				bottomMargin: debugImg.pressed ? -2 : 0;
 				topMargin: debugImg.pressed ? 2 : 0;
 			}
 			source: sourceImg
 			fillMode: Image.PreserveAspectFit
-			height: 30
 		}
 
 		Button {
@@ -53,12 +106,22 @@ Rectangle {
 		}
 	}
 
+	Rectangle
+	{
+		id: right
+		width: 10
+		height: parent.height
+		anchors.left: contentRectangle.right
+		anchors.leftMargin: -8
+		radius: 15
+	}
+
 	Rectangle
 	{
 		anchors.top: contentRectangle.bottom
 		anchors.topMargin: 15
 		width: parent.width
-		Text
+		Label
 		{
 			text: buttonActionContainer.text
 			anchors.centerIn: parent

mix/qml/ScenarioExecution.qml

@@ -28,14 +28,23 @@ Rectangle {
 		spacing: 10
 		ScenarioLoader
 		{
-			height: 70
+			height: 100
 			width: parent.width
 			id: loader
 		}
 
+		Connections
+		{
+			target: blockChain
+			onChainChanged:
+			{
+				loader.needSaveOrReload()
+			}
+		}
+
 		Rectangle
 		{
-			width: parent.width
+			width: parent.parent.width
 			height: 1
 			color: "#cccccc"
 		}
@@ -43,7 +52,8 @@ Rectangle {
 		Connections
 		{
 			target: loader
-			onLoaded: {
+			onLoaded:
+			{
 				blockChain.load(scenario)
 			}
 		}

mix/qml/ScenarioLoader.qml

@@ -10,166 +10,329 @@ import "js/Debugger.js" as Debugger
 import "js/ErrorLocationFormater.js" as ErrorLocationFormater
 import "."
 
-RowLayout
+ColumnLayout
 {
+	id: blockChainSelector
 	signal restored(variant scenario)
 	signal saved(variant scenario)
 	signal duplicated(variant scenario)
 	signal loaded(variant scenario)
+	signal renamed(variant scenario)
 	spacing: 0
 	function init()
 	{
 		scenarioList.load()
 	}
 
-	id: blockChainSelector
-
-	Dialog {
-		id: newStateWin
-		modality: Qt.ApplicationModal
-		title: qsTr("New Project");
-
-		width: 320
-		height: 120
+	function needSaveOrReload()
+	{
+		editStatus.visible = true
+	}
 
-		visible: false
+	Rectangle
+	{
+		Layout.fillWidth: true
+		Layout.preferredHeight: 30
+		color: "transparent"
+		Rectangle
+		{
+			anchors.verticalCenter: parent.verticalCenter
+			anchors.horizontalCenter: parent.horizontalCenter
+			color: "transparent"
+			Label
+			{
+				anchors.verticalCenter: parent.verticalCenter
+				anchors.horizontalCenter: parent.horizontalCenter
+				id: scenarioName
+				font.bold: true
+			}
 
-		contentItem: Rectangle {
-			anchors.fill: parent
-			anchors.margins: 10
-			RowLayout {
+			TextInput
+			{
+				id: scenarioNameEdit
+				visible: false
 				anchors.verticalCenter: parent.verticalCenter
-				Text {
-					text: qsTr("Name:")
+				anchors.horizontalCenter: parent.horizontalCenter
+				Keys.onEnterPressed:
+				{
+					save()
 				}
 
-				Rectangle
+				function edit()
 				{
-					Layout.preferredWidth: 250
-					Layout.preferredHeight: parent.height
-					border.width: 1
-					border.color: "#cccccc"
-					TextInput
-					{
-						anchors.fill: parent
-						id: stateName
-					}
+					editIconRect.anchors.left = scenarioNameEdit.right
+					editStatus.parent.anchors.left = scenarioNameEdit.right
+					scenarioNameEdit.forceActiveFocus()
+				}
+
+				function save()
+				{
+					editIconRect.anchors.left = scenarioName.right
+					editStatus.parent.anchors.left = scenarioName.right
+					scenarioName.text = scenarioNameEdit.text
+					scenarioName.visible = true
+					scenarioNameEdit.visible = false
+					projectModel.stateListModel.getState(scenarioList.currentIndex).title = scenarioName.text
+					projectModel.saveProjectFile()
+					saved(state)
+					scenarioList.model.get(scenarioList.currentIndex).title = scenarioName.text
+					scenarioList.currentIndex = scenarioList.currentIndex
+					renamed(projectModel.stateListModel.getState(scenarioList.currentIndex))
 				}
 			}
-			RowLayout
+
+			Connections
 			{
-				anchors.bottom: parent.bottom
-				anchors.right: parent.right;
-				function acceptAndClose()
+				target: blockChainSelector
+				onLoaded:
 				{
-					var item = projectModel.stateListModel.createDefaultState();
-					item.title = stateName.text
-					projectModel.stateListModel.appendState(item)
-					projectModel.stateListModel.save()
-					close()
-					scenarioList.currentIndex = projectModel.stateListModel.count - 1
+					scenarioName.text = scenario.title
+					scenarioNameEdit.text = scenario.title
 				}
+			}
 
-				function close()
-				{
-					newStateWin.close()
-					stateName.text = ""
+			Rectangle
+			{
+				anchors.left: scenarioName.right
+				anchors.top: scenarioName.top
+				anchors.leftMargin: 2
+				Layout.preferredWidth: 20
+				Text {
+					id: editStatus
+					text: "*"
+					visible: false
 				}
+			}
 
-				Button {
-					id: okButton;
-					enabled: stateName.text !== ""
-					text: qsTr("OK");
-					onClicked: {
-						parent.acceptAndClose();
+			Rectangle
+			{
+				id: editIconRect
+				anchors.left: scenarioName.right
+				anchors.leftMargin: 15
+				Image {
+					source: "qrc:/qml/img/edit.png"
+					width: 10
+					fillMode: Image.PreserveAspectFit
+					anchors.verticalCenter: parent.verticalCenter
+					anchors.horizontalCenter: parent.horizontalCenter
+					MouseArea
+					{
+						anchors.fill: parent
+						onClicked:
+						{
+							scenarioName.visible = !scenarioName.visible
+							scenarioNameEdit.visible = !scenarioNameEdit.visible
+							if (!scenarioNameEdit.visible)
+								scenarioNameEdit.save()
+							else
+								scenarioNameEdit.edit()
+
+						}
 					}
 				}
-				Button {
-					text: qsTr("Cancel");
-					onClicked: parent.close();
-				}
 			}
 		}
 	}
 
-	ComboBox
+	RowLayout
 	{
-		id: scenarioList
-		model: projectModel.stateListModel
-		textRole: "title"
-		onCurrentIndexChanged:
-		{
-			restoreScenario.restore()
-		}
+		Layout.preferredWidth: 560
+		anchors.horizontalCenter: parent.horizontalCenter
+		Layout.preferredHeight: 50
+		spacing: 0
 
-		function load()
+		Row
 		{
-			var state = projectModel.stateListModel.getState(currentIndex)
-			loaded(state)
-		}
-	}
+			Layout.preferredWidth: 100 * 5
+			Layout.preferredHeight: 50
+			spacing: 15
 
-	Row
-	{
-		Layout.preferredWidth: 100 * 4
-		Layout.preferredHeight: 30
-		spacing: 0
-		ScenarioButton {
-			id: restoreScenario
-			width: 100
-			height: 30
-			buttonShortcut: ""
-			sourceImg: "qrc:/qml/img/restoreicon@2x.png"
-			onClicked: {
-				restore()
-			}
-			text: qsTr("Restore")
-			function restore()
+			Rectangle
 			{
-				var state = projectModel.stateListModel.reloadStateFromFromProject(scenarioList.currentIndex)
-				restored(state)
-				loaded(state)
-			}
-		}
+				color: "transparent"
+				width: 251
+				height: 30
+				Rectangle
+				{
+					width: 10
+					height: parent.height
+					anchors.right: scenarioList.left
+					anchors.rightMargin: -8
+					radius: 15
+				}
 
-		ScenarioButton {
-			id: saveScenario
-			text: qsTr("Save")
-			onClicked: {
-				projectModel.saveProjectFile()
-				saved(state)
-			}
-			width: 100
-			height: 30
-			buttonShortcut: ""
-			sourceImg: "qrc:/qml/img/saveicon@2x.png"
-		}
+				ComboBox
+				{
+					id: scenarioList
+					model: projectModel.stateListModel
+					textRole: "title"
+					height: parent.height
+					width: 150
+					onCurrentIndexChanged:
+					{
+						restoreScenario.restore()
+					}
 
-		ScenarioButton
-		{
-			id: duplicateScenario
-			text: qsTr("Duplicate")
-			onClicked: {
-				projectModel.stateListModel.duplicateState(scenarioList.currentIndex)
-				duplicated(state)
+					function load()
+					{
+						var state = projectModel.stateListModel.getState(currentIndex)
+						loaded(state)
+					}
+
+					style: ComboBoxStyle {
+						background: Rectangle {
+							color: "white"
+							anchors.fill: parent
+						}
+						label: Rectangle {
+							anchors.fill: parent
+							color: "white"
+							Label {
+								id: comboLabel
+								maximumLineCount: 1
+								elide: Text.ElideRight
+								width: parent.width
+								anchors.verticalCenter: parent.verticalCenter
+								anchors.horizontalCenter: parent.horizontalCenter
+								text: {
+									if (projectModel.stateListModel.getState(scenarioList.currentIndex))
+										return projectModel.stateListModel.getState(scenarioList.currentIndex).title
+									else
+										return ""
+								}
+								Connections {
+									target: blockChainSelector
+									onLoaded: {
+										comboLabel.text = projectModel.stateListModel.getState(scenarioList.currentIndex).title
+									}
+									onRenamed: {
+										comboLabel.text = scenario.title
+									}
+								}
+							}
+						}
+					}
+				}
+
+				Rectangle
+				{
+					width: 1
+					height: parent.height
+					anchors.right: addScenario.left
+					color: "#ededed"
+				}
+
+				ScenarioButton {
+					id: addScenario
+					anchors.left: scenarioList.right
+					width: 100
+					height: parent.height
+					buttonShortcut: ""
+					sourceImg: "qrc:/qml/img/restoreicon@2x.png"
+					onClicked: {
+						var item = projectModel.stateListModel.createDefaultState();
+						item.title = qsTr("New Scenario")
+						projectModel.stateListModel.appendState(item)
+						projectModel.stateListModel.save()
+						scenarioList.currentIndex = projectModel.stateListModel.count - 1
+						scenarioNameEdit.edit()
+					}
+					text: qsTr("New..")
+					roundRight: true
+					roundLeft: false
+				}
 			}
-			width: 100
-			height: 30
-			buttonShortcut: ""
-			sourceImg: "qrc:/qml/img/duplicateicon@2x.png"
-		}
 
-		ScenarioButton {
-			id: addScenario
-			width: 100
-			height: 30
-			buttonShortcut: ""
-			sourceImg: "qrc:/qml/img/plus.png"
-			onClicked: {
-				newStateWin.open()
+
+			Rectangle
+			{
+				width: 100 * 3
+				height: 30
+				color: "transparent"
+
+				Rectangle
+				{
+					width: 10
+					height: parent.height
+					anchors.right: restoreScenario.left
+					anchors.rightMargin: -4
+					radius: 15
+				}
+
+				ScenarioButton {
+					id: restoreScenario
+					width: 100
+					height: parent.height
+					buttonShortcut: ""
+					sourceImg: "qrc:/qml/img/restoreicon@2x.png"
+					onClicked: {
+						restore()
+					}
+					text: qsTr("Restore")
+					function restore()
+					{
+						var state = projectModel.stateListModel.reloadStateFromFromProject(scenarioList.currentIndex)
+						if (state)
+						{
+							editStatus.visible = false
+							restored(state)
+							loaded(state)
+						}
+					}
+					roundRight: false
+					roundLeft: true
+				}
+
+
+				Rectangle
+				{
+					width: 1
+					height: parent.height
+					anchors.right: saveScenario.left
+					color: "#ededed"
+				}
+
+				ScenarioButton {
+					id: saveScenario
+					anchors.left: restoreScenario.right
+					text: qsTr("Save")
+					onClicked: {
+						projectModel.saveProjectFile()
+						saved(state)
+					}
+					width: 100
+					height: parent.height
+					buttonShortcut: ""
+					sourceImg: "qrc:/qml/img/saveicon@2x.png"
+					roundRight: false
+					roundLeft: false
+				}
+
+				Rectangle
+				{
+					width: 1
+					height: parent.height
+					anchors.right: duplicateScenario.left
+					color: "#ededed"
+				}
+
+				ScenarioButton
+				{
+					id: duplicateScenario
+					anchors.left: saveScenario.right
+					text: qsTr("Duplicate")
+					onClicked: {
+						projectModel.stateListModel.duplicateState(scenarioList.currentIndex)
+						duplicated(state)
+					}
+					width: 100
+					height: parent.height
+					buttonShortcut: ""
+					sourceImg: "qrc:/qml/img/duplicateicon@2x.png"
+					roundRight: true
+					roundLeft: false
+				}
 			}
-			text: qsTr("New")
 		}
 	}
-
 }

mix/qml/WebPreview.qml

@@ -89,11 +89,6 @@ Item {
 		}
 	}
 
-	Connections {
-		target: clientModel
-		onRunComplete: reload();
-	}
-
 	Connections {
 		target: codeModel
 		onContractInterfaceChanged: reload();

sanitizer-blacklist.txt

@@ -0,0 +1,8 @@
+# Ignore standard library headers.
+src:*/include/c\+\+/*
+
+# Ignore boost libraries headers.
+src:*/include/boost/*
+
+# Ignore Crypto++ library. We plan to remove it in the future. It exploits interger overflow and uses memcpy incorrectly.
+src:*/include/cryptopp/*

solc/CommandLineInterface.cpp

@@ -273,6 +273,11 @@ void CommandLineInterface::handleGasEstimation(string const& _contract)
 			GasEstimator::GasConsumption gas = GasEstimator::functionalEstimation(*items, sig);
 			cout << "   " << sig << ":\t" << gas << endl;
 		}
+		if (contract.getFallbackFunction())
+		{
+			GasEstimator::GasConsumption gas = GasEstimator::functionalEstimation(*items, "INVALID");
+			cout << "   fallback:\t" << gas << endl;
+		}
 		cout << "internal:" << endl;
 		for (auto const& it: contract.getDefinedFunctions())
 		{

solc/jsonCompiler.cpp

@@ -91,6 +91,8 @@ Json::Value estimateGas(CompilerStack const& _compiler, string const& _contract)
 			string sig = it.second->externalSignature();
 			externalFunctions[sig] = gasToJson(GasEstimator::functionalEstimation(*items, sig));
 		}
+		if (contract.getFallbackFunction())
+			externalFunctions[""] = gasToJson(GasEstimator::functionalEstimation(*items, "INVALID"));
 		gasEstimates["external"] = externalFunctions;
 		Json::Value internalFunctions(Json::objectValue);
 		for (auto const& it: contract.getDefinedFunctions())

test/libethereum/blockchain.cpp

@@ -788,58 +788,58 @@ BOOST_AUTO_TEST_SUITE(BlockChainTests)
 
 BOOST_AUTO_TEST_CASE(bcForkBlockTest)
 {
-	dev::test::executeTests("bcForkBlockTest", "/BlockTests",dev::test::getFolder(__FILE__) + "/BlockTestsFiller", dev::test::doBlockchainTests);
+	dev::test::executeTests("bcForkBlockTest", "/BlockchainTests",dev::test::getFolder(__FILE__) + "/BlockchainTestsFiller", dev::test::doBlockchainTests);
 }
 
 BOOST_AUTO_TEST_CASE(bcTotalDifficultyTest)
 {
-	dev::test::executeTests("bcTotalDifficultyTest", "/BlockTests",dev::test::getFolder(__FILE__) + "/BlockTestsFiller", dev::test::doBlockchainTests);
+	dev::test::executeTests("bcTotalDifficultyTest", "/BlockchainTests",dev::test::getFolder(__FILE__) + "/BlockchainTestsFiller", dev::test::doBlockchainTests);
 }
 
 BOOST_AUTO_TEST_CASE(bcInvalidRLPTest)
 {
-	dev::test::executeTests("bcInvalidRLPTest", "/BlockTests",dev::test::getFolder(__FILE__) + "/BlockTestsFiller", dev::test::doBlockchainTests);
+	dev::test::executeTests("bcInvalidRLPTest", "/BlockchainTests",dev::test::getFolder(__FILE__) + "/BlockchainTestsFiller", dev::test::doBlockchainTests);
 }
 
 BOOST_AUTO_TEST_CASE(bcRPC_API_Test)
 {
-	dev::test::executeTests("bcRPC_API_Test", "/BlockTests",dev::test::getFolder(__FILE__) + "/BlockTestsFiller", dev::test::doBlockchainTests);
+	dev::test::executeTests("bcRPC_API_Test", "/BlockchainTests",dev::test::getFolder(__FILE__) + "/BlockchainTestsFiller", dev::test::doBlockchainTests);
 }
 
 BOOST_AUTO_TEST_CASE(bcValidBlockTest)
 {
-	dev::test::executeTests("bcValidBlockTest", "/BlockTests",dev::test::getFolder(__FILE__) + "/BlockTestsFiller", dev::test::doBlockchainTests);
+	dev::test::executeTests("bcValidBlockTest", "/BlockchainTests",dev::test::getFolder(__FILE__) + "/BlockchainTestsFiller", dev::test::doBlockchainTests);
 }
 
 BOOST_AUTO_TEST_CASE(bcInvalidHeaderTest)
 {
-	dev::test::executeTests("bcInvalidHeaderTest", "/BlockTests",dev::test::getFolder(__FILE__) + "/BlockTestsFiller", dev::test::doBlockchainTests);
+	dev::test::executeTests("bcInvalidHeaderTest", "/BlockchainTests",dev::test::getFolder(__FILE__) + "/BlockchainTestsFiller", dev::test::doBlockchainTests);
 }
 
 BOOST_AUTO_TEST_CASE(bcUncleTest)
 {
-	dev::test::executeTests("bcUncleTest", "/BlockTests",dev::test::getFolder(__FILE__) + "/BlockTestsFiller", dev::test::doBlockchainTests);
+	dev::test::executeTests("bcUncleTest", "/BlockchainTests",dev::test::getFolder(__FILE__) + "/BlockchainTestsFiller", dev::test::doBlockchainTests);
 }
 
 BOOST_AUTO_TEST_CASE(bcUncleHeaderValiditiy)
 {
-	dev::test::executeTests("bcUncleHeaderValiditiy", "/BlockTests",dev::test::getFolder(__FILE__) + "/BlockTestsFiller", dev::test::doBlockchainTests);
+	dev::test::executeTests("bcUncleHeaderValiditiy", "/BlockchainTests",dev::test::getFolder(__FILE__) + "/BlockchainTestsFiller", dev::test::doBlockchainTests);
 }
 
 BOOST_AUTO_TEST_CASE(bcGasPricerTest)
 {
-	dev::test::executeTests("bcGasPricerTest", "/BlockTests",dev::test::getFolder(__FILE__) + "/BlockTestsFiller", dev::test::doBlockchainTests);
+	dev::test::executeTests("bcGasPricerTest", "/BlockchainTests",dev::test::getFolder(__FILE__) + "/BlockchainTestsFiller", dev::test::doBlockchainTests);
 }
 
 BOOST_AUTO_TEST_CASE(bcBruncleTest)
 {
-	dev::test::executeTests("bcBruncleTest", "/BlockTests",dev::test::getFolder(__FILE__) + "/BlockTestsFiller", dev::test::doBlockchainTests);
+	dev::test::executeTests("bcBruncleTest", "/BlockchainTests",dev::test::getFolder(__FILE__) + "/BlockchainTestsFiller", dev::test::doBlockchainTests);
 }
 
 BOOST_AUTO_TEST_CASE(bcWalletTest)
 {
 	if (test::Options::get().wallet)
-		dev::test::executeTests("bcWalletTest", "/BlockTests",dev::test::getFolder(__FILE__) + "/BlockTestsFiller", dev::test::doBlockchainTests);
+		dev::test::executeTests("bcWalletTest", "/BlockchainTests",dev::test::getFolder(__FILE__) + "/BlockchainTestsFiller", dev::test::doBlockchainTests);
 }
 
 BOOST_AUTO_TEST_CASE(userDefinedFile)

test/libethereum/gaspricer.cpp

@@ -90,51 +90,51 @@ BOOST_AUTO_TEST_CASE(basicGasPricerNoUpdate)
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_RPC_API_Test)
 {
-	dev::test::executeGasPricerTest("RPC_API_Test", 30.679, 15.0, "/BlockTests/bcRPC_API_Test.json", TransactionPriority::Medium, 155632494086, 1);
+	dev::test::executeGasPricerTest("RPC_API_Test", 30.679, 15.0, "/BlockchainTests/bcRPC_API_Test.json", TransactionPriority::Medium, 155632494086, 1);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_bcValidBlockTest)
 {
-	dev::test::executeGasPricerTest("SimpleTx", 30.679, 15.0, "/BlockTests/bcValidBlockTest.json", TransactionPriority::Medium, 155632494086, 10);
+	dev::test::executeGasPricerTest("SimpleTx", 30.679, 15.0, "/BlockchainTests/bcValidBlockTest.json", TransactionPriority::Medium, 155632494086, 10);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_bcUncleTest)
 {
-	dev::test::executeGasPricerTest("twoUncle", 30.679, 15.0, "/BlockTests/bcUncleTest.json", TransactionPriority::Medium, 155632494086, 1);
+	dev::test::executeGasPricerTest("twoUncle", 30.679, 15.0, "/BlockchainTests/bcUncleTest.json", TransactionPriority::Medium, 155632494086, 1);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_bcUncleHeaderValiditiy)
 {
-	dev::test::executeGasPricerTest("correct", 30.679, 15.0, "/BlockTests/bcUncleHeaderValiditiy.json", TransactionPriority::Medium, 155632494086, 1);
+	dev::test::executeGasPricerTest("correct", 30.679, 15.0, "/BlockchainTests/bcUncleHeaderValiditiy.json", TransactionPriority::Medium, 155632494086, 1);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_notxs)
 {
-	dev::test::executeGasPricerTest("notxs", 30.679, 15.0, "/BlockTests/bcGasPricerTest.json", TransactionPriority::Medium, 155632494086, 155632494086);
+	dev::test::executeGasPricerTest("notxs", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest.json", TransactionPriority::Medium, 155632494086, 155632494086);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_highGasUsage_LowestPrio)
 {
-	dev::test::executeGasPricerTest("highGasUsage", 30.679, 15.0, "/BlockTests/bcGasPricerTest.json", TransactionPriority::Lowest, 15731282021, 10000000000000);
+	dev::test::executeGasPricerTest("highGasUsage", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest.json", TransactionPriority::Lowest, 15731282021, 10000000000000);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_highGasUsage_LowPrio)
 {
-	dev::test::executeGasPricerTest("highGasUsage", 30.679, 15.0, "/BlockTests/bcGasPricerTest.json", TransactionPriority::Low, 15731282021, 15734152261884);
+	dev::test::executeGasPricerTest("highGasUsage", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest.json", TransactionPriority::Low, 15731282021, 15734152261884);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_highGasUsage_MediumPrio)
 {
-	dev::test::executeGasPricerTest("highGasUsage", 30.679, 15.0, "/BlockTests/bcGasPricerTest.json", TransactionPriority::Medium, 15731282021, 20000000000000);
+	dev::test::executeGasPricerTest("highGasUsage", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest.json", TransactionPriority::Medium, 15731282021, 20000000000000);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_highGasUsage_HighPrio)
 {
-	dev::test::executeGasPricerTest("highGasUsage", 30.679, 15.0, "/BlockTests/bcGasPricerTest.json", TransactionPriority::High, 15731282021, 24265847738115);
+	dev::test::executeGasPricerTest("highGasUsage", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest.json", TransactionPriority::High, 15731282021, 24265847738115);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_highGasUsage_HighestPrio)
 {
-	dev::test::executeGasPricerTest("highGasUsage", 30.679, 15.0, "/BlockTests/bcGasPricerTest.json", TransactionPriority::Highest, 15731282021, 30000000000000);
+	dev::test::executeGasPricerTest("highGasUsage", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest.json", TransactionPriority::Highest, 15731282021, 30000000000000);
 }
 BOOST_AUTO_TEST_SUITE_END()